diff --git a/app/admin/[businessId]/page.tsx b/app/admin/[businessId]/page.tsx
index 711c62c..2e86021 100644
--- a/app/admin/[businessId]/page.tsx
+++ b/app/admin/[businessId]/page.tsx
@@ -9,85 +9,31 @@ import {
   provisionBusinessAction,
   resyncBusinessWebhooksAction,
   restoreBusinessAction,
-  saveAdminBusinessProfileAction,
+  saveAdminTwilioSetupAction,
   sendBusinessTestSmsAction,
   setBusinessProvisioningStatusAction,
 } from '@/app/admin/actions';
-import { buildAdminCustomerOpenHref } from '@/lib/admin-customer-paths';
-import {
-  buildAdminOnboardingConfidence,
-  canDeleteTestBusiness,
-  isBusinessArchived,
-} from '@/lib/admin-dashboard';
-import { CopyValueButton } from '@/components/copy-value-button';
+import { TwilioSetupChecklist } from '@/components/twilio-setup-checklist';
 import { Badge } from '@/components/ui/badge';
 import { Button, buttonVariants } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Select } from '@/components/ui/select';
-import { Textarea } from '@/components/ui/textarea';
+import { buildAdminCustomerOpenHref } from '@/lib/admin-customer-paths';
+import { getAdminTestSmsConfidenceState, isBusinessArchived } from '@/lib/admin-dashboard';
+import { getAdminOwnerState, getTwilioWebhookSnapshot, listAdminTwilioNumbers } from '@/lib/admin-provisioning';
 import { requireAdmin } from '@/lib/admin';
-import {
-  adminProvisioningStatusLabels,
-  buildAdminProvisioningChecklist,
-  getAdminOwnerState,
-  getAdminProvisioningStatusVariant,
-  getTwilioWebhookSnapshot,
-  listAdminTwilioNumbers,
-} from '@/lib/admin-provisioning';
+import { TwilioSetupTone, buildTwilioSetupFlow, twilioAccountModeOptions, twilioNumberSetupModeOptions } from '@/lib/twilio-setup';
 import { db } from '@/lib/db';
-import {
-  formatDateTime,
-  formatMessageStatus,
-  formatRelativeTime,
-  getLeadCallbackState,
-  getLeadStatusBadgeVariant,
-  leadReadinessLabels,
-  leadStatusLabels,
-} from '@/lib/lead-presenters';
-import { getManagedTextingNumber, getManagedTwilioStatusSummary, managedTwilioStatusLabels } from '@/lib/managed-twilio-status';
-import {
-  businessTimelineFilterOptions,
-  countTimelineFilters,
-  matchesTimelineFilter,
-  operatorEventCategoryLabels,
-  operatorEventStatusLabels,
-  type BusinessTimelineFilter,
-} from '@/lib/operator-events';
+import { getManagedTextingNumber, managedTwilioStatusLabels } from '@/lib/managed-twilio-status';
 import { formatPhoneForDisplay } from '@/lib/phone';
-import { getBusinessBillingAccessState } from '@/lib/subscription';
-import { getAdminBusinessStatus, getCustomerSystemStatus } from '@/lib/system-status';
-import { cn } from '@/lib/utils';
-
-export const dynamic = 'force-dynamic';
 
-const changedFieldLabels: Record<string, string> = {
-  ownerPhone: 'owner alert phone',
-  twilioPhoneNumber: 'Twilio number',
-  twilioPhoneNumberSid: 'Twilio number SID',
-  twilioMessagingServiceSid: 'messaging service SID',
-  a2pCustomerProfileSid: 'A2P customer profile SID',
-  a2pBrandSid: 'A2P brand SID',
-  a2pCampaignSid: 'A2P campaign SID',
-  a2pFailureReason: 'A2P failure reason',
-  managedTwilioStatus: 'managed Twilio status',
-  isTestBusiness: 'test business flag',
-};
-
-type AdminBusinessFormDefaults = {
-  name: string;
-  ownerName: string;
-  ownerEmail: string;
-  ownerPhone: string;
-  isTestBusiness: boolean;
-  forwardingNumber: string;
-  timezone: string;
-  missedCallSeconds: string;
-  serviceLabel1: string;
-  serviceLabel2: string;
-  serviceLabel3: string;
-  internalNotes: string;
+type AdminTwilioDefaults = {
+  businessId: string;
+  twilioAccountMode: string;
+  twilioNumberSetupMode: string;
+  twilioSubaccountSid: string;
   twilioPhoneNumber: string;
   twilioPhoneNumberSid: string;
   twilioMessagingServiceSid: string;
@@ -96,42 +42,6 @@ type AdminBusinessFormDefaults = {
   a2pCampaignSid: string;
   a2pFailureReason: string;
   managedTwilioStatus: string;
-  notifySms: boolean;
-  notifyEmail: boolean;
-  notifyInApp: boolean;
-  urgentOnly: boolean;
-};
-
-type AdminBusinessWithSettings = {
-  name: string;
-  ownerName: string | null;
-  notifyPhone: string | null;
-  isTestBusiness: boolean;
-  forwardingNumber: string;
-  timezone: string;
-  missedCallSeconds: number;
-  serviceLabel1: string;
-  serviceLabel2: string;
-  serviceLabel3: string;
-  internalNotes: string | null;
-  twilioPrimaryPhoneNumber: string | null;
-  twilioPhoneNumber: string | null;
-  twilioPrimaryNumberSid: string | null;
-  twilioPhoneNumberSid: string | null;
-  twilioMessagingServiceSid: string | null;
-  a2pCustomerProfileSid: string | null;
-  a2pBrandSid: string | null;
-  a2pCampaignSid: string | null;
-  a2pFailureReason: string | null;
-  managedTwilioStatus: string;
-  notificationSettings: {
-    ownerEmail: string | null;
-    ownerPhone: string | null;
-    notifySms: boolean;
-    notifyEmail: boolean;
-    notifyInApp: boolean;
-    urgentOnly: boolean;
-  } | null;
 };
 
 function getQueryValue(searchParams: Record<string, string | string[] | undefined> | undefined, key: string) {
@@ -139,148 +49,28 @@ function getQueryValue(searchParams: Record<string, string | string[] | undefine
   return typeof value === 'string' ? value : null;
 }
 
-function getTimelineFilter(searchParams: Record<string, string | string[] | undefined> | undefined): BusinessTimelineFilter {
-  const value = getQueryValue(searchParams, 'activity');
-  return businessTimelineFilterOptions.some((option) => option.key === value) ? (value as BusinessTimelineFilter) : 'all';
-}
-
-function getOperatorEventBadgeVariant(status: keyof typeof operatorEventStatusLabels) {
-  if (status === 'FAILED') return 'destructive' as const;
-  if (status === 'WARNING') return 'outline' as const;
-  if (status === 'SUCCESS') return 'success' as const;
-  return 'secondary' as const;
-}
-
-function getConfidenceMilestoneBadgeVariant(variant: 'success' | 'warning' | 'pending') {
-  if (variant === 'success') return 'success' as const;
-  if (variant === 'warning') return 'outline' as const;
-  return 'secondary' as const;
-}
-
-function formatOperatorEventDetailValue(value: unknown): string {
-  if (value === null || value === undefined) return '-';
-  if (typeof value === 'string') return value;
-  if (typeof value === 'number' || typeof value === 'boolean') return String(value);
-  if (Array.isArray(value)) return value.map((item) => formatOperatorEventDetailValue(item)).join(', ');
-  if (typeof value === 'object') {
-    return Object.entries(value as Record<string, unknown>)
-      .map(([key, nested]) => `${key}: ${formatOperatorEventDetailValue(nested)}`)
-      .join(' | ');
-  }
-  return String(value);
-}
-
-function getOperatorEventDetails(value: unknown) {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) return [];
-  return Object.entries(value as Record<string, unknown>).map(([key, detail]) => ({
-    key,
-    label: key.replace(/([A-Z])/g, ' $1').replace(/_/g, ' '),
-    value: formatOperatorEventDetailValue(detail),
-  }));
-}
-
-function buildOperatorEventRelatedHref(businessId: string, relatedEntityType: string | null, relatedEntityId: string | null) {
-  if (!relatedEntityType || !relatedEntityId) return null;
-  if (relatedEntityType === 'lead') return buildAdminCustomerOpenHref(businessId, `/app/leads/${relatedEntityId}`);
-  if (relatedEntityType === 'message') return `/admin/${businessId}/workspace#recent-activity`;
-  if (relatedEntityType === 'call') return buildAdminCustomerOpenHref(businessId, '/app/call-flow');
-  return null;
-}
-
-function HiddenAdminBusinessFields({
+function HiddenAdminTwilioFields({
   defaults,
   exclude = [],
 }: {
-  defaults: AdminBusinessFormDefaults;
-  exclude?: Array<keyof AdminBusinessFormDefaults>;
+  defaults: AdminTwilioDefaults;
+  exclude?: Array<keyof AdminTwilioDefaults>;
 }) {
   return (
     <>
       {Object.entries(defaults).map(([name, value]) => {
-        if (exclude.includes(name as keyof AdminBusinessFormDefaults)) return null;
-
-        if (typeof value === 'boolean') {
-          if (!value) return null;
-          return <input key={name} name={name} type="hidden" value="true" />;
-        }
-
+        if (exclude.includes(name as keyof AdminTwilioDefaults)) return null;
         return <input key={name} name={name} type="hidden" value={value} />;
       })}
     </>
   );
 }
 
-function StatusButton({
-  businessId,
-  status,
-  label,
-  variant = 'outline',
-}: {
-  businessId: string;
-  status: 'DRAFT' | 'ONBOARDING' | 'NEEDS_ATTENTION' | 'LIVE' | 'PAUSED';
-  label: string;
-  variant?: 'default' | 'outline' | 'destructive' | 'secondary';
-}) {
-  return (
-    <form action={setBusinessProvisioningStatusAction}>
-      <input type="hidden" name="businessId" value={businessId} />
-      <input type="hidden" name="status" value={status} />
-      <Button size="sm" type="submit" variant={variant}>
-        {label}
-      </Button>
-    </form>
-  );
-}
-
-function WebhookResyncButton({
-  businessId,
-  target,
-  label,
-  variant = 'outline',
-}: {
-  businessId: string;
-  target: 'VOICE' | 'SMS' | 'ALL';
-  label: string;
-  variant?: 'default' | 'outline' | 'destructive' | 'secondary';
-}) {
-  return (
-    <form action={resyncBusinessWebhooksAction}>
-      <input type="hidden" name="businessId" value={businessId} />
-      <input type="hidden" name="target" value={target} />
-      <Button type="submit" size="sm" variant={variant}>
-        {label}
-      </Button>
-    </form>
-  );
-}
-
-function buildAdminFormDefaults(business: AdminBusinessWithSettings) {
-  return {
-    name: business.name,
-    ownerName: business.ownerName || '',
-    ownerEmail: business.notificationSettings?.ownerEmail || '',
-    ownerPhone: business.notificationSettings?.ownerPhone || business.notifyPhone || '',
-    isTestBusiness: business.isTestBusiness,
-    forwardingNumber: business.forwardingNumber,
-    timezone: business.timezone,
-    missedCallSeconds: String(business.missedCallSeconds),
-    serviceLabel1: business.serviceLabel1,
-    serviceLabel2: business.serviceLabel2,
-    serviceLabel3: business.serviceLabel3,
-    internalNotes: business.internalNotes || '',
-    twilioPhoneNumber: business.twilioPrimaryPhoneNumber || business.twilioPhoneNumber || '',
-    twilioPhoneNumberSid: business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || '',
-    twilioMessagingServiceSid: business.twilioMessagingServiceSid || '',
-    a2pCustomerProfileSid: business.a2pCustomerProfileSid || '',
-    a2pBrandSid: business.a2pBrandSid || '',
-    a2pCampaignSid: business.a2pCampaignSid || '',
-    a2pFailureReason: business.a2pFailureReason || '',
-    managedTwilioStatus: business.managedTwilioStatus,
-    notifySms: business.notificationSettings?.notifySms ?? true,
-    notifyEmail: business.notificationSettings?.notifyEmail ?? true,
-    notifyInApp: business.notificationSettings?.notifyInApp ?? true,
-    urgentOnly: business.notificationSettings?.urgentOnly ?? false,
-  } satisfies AdminBusinessFormDefaults;
+function getBadgeVariant(tone: TwilioSetupTone) {
+  if (tone === 'success') return 'success' as const;
+  if (tone === 'attention') return 'destructive' as const;
+  if (tone === 'pending') return 'outline' as const;
+  return 'secondary' as const;
 }
 
 export default async function AdminBusinessDetailPage({
@@ -291,99 +81,36 @@ export default async function AdminBusinessDetailPage({
   searchParams?: Record<string, string | string[] | undefined>;
 }) {
   await requireAdmin();
-  const activityFilter = getTimelineFilter(searchParams);
 
-  const [business, successfulLeadCount, leadCount, callCount, messageCount, recentLeads, recentCalls, recentMessages, recentOwnerNotifications, operatorEvents] =
-    await Promise.all([
-      db.business.findUnique({
-        where: { id: params.businessId },
-        include: {
-          notificationSettings: true,
-        },
-      }),
-      db.lead.count({
-        where: {
-          businessId: params.businessId,
-          OR: [{ ownerNotifiedAt: { not: null } }, { notifiedAt: { not: null } }],
+  const [business, successfulLeadCount, operatorEvents] = await Promise.all([
+    db.business.findUnique({
+      where: { id: params.businessId },
+      include: {
+        notificationSettings: true,
+      },
+    }),
+    db.lead.count({
+      where: {
+        businessId: params.businessId,
+        OR: [{ ownerNotifiedAt: { not: null } }, { notifiedAt: { not: null } }],
+      },
+    }),
+    db.businessOperatorEvent.findMany({
+      where: {
+        businessId: params.businessId,
+        type: {
+          startsWith: 'admin.test_sms_',
         },
-      }),
-      db.lead.count({ where: { businessId: params.businessId } }),
-      db.call.count({ where: { businessId: params.businessId } }),
-      db.message.count({ where: { businessId: params.businessId } }),
-      db.lead.findMany({
-        where: { businessId: params.businessId },
-        orderBy: [{ lastInteractionAt: 'desc' }, { createdAt: 'desc' }],
-        take: 6,
-        select: {
-          id: true,
-          status: true,
-          readiness: true,
-          billingRequired: true,
-          smsState: true,
-          summary: true,
-          notifiedAt: true,
-          ownerNotifiedAt: true,
-          createdAt: true,
-          lastInteractionAt: true,
-        },
-      }),
-      db.call.findMany({
-        where: { businessId: params.businessId },
-        orderBy: { createdAt: 'desc' },
-        take: 6,
-        select: {
-          id: true,
-          status: true,
-          missed: true,
-          answered: true,
-          dialCallStatus: true,
-          createdAt: true,
-        },
-      }),
-      db.message.findMany({
-        where: { businessId: params.businessId, direction: 'OUTBOUND' },
-        orderBy: { createdAt: 'desc' },
-        take: 8,
-        select: {
-          id: true,
-          leadId: true,
-          participant: true,
-          direction: true,
-          status: true,
-          body: true,
-          createdAt: true,
-        },
-      }),
-      db.ownerNotification.findMany({
-        where: { businessId: params.businessId },
-        orderBy: { createdAt: 'desc' },
-        take: 8,
-        select: {
-          id: true,
-          channel: true,
-          status: true,
-          error: true,
-          createdAt: true,
-          destination: true,
-        },
-      }),
-      db.businessOperatorEvent.findMany({
-        where: { businessId: params.businessId },
-        orderBy: { createdAt: 'desc' },
-        take: 120,
-        select: {
-          id: true,
-          type: true,
-          category: true,
-          status: true,
-          summary: true,
-          detailsJson: true,
-          relatedEntityType: true,
-          relatedEntityId: true,
-          createdAt: true,
-        },
-      }),
-    ]);
+      },
+      orderBy: { createdAt: 'desc' },
+      take: 20,
+      select: {
+        type: true,
+        status: true,
+        createdAt: true,
+      },
+    }),
+  ]);
 
   if (!business) notFound();
 
@@ -393,1080 +120,608 @@ export default async function AdminBusinessDetailPage({
     listAdminTwilioNumbers(business),
   ]);
 
-  const rolloutStatus = getAdminBusinessStatus(business, successfulLeadCount);
-  const customerStatus = getCustomerSystemStatus(business, successfulLeadCount);
-  const managedSummary = getManagedTwilioStatusSummary(business);
-  const billingAccess = getBusinessBillingAccessState(business);
-  const checklist = buildAdminProvisioningChecklist({
-    business,
-    notificationSettings: business.notificationSettings,
-    ownerConnected: ownerState.connected,
-    webhookSnapshot,
-  });
-  const onboardingConfidence = buildAdminOnboardingConfidence({
+  const testSmsState = getAdminTestSmsConfidenceState(operatorEvents);
+  const managedTextingNumber = getManagedTextingNumber(business);
+  const setupFlow = buildTwilioSetupFlow({
     business,
     notificationSettings: business.notificationSettings,
     ownerConnected: ownerState.connected,
     successfulLeadCount,
-    operatorEvents: operatorEvents.map((event) => ({
-      type: event.type,
-      status: event.status,
-      createdAt: event.createdAt,
-    })),
-  });
-  const timelineFilterCounts = countTimelineFilters(operatorEvents);
-  const visibleTimelineEvents = operatorEvents.filter((event) => {
-    return matchesTimelineFilter(event, activityFilter);
+    testSmsState,
+    webhookSnapshot,
   });
-  const assignedNumber = getManagedTextingNumber(business);
-  const defaults = buildAdminFormDefaults(business);
-  const webhooksNeedAttention = Boolean(
-    assignedNumber &&
-      (!business.twilioWebhookSyncedAt ||
-        webhookSnapshot?.voiceSynced === false ||
-        webhookSnapshot?.smsSynced === false ||
-        webhookSnapshot?.statusSynced === false)
-  );
-  const brandStatusLabel = business.a2pBrandSid
-    ? managedSummary.complianceReady
-      ? 'Approved'
-      : managedSummary.attentionRequired
-        ? 'Needs attention'
-        : 'Submitted'
-    : 'Not started';
-  const campaignStatusLabel = business.a2pCampaignSid
-    ? managedSummary.complianceReady
-      ? 'Approved'
-      : managedSummary.attentionRequired
-        ? 'Needs attention'
-        : 'Pending'
-    : 'Not started';
-  const latestProvisioningEvent = operatorEvents.find((event) => event.category === 'PROVISIONING') || null;
-  const latestWebhookEvent =
-    operatorEvents.find((event) => event.category === 'WEBHOOKS') ||
-    (webhooksNeedAttention
-      ? {
-          id: 'webhook-attention',
-          createdAt: business.updatedAt,
-          status: 'WARNING' as const,
-          category: 'WEBHOOKS' as const,
-          summary: 'Webhook mismatch detected',
-          detailsJson: {
-            detail: webhookSnapshot?.error || 'Voice, SMS, or status callback sync still needs attention.',
-          },
-          relatedEntityType: null,
-          relatedEntityId: null,
-          type: 'webhooks.mismatch_detected',
-        }
-      : null);
-  const latestOutboundSms = recentMessages[0] || null;
-  const latestOwnerAlert = recentOwnerNotifications[0] || null;
+  const defaults: AdminTwilioDefaults = {
+    businessId: business.id,
+    twilioAccountMode: business.twilioAccountMode,
+    twilioNumberSetupMode: business.twilioNumberSetupMode,
+    twilioSubaccountSid: business.twilioSubaccountSid || '',
+    twilioPhoneNumber: business.twilioPrimaryPhoneNumber || business.twilioPhoneNumber || '',
+    twilioPhoneNumberSid: business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || '',
+    twilioMessagingServiceSid: business.twilioMessagingServiceSid || '',
+    a2pCustomerProfileSid: business.a2pCustomerProfileSid || '',
+    a2pBrandSid: business.a2pBrandSid || '',
+    a2pCampaignSid: business.a2pCampaignSid || '',
+    a2pFailureReason: business.a2pFailureReason || '',
+    managedTwilioStatus: business.managedTwilioStatus,
+  };
 
   const created = getQueryValue(searchParams, 'created') === '1';
   const saved = getQueryValue(searchParams, 'saved') === '1';
   const ownerAction = getQueryValue(searchParams, 'ownerAction');
   const provisioned = getQueryValue(searchParams, 'provisioned') === '1';
   const synced = getQueryValue(searchParams, 'synced');
-  const statusSaved = getQueryValue(searchParams, 'statusSaved');
   const testSms = getQueryValue(searchParams, 'testSms') === '1';
   const archived = getQueryValue(searchParams, 'archived') === '1';
   const restored = getQueryValue(searchParams, 'restored') === '1';
   const error = getQueryValue(searchParams, 'error');
-  const changed = (getQueryValue(searchParams, 'changed') || '')
-    .split(',')
-    .map((field) => field.trim())
-    .filter(Boolean)
-    .map((field) => changedFieldLabels[field] || field);
 
-  return (
-    <div className="container space-y-6 py-8">
-      <div className="space-y-2">
-        <Link className="text-sm text-muted-foreground underline underline-offset-4" href="/admin">
-          Back to operator board
-        </Link>
-        <div className="flex flex-col gap-3 xl:flex-row xl:items-end xl:justify-between">
-          <div className="space-y-2">
-            <div className="flex flex-wrap items-center gap-2">
-              <h1 className="text-3xl font-semibold tracking-tight">{business.name} business control panel</h1>
-              {business.isTestBusiness ? <Badge variant="outline">Test</Badge> : null}
-              {isBusinessArchived(business) ? <Badge variant="outline">Archived</Badge> : null}
+  const bannerAction =
+    setupFlow.banner.stepKey === 'owner_connected' && !ownerState.connected ? (
+      <Link className={buttonVariants({ size: 'sm' })} href="#owner-step">
+        Connect owner
+      </Link>
+    ) : setupFlow.banner.stepKey === 'voice_webhook_synced' ||
+      setupFlow.banner.stepKey === 'sms_webhook_synced' ||
+      setupFlow.banner.stepKey === 'status_callback_synced' ? (
+      <form action={resyncBusinessWebhooksAction}>
+        <input type="hidden" name="businessId" value={business.id} />
+        <input type="hidden" name="target" value="ALL" />
+        <Button size="sm" type="submit">
+          Sync webhooks
+        </Button>
+      </form>
+    ) : setupFlow.banner.stepKey === 'safe_to_mark_live' && setupFlow.safeToMarkLive && business.provisioningStatus !== 'LIVE' ? (
+      <form action={setBusinessProvisioningStatusAction}>
+        <input type="hidden" name="businessId" value={business.id} />
+        <input type="hidden" name="status" value="LIVE" />
+        <Button size="sm" type="submit">
+          Mark live
+        </Button>
+      </form>
+    ) : (
+      <Link
+        className={buttonVariants({ size: 'sm', variant: 'outline' })}
+        href={
+          setupFlow.banner.stepKey === 'owner_connected'
+            ? '#owner-step'
+            : setupFlow.banner.stepKey === 'account_mode'
+              ? '#account-mode-step'
+              : setupFlow.banner.stepKey === 'number_path'
+                ? '#number-path-step'
+                : setupFlow.banner.stepKey === 'test_sms_delivered'
+                  ? '#test-sms-step'
+                  : '#admin-twilio-setup'
+        }
+      >
+        Review step
+      </Link>
+    );
+
+  const setupSteps = setupFlow.steps.map((step) => {
+    if (step.key === 'owner_connected') {
+      return {
+        ...step,
+        body: ownerState.connected ? (
+          <div className="space-y-3 text-sm text-muted-foreground" id="owner-step">
+            <div className="flex flex-wrap items-center gap-3">
+              <Badge variant="success">{ownerState.statusLabel}</Badge>
+              <span>{ownerState.email || business.notificationSettings?.ownerEmail || 'Owner email not recorded'}</span>
             </div>
-            <p className="text-sm text-muted-foreground">
-              Compact owner-first workspace for onboarding, fast edits, support shortcuts, and the most common repair actions.
-            </p>
+            <p>{ownerState.detail}</p>
           </div>
-          <div className="flex flex-wrap gap-2">
-            <Link className={buttonVariants({ variant: 'default' })} href={buildAdminCustomerOpenHref(business.id, '/app')}>
-              Open customer workspace
-            </Link>
-            <Link className={buttonVariants({ variant: 'outline' })} href={buildAdminCustomerOpenHref(business.id, '/app/leads?view=attention')}>
-              Open customer leads
-            </Link>
-            <Link className={buttonVariants({ variant: 'outline' })} href={`/admin/${business.id}/workspace`}>
-              View support workspace snapshot
-            </Link>
-            <Link className={buttonVariants({ variant: 'outline' })} href="/admin">
-              Back to board
-            </Link>
-          </div>
-        </div>
-        <div className="flex flex-wrap gap-2">
-          <Badge variant={getAdminProvisioningStatusVariant(business.provisioningStatus)}>
-            {adminProvisioningStatusLabels[business.provisioningStatus]}
-          </Badge>
-          <Badge variant={rolloutStatus.badgeVariant}>{rolloutStatus.label}</Badge>
-          <Badge variant={customerStatus.badgeVariant}>{customerStatus.label}</Badge>
-          <Badge variant={onboardingConfidence.stateVariant}>{onboardingConfidence.stateLabel}</Badge>
-          <Badge variant={onboardingConfidence.readinessVariant}>{onboardingConfidence.readinessLabel}</Badge>
-        </div>
-      </div>
-
-      {created ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business workspace created. Review owner setup and provisioning health below.</div> : null}
-      {saved ? (
-        <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">
-          Business details saved{changed.length > 0 ? `: ${changed.join(', ')}.` : '.'}
-        </div>
-      ) : null}
-      {ownerAction ? (
-        <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">
-          {ownerAction === 'connected'
-            ? 'Existing owner connected.'
-            : ownerAction === 'invited'
-              ? 'Owner invitation sent.'
-              : ownerAction === 'resent'
-                ? 'Owner invitation resent.'
-                : 'Owner state updated.'}
-        </div>
-      ) : null}
-      {provisioned ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Provisioning finished. Review the health cards below.</div> : null}
-      {synced ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Webhook sync complete for {synced.toLowerCase()}.</div> : null}
-      {statusSaved ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business status updated to {statusSaved.replace(/_/g, ' ')}.</div> : null}
-      {testSms ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Admin test SMS sent.</div> : null}
-      {archived ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business archived safely. Automation is paused.</div> : null}
-      {restored ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business restored and ready for review.</div> : null}
-      {error ? <div className="rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive">{error}</div> : null}
-
-      <div className="grid gap-6 xl:grid-cols-[1.2fr_0.8fr]">
-        <Card className="border-primary/20 bg-primary/5">
-          <CardHeader>
-            <CardTitle>Onboarding confidence</CardTitle>
-            <CardDescription>Current state, blockers, next action, and the exact gate between setup, testing, and launch.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4">
-            <div className="rounded-xl border bg-background/80 p-4">
-              <div className="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
-                <div className="space-y-2">
-                  <div className="flex flex-wrap items-center gap-2">
-                    <p className="text-lg font-semibold">{onboardingConfidence.stateLabel}</p>
-                    <Badge variant={onboardingConfidence.stateVariant}>{onboardingConfidence.readinessLabel}</Badge>
-                  </div>
-                  <p className="max-w-3xl text-sm text-muted-foreground">{onboardingConfidence.summary}</p>
-                  <p className="text-sm font-medium">Next action: {onboardingConfidence.nextAction}</p>
-                  <p className="text-xs text-muted-foreground">
-                    Confidence checklist: {onboardingConfidence.milestones.filter((item) => item.complete).length} /{' '}
-                    {onboardingConfidence.milestones.length} signals complete
-                  </p>
-                </div>
-                <div className="flex flex-wrap gap-2">
-                  {isBusinessArchived(business) ? (
-                    <Link className={buttonVariants({ size: 'sm' })} href="#advanced">
-                      Restore business
-                    </Link>
-                  ) : business.provisioningStatus === 'PAUSED' ? (
-                    <Link className={buttonVariants({ size: 'sm' })} href="#advanced">
-                      Resume automation
-                    </Link>
-                  ) : !ownerState.connected ? (
-                    <Link className={buttonVariants({ size: 'sm' })} href="#business-info">
-                      Review owner setup
-                    </Link>
-                  ) : !(business.notificationSettings?.ownerPhone || business.notifyPhone) ? (
-                    <Link className={buttonVariants({ size: 'sm' })} href="#automation-settings">
-                      Add owner alert phone
-                    </Link>
-                  ) : !managedSummary.subaccountReady || !managedSummary.numberAssigned || !managedSummary.messagingServiceReady ? (
-                    <form action={provisionBusinessAction}>
-                      <input type="hidden" name="businessId" value={business.id} />
-                      <input type="hidden" name="mode" value="NEW_NUMBER" />
-                      <Button size="sm" type="submit">
-                        {managedSummary.numberAssigned ? 'Continue setup' : 'Provision business'}
-                      </Button>
-                    </form>
-                  ) : webhooksNeedAttention ? (
-                    <WebhookResyncButton businessId={business.id} label="Re-sync webhooks" target="ALL" variant="default" />
-                  ) : managedSummary.messagingReady && business.provisioningStatus !== 'LIVE' ? (
-                    <StatusButton
-                      businessId={business.id}
-                      label={onboardingConfidence.canSafelyMarkLive ? 'Mark live' : 'Mark live with warnings'}
-                      status="LIVE"
-                      variant={onboardingConfidence.canSafelyMarkLive ? 'default' : 'outline'}
-                    />
-                  ) : (
-                    <Link className={buttonVariants({ size: 'sm' })} href={`/admin/${business.id}/workspace`}>
-                      Open support workspace
-                    </Link>
-                  )}
-
-                  {!isBusinessArchived(business) ? (
-                    <form action={provisionBusinessAction}>
-                      <input type="hidden" name="businessId" value={business.id} />
-                      <input type="hidden" name="mode" value="NEW_NUMBER" />
-                      <Button size="sm" type="submit" variant="outline">
-                        Re-run provisioning
-                      </Button>
-                    </form>
-                  ) : null}
-                  {assignedNumber ? <WebhookResyncButton businessId={business.id} label="Re-sync all webhooks" target="ALL" /> : null}
-                </div>
-              </div>
-            </div>
-
-            {onboardingConfidence.blockers.length > 0 ? (
-              <div className="grid gap-3">
-                {onboardingConfidence.blockers.map((blocker, index) => (
-                  <div
-                    key={`${blocker.message}-${index}`}
-                    className={cn(
-                      'rounded-xl border p-4 text-sm',
-                      blocker.level === 'error' ? 'border-destructive/30 bg-destructive/5 text-destructive' : 'bg-background/80'
-                    )}
-                  >
-                    {blocker.message}
-                  </div>
-                ))}
-              </div>
-            ) : null}
-
-            {onboardingConfidence.milestones.length > 0 ? (
-              <div className="grid gap-3 md:grid-cols-2">
-                {onboardingConfidence.milestones.map((item) => (
-                  <div key={item.key} className="rounded-xl border bg-background/80 p-4 text-sm">
-                    <div className="flex items-center justify-between gap-3">
-                      <p className="font-medium">{item.label}</p>
-                      <Badge variant={getConfidenceMilestoneBadgeVariant(item.variant)}>{item.complete ? 'Done' : 'Next'}</Badge>
-                    </div>
-                    <p className="mt-2 text-muted-foreground">{item.detail}</p>
-                  </div>
-                ))}
-              </div>
-            ) : (
-              <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground">
-                No onboarding milestones are available for this business yet.
-              </div>
-            )}
-
-            <div className="grid gap-3 md:grid-cols-4">
-              {[
-                { label: 'Leads', value: leadCount },
-                { label: 'Calls', value: callCount },
-                { label: 'Messages', value: messageCount },
-                { label: 'Qualified alerts', value: successfulLeadCount },
-              ].map((item) => (
-                <div key={item.label} className="rounded-xl border bg-background/80 p-4">
-                  <p className="text-sm text-muted-foreground">{item.label}</p>
-                  <p className="mt-2 text-2xl font-semibold">{item.value}</p>
-                </div>
-              ))}
-            </div>
-          </CardContent>
-        </Card>
-
-        <Card className="bg-card/90">
-          <CardHeader>
-            <CardTitle>Support mode shortcuts</CardTitle>
-            <CardDescription>Open the real customer pages for this business, or choose the snapshot view when you only need read-only context.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4">
-            <div className="grid gap-2">
-              <Link className={buttonVariants({ variant: 'default', size: 'sm' })} href={buildAdminCustomerOpenHref(business.id, '/app')}>
-                Open customer workspace
-              </Link>
-              <Link className={buttonVariants({ variant: 'outline', size: 'sm' })} href={buildAdminCustomerOpenHref(business.id, '/app/leads?view=attention')}>
-                Open customer leads
-              </Link>
-              <Link className={buttonVariants({ variant: 'outline', size: 'sm' })} href={buildAdminCustomerOpenHref(business.id, '/app/settings')}>
-                Open customer settings
-              </Link>
-              <Link className={buttonVariants({ variant: 'outline', size: 'sm' })} href={buildAdminCustomerOpenHref(business.id, '/app/call-flow')}>
-                Open customer call flow
-              </Link>
-              <Link className={buttonVariants({ variant: 'ghost', size: 'sm' })} href={`/admin/${business.id}/workspace`}>
-                View support workspace snapshot
-              </Link>
-            </div>
-
-            <form action={sendBusinessTestSmsAction} className="rounded-xl border bg-background/80 p-4">
-              <input type="hidden" name="businessId" value={business.id} />
-              <div className="space-y-2">
-                <Label htmlFor="destinationPhone">Send test SMS</Label>
-                <Input
-                  id="destinationPhone"
-                  name="destinationPhone"
-                  type="tel"
-                  defaultValue={business.notificationSettings?.ownerPhone || business.notifyPhone || ''}
-                  placeholder="+1 555 123 4567"
-                />
-                <p className="text-xs text-muted-foreground">
-                  {assignedNumber
-                    ? 'Sends a short admin verification message from the assigned business line to the destination above.'
-                    : 'Assign the business number first. Test SMS stays unavailable until the business line is ready.'}
-                </p>
-              </div>
-              <Button className="mt-3" disabled={!assignedNumber} size="sm" type="submit" variant="outline">
-                Send test SMS
-              </Button>
-            </form>
-
-            <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground">
-              Support workspace snapshots stay read-only. The buttons above open the real customer pages in an admin-scoped customer mode so you can act without impersonation.
-            </div>
-          </CardContent>
-        </Card>
-      </div>
-
-      <div className="grid gap-6 xl:grid-cols-2">
-        <Card className="bg-card/90" id="business-info">
-          <CardHeader>
-            <CardTitle>Business info</CardTitle>
-            <CardDescription>Fast edits for the business record, owner identity, and operator notes.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-5">
-            <form action={saveAdminBusinessProfileAction} className="space-y-4">
-              <input type="hidden" name="businessId" value={business.id} />
-              <HiddenAdminBusinessFields
-                defaults={defaults}
-                exclude={['name', 'ownerName', 'ownerEmail', 'internalNotes']}
-              />
-              <div className="grid gap-4 md:grid-cols-2">
-                <div className="space-y-2">
-                  <Label htmlFor="name">Business name</Label>
-                  <Input id="name" name="name" defaultValue={business.name} required />
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="ownerName">Owner name</Label>
-                  <Input id="ownerName" name="ownerName" defaultValue={business.ownerName || ''} />
-                </div>
-                <div className="space-y-2 md:col-span-2">
-                  <Label htmlFor="ownerEmail">Owner email</Label>
-                  <Input id="ownerEmail" name="ownerEmail" type="email" defaultValue={business.notificationSettings?.ownerEmail || ''} required />
-                </div>
-                <div className="space-y-2 md:col-span-2">
-                  <Label htmlFor="internalNotes">Internal notes</Label>
-                  <Textarea
-                    id="internalNotes"
-                    name="internalNotes"
-                    defaultValue={business.internalNotes || ''}
-                    rows={4}
-                    placeholder="Keep launch notes, edge cases, and handoff context here so the founder does not have to remember it."
-                  />
-                </div>
-              </div>
-              <Button type="submit">Save business info</Button>
-            </form>
-
-            <div className="rounded-xl border bg-background/80 p-4" id="owner-setup">
+        ) : (
+          <div className="grid gap-4 lg:grid-cols-[0.85fr_1.15fr]" id="owner-step">
+            <div className="rounded-xl border bg-background/80 p-4 text-sm">
               <div className="flex flex-wrap items-center gap-2">
-                <p className="font-medium">{ownerState.name || business.ownerName || 'Owner not named yet'}</p>
                 <Badge variant={ownerState.badgeVariant}>{ownerState.statusLabel}</Badge>
+                {ownerState.matchedUserId ? <Badge variant="outline">Existing account found</Badge> : null}
               </div>
-              <p className="mt-2 text-sm text-muted-foreground">
-                {ownerState.email || business.notificationSettings?.ownerEmail || 'Owner email missing'}
-              </p>
-              <p className="mt-2 text-sm text-muted-foreground">{ownerState.detail}</p>
-              {ownerState.clerkUserId ? <p className="mt-2 text-xs text-muted-foreground">{ownerState.clerkUserId}</p> : null}
-              {ownerState.matchedUserId && !ownerState.connected ? (
-                <p className="mt-2 text-xs text-muted-foreground">Matching Clerk user: {ownerState.matchedUserId}</p>
+              <p className="mt-3 text-muted-foreground">{ownerState.detail}</p>
+              {ownerState.email ? <p className="mt-2 text-xs text-muted-foreground">Owner email: {ownerState.email}</p> : null}
+              {ownerState.matchedUserId ? (
+                <p className="mt-2 text-xs text-muted-foreground">Matched Clerk user: {ownerState.matchedUserId}</p>
               ) : null}
-              {ownerState.invitedAt ? <p className="mt-2 text-xs text-muted-foreground">Invite sent {formatDateTime(ownerState.invitedAt)}</p> : null}
             </div>
 
             <div className="grid gap-4 md:grid-cols-2">
-              <form action={inviteBusinessOwnerAction} className="space-y-4 rounded-xl border bg-background/80 p-4">
+              <form action={inviteBusinessOwnerAction} className="rounded-xl border bg-background/80 p-4">
                 <input type="hidden" name="businessId" value={business.id} />
-                <div className="space-y-1">
-                  <p className="font-medium">Invite owner by email</p>
-                  <p className="text-xs text-muted-foreground">Use this when the owner still needs a CallbackCloser account.</p>
-                </div>
                 <div className="space-y-2">
-                  <Label htmlFor="inviteOwnerEmail">Owner email</Label>
-                  <Input id="inviteOwnerEmail" name="ownerEmail" type="email" defaultValue={business.notificationSettings?.ownerEmail || ''} required />
+                  <Label htmlFor="ownerInviteName">Owner name</Label>
+                  <Input id="ownerInviteName" name="ownerName" defaultValue={business.ownerName || ''} />
                 </div>
-                <div className="space-y-2">
-                  <Label htmlFor="inviteOwnerName">Owner name</Label>
-                  <Input id="inviteOwnerName" name="ownerName" defaultValue={business.ownerName || ''} />
+                <div className="mt-4 space-y-2">
+                  <Label htmlFor="ownerInviteEmail">Owner email</Label>
+                  <Input
+                    id="ownerInviteEmail"
+                    name="ownerEmail"
+                    type="email"
+                    defaultValue={business.notificationSettings?.ownerEmail || ''}
+                    placeholder="owner@business.com"
+                    required
+                  />
                 </div>
-                <Button
-                  disabled={ownerState.connected || Boolean(ownerState.matchedUserId)}
-                  type="submit"
-                  variant="outline"
-                >
-                  {ownerState.connected
-                    ? 'Owner already connected'
-                    : ownerState.matchedUserId
-                      ? 'Use Connect existing owner'
-                      : ownerState.status === 'invitation_pending'
-                        ? 'Resend invite'
-                        : 'Invite owner by email'}
+                <p className="mt-3 text-xs text-muted-foreground">Use this when the owner does not already have a CallbackCloser login.</p>
+                <Button className="mt-4" size="sm" type="submit" variant="outline">
+                  {ownerState.status === 'invitation_pending' ? 'Resend owner invite' : 'Invite owner by email'}
                 </Button>
               </form>
 
-              <form action={connectExistingBusinessOwnerAction} className="space-y-4 rounded-xl border bg-background/80 p-4">
+              <form action={connectExistingBusinessOwnerAction} className="rounded-xl border bg-background/80 p-4">
                 <input type="hidden" name="businessId" value={business.id} />
-                <div className="space-y-1">
-                  <p className="font-medium">Connect existing owner</p>
-                  <p className="text-xs text-muted-foreground">Use this when the owner already has a CallbackCloser account, or after they accept the invite and finish sign-up.</p>
-                </div>
+                {ownerState.matchedUserId ? <input type="hidden" name="ownerClerkId" value={ownerState.matchedUserId} /> : null}
                 <div className="space-y-2">
-                  <Label htmlFor="connectOwnerEmail">Owner email</Label>
-                  <Input id="connectOwnerEmail" name="ownerEmail" type="email" defaultValue={business.notificationSettings?.ownerEmail || ''} required />
+                  <Label htmlFor="ownerConnectName">Owner name</Label>
+                  <Input id="ownerConnectName" name="ownerName" defaultValue={business.ownerName || ''} />
                 </div>
-                <div className="space-y-2">
-                  <Label htmlFor="connectOwnerName">Owner name</Label>
-                  <Input id="connectOwnerName" name="ownerName" defaultValue={business.ownerName || ''} />
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="ownerClerkId">Existing Clerk user ID (optional)</Label>
+                <div className="mt-4 space-y-2">
+                  <Label htmlFor="ownerConnectEmail">Owner email</Label>
                   <Input
-                    id="ownerClerkId"
-                    name="ownerClerkId"
-                    defaultValue={ownerState.connected ? ownerState.clerkUserId || '' : ownerState.matchedUserId || ''}
-                    placeholder="user_..."
+                    id="ownerConnectEmail"
+                    name="ownerEmail"
+                    type="email"
+                    defaultValue={business.notificationSettings?.ownerEmail || ''}
+                    placeholder="owner@business.com"
+                    required
                   />
                 </div>
-                <Button type="submit">Connect existing owner</Button>
+                <p className="mt-3 text-xs text-muted-foreground">
+                  Use this when the owner already has a CallbackCloser account and should be linked immediately.
+                </p>
+                <Button className="mt-4" size="sm" type="submit">
+                  Connect existing owner
+                </Button>
               </form>
             </div>
-          </CardContent>
-        </Card>
-
-        <Card className="bg-card/90" id="provisioning-health">
-          <CardHeader>
-            <CardTitle>Provisioning health</CardTitle>
-            <CardDescription>Everything needed to finish setup or repair launch blockers without digging through a long form.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4">
+          </div>
+        ),
+      };
+    }
+
+    if (step.key === 'account_mode') {
+      return {
+        ...step,
+        body: (
+          <form action={saveAdminTwilioSetupAction} className="space-y-4" id="account-mode-step">
+            <HiddenAdminTwilioFields defaults={defaults} exclude={['twilioAccountMode']} />
             <div className="grid gap-3 md:grid-cols-2">
-              <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Current status</p>
-                <div className="mt-2 flex flex-wrap gap-2">
-                  <Badge variant={getAdminProvisioningStatusVariant(business.provisioningStatus)}>
-                    {adminProvisioningStatusLabels[business.provisioningStatus]}
-                  </Badge>
-                  <Badge variant={managedSummary.messagingReady ? 'success' : managedSummary.attentionRequired ? 'destructive' : 'secondary'}>
-                    {managedSummary.messagingReady ? 'Healthy' : managedSummary.attentionRequired ? 'Needs attention' : 'Pending'}
-                  </Badge>
-                </div>
-                <p className="mt-3 text-xs text-muted-foreground">Last provisioning run: {formatDateTime(business.provisioningLastRunAt)}</p>
-                {business.provisioningError ? <p className="mt-2 text-sm text-destructive">{business.provisioningError}</p> : null}
-              </div>
-              <form action={provisionBusinessAction} className="rounded-xl border bg-background/80 p-4">
-                <input type="hidden" name="businessId" value={business.id} />
-                <input type="hidden" name="mode" value="NEW_NUMBER" />
-                <div className="space-y-2">
-                  <Label htmlFor="areaCode">Preferred area code</Label>
-                  <Input id="areaCode" name="areaCode" maxLength={3} placeholder="512" />
-                  <p className="text-xs text-muted-foreground">
-                    Use this as the main onboarding button. Existing-number attach stays in Advanced because it is still admin-assisted.
-                  </p>
-                </div>
-                <div className="mt-3 flex flex-wrap gap-2">
-                  <Button type="submit">{assignedNumber ? 'Continue setup' : 'Provision business'}</Button>
-                  {assignedNumber ? <WebhookResyncButton businessId={business.id} label="Re-sync all webhooks" target="ALL" /> : null}
-                </div>
-              </form>
-            </div>
-
-            <div className="grid gap-3 md:grid-cols-2 xl:grid-cols-3 text-sm">
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Subaccount status</p>
-                <p className="mt-2">{business.twilioSubaccountSid ? 'Connected' : 'Missing'}</p>
-                <p className="mt-2 break-all text-xs text-muted-foreground">{business.twilioSubaccountSid || 'Create or reconnect the business subaccount.'}</p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Messaging service</p>
-                <p className="mt-2">{business.twilioMessagingServiceSid ? 'Connected' : 'Missing'}</p>
-                <p className="mt-2 break-all text-xs text-muted-foreground">
-                  {business.twilioMessagingServiceSid || 'Provisioning will create or repair the Twilio Messaging Service.'}
-                </p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Assigned number</p>
-                <p className="mt-2">{assignedNumber ? formatPhoneForDisplay(assignedNumber) : 'Not assigned yet'}</p>
-                <p className="mt-2 text-xs text-muted-foreground">
-                  {business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || 'Number SID missing'}
-                </p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Number path</p>
-                <p className="mt-2">{assignedNumber ? 'Current path active' : 'Path not chosen yet'}</p>
-                <p className="mt-2 text-xs text-muted-foreground">
-                  {assignedNumber
-                    ? 'New-number re-provisioning is the default. Existing-number support stays in Advanced.'
-                    : 'Use Provision business for a new number, or use the admin-assisted existing-number tools in Advanced.'}
-                </p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Voice webhook sync</p>
-                <p className="mt-2">{webhookSnapshot?.voiceSynced ? 'Healthy' : 'Needs sync'}</p>
-                <p className="mt-2 text-xs text-muted-foreground">
-                  {webhookSnapshot?.currentVoiceUrl || webhookSnapshot?.expectedVoiceUrl || 'Voice webhook will appear after number assignment.'}
-                </p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">SMS webhook sync</p>
-                <p className="mt-2">{webhookSnapshot?.smsSynced ? 'Healthy' : 'Needs sync'}</p>
-                <p className="mt-2 text-xs text-muted-foreground">
-                  {webhookSnapshot?.currentSmsUrl || webhookSnapshot?.expectedSmsUrl || 'SMS webhook will appear after number assignment.'}
-                </p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Status callback sync</p>
-                <p className="mt-2">{webhookSnapshot?.statusSynced ? 'Healthy' : 'Needs sync'}</p>
-                <p className="mt-2 text-xs text-muted-foreground">
-                  {webhookSnapshot?.currentStatusUrl || webhookSnapshot?.expectedStatusUrl || 'Status callback will appear after number assignment.'}
-                </p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Last provisioning run</p>
-                <p className="mt-2 text-muted-foreground">{formatDateTime(business.provisioningLastRunAt)}</p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4">
-                <p className="font-medium">Last provisioning error</p>
-                <p className={cn('mt-2 text-muted-foreground', business.provisioningError ? 'text-destructive' : '')}>
-                  {business.provisioningError || 'No current provisioning error recorded.'}
-                </p>
-              </div>
+              {twilioAccountModeOptions.map((option) => (
+                <label key={option.value} className="rounded-xl border bg-background/80 p-4 text-sm">
+                  <div className="flex items-start gap-3">
+                    <input defaultChecked={business.twilioAccountMode === option.value} name="twilioAccountMode" type="radio" value={option.value} />
+                    <div className="space-y-1">
+                      <p className="font-medium">{option.label}</p>
+                      <p className="text-muted-foreground">{option.description}</p>
+                    </div>
+                  </div>
+                </label>
+              ))}
             </div>
-
+            <Button size="sm" type="submit">
+              Save account mode
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'number_path') {
+      return {
+        ...step,
+        body: (
+          <form action={saveAdminTwilioSetupAction} className="space-y-4" id="number-path-step">
+            <HiddenAdminTwilioFields defaults={defaults} exclude={['twilioNumberSetupMode']} />
             <div className="grid gap-3 md:grid-cols-2">
-              {checklist.map((item) => (
-                <div key={item.key} className="rounded-xl border bg-background/80 p-4 text-sm">
-                  <div className="flex items-center justify-between gap-3">
-                    <span className="font-medium">{item.label}</span>
-                    <Badge variant={item.complete ? 'success' : 'outline'}>{item.complete ? 'Done' : 'Pending'}</Badge>
+              {twilioNumberSetupModeOptions.map((option) => (
+                <label key={option.value} className="rounded-xl border bg-background/80 p-4 text-sm">
+                  <div className="flex items-start gap-3">
+                    <input defaultChecked={business.twilioNumberSetupMode === option.value} name="twilioNumberSetupMode" type="radio" value={option.value} />
+                    <div className="space-y-1">
+                      <p className="font-medium">{option.label}</p>
+                      <p className="text-muted-foreground">{option.description}</p>
+                    </div>
                   </div>
-                  <p className="mt-2 text-muted-foreground">{item.detail}</p>
-                </div>
+                </label>
               ))}
             </div>
-
-            <div className="flex flex-wrap gap-2">
-              {assignedNumber ? <WebhookResyncButton businessId={business.id} label="Re-sync voice" target="VOICE" /> : null}
-              {assignedNumber ? <WebhookResyncButton businessId={business.id} label="Re-sync SMS" target="SMS" /> : null}
-              {managedSummary.messagingReady && business.provisioningStatus !== 'LIVE' ? (
-                <StatusButton
-                  businessId={business.id}
-                  label={onboardingConfidence.canSafelyMarkLive ? 'Mark live' : 'Mark live with warnings'}
-                  status="LIVE"
-                  variant={onboardingConfidence.canSafelyMarkLive ? 'secondary' : 'outline'}
-                />
-              ) : null}
-            </div>
-          </CardContent>
-        </Card>
-
-        <Card className="bg-card/90" id="messaging-readiness">
-          <CardHeader>
-            <CardTitle>Messaging / A2P readiness</CardTitle>
-            <CardDescription>Plain-English launch blocker plus the operator tracking fields that matter for compliance follow-up.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4">
-            <div className="rounded-xl border bg-background/80 p-4 text-sm">
-              <div className="flex flex-wrap items-center gap-2">
-                <Badge variant={managedSummary.messagingReady ? 'success' : managedSummary.attentionRequired ? 'destructive' : 'secondary'}>
-                  {managedSummary.label}
-                </Badge>
-                <Badge variant={managedSummary.complianceReady ? 'success' : managedSummary.attentionRequired ? 'destructive' : 'outline'}>
-                  {managedSummary.complianceReady ? 'Approved' : managedSummary.attentionRequired ? 'Needs attention' : 'Pending'}
-                </Badge>
-              </div>
-              <p className="mt-3 text-muted-foreground">{managedSummary.description}</p>
-              <p className="mt-2 text-xs text-muted-foreground">
-                {managedSummary.messagingReady ? 'Messaging is clear to go live.' : managedSummary.nextStep}
-              </p>
-              {business.a2pApprovedAt ? <p className="mt-2 text-xs text-muted-foreground">Approved {formatDateTime(business.a2pApprovedAt)}</p> : null}
-            </div>
-
-            <div className="grid gap-3 md:grid-cols-2">
-              <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Readiness state</p>
-                <p className="mt-2">{managedSummary.label}</p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Live blocker</p>
-                <p className="mt-2 text-muted-foreground">{managedSummary.messagingReady ? 'No current blocker.' : managedSummary.nextStep}</p>
-              </div>
-              <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Brand status</p>
-                <p className="mt-2">{brandStatusLabel}</p>
-                <p className="mt-2 break-all text-xs text-muted-foreground">{business.a2pBrandSid || 'Brand SID not recorded yet'}</p>
+            {business.twilioNumberSetupMode === 'EXISTING_NUMBER' ? (
+              <p className="text-sm text-muted-foreground">{setupFlow.existingNumberMessage}</p>
+            ) : null}
+            <Button size="sm" type="submit" variant="outline">
+              Save number path
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'account_ready') {
+      return {
+        ...step,
+        body: (
+          <form action={saveAdminTwilioSetupAction} className="space-y-4">
+            <HiddenAdminTwilioFields defaults={defaults} exclude={['twilioSubaccountSid']} />
+            {business.twilioAccountMode === 'BUSINESS_SUBACCOUNT' ? (
+              <div className="space-y-2">
+                <Label htmlFor="adminTwilioSubaccountSid">Business subaccount SID</Label>
+                <Input id="adminTwilioSubaccountSid" name="twilioSubaccountSid" defaultValue={business.twilioSubaccountSid || ''} placeholder="AC..." />
+                <p className="text-xs text-muted-foreground">Paste an existing subaccount SID to reuse it, or leave it blank and let provisioning create one.</p>
               </div>
-              <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Campaign status</p>
-                <p className="mt-2">{campaignStatusLabel}</p>
-                <p className="mt-2 break-all text-xs text-muted-foreground">{business.a2pCampaignSid || 'Campaign SID not recorded yet'}</p>
+            ) : (
+              <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground">
+                Main account mode is active. This business will use the parent Twilio account directly.
               </div>
+            )}
+            <Button size="sm" type="submit" variant="outline">
+              Save account target
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'messaging_service_ready') {
+      return {
+        ...step,
+        body: (
+          <form action={saveAdminTwilioSetupAction} className="space-y-4">
+            <HiddenAdminTwilioFields defaults={defaults} exclude={['twilioMessagingServiceSid']} />
+            <div className="space-y-2">
+              <Label htmlFor="adminMessagingServiceSid">Messaging Service SID</Label>
+              <Input id="adminMessagingServiceSid" name="twilioMessagingServiceSid" defaultValue={business.twilioMessagingServiceSid || ''} placeholder="MG..." />
             </div>
-
-            <form action={saveAdminBusinessProfileAction} className="space-y-4 rounded-xl border bg-background/80 p-4">
-              <input type="hidden" name="businessId" value={business.id} />
-              <HiddenAdminBusinessFields
-                defaults={defaults}
-                exclude={['managedTwilioStatus', 'a2pFailureReason', 'a2pCustomerProfileSid', 'a2pBrandSid', 'a2pCampaignSid']}
-              />
-              <div className="grid gap-4 md:grid-cols-2">
-                <div className="space-y-2">
-                  <Label htmlFor="managedTwilioStatus">Readiness state</Label>
-                  <Select id="managedTwilioStatus" name="managedTwilioStatus" defaultValue={business.managedTwilioStatus}>
-                    {Object.entries(managedTwilioStatusLabels).map(([value, label]) => (
-                      <option key={value} value={value}>
-                        {label}
-                      </option>
-                    ))}
-                  </Select>
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="a2pCustomerProfileSid">Customer profile SID</Label>
-                  <Input id="a2pCustomerProfileSid" name="a2pCustomerProfileSid" defaultValue={business.a2pCustomerProfileSid || ''} />
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="a2pBrandSid">Brand SID</Label>
-                  <Input id="a2pBrandSid" name="a2pBrandSid" defaultValue={business.a2pBrandSid || ''} />
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="a2pCampaignSid">Campaign SID</Label>
-                  <Input id="a2pCampaignSid" name="a2pCampaignSid" defaultValue={business.a2pCampaignSid || ''} />
-                </div>
-                <div className="space-y-2 md:col-span-2">
-                  <Label htmlFor="a2pFailureReason">Launch blocker note</Label>
-                  <Textarea
-                    id="a2pFailureReason"
-                    name="a2pFailureReason"
-                    defaultValue={business.a2pFailureReason || ''}
-                    rows={3}
-                    placeholder="Record what is still blocking live texting, or what manual review is waiting on Twilio."
-                  />
-                </div>
-              </div>
-              <Button type="submit" variant="outline">
-                Save readiness tracking
-              </Button>
-            </form>
-          </CardContent>
-        </Card>
-
-        <Card className="bg-card/90" id="automation-settings">
-          <CardHeader>
-            <CardTitle>Automation settings</CardTitle>
-            <CardDescription>Quick edits for owner alert routing, missed-call handling, and the controls that affect day-to-day operations.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4">
+            <Button size="sm" type="submit" variant="outline">
+              Save Messaging Service
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'number_assigned') {
+      return {
+        ...step,
+        body: (
+          <div className="space-y-4">
             <div className="grid gap-3 md:grid-cols-2">
               <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Automation state</p>
-                <div className="mt-2 flex flex-wrap gap-2">
-                  <Badge variant={getAdminProvisioningStatusVariant(business.provisioningStatus)}>
-                    {adminProvisioningStatusLabels[business.provisioningStatus]}
-                  </Badge>
-                  <Badge variant={defaults.notifySms ? 'success' : 'outline'}>{defaults.notifySms ? 'Owner SMS alerts on' : 'Owner SMS alerts off'}</Badge>
-                </div>
+                <p className="font-medium">Current number</p>
+                <p className="mt-2 text-muted-foreground">
+                  {managedTextingNumber ? formatPhoneForDisplay(managedTextingNumber) : 'No business number recorded yet'}
+                </p>
               </div>
               <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                <p className="font-medium">Alert destination</p>
+                <p className="font-medium">Numbers visible in selected account</p>
                 <p className="mt-2 text-muted-foreground">
-                  {formatPhoneForDisplay(business.notificationSettings?.ownerPhone || business.notifyPhone)} · {business.notificationSettings?.ownerEmail || 'No owner email'}
+                  {availableNumbers.error ? availableNumbers.error : `${availableNumbers.numbers.length} number${availableNumbers.numbers.length === 1 ? '' : 's'} in ${availableNumbers.sourceLabel || 'Twilio'}.`}
                 </p>
               </div>
             </div>
 
-            <form action={saveAdminBusinessProfileAction} className="space-y-4 rounded-xl border bg-background/80 p-4">
-              <input type="hidden" name="businessId" value={business.id} />
-              <HiddenAdminBusinessFields
-                defaults={defaults}
-                exclude={['ownerPhone', 'forwardingNumber', 'missedCallSeconds', 'notifySms', 'notifyEmail', 'notifyInApp', 'urgentOnly']}
-              />
-              <div className="grid gap-4 md:grid-cols-2">
-                <div className="space-y-2">
-                  <Label htmlFor="ownerPhone">Owner alert phone</Label>
-                  <Input
-                    id="ownerPhone"
-                    name="ownerPhone"
-                    type="tel"
-                    defaultValue={business.notificationSettings?.ownerPhone || business.notifyPhone || ''}
-                    placeholder="+1 555 123 4567"
-                  />
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="forwardingNumber">Missed-call forward number</Label>
-                  <Input id="forwardingNumber" name="forwardingNumber" type="tel" defaultValue={business.forwardingNumber} required />
+            {business.twilioNumberSetupMode === 'NEW_NUMBER' ? (
+              <form action={provisionBusinessAction} className="flex flex-col gap-3 md:flex-row md:items-end">
+                <input type="hidden" name="businessId" value={business.id} />
+                <input type="hidden" name="mode" value="NEW_NUMBER" />
+                <div className="w-full md:max-w-xs">
+                  <Label htmlFor="adminAreaCode">Preferred area code</Label>
+                  <Input id="adminAreaCode" name="areaCode" inputMode="numeric" maxLength={3} placeholder="512" />
                 </div>
+                <Button size="sm" type="submit">
+                  {managedTextingNumber ? 'Re-run number provisioning' : 'Provision number'}
+                </Button>
+              </form>
+            ) : (
+              <form action={provisionBusinessAction} className="space-y-4">
+                <input type="hidden" name="businessId" value={business.id} />
+                <input type="hidden" name="mode" value="EXISTING_NUMBER" />
                 <div className="space-y-2">
-                  <Label htmlFor="missedCallSeconds">Missed-call timeout</Label>
-                  <Input id="missedCallSeconds" name="missedCallSeconds" type="number" min={5} max={90} defaultValue={business.missedCallSeconds} />
+                  <Label htmlFor="existingNumberSidSelect">Choose an existing number in the selected account</Label>
+                  <Select id="existingNumberSidSelect" name="existingNumberSidSelect" defaultValue="">
+                    <option value="">Choose a number</option>
+                    {availableNumbers.numbers.map((number) => (
+                      <option key={number.sid} value={number.sid}>
+                        {(number.phoneNumber ? formatPhoneForDisplay(number.phoneNumber) : number.friendlyName || number.sid) ?? number.sid}
+                      </option>
+                    ))}
+                  </Select>
+                  <p className="text-xs text-muted-foreground">{setupFlow.existingNumberMessage}</p>
                 </div>
                 <div className="space-y-2">
-                  <Label htmlFor="timezone">Timezone</Label>
-                  <Input id="timezone" name="timezone" defaultValue={business.timezone} />
+                  <Label htmlFor="existingNumberSidManual">Or paste a number SID manually</Label>
+                  <Input id="existingNumberSidManual" name="existingNumberSidManual" placeholder="PN..." />
                 </div>
-              </div>
+                <Button size="sm" type="submit">
+                  Attach existing number
+                </Button>
+              </form>
+            )}
 
-              <div className="grid gap-3 md:grid-cols-2">
-                <label className="flex items-center gap-2 rounded-xl border p-3 text-sm">
-                  <input type="checkbox" name="notifySms" defaultChecked={business.notificationSettings?.notifySms ?? true} />
-                  Owner SMS alerts
-                </label>
-                <label className="flex items-center gap-2 rounded-xl border p-3 text-sm">
-                  <input type="checkbox" name="notifyEmail" defaultChecked={business.notificationSettings?.notifyEmail ?? true} />
-                  Owner email alerts
-                </label>
-                <label className="flex items-center gap-2 rounded-xl border p-3 text-sm">
-                  <input type="checkbox" name="notifyInApp" defaultChecked={business.notificationSettings?.notifyInApp ?? true} />
-                  In-app alerts
-                </label>
-                <label className="flex items-center gap-2 rounded-xl border p-3 text-sm">
-                  <input type="checkbox" name="urgentOnly" defaultChecked={business.notificationSettings?.urgentOnly ?? false} />
-                  Urgent leads only
-                </label>
+            <form action={saveAdminTwilioSetupAction} className="grid gap-4 md:grid-cols-2">
+              <HiddenAdminTwilioFields defaults={defaults} exclude={['twilioPhoneNumber', 'twilioPhoneNumberSid']} />
+              <div className="space-y-2">
+                <Label htmlFor="adminTwilioPhoneNumber">Twilio number</Label>
+                <Input id="adminTwilioPhoneNumber" name="twilioPhoneNumber" defaultValue={managedTextingNumber || ''} placeholder="+15551234567" />
               </div>
-
-              <div className="flex flex-wrap gap-2">
-                <Button type="submit">Save automation settings</Button>
-                {business.provisioningStatus !== 'LIVE' ? (
-                  <StatusButton
-                    businessId={business.id}
-                    label={onboardingConfidence.canSafelyMarkLive ? 'Mark live' : 'Mark live with warnings'}
-                    status="LIVE"
-                    variant={onboardingConfidence.canSafelyMarkLive ? 'secondary' : 'outline'}
-                  />
-                ) : (
-                  <StatusButton businessId={business.id} label="Back to onboarding" status="ONBOARDING" variant="outline" />
-                )}
+              <div className="space-y-2">
+                <Label htmlFor="adminTwilioPhoneNumberSid">Twilio number SID</Label>
+                <Input
+                  id="adminTwilioPhoneNumberSid"
+                  name="twilioPhoneNumberSid"
+                  defaultValue={business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || ''}
+                  placeholder="PN..."
+                />
+              </div>
+              <div className="md:col-span-2">
+                <Button size="sm" type="submit" variant="outline">
+                  Save number mapping
+                </Button>
               </div>
             </form>
-          </CardContent>
-        </Card>
-
-        <Card className="bg-card/90" id="account-state">
-          <CardHeader>
-            <CardTitle>Account / commercial state</CardTitle>
-            <CardDescription>Plan, billing, lifecycle, and business state in one compact scan.</CardDescription>
-          </CardHeader>
-          <CardContent className="grid gap-3 md:grid-cols-2 text-sm">
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Subscription</p>
-              <p className="mt-2 text-muted-foreground">{business.subscriptionStatus.toLowerCase()}</p>
-            </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Billing access</p>
-              <p className="mt-2 text-muted-foreground">{billingAccess.billingActive ? 'Active' : 'Inactive'}</p>
-            </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Setup state</p>
-              <p className="mt-2 text-muted-foreground">{adminProvisioningStatusLabels[business.provisioningStatus]}</p>
-            </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Archive state</p>
-              <p className="mt-2 text-muted-foreground">{isBusinessArchived(business) ? 'Archived' : 'Active'}</p>
+          </div>
+        ),
+      };
+    }
+
+    if (step.key === 'voice_webhook_synced') {
+      return {
+        ...step,
+        body: (
+          <form action={resyncBusinessWebhooksAction} className="flex flex-wrap gap-3">
+            <input type="hidden" name="businessId" value={business.id} />
+            <input type="hidden" name="target" value="ALL" />
+            <Button size="sm" type="submit">
+              Sync all webhooks
+            </Button>
+            <span className="text-sm text-muted-foreground">Voice, SMS, and status callback sync all happen together from this page.</span>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'a2p_status_recorded') {
+      return {
+        ...step,
+        body: (
+          <form action={saveAdminTwilioSetupAction} className="grid gap-4 md:grid-cols-2">
+            <HiddenAdminTwilioFields
+              defaults={defaults}
+              exclude={['managedTwilioStatus', 'a2pCustomerProfileSid', 'a2pBrandSid', 'a2pCampaignSid', 'a2pFailureReason']}
+            />
+            <div className="space-y-2">
+              <Label htmlFor="adminManagedTwilioStatus">A2P status</Label>
+              <Select id="adminManagedTwilioStatus" name="managedTwilioStatus" defaultValue={business.managedTwilioStatus}>
+                {Object.entries(managedTwilioStatusLabels).map(([value, label]) => (
+                  <option key={value} value={value}>
+                    {label}
+                  </option>
+                ))}
+              </Select>
             </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Customer-facing state</p>
-              <p className="mt-2 text-muted-foreground">{customerStatus.description}</p>
+            <div className="space-y-2">
+              <Label htmlFor="adminA2pCustomerProfileSid">Customer profile SID</Label>
+              <Input id="adminA2pCustomerProfileSid" name="a2pCustomerProfileSid" defaultValue={business.a2pCustomerProfileSid || ''} />
             </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Last updated</p>
-              <p className="mt-2 text-muted-foreground">{formatDateTime(business.updatedAt)}</p>
+            <div className="space-y-2">
+              <Label htmlFor="adminA2pBrandSid">Brand SID</Label>
+              <Input id="adminA2pBrandSid" name="a2pBrandSid" defaultValue={business.a2pBrandSid || ''} />
             </div>
-          </CardContent>
-        </Card>
-      </div>
-
-      <Card className="bg-card/90" id="recent-events">
-        <CardHeader>
-          <CardTitle>Recent activity</CardTitle>
-          <CardDescription>Business-scoped operator timeline with plain-English summaries first and details on demand.</CardDescription>
-        </CardHeader>
-        <CardContent className="space-y-4">
-          <div className="grid gap-3 md:grid-cols-2 xl:grid-cols-4 text-sm">
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Latest provisioning attempt</p>
-              <p className="mt-2">{latestProvisioningEvent?.summary || 'No provisioning run recorded'}</p>
-              <p className="mt-2 text-xs text-muted-foreground">
-                {latestProvisioningEvent
-                  ? getOperatorEventDetails(latestProvisioningEvent.detailsJson)[0]?.value || 'Open the timeline below for full provisioning detail.'
-                  : 'Run provisioning from the top of this page when setup should continue.'}
-              </p>
+            <div className="space-y-2">
+              <Label htmlFor="adminA2pCampaignSid">Campaign SID</Label>
+              <Input id="adminA2pCampaignSid" name="a2pCampaignSid" defaultValue={business.a2pCampaignSid || ''} />
             </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Latest webhook issue</p>
-              <p className="mt-2">{latestWebhookEvent?.summary || 'No webhook issue recorded'}</p>
-              <p className="mt-2 text-xs text-muted-foreground">
-                {latestWebhookEvent
-                  ? getOperatorEventDetails(latestWebhookEvent.detailsJson)[0]?.value || 'Webhook sync looks healthy.'
-                  : 'Webhook sync looks healthy.'}
-              </p>
+            <div className="space-y-2 md:col-span-2">
+              <Label htmlFor="adminA2pFailureReason">A2P blocker note</Label>
+              <Input
+                id="adminA2pFailureReason"
+                name="a2pFailureReason"
+                defaultValue={business.a2pFailureReason || ''}
+                placeholder="Record why launch is pending, blocked, or approved."
+              />
             </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Latest outbound SMS</p>
-              <p className="mt-2">
-                {latestOutboundSms
-                  ? `${latestOutboundSms.participant === 'OWNER' ? 'Owner SMS' : 'Lead SMS'}${latestOutboundSms.status ? ` · ${formatMessageStatus(latestOutboundSms.status)}` : ''}`
-                  : 'No outbound SMS yet'}
-              </p>
-              <p className="mt-2 text-xs text-muted-foreground">{latestOutboundSms?.body || 'No outbound SMS has been recorded yet.'}</p>
+            <div className="md:col-span-2">
+              <Button size="sm" type="submit" variant="outline">
+                Save A2P status
+              </Button>
             </div>
-            <div className="rounded-xl border bg-background/80 p-4">
-              <p className="font-medium">Latest owner alert</p>
-              <p className="mt-2">
-                {latestOwnerAlert ? `Owner ${latestOwnerAlert.channel.toLowerCase()} · ${latestOwnerAlert.status.toLowerCase()}` : 'No owner alert yet'}
-              </p>
-              <p className="mt-2 text-xs text-muted-foreground">
-                {latestOwnerAlert?.error || latestOwnerAlert?.destination || 'No owner alert issue is currently recorded.'}
-              </p>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'test_sms_delivered') {
+      return {
+        ...step,
+        body: (
+          <form action={sendBusinessTestSmsAction} className="space-y-3" id="test-sms-step">
+            <input type="hidden" name="businessId" value={business.id} />
+            <div className="space-y-2">
+              <Label htmlFor="adminTwilioTestSmsDestination">Test SMS destination</Label>
+              <Input
+                id="adminTwilioTestSmsDestination"
+                name="destinationPhone"
+                defaultValue={business.notificationSettings?.ownerPhone || business.notifyPhone || ''}
+                placeholder="+15551234567"
+              />
             </div>
+            <Button size="sm" type="submit">
+              Send test SMS
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'missed_call_validated') {
+      return {
+        ...step,
+        body: (
+            <div className="flex flex-wrap gap-3">
+            <Link className={buttonVariants({ size: 'sm' })} href={buildAdminCustomerOpenHref(business.id, '/app')}>
+              Open customer workspace
+            </Link>
+            <Link className={buttonVariants({ size: 'sm', variant: 'outline' })} href={buildAdminCustomerOpenHref(business.id, '/app/call-flow')}>
+              Open customer call flow
+            </Link>
           </div>
-
-          <div className="flex flex-wrap gap-2">
-            {businessTimelineFilterOptions.map((option) => {
-              const href = option.key === 'all' ? `/admin/${business.id}#recent-events` : `/admin/${business.id}?activity=${option.key}#recent-events`;
-              return (
-                <Link
-                  key={option.key}
-                  className={cn(
-                    buttonVariants({ variant: option.key === activityFilter ? 'default' : 'outline', size: 'sm' }),
-                    option.key === activityFilter && 'pointer-events-none'
-                  )}
-                  href={href}
-                >
-                  {option.label} ({timelineFilterCounts.get(option.key) ?? 0})
-                </Link>
-              );
-            })}
-          </div>
-
-          {visibleTimelineEvents.length === 0 ? (
-            <div className="rounded-xl border border-dashed p-4 text-sm text-muted-foreground">No recent operator events are recorded for this business yet.</div>
-          ) : (
-            <div className="grid gap-3">
-              {visibleTimelineEvents.map((event) => {
-                const details = getOperatorEventDetails(event.detailsJson);
-                const relatedHref = buildOperatorEventRelatedHref(business.id, event.relatedEntityType, event.relatedEntityId);
-                return (
-                <details key={event.id} className="rounded-xl border bg-background/80 p-4 text-sm">
-                  <summary className="cursor-pointer list-none">
-                    <div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
-                      <div>
-                        <div className="flex flex-wrap items-center gap-2">
-                          <Badge variant={getOperatorEventBadgeVariant(event.status)}>
-                            {operatorEventStatusLabels[event.status]}
-                          </Badge>
-                          <Badge variant="outline">{operatorEventCategoryLabels[event.category]}</Badge>
-                          <span className="font-medium">{event.summary}</span>
-                        </div>
-                        <p className="mt-2 text-xs text-muted-foreground">{formatDateTime(event.createdAt)}</p>
-                      </div>
-                      <span className="text-xs text-muted-foreground">Show detail</span>
-                    </div>
-                  </summary>
-                  <div className="mt-3 space-y-3">
-                    <div className="flex flex-wrap items-center gap-2">
-                      <code className="rounded bg-muted px-1.5 py-0.5 text-xs">{event.id}</code>
-                      <CopyValueButton value={event.id} label="Copy event ID" />
-                      {relatedHref ? (
-                        <Link className={buttonVariants({ variant: 'outline', size: 'sm' })} href={relatedHref}>
-                          Open related view
-                        </Link>
-                      ) : null}
-                    </div>
-                    {details.length > 0 ? (
-                      <div className="grid gap-2 md:grid-cols-2">
-                        {details.map((detail) => (
-                          <div key={detail.key} className="rounded-lg border bg-background/70 p-3">
-                            <p className="text-xs font-medium uppercase tracking-wide text-muted-foreground">{detail.label}</p>
-                            <p className="mt-1 text-muted-foreground">{detail.value}</p>
-                          </div>
-                        ))}
-                      </div>
-                    ) : (
-                      <p className="text-muted-foreground">No extra detail recorded.</p>
-                    )}
-                  </div>
-                </details>
-                );
-              })}
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      <div className="grid gap-6 xl:grid-cols-[1.1fr_0.9fr]" id="advanced">
-        <Card className="border-destructive/20 bg-card/90">
-          <CardHeader>
-            <CardTitle>Advanced / rare actions</CardTitle>
-            <CardDescription>Manual number support and low-level Twilio repair stay separated from the everyday onboarding path.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-6">
-            <form action={provisionBusinessAction} className="space-y-4 rounded-xl border bg-background/80 p-4">
+        ),
+      };
+    }
+
+    if (step.key === 'safe_to_mark_live') {
+      return {
+        ...step,
+        body: (
+          <div className="flex flex-wrap gap-3">
+            <form action={setBusinessProvisioningStatusAction}>
               <input type="hidden" name="businessId" value={business.id} />
-              <input type="hidden" name="mode" value="EXISTING_NUMBER" />
-              <div className="space-y-2">
-                <Label htmlFor="existingNumberSidManual">Attach existing number</Label>
-                <Input id="existingNumberSidManual" name="existingNumberSidManual" placeholder="PN..." />
-                <p className="text-xs text-muted-foreground">
-                  Existing-number launches remain admin-assisted. The number must already exist in the right Twilio account context before attach.
-                </p>
-              </div>
-              {availableNumbers.numbers.length > 0 ? (
-                <div className="space-y-2">
-                  <Label htmlFor="existingNumberSelect">Choose loaded number</Label>
-                  <select
-                    id="existingNumberSelect"
-                    name="existingNumberSidSelect"
-                    defaultValue=""
-                    className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm"
-                  >
-                    <option value="">Select a number</option>
-                    {availableNumbers.numbers.map((number) => (
-                      <option key={number.sid} value={number.sid}>
-                        {formatPhoneForDisplay(number.phoneNumber)} · {number.sid}
-                      </option>
-                    ))}
-                  </select>
-                </div>
-              ) : (
-                <p className="text-xs text-muted-foreground">
-                  {availableNumbers.error || 'No Twilio numbers were found on the current account context.'}
-                </p>
-              )}
-              <Button type="submit" variant="outline">
-                Attach existing number
+              <input type="hidden" name="status" value="LIVE" />
+              <Button size="sm" type="submit" disabled={!setupFlow.safeToMarkLive || business.provisioningStatus === 'LIVE'}>
+                {business.provisioningStatus === 'LIVE' ? 'Already live' : 'Mark live'}
               </Button>
             </form>
-
-            <form action={saveAdminBusinessProfileAction} className="space-y-4 rounded-xl border bg-background/80 p-4">
+            <form action={setBusinessProvisioningStatusAction}>
               <input type="hidden" name="businessId" value={business.id} />
-              <HiddenAdminBusinessFields
-                defaults={defaults}
-                exclude={['twilioPhoneNumber', 'twilioPhoneNumberSid', 'twilioMessagingServiceSid']}
-              />
-              <div className="grid gap-4 md:grid-cols-2">
-                <div className="space-y-2">
-                  <Label htmlFor="twilioPhoneNumber">Assigned number</Label>
-                  <Input
-                    id="twilioPhoneNumber"
-                    name="twilioPhoneNumber"
-                    type="tel"
-                    defaultValue={business.twilioPrimaryPhoneNumber || business.twilioPhoneNumber || ''}
-                  />
-                </div>
-                <div className="space-y-2">
-                  <Label htmlFor="twilioPhoneNumberSid">Number SID</Label>
-                  <Input
-                    id="twilioPhoneNumberSid"
-                    name="twilioPhoneNumberSid"
-                    defaultValue={business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || ''}
-                  />
-                </div>
-                <div className="space-y-2 md:col-span-2">
-                  <Label htmlFor="twilioMessagingServiceSid">Messaging Service SID</Label>
-                  <Input id="twilioMessagingServiceSid" name="twilioMessagingServiceSid" defaultValue={business.twilioMessagingServiceSid || ''} />
-                </div>
-              </div>
-              <label className="flex items-start gap-2 rounded-lg border bg-background/80 p-3 text-sm">
-                <input className="mt-1" type="checkbox" name="confirmCriticalFieldClears" value="true" />
-                <span>I understand this can clear or replace live Twilio mappings and should only be used for deliberate internal repair.</span>
-              </label>
-              <Button type="submit" variant="outline">
-                Save manual Twilio mapping
+              <input type="hidden" name="status" value="PAUSED" />
+              <Button size="sm" type="submit" variant="outline">
+                Pause automation
               </Button>
             </form>
-          </CardContent>
-        </Card>
+          </div>
+        ),
+      };
+    }
+
+    return step;
+  });
 
-        <Card className="border-destructive/20 bg-card/90">
-          <CardHeader>
-            <CardTitle>Lifecycle / destructive actions</CardTitle>
-            <CardDescription>Pause or archive safely. Delete stays locked to archived test/demo businesses only.</CardDescription>
-          </CardHeader>
-          <CardContent className="space-y-4 text-sm">
-            <div className="flex flex-wrap gap-2 rounded-xl border bg-background/80 p-4">
-              {business.provisioningStatus === 'PAUSED' ? (
-                <StatusButton businessId={business.id} label="Resume automation" status="ONBOARDING" />
-              ) : (
-                <StatusButton businessId={business.id} label="Pause automation" status="PAUSED" variant="outline" />
-              )}
-              <StatusButton businessId={business.id} label="Mark needs attention" status="NEEDS_ATTENTION" variant="destructive" />
-              <StatusButton businessId={business.id} label="Mark onboarding" status="ONBOARDING" variant="secondary" />
+  return (
+    <div className="container space-y-6 py-8">
+      <div className="space-y-2">
+        <Link className="text-sm text-muted-foreground underline underline-offset-4" href="/admin">
+          Back to operator board
+        </Link>
+        <div className="flex flex-col gap-3 xl:flex-row xl:items-end xl:justify-between">
+          <div className="space-y-2">
+            <div className="flex flex-wrap items-center gap-2">
+              <h1 className="text-3xl font-semibold tracking-tight">{business.name} Twilio setup control panel</h1>
+              {isBusinessArchived(business) ? <Badge variant="outline">Archived</Badge> : null}
+              <Badge variant={getBadgeVariant(setupFlow.banner.tone)}>{setupFlow.banner.title}</Badge>
             </div>
+            <p className="max-w-3xl text-sm text-muted-foreground">
+              Shared setup flow for new-business provisioning and existing-business control. The first choice stays visible near the top: main Twilio account or business subaccount.
+            </p>
+          </div>
+          <div className="flex flex-wrap gap-2">
+            <Link className={buttonVariants({ variant: 'default' })} href={buildAdminCustomerOpenHref(business.id, '/app')}>
+              Open customer workspace
+            </Link>
+            <Link className={buttonVariants({ variant: 'outline' })} href={buildAdminCustomerOpenHref(business.id, '/app/settings')}>
+              Open customer settings
+            </Link>
+            <Link className={buttonVariants({ variant: 'outline' })} href={buildAdminCustomerOpenHref(business.id, '/app/call-flow')}>
+              Open customer call flow
+            </Link>
+            <Link className={buttonVariants({ variant: 'outline' })} href={`/admin/${business.id}/workspace`}>
+              View support workspace snapshot
+            </Link>
+            <Link className={buttonVariants({ variant: 'outline' })} href={buildAdminCustomerOpenHref(business.id, '/app/leads?view=attention')}>
+              Open customer leads
+            </Link>
+          </div>
+        </div>
+      </div>
 
-            {isBusinessArchived(business) ? (
-              <form action={restoreBusinessAction} className="rounded-xl border bg-background/80 p-4">
-                <input type="hidden" name="businessId" value={business.id} />
-                <div className="space-y-2">
-                  <Label htmlFor="restoreName">Type business name to restore</Label>
-                  <Input id="restoreName" name="confirmationName" placeholder={business.name} />
-                </div>
-                <Button className="mt-3" type="submit">
-                  Restore business
-                </Button>
-              </form>
-            ) : (
-              <form action={archiveBusinessAction} className="rounded-xl border bg-background/80 p-4">
-                <input type="hidden" name="businessId" value={business.id} />
-                <div className="space-y-2">
-                  <Label htmlFor="archiveName">Type business name to archive</Label>
-                  <Input id="archiveName" name="confirmationName" placeholder={business.name} />
-                </div>
-                <Button className="mt-3" type="submit" variant="outline">
-                  Archive business safely
-                </Button>
-              </form>
-            )}
+      {created ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business workspace created and ready for the Twilio setup flow.</div> : null}
+      {saved ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Setup state saved.</div> : null}
+      {ownerAction ? (
+        <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">
+          {ownerAction === 'connected'
+            ? 'Existing owner connected.'
+            : ownerAction === 'invited'
+              ? 'Owner invitation sent.'
+              : ownerAction === 'resent'
+                ? 'Owner invitation resent.'
+                : 'Owner state updated.'}
+        </div>
+      ) : null}
+      {provisioned ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Provisioning run finished. Review the checklist below before moving on.</div> : null}
+      {synced ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Webhook sync complete for {synced.toLowerCase()}.</div> : null}
+      {testSms ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Test SMS requested. Wait for delivery before treating this business as launch-ready.</div> : null}
+      {archived ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business archived safely. Automation is paused.</div> : null}
+      {restored ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business restored and ready for review.</div> : null}
+      {error ? <div className="rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive">{error}</div> : null}
 
-            {canDeleteTestBusiness(business) ? (
-              <form action={deleteTestBusinessAction} className="rounded-xl border border-destructive/30 bg-destructive/5 p-4">
-                <input type="hidden" name="businessId" value={business.id} />
-                <div className="space-y-2">
-                  <Label htmlFor="deleteName">Type business name to delete this test workspace</Label>
-                  <Input id="deleteName" name="confirmationName" placeholder={business.name} />
-                </div>
-                <Button className="mt-3" type="submit" variant="destructive">
-                  Delete archived test business
-                </Button>
-              </form>
-            ) : (
-              <div className="rounded-xl border border-dashed p-4 text-muted-foreground">
-                Delete stays unavailable until this workspace is archived and marked as a test/demo business.
-              </div>
-            )}
-          </CardContent>
-        </Card>
+      <div id="admin-twilio-setup">
+        <TwilioSetupChecklist
+          title="CallbackCloser Twilio launch flow"
+          description="Use the same guided checklist here that the business sees during setup, with the admin-only controls needed to actually finish provisioning."
+          banner={setupFlow.banner}
+          bannerAction={bannerAction}
+          steps={setupSteps}
+          advanced={
+            <Card className="bg-card/90" id="advanced">
+              <CardHeader>
+                <CardTitle>Advanced</CardTitle>
+                <CardDescription>Rare lifecycle actions stay out of the main setup path.</CardDescription>
+              </CardHeader>
+              <CardContent className="flex flex-wrap gap-3">
+                {isBusinessArchived(business) ? (
+                  <form action={restoreBusinessAction}>
+                    <input type="hidden" name="businessId" value={business.id} />
+                    <Button size="sm" type="submit">
+                      Restore business
+                    </Button>
+                  </form>
+                ) : (
+                  <form action={archiveBusinessAction}>
+                    <input type="hidden" name="businessId" value={business.id} />
+                    <input type="hidden" name="confirmationName" value={business.name} />
+                    <Button size="sm" type="submit" variant="outline">
+                      Archive business
+                    </Button>
+                  </form>
+                )}
+                {business.isTestBusiness ? (
+                  <form action={deleteTestBusinessAction}>
+                    <input type="hidden" name="businessId" value={business.id} />
+                    <input type="hidden" name="confirmationName" value={business.name} />
+                    <Button size="sm" type="submit" variant="destructive">
+                      Delete test business
+                    </Button>
+                  </form>
+                ) : null}
+              </CardContent>
+            </Card>
+          }
+        />
       </div>
 
-      <Card className="bg-card/90" id="recent-leads">
+      <Card className="bg-card/90">
         <CardHeader>
-          <CardTitle>Recent leads snapshot</CardTitle>
-          <CardDescription>Useful context without forcing a jump into multiple customer pages.</CardDescription>
+          <CardTitle>Setup snapshot</CardTitle>
+          <CardDescription>Plain-English context without the old dashboard clutter.</CardDescription>
         </CardHeader>
-        <CardContent className="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
-          {recentLeads.length === 0 ? (
-            <div className="rounded-xl border border-dashed p-4 text-sm text-muted-foreground">No recent leads yet.</div>
-          ) : (
-            recentLeads.map((lead) => (
-              <div key={lead.id} className="rounded-xl border bg-background/80 p-4 text-sm">
-                <div className="flex flex-wrap items-center gap-2">
-                  <Badge variant={getLeadStatusBadgeVariant(lead.status)}>{leadStatusLabels[lead.status]}</Badge>
-                  <Badge variant={lead.readiness === 'URGENT' ? 'destructive' : lead.readiness === 'QUALIFIED' ? 'secondary' : 'outline'}>
-                    {leadReadinessLabels[lead.readiness]}
-                  </Badge>
-                </div>
-                <p className="mt-3 font-medium">{getLeadCallbackState(lead)}</p>
-                <p className="mt-2 text-muted-foreground">{lead.summary || 'Lead details are still coming in.'}</p>
-                <p className="mt-2 text-xs text-muted-foreground">
-                  Last activity {formatRelativeTime(lead.lastInteractionAt || lead.createdAt)} · {lead.id}
-                </p>
-              </div>
-            ))
-          )}
+        <CardContent className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
+          <div className="rounded-xl border bg-background/80 p-4 text-sm">
+            <p className="font-medium">Owner</p>
+            <p className="mt-2 text-muted-foreground">{ownerState.email || business.notificationSettings?.ownerEmail || 'Owner email missing'}</p>
+          </div>
+          <div className="rounded-xl border bg-background/80 p-4 text-sm">
+            <p className="font-medium">Forwarding number</p>
+            <p className="mt-2 text-muted-foreground">{formatPhoneForDisplay(business.forwardingNumber)}</p>
+          </div>
+          <div className="rounded-xl border bg-background/80 p-4 text-sm">
+            <p className="font-medium">Owner alert phone</p>
+            <p className="mt-2 text-muted-foreground">
+              {business.notificationSettings?.ownerPhone || business.notifyPhone
+                ? formatPhoneForDisplay(business.notificationSettings?.ownerPhone || business.notifyPhone)
+                : 'Owner alert phone missing'}
+            </p>
+          </div>
+          <div className="rounded-xl border bg-background/80 p-4 text-sm">
+            <p className="font-medium">Account inventory source</p>
+            <p className="mt-2 text-muted-foreground">{availableNumbers.sourceLabel || 'Twilio not available'}</p>
+          </div>
         </CardContent>
       </Card>
     </div>
diff --git a/app/admin/actions.ts b/app/admin/actions.ts
index 0def9c8..187f547 100644
--- a/app/admin/actions.ts
+++ b/app/admin/actions.ts
@@ -1,12 +1,13 @@
 'use server';
 
-import { BusinessProvisioningStatus, ManagedTwilioStatus, SubscriptionStatus } from '@prisma/client';
+import { BusinessProvisioningStatus, ManagedTwilioStatus, SubscriptionStatus, TwilioAccountMode, TwilioNumberSetupMode } from '@prisma/client';
 import { revalidatePath } from 'next/cache';
 import { redirect } from 'next/navigation';
 
 import {
   buildPendingOwnerClerkId,
   connectExistingBusinessOwner,
+  findClerkUserByEmail,
   inviteBusinessOwner,
   runAdminProvisioning,
   syncBusinessTwilioWebhooks,
@@ -15,6 +16,11 @@ import {
 import { deleteDeletableTestBusiness } from '@/lib/admin-business-lifecycle';
 import { requireAdmin } from '@/lib/admin';
 import { canDeleteTestBusiness, getDeleteTestBusinessBlockedReason } from '@/lib/admin-dashboard';
+import {
+  bulkDeleteTestDemoBusinesses,
+  BULK_TEST_DATA_RESET_CONFIRMATION,
+  DEMO_OWNER_CLERK_ID,
+} from '@/lib/admin-test-data-reset';
 import { logAuditEvent } from '@/lib/audit-log';
 import { db } from '@/lib/db';
 import { formatPhoneDetail, maskSid, recordBusinessOperatorEvent } from '@/lib/operator-events';
@@ -22,18 +28,19 @@ import { maskPhoneForAudit, normalizePhoneNumber, normalizePhoneNumberToE164 } f
 import { sendAndPersistOutboundMessage } from '@/lib/twilio-messaging';
 import {
   adminArchiveBusinessSchema,
+  adminBulkDeleteTestBusinessesSchema,
   adminBusinessDraftSchema,
   adminConnectExistingOwnerSchema,
   adminDeleteBusinessSchema,
   adminInviteOwnerSchema,
   adminSendTestSmsSchema,
+  adminTwilioSetupSchema,
   adminBusinessUpdateSchema,
   adminProvisionBusinessSchema,
   adminProvisioningStatusSchema,
   adminWebhookSyncSchema,
 } from '@/lib/validators';
 
-const DEMO_OWNER_CLERK_ID = 'simulator_demo_callbackcloser';
 const DEFAULT_DEMO_NAME = 'CallbackCloser Demo';
 const DEFAULT_DEMO_TEXTING_NUMBER = '+15005550006';
 const DEFAULT_DEMO_FORWARDING_NUMBER = '+15005550001';
@@ -298,18 +305,51 @@ export async function createAdminBusinessAction(formData: FormData) {
 
   let redirectPath: string;
   try {
-    await runAdminProvisioning({
+    const existingOwner = await findClerkUserByEmail(data.ownerEmail);
+    if (existingOwner) {
+      await connectExistingBusinessOwner({
+        businessId: business.id,
+        ownerEmail: data.ownerEmail,
+        ownerName: data.ownerName || null,
+        ownerClerkId: existingOwner.id,
+      });
+
+      redirectPath = buildAdminBusinessRedirectPath(business.id, {
+        created: 1,
+        ownerAction: 'connected',
+      });
+    } else {
+      const inviteResult = await inviteBusinessOwner({
+        businessId: business.id,
+        ownerEmail: data.ownerEmail,
+        ownerName: data.ownerName || null,
+      });
+
+      redirectPath = buildAdminBusinessRedirectPath(business.id, {
+        created: 1,
+        ownerAction: inviteResult.state,
+      });
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'Business created, but owner setup failed.';
+    await db.business.update({
+      where: { id: business.id },
+      data: {
+        provisioningStatus: BusinessProvisioningStatus.NEEDS_ATTENTION,
+        provisioningError: message,
+      },
+    });
+    await recordBusinessOperatorEvent({
       businessId: business.id,
-      mode: 'NEW_NUMBER',
-      areaCode: data.areaCode || null,
+      type: 'onboarding.owner_setup_failed',
+      category: 'ONBOARDING',
+      status: 'FAILED',
+      summary: 'Owner setup failed after business creation',
+      details: {
+        error: message,
+      },
     });
 
-    redirectPath = buildAdminBusinessRedirectPath(business.id, {
-      created: 1,
-      provisioned: 1,
-    });
-  } catch (error) {
-    const message = error instanceof Error ? error.message : 'Business created, but managed Twilio provisioning failed.';
     redirectPath = buildAdminBusinessRedirectPath(business.id, {
       created: 1,
       error: message,
@@ -549,6 +589,207 @@ export async function saveAdminBusinessProfileAction(formData: FormData) {
   );
 }
 
+export async function saveAdminTwilioSetupAction(formData: FormData) {
+  const admin = await requireAdmin();
+
+  const parsed = adminTwilioSetupSchema.safeParse(Object.fromEntries(formData));
+  if (!parsed.success) {
+    redirect(`/admin?error=${encodeURIComponent(parsed.error.issues[0]?.message || 'Invalid Twilio setup update.')}`);
+  }
+
+  const data = parsed.data;
+  const existingBusiness = await db.business.findUnique({
+    where: { id: data.businessId },
+  });
+
+  if (!existingBusiness) {
+    redirect(`/admin?error=${encodeURIComponent('Business not found.')}`);
+  }
+
+  const twilioAccountMode = data.twilioAccountMode as TwilioAccountMode;
+  const twilioNumberSetupMode = data.twilioNumberSetupMode as TwilioNumberSetupMode;
+  const twilioSubaccountSid = twilioAccountMode === TwilioAccountMode.MAIN_ACCOUNT ? null : normalizeOptionalSid(data.twilioSubaccountSid);
+  const twilioPhoneNumber = normalizeOptionalE164Phone(data.twilioPhoneNumber || '', 'Twilio number');
+  const twilioPhoneNumberSid = normalizeOptionalSid(data.twilioPhoneNumberSid);
+  const twilioMessagingServiceSid = normalizeOptionalSid(data.twilioMessagingServiceSid);
+  const a2pCustomerProfileSid = normalizeOptionalSid(data.a2pCustomerProfileSid);
+  const a2pBrandSid = normalizeOptionalSid(data.a2pBrandSid);
+  const a2pCampaignSid = normalizeOptionalSid(data.a2pCampaignSid);
+  const a2pFailureReason = data.a2pFailureReason?.trim() || null;
+
+  const criticalFieldClears = [
+    existingBusiness.twilioSubaccountSid && !twilioSubaccountSid && twilioAccountMode === TwilioAccountMode.BUSINESS_SUBACCOUNT
+      ? 'Twilio subaccount SID'
+      : null,
+    (existingBusiness.twilioPrimaryPhoneNumber || existingBusiness.twilioPhoneNumber) && !twilioPhoneNumber ? 'Twilio number' : null,
+    (existingBusiness.twilioPrimaryNumberSid || existingBusiness.twilioPhoneNumberSid) && !twilioPhoneNumberSid ? 'Twilio number SID' : null,
+    existingBusiness.twilioMessagingServiceSid && !twilioMessagingServiceSid ? 'messaging service SID' : null,
+  ].filter(Boolean) as string[];
+
+  if (criticalFieldClears.length > 0 && !data.confirmCriticalFieldClears) {
+    redirect(
+      buildAdminBusinessRedirectPath(data.businessId, {
+        error: `Confirm clearing live fields before removing: ${criticalFieldClears.join(', ')}.`,
+      })
+    );
+  }
+
+  const managedTwilioStatusChanged = existingBusiness.managedTwilioStatus !== data.managedTwilioStatus;
+  const twilioMappingChanged =
+    existingBusiness.twilioAccountMode !== twilioAccountMode ||
+    existingBusiness.twilioNumberSetupMode !== twilioNumberSetupMode ||
+    existingBusiness.twilioSubaccountSid !== twilioSubaccountSid ||
+    (existingBusiness.twilioPrimaryPhoneNumber || existingBusiness.twilioPhoneNumber) !== twilioPhoneNumber ||
+    (existingBusiness.twilioPrimaryNumberSid || existingBusiness.twilioPhoneNumberSid) !== twilioPhoneNumberSid ||
+    existingBusiness.twilioMessagingServiceSid !== twilioMessagingServiceSid;
+  const a2pMetadataChanged =
+    existingBusiness.a2pCustomerProfileSid !== a2pCustomerProfileSid ||
+    existingBusiness.a2pBrandSid !== a2pBrandSid ||
+    existingBusiness.a2pCampaignSid !== a2pCampaignSid ||
+    existingBusiness.a2pFailureReason !== a2pFailureReason;
+
+  const changedFields = [
+    existingBusiness.twilioAccountMode !== twilioAccountMode
+      ? { key: 'twilioAccountMode', label: 'Twilio account mode', before: existingBusiness.twilioAccountMode, after: twilioAccountMode }
+      : null,
+    existingBusiness.twilioNumberSetupMode !== twilioNumberSetupMode
+      ? {
+          key: 'twilioNumberSetupMode',
+          label: 'Twilio number path',
+          before: existingBusiness.twilioNumberSetupMode,
+          after: twilioNumberSetupMode,
+        }
+      : null,
+    existingBusiness.twilioSubaccountSid !== twilioSubaccountSid
+      ? { key: 'twilioSubaccountSid', label: 'Twilio subaccount SID', before: existingBusiness.twilioSubaccountSid, after: twilioSubaccountSid }
+      : null,
+    (existingBusiness.twilioPrimaryPhoneNumber || existingBusiness.twilioPhoneNumber) !== twilioPhoneNumber
+      ? {
+          key: 'twilioPhoneNumber',
+          label: 'Twilio number',
+          before: existingBusiness.twilioPrimaryPhoneNumber || existingBusiness.twilioPhoneNumber,
+          after: twilioPhoneNumber,
+        }
+      : null,
+    (existingBusiness.twilioPrimaryNumberSid || existingBusiness.twilioPhoneNumberSid) !== twilioPhoneNumberSid
+      ? {
+          key: 'twilioPhoneNumberSid',
+          label: 'Twilio number SID',
+          before: existingBusiness.twilioPrimaryNumberSid || existingBusiness.twilioPhoneNumberSid,
+          after: twilioPhoneNumberSid,
+        }
+      : null,
+    existingBusiness.twilioMessagingServiceSid !== twilioMessagingServiceSid
+      ? {
+          key: 'twilioMessagingServiceSid',
+          label: 'messaging service SID',
+          before: existingBusiness.twilioMessagingServiceSid,
+          after: twilioMessagingServiceSid,
+        }
+      : null,
+    existingBusiness.a2pCustomerProfileSid !== a2pCustomerProfileSid
+      ? {
+          key: 'a2pCustomerProfileSid',
+          label: 'A2P customer profile SID',
+          before: existingBusiness.a2pCustomerProfileSid,
+          after: a2pCustomerProfileSid,
+        }
+      : null,
+    existingBusiness.a2pBrandSid !== a2pBrandSid
+      ? { key: 'a2pBrandSid', label: 'A2P brand SID', before: existingBusiness.a2pBrandSid, after: a2pBrandSid }
+      : null,
+    existingBusiness.a2pCampaignSid !== a2pCampaignSid
+      ? { key: 'a2pCampaignSid', label: 'A2P campaign SID', before: existingBusiness.a2pCampaignSid, after: a2pCampaignSid }
+      : null,
+    existingBusiness.a2pFailureReason !== a2pFailureReason
+      ? {
+          key: 'a2pFailureReason',
+          label: 'A2P failure reason',
+          before: existingBusiness.a2pFailureReason,
+          after: a2pFailureReason,
+        }
+      : null,
+    managedTwilioStatusChanged
+      ? {
+          key: 'managedTwilioStatus',
+          label: 'managed Twilio status',
+          before: existingBusiness.managedTwilioStatus,
+          after: data.managedTwilioStatus,
+        }
+      : null,
+  ].filter(Boolean) as Array<{ key: string; label: string; before: string | null; after: string | null }>;
+
+  await db.business.update({
+    where: { id: data.businessId },
+    data: {
+      twilioAccountMode,
+      twilioNumberSetupMode,
+      twilioSubaccountSid,
+      managedTwilioStatus: data.managedTwilioStatus as ManagedTwilioStatus,
+      managedTwilioStatusUpdatedAt: managedTwilioStatusChanged ? new Date() : existingBusiness.managedTwilioStatusUpdatedAt,
+      twilioPhoneNumber,
+      twilioPrimaryPhoneNumber: twilioPhoneNumber,
+      twilioPhoneNumberSid,
+      twilioPrimaryNumberSid: twilioPhoneNumberSid,
+      twilioMessagingServiceSid,
+      a2pCustomerProfileSid,
+      a2pBrandSid,
+      a2pCampaignSid,
+      a2pFailureReason,
+      a2pSubmittedAt:
+        managedTwilioStatusChanged &&
+        ['AWAITING_BUSINESS_VERIFICATION', 'BRAND_SUBMITTED', 'CAMPAIGN_SUBMITTED'].includes(data.managedTwilioStatus)
+          ? existingBusiness.a2pSubmittedAt || new Date()
+          : existingBusiness.a2pSubmittedAt,
+      a2pApprovedAt:
+        data.managedTwilioStatus === ManagedTwilioStatus.COMPLIANT_LIVE
+          ? existingBusiness.a2pApprovedAt || new Date()
+          : managedTwilioStatusChanged
+            ? null
+            : existingBusiness.a2pApprovedAt,
+      ...(twilioMappingChanged ? { twilioWebhookSyncedAt: null } : {}),
+      ...(twilioMappingChanged || a2pMetadataChanged || managedTwilioStatusChanged ? { provisioningLastRunAt: new Date() } : {}),
+      provisioningError: null,
+    },
+  });
+
+  if (changedFields.length > 0) {
+    await recordBusinessOperatorEvent({
+      businessId: data.businessId,
+      type: 'admin.twilio_setup_updated',
+      category: 'ONBOARDING',
+      status: 'INFO',
+      summary: 'Twilio setup flow updated',
+      details: {
+        changedFields: buildChangedFieldMetadata(changedFields),
+      },
+    });
+    logAuditEvent({
+      event: 'admin_twilio_setup_saved',
+      actorType: 'user',
+      actorId: admin.userId,
+      businessId: data.businessId,
+      targetType: 'business',
+      targetId: data.businessId,
+      metadata: {
+        actorEmail: admin.email,
+        source: 'twilio_setup_flow',
+        changedFields: buildChangedFieldMetadata(changedFields),
+      },
+    });
+  }
+
+  await revalidateAdminPaths(data.businessId);
+  revalidatePath('/app/settings');
+  revalidatePath('/app/call-flow');
+  redirect(
+    buildAdminBusinessRedirectPath(data.businessId, {
+      saved: 1,
+      changed: changedFields.map((field) => field.key).join(','),
+    })
+  );
+}
+
 export async function inviteBusinessOwnerAction(formData: FormData) {
   await requireAdmin();
 
@@ -687,6 +928,7 @@ export async function resyncBusinessWebhooksAction(formData: FormData) {
     where: { id: parsed.data.businessId },
     select: {
       id: true,
+      twilioAccountMode: true,
       twilioSubaccountSid: true,
       twilioPhoneNumberSid: true,
       twilioPrimaryNumberSid: true,
@@ -785,7 +1027,8 @@ export async function sendBusinessTestSmsAction(formData: FormData) {
       toPhone: destinationPhone!,
       body: `CallbackCloser admin test: ${business.name} is using ${fromPhone} for live support verification.`,
       participant: 'OWNER',
-      twilioSubaccountSid: business.twilioSubaccountSid,
+      context: 'admin_test',
+      twilioSubaccountSid: business.twilioAccountMode === TwilioAccountMode.MAIN_ACCOUNT ? null : business.twilioSubaccountSid,
       messagingServiceSid: business.twilioMessagingServiceSid,
       managedTwilioStatus: business.managedTwilioStatus,
       a2pFailureReason: business.a2pFailureReason,
@@ -1039,3 +1282,46 @@ export async function deleteTestBusinessAction(formData: FormData) {
   revalidatePath('/admin');
   redirect(clearBusinessSelectionFromReturnPath(parsed.data.returnTo, { deleted: 1 }, '/admin?deleted=1'));
 }
+
+export async function bulkDeleteTestBusinessesAction(formData: FormData) {
+  const admin = await requireAdmin();
+
+  const parsed = adminBulkDeleteTestBusinessesSchema.safeParse(Object.fromEntries(formData));
+  if (!parsed.success) {
+    redirect(`/admin?error=${encodeURIComponent(parsed.error.issues[0]?.message || 'Invalid reset request.')}`);
+  }
+
+  let redirectPath = '/admin';
+
+  try {
+    const result = await bulkDeleteTestDemoBusinesses({
+      confirmation: parsed.data.confirmationText,
+    });
+
+    logAuditEvent({
+      event: 'admin_test_businesses_bulk_deleted',
+      actorType: 'user',
+      actorId: admin.userId,
+      targetType: 'business_collection',
+      targetId: 'test_demo_businesses',
+      metadata: {
+        actorEmail: admin.email,
+        deletedCount: result.deletedCount,
+        deletedBusinessNames: result.deletedBusinessNames,
+        confirmationText: BULK_TEST_DATA_RESET_CONFIRMATION,
+      },
+    });
+
+    revalidatePath('/admin');
+
+    redirectPath =
+      result.deletedCount > 0
+        ? `/admin?resetResult=deleted&resetDeleted=${encodeURIComponent(String(result.deletedCount))}`
+        : '/admin?resetResult=noop&resetDeleted=0';
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'Unable to delete test/demo businesses.';
+    redirectPath = `/admin?error=${encodeURIComponent(message)}`;
+  }
+
+  redirect(redirectPath);
+}
diff --git a/app/admin/page.tsx b/app/admin/page.tsx
index 1ebe135..981e4ba 100644
--- a/app/admin/page.tsx
+++ b/app/admin/page.tsx
@@ -2,6 +2,7 @@ import Link from 'next/link';
 
 import {
   archiveBusinessAction,
+  bulkDeleteTestBusinessesAction,
   createAdminBusinessAction,
   createDemoBusinessAction,
   deleteTestBusinessAction,
@@ -11,6 +12,7 @@ import {
   sendBusinessTestSmsAction,
 } from '@/app/admin/actions';
 import { buildAdminCustomerOpenHref } from '@/lib/admin-customer-paths';
+import { BULK_TEST_DATA_RESET_CONFIRMATION, listTestDemoBusinessesForReset } from '@/lib/admin-test-data-reset';
 import {
   adminBoardFilterOptions,
   buildAdminBusinessPickerLabel,
@@ -112,11 +114,13 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
   const deleted = getQueryValue(searchParams, 'deleted') === '1';
   const error = getQueryValue(searchParams, 'error');
   const query = getQueryValue(searchParams, 'q')?.trim() || '';
+  const resetResult = getQueryValue(searchParams, 'resetResult');
+  const resetDeleted = Number(getQueryValue(searchParams, 'resetDeleted') || '0');
   const restored = getQueryValue(searchParams, 'restored') === '1';
   const view = (getQueryValue(searchParams, 'view') as AdminBoardFilter | null) || 'all';
   const adminBusiness = await db.business.findUnique({ where: { ownerClerkId: admin.userId } });
 
-  const [businesses, businessPickerOptions, leadCounts, leadActivity, callActivity, messageActivity, notificationFailures, operatorSignals] = await Promise.all([
+  const [businesses, businessPickerOptions, leadCounts, leadActivity, callActivity, messageActivity, notificationFailures, operatorSignals, resettableBusinesses] = await Promise.all([
     query
       ? searchBusinessesForAdmin(query)
       : db.business.findMany({
@@ -182,6 +186,7 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
       },
       take: 600,
     }),
+    listTestDemoBusinessesForReset(),
   ]);
 
   const leadCountMap = new Map(leadCounts.map((item) => [item.businessId, item._count._all]));
@@ -316,6 +321,7 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
     { label: 'Live', value: filterCounts.get('live') ?? 0 },
     { label: 'Archived', value: filterCounts.get('archived') ?? 0 },
   ];
+  const resettableBusinessPreview = resettableBusinesses.slice(0, 4).map((business) => business.name);
 
   return (
     <div className="container space-y-6 py-8">
@@ -348,6 +354,14 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
       {archived ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business archived. Permanent delete stays locked until the workspace is clearly demo/test.</div> : null}
       {restored ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business restored to active triage.</div> : null}
       {deleted ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Demo/test business deleted permanently.</div> : null}
+      {resetResult === 'deleted' && Number.isFinite(resetDeleted) ? (
+        <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">
+          Deleted {resetDeleted} test/demo {resetDeleted === 1 ? 'business' : 'businesses'}.
+        </div>
+      ) : null}
+      {resetResult === 'noop' ? (
+        <div className="rounded-md border bg-background/80 p-3 text-sm text-muted-foreground">No test/demo businesses were eligible for deletion.</div>
+      ) : null}
       {createdDemo && createdBusinessId ? (
         <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">
           Demo business ready. Use <code className="rounded bg-background px-1 py-0.5">{createdBusinessId}</code> as `SIMULATOR_BUSINESS_ID`, or open the
@@ -360,7 +374,7 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
           <CardHeader>
             <CardTitle>Fast onboard</CardTitle>
             <CardDescription>
-              Create the workspace, save owner contact info, and start the managed new-number Twilio path immediately. Owner invite and existing-owner connect stay explicit on the business page.
+              Create the workspace with the minimum founder-needed inputs. The guided Twilio flow, explicit account-mode choice, and owner decision stay inside the business setup panel.
             </CardDescription>
           </CardHeader>
           <CardContent>
@@ -394,10 +408,6 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
                 <Label htmlFor="timezone">Timezone</Label>
                 <Input id="timezone" name="timezone" defaultValue="America/New_York" />
               </div>
-              <div className="space-y-2">
-                <Label htmlFor="areaCode">Preferred area code</Label>
-                <Input id="areaCode" name="areaCode" maxLength={3} placeholder="512" />
-              </div>
 
               <label className="md:col-span-2 flex items-start gap-2 rounded-xl border bg-background/80 p-3 text-sm">
                 <input name="isTestBusiness" type="checkbox" value="true" />
@@ -405,8 +415,8 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
               </label>
 
               <div className="md:col-span-2 flex flex-wrap items-center gap-3">
-                <Button type="submit">Create workspace and start provisioning</Button>
-                <p className="text-sm text-muted-foreground">This saves owner contact info and immediately starts managed Twilio provisioning. Owner invite and existing-owner connect are handled separately inside the business panel.</p>
+                <Button type="submit">Create business workspace</Button>
+                <p className="text-sm text-muted-foreground">CallbackCloser will auto-connect an existing owner account or send an invite if needed. Twilio account mode and number setup stay explicit on the next screen.</p>
               </div>
             </form>
           </CardContent>
@@ -466,6 +476,46 @@ export default async function AdminPage({ searchParams }: { searchParams?: Recor
         </Card>
       </div>
 
+      <Card className="border-destructive/30 bg-destructive/5">
+        <CardHeader>
+          <CardTitle>Reset test data</CardTitle>
+          <CardDescription>
+            Founder/admin-only destructive cleanup. This removes every current test/demo business and its business-owned data so you can restart from a clean slate.
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="grid gap-4 xl:grid-cols-[1.1fr_0.9fr]">
+          <div className="rounded-xl border bg-background/80 p-4 text-sm">
+            <p className="font-medium text-foreground">
+              {resettableBusinesses.length} test/demo {resettableBusinesses.length === 1 ? 'business' : 'businesses'} eligible for deletion
+            </p>
+            <p className="mt-2 text-muted-foreground">
+              Only businesses marked as test/demo or the dedicated simulator demo workspace are included. Real customer businesses stay untouched.
+            </p>
+            {resettableBusinessPreview.length > 0 ? (
+              <p className="mt-3 text-muted-foreground">
+                Preview: {resettableBusinessPreview.join(', ')}
+                {resettableBusinesses.length > resettableBusinessPreview.length ? ` and ${resettableBusinesses.length - resettableBusinessPreview.length} more.` : '.'}
+              </p>
+            ) : (
+              <p className="mt-3 text-muted-foreground">No test/demo businesses are currently eligible for cleanup.</p>
+            )}
+          </div>
+
+          <form action={bulkDeleteTestBusinessesAction} className="rounded-xl border border-destructive/30 bg-background/80 p-4">
+            <div className="space-y-2">
+              <Label htmlFor="confirmationText">Type {BULK_TEST_DATA_RESET_CONFIRMATION}</Label>
+              <Input id="confirmationText" name="confirmationText" autoComplete="off" placeholder={BULK_TEST_DATA_RESET_CONFIRMATION} />
+            </div>
+            <p className="mt-3 text-xs text-muted-foreground">
+              This is irreversible. Deleting a business also removes its business-scoped leads, calls, messages, notifications, operator events, settings, and related demo data through the existing schema cascades.
+            </p>
+            <Button className="mt-4" type="submit" variant="destructive" disabled={resettableBusinesses.length === 0}>
+              Delete all test/demo businesses
+            </Button>
+          </form>
+        </CardContent>
+      </Card>
+
       <Card className="bg-card/90">
         <CardHeader>
           <CardTitle>Business triage board</CardTitle>
diff --git a/app/api/twilio/message-status/route.ts b/app/api/twilio/message-status/route.ts
new file mode 100644
index 0000000..9882a80
--- /dev/null
+++ b/app/api/twilio/message-status/route.ts
@@ -0,0 +1,193 @@
+import { NextResponse } from 'next/server';
+
+import { db } from '@/lib/db';
+import { getCorrelationIdFromRequest, withCorrelationIdHeader } from '@/lib/observability';
+import {
+  buildOutboundMessageStatusEvent,
+  isTerminalOutboundMessageStatus,
+  normalizeOutboundMessageStatus,
+} from '@/lib/outbound-message-events';
+import { formatPhoneDetail, recordBusinessOperatorEvent } from '@/lib/operator-events';
+import { RATE_LIMIT_TWILIO_AUTH_MAX, RATE_LIMIT_TWILIO_UNAUTH_MAX, RATE_LIMIT_WINDOW_MS } from '@/lib/rate-limit-config';
+import { buildRateLimitHeaders, consumeRateLimit, getClientIpAddress } from '@/lib/rate-limit';
+import { logTwilioError, logTwilioInfo, logTwilioWarn } from '@/lib/twilio-logging';
+import { hasValidTwilioWebhookRequest } from '@/lib/twilio-webhook';
+
+export const runtime = 'nodejs';
+export const dynamic = 'force-dynamic';
+
+function formField(formData: FormData, key: string) {
+  const value = formData.get(key);
+  return typeof value === 'string' ? value : '';
+}
+
+function okResponse() {
+  return new NextResponse(null, { status: 200 });
+}
+
+export async function POST(request: Request) {
+  let messageSid: string | null = null;
+  const correlationId = getCorrelationIdFromRequest(request);
+  const withCorrelation = (response: Response) => withCorrelationIdHeader(response, correlationId);
+
+  try {
+    const formData = await request.formData();
+    const payload = Object.fromEntries(formData.entries()) as Record<string, string>;
+    const clientIp = getClientIpAddress(request);
+    const accountSid = formField(formData, 'AccountSid');
+
+    const authorized = await hasValidTwilioWebhookRequest(request, payload);
+    if (!authorized) {
+      const rateLimit = consumeRateLimit({
+        key: `twilio:message-status:unauth:${clientIp}`,
+        limit: RATE_LIMIT_TWILIO_UNAUTH_MAX,
+        windowMs: RATE_LIMIT_WINDOW_MS,
+      });
+      if (!rateLimit.allowed) {
+        logTwilioWarn('sms', 'message_status_unauthorized_rate_limited', {
+          correlationId,
+          eventType: 'message_status_callback',
+          decision: 'reject_429',
+          clientIp,
+        });
+        return withCorrelation(
+          new NextResponse(JSON.stringify({ error: 'Too many unauthorized requests' }), {
+            status: 429,
+            headers: { 'Content-Type': 'application/json', ...buildRateLimitHeaders(rateLimit) },
+          })
+        );
+      }
+
+      logTwilioWarn('sms', 'message_status_unauthorized', {
+        correlationId,
+        eventType: 'message_status_callback',
+        decision: 'reject_401',
+      });
+      return withCorrelation(NextResponse.json({ error: 'Unauthorized' }, { status: 401 }));
+    }
+
+    const authRateLimit = consumeRateLimit({
+      key: `twilio:message-status:auth:${accountSid || clientIp}`,
+      limit: RATE_LIMIT_TWILIO_AUTH_MAX,
+      windowMs: RATE_LIMIT_WINDOW_MS,
+    });
+    if (!authRateLimit.allowed) {
+      logTwilioWarn('sms', 'message_status_rate_limited', {
+        correlationId,
+        eventType: 'message_status_callback',
+        decision: 'reject_429',
+        accountSid: accountSid || null,
+        clientIp,
+      });
+      return withCorrelation(
+        new NextResponse(null, {
+          status: 429,
+          headers: buildRateLimitHeaders(authRateLimit),
+        })
+      );
+    }
+
+    messageSid = formField(formData, 'MessageSid') || formField(formData, 'SmsSid') || null;
+    const messageStatus = normalizeOutboundMessageStatus(formField(formData, 'MessageStatus') || formField(formData, 'SmsStatus'));
+    const errorCode = formField(formData, 'ErrorCode') || null;
+    const errorMessage = formField(formData, 'ErrorMessage') || null;
+
+    logTwilioInfo('sms', 'message_status_received', {
+      messageSid,
+      correlationId,
+      eventType: 'message_status_callback',
+      messageStatus,
+      decision: 'processing',
+    });
+
+    if (!messageSid || !messageStatus) {
+      logTwilioWarn('sms', 'message_status_missing_fields', {
+        messageSid,
+        correlationId,
+        eventType: 'message_status_callback',
+        decision: 'noop_missing_message_sid_or_status',
+      });
+      return withCorrelation(okResponse());
+    }
+
+    const message = await db.message.findUnique({
+      where: { twilioSid: messageSid },
+      select: {
+        id: true,
+        businessId: true,
+        leadId: true,
+        participant: true,
+        body: true,
+        fromPhone: true,
+        toPhone: true,
+        status: true,
+      },
+    });
+
+    if (!message) {
+      logTwilioWarn('sms', 'message_status_message_not_found', {
+        messageSid,
+        correlationId,
+        eventType: 'message_status_callback',
+        decision: 'noop_message_not_found',
+      });
+      return withCorrelation(okResponse());
+    }
+
+    const previousStatus = normalizeOutboundMessageStatus(message.status);
+    await db.message.update({
+      where: { id: message.id },
+      data: {
+        status: messageStatus,
+      },
+    });
+
+    if (previousStatus !== messageStatus && isTerminalOutboundMessageStatus(messageStatus)) {
+      const event = buildOutboundMessageStatusEvent(message, messageStatus);
+      if (event) {
+        await recordBusinessOperatorEvent({
+          businessId: message.businessId,
+          type: event.type,
+          category: event.category,
+          status: event.status,
+          summary: event.summary,
+          details: {
+            messageSid,
+            messageStatus,
+            toPhone: formatPhoneDetail(message.toPhone),
+            fromPhone: formatPhoneDetail(message.fromPhone),
+            errorCode,
+            errorMessage,
+          },
+          relatedEntityType: message.leadId ? 'lead' : 'message',
+          relatedEntityId: message.leadId ?? message.id,
+        });
+      }
+    }
+
+    logTwilioInfo('sms', 'message_status_persisted', {
+      messageSid,
+      correlationId,
+      eventType: 'message_status_callback',
+      businessId: message.businessId,
+      previousStatus,
+      messageStatus,
+      decision: previousStatus === messageStatus ? 'noop_duplicate_status' : 'persist_status_update',
+    });
+
+    return withCorrelation(okResponse());
+  } catch (error) {
+    logTwilioError(
+      'sms',
+      'message_status_route_error',
+      {
+        messageSid,
+        correlationId,
+        eventType: 'message_status_callback',
+        decision: 'return_retryable_500',
+      },
+      error
+    );
+    return withCorrelation(NextResponse.json({ error: 'Message status callback failed' }, { status: 500 }));
+  }
+}
diff --git a/app/api/twilio/status/route.ts b/app/api/twilio/status/route.ts
index fe505bb..cc170c0 100644
--- a/app/api/twilio/status/route.ts
+++ b/app/api/twilio/status/route.ts
@@ -257,7 +257,7 @@ export async function POST(request: Request) {
       businessId: business.id,
       type: 'voice.call_marked_missed',
       category: 'VOICE',
-      status: 'WARNING',
+      status: 'INFO',
       summary: 'Call marked missed',
       details: {
         callSid,
@@ -422,7 +422,7 @@ export async function POST(request: Request) {
                 `CallbackCloser: Monthly conversation limit reached (${usage.used}/${usage.limit}). ` +
                 'Missed call was recorded, but automated SMS follow-up was not sent.',
               participant: 'OWNER',
-              twilioSubaccountSid: business.twilioSubaccountSid,
+              twilioSubaccountSid: business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : business.twilioSubaccountSid,
               messagingServiceSid: business.twilioMessagingServiceSid,
               managedTwilioStatus: business.managedTwilioStatus,
               a2pFailureReason: business.a2pFailureReason,
diff --git a/app/app/onboarding/actions.ts b/app/app/onboarding/actions.ts
index 7b473b3..a7a5da2 100644
--- a/app/app/onboarding/actions.ts
+++ b/app/app/onboarding/actions.ts
@@ -5,8 +5,6 @@ import { redirect } from 'next/navigation';
 import { revalidatePath } from 'next/cache';
 
 import { upsertBusinessForOwner } from '@/lib/business';
-import { logTwilioError } from '@/lib/twilio-logging';
-import { getTwilioProvisioningBlockReason, provisionPhoneNumber } from '@/lib/twilio-provision';
 import { onboardingSchema } from '@/lib/validators';
 
 const DEFAULT_POST_ONBOARDING_REDIRECT = '/app/settings';
@@ -44,34 +42,10 @@ export async function saveOnboardingAction(formData: FormData) {
       ? user.emailAddresses.find((email) => email.id === user.primaryEmailAddressId)?.emailAddress
       : user?.emailAddresses[0]?.emailAddress) || null;
 
-  const business = await upsertBusinessForOwner(userId, { ...parsed.data, ownerEmail });
-  const provisioningBlockReason = getTwilioProvisioningBlockReason(business);
-
-  if (!provisioningBlockReason) {
-    const correlationId = `onboarding_${business.id}`;
-
-    try {
-      await provisionPhoneNumber({
-        businessId: business.id,
-        businessName: business.name,
-        correlationId,
-      });
-    } catch (error) {
-      logTwilioError(
-        'provisioning',
-        'onboarding_auto_provision_failed',
-        {
-          correlationId,
-          businessId: business.id,
-          ownerClerkId: userId,
-          decision: 'onboarding_completed_without_twilio_number',
-        },
-        error
-      );
-    }
-  }
+  await upsertBusinessForOwner(userId, { ...parsed.data, ownerEmail });
 
   revalidatePath('/app');
   revalidatePath('/app/settings');
+  revalidatePath('/app/onboarding');
   redirect(postOnboardingRedirect);
 }
diff --git a/app/app/onboarding/page.tsx b/app/app/onboarding/page.tsx
index bccb351..41a3c5b 100644
--- a/app/app/onboarding/page.tsx
+++ b/app/app/onboarding/page.tsx
@@ -1,14 +1,16 @@
 import { auth } from '@clerk/nextjs/server';
 import { redirect } from 'next/navigation';
+import { BusinessProvisioningStatus, ManagedTwilioStatus, TwilioAccountMode, TwilioNumberSetupMode } from '@prisma/client';
 
 import { saveOnboardingAction } from '@/app/app/onboarding/actions';
-import { SetupChecklist } from '@/components/setup-checklist';
+import { TwilioSetupChecklist } from '@/components/twilio-setup-checklist';
 import { Badge } from '@/components/ui/badge';
-import { Button } from '@/components/ui/button';
+import { Button, buttonVariants } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { db } from '@/lib/db';
+import { buildTwilioSetupFlow, twilioAccountModeOptions, twilioNumberSetupModeOptions } from '@/lib/twilio-setup';
 
 const DEFAULT_POST_ONBOARDING_REDIRECT = '/app/settings';
 
@@ -36,32 +38,34 @@ export default async function OnboardingPage({
   const error = typeof searchParams?.error === 'string' ? searchParams.error : undefined;
   const nextPath = resolveSafeNextPath(typeof searchParams?.next === 'string' ? searchParams.next : undefined);
 
-  const checklistItems = [
-    {
-      key: 'routing',
-      label: 'Connect phone / routing',
-      detail: 'Create the business first, then confirm which line should ring while CallbackCloser sets up the texting line that covers missed calls.',
-      complete: false,
+  const setupPreviewFlow = buildTwilioSetupFlow({
+    business: {
+      name: 'New business workspace',
+      notifyPhone: null,
+      forwardingNumber: '',
+      provisioningStatus: BusinessProvisioningStatus.DRAFT,
+      twilioAccountMode: TwilioAccountMode.BUSINESS_SUBACCOUNT,
+      twilioNumberSetupMode: TwilioNumberSetupMode.NEW_NUMBER,
+      twilioSubaccountSid: null,
+      twilioMessagingServiceSid: null,
+      twilioPrimaryNumberSid: null,
+      twilioPhoneNumberSid: null,
+      twilioPrimaryPhoneNumber: null,
+      twilioPhoneNumber: null,
+      twilioWebhookSyncedAt: null,
+      managedTwilioStatus: ManagedTwilioStatus.DRAFT,
+      a2pCustomerProfileSid: null,
+      a2pBrandSid: null,
+      a2pCampaignSid: null,
+      a2pFailureReason: null,
+      a2pApprovedAt: null,
     },
-    {
-      key: 'sms',
-      label: 'Verify SMS template',
-      detail: 'Check the first automated text and the qualification prompts before live traffic starts.',
-      complete: false,
-    },
-    {
-      key: 'alerts',
-      label: 'Verify owner notifications',
-      detail: 'Add the owner mobile number so lead summaries reach the right phone immediately.',
-      complete: false,
-    },
-    {
-      key: 'test',
-      label: 'Run test lead',
-      detail: 'Place a missed-call test after settings and billing are complete so you can confirm the full handoff.',
-      complete: false,
-    },
-  ];
+    notificationSettings: null,
+    ownerConnected: true,
+    successfulLeadCount: 0,
+    testSmsState: 'not_started',
+    webhookSnapshot: null,
+  });
 
   return (
     <div className="mx-auto max-w-4xl space-y-6">
@@ -70,26 +74,38 @@ export default async function OnboardingPage({
         <div>
           <h1 className="text-2xl font-semibold tracking-tight">Create your business workspace</h1>
           <p className="text-sm text-muted-foreground">
-            Start with the business details now. Next, you will land in Business Settings where CallbackCloser helps set up your texting line, routing, owner alerts, billing, and the A2P approval path needed before live customer texting is truly ready.
+            Start with the business details and Twilio setup choices here. After you save, CallbackCloser opens the same shared setup flow used later for ongoing business control, without auto-provisioning ahead of your chosen account mode.
           </p>
         </div>
       </div>
 
-      <SetupChecklist
-        title="First successful activation path"
-        description="CallbackCloser works best when the first missed-call test is treated like a guided rollout, not a blind setup sprint."
-        items={checklistItems}
+      <TwilioSetupChecklist
+        title="CallbackCloser Twilio launch flow"
+        description="The new-business setup starts the exact same step-by-step rollout you will keep using later in the business control panel."
+        banner={{
+          title: 'Create the business workspace first',
+          detail:
+            'Save the business basics below. Then the shared Twilio setup flow opens with your account mode and number path already selected near the top.',
+          tone: 'pending',
+          stepKey: 'account_mode',
+        }}
+        bannerAction={
+          <a className={buttonVariants({ size: 'sm' })} href="#onboarding-business-form">
+            Start setup
+          </a>
+        }
+        steps={setupPreviewFlow.steps}
       />
 
       <Card className="border-primary/20 bg-primary/5">
         <CardHeader>
           <CardTitle>What happens after this form</CardTitle>
-          <CardDescription>Reduce onboarding drag by keeping the next steps explicit.</CardDescription>
+          <CardDescription>Reduce onboarding drag by carrying your Twilio choices directly into the guided control panel.</CardDescription>
         </CardHeader>
         <CardContent className="grid gap-3 text-sm text-muted-foreground sm:grid-cols-3">
-          <div className="rounded-xl border bg-background/80 p-4">1. Business Settings opens so you can confirm routing and we can provision your business texting line.</div>
-          <div className="rounded-xl border bg-background/80 p-4">2. Billing and A2P readiness are confirmed so live missed calls can trigger compliant automated SMS follow-up.</div>
-          <div className="rounded-xl border bg-background/80 p-4">3. You run the missed-call test and confirm the owner alert arrives with a ready-to-call summary.</div>
+          <div className="rounded-xl border bg-background/80 p-4">1. The shared Twilio setup flow opens with your chosen account mode and number path already saved for this business.</div>
+          <div className="rounded-xl border bg-background/80 p-4">2. Nothing gets auto-provisioned before you can review Messaging Service, number assignment, webhooks, and honest A2P status in plain English.</div>
+          <div className="rounded-xl border bg-background/80 p-4">3. You send the test SMS, run the missed-call validation, and only mark live after the checklist is actually clear.</div>
         </CardContent>
       </Card>
 
@@ -104,8 +120,59 @@ export default async function OnboardingPage({
               {error}
             </div>
           ) : null}
-          <form action={saveOnboardingAction} className="grid gap-4 sm:grid-cols-2">
+          <form action={saveOnboardingAction} className="grid gap-4 sm:grid-cols-2" id="onboarding-business-form">
             <input type="hidden" name="next" value={nextPath} />
+            <div className="sm:col-span-2 space-y-3 rounded-xl border bg-background/80 p-4">
+              <div className="space-y-1">
+                <p className="text-sm font-medium">Twilio account mode</p>
+                <p className="text-sm text-muted-foreground">Choose the account context before CallbackCloser provisions anything for this business.</p>
+              </div>
+              <div className="grid gap-3 md:grid-cols-2">
+                {twilioAccountModeOptions.map((option) => (
+                  <label key={option.value} className="rounded-xl border bg-card/80 p-4 text-sm">
+                    <div className="flex items-start gap-3">
+                      <input
+                        defaultChecked={option.value === TwilioAccountMode.BUSINESS_SUBACCOUNT}
+                        name="twilioAccountMode"
+                        type="radio"
+                        value={option.value}
+                      />
+                      <div className="space-y-1">
+                        <p className="font-medium">{option.label}</p>
+                        <p className="text-muted-foreground">{option.description}</p>
+                      </div>
+                    </div>
+                  </label>
+                ))}
+              </div>
+            </div>
+            <div className="sm:col-span-2 space-y-3 rounded-xl border bg-background/80 p-4">
+              <div className="space-y-1">
+                <p className="text-sm font-medium">Number path</p>
+                <p className="text-sm text-muted-foreground">Choose whether CallbackCloser should provision a new number or keep the rollout on an existing Twilio number.</p>
+              </div>
+              <div className="grid gap-3 md:grid-cols-2">
+                {twilioNumberSetupModeOptions.map((option) => (
+                  <label key={option.value} className="rounded-xl border bg-card/80 p-4 text-sm">
+                    <div className="flex items-start gap-3">
+                      <input
+                        defaultChecked={option.value === TwilioNumberSetupMode.NEW_NUMBER}
+                        name="twilioNumberSetupMode"
+                        type="radio"
+                        value={option.value}
+                      />
+                      <div className="space-y-1">
+                        <p className="font-medium">{option.label}</p>
+                        <p className="text-muted-foreground">{option.description}</p>
+                      </div>
+                    </div>
+                  </label>
+                ))}
+              </div>
+              <p className="text-xs text-muted-foreground">
+                Existing-number support stays admin-assisted unless the number already lives in the chosen Twilio account context.
+              </p>
+            </div>
             <div className="sm:col-span-2">
               <Label htmlFor="name">Business name</Label>
               <Input id="name" name="name" required placeholder="Acme Plumbing" />
diff --git a/app/app/settings/actions.ts b/app/app/settings/actions.ts
index e37ebd9..631ac59 100644
--- a/app/app/settings/actions.ts
+++ b/app/app/settings/actions.ts
@@ -3,17 +3,26 @@
 import { currentUser } from '@clerk/nextjs/server';
 import { revalidatePath } from 'next/cache';
 import { redirect } from 'next/navigation';
+import { ManagedTwilioStatus, TwilioAccountMode, TwilioNumberSetupMode } from '@prisma/client';
 
 import { requireAdmin } from '@/lib/admin';
 import { logAuditEvent } from '@/lib/audit-log';
 import { requireBusiness } from '@/lib/auth';
 import { db } from '@/lib/db';
+import { formatPhoneDetail, maskSid, recordBusinessOperatorEvent } from '@/lib/operator-events';
 import { maskPhoneForAudit, normalizePhoneNumber, normalizePhoneNumberToE164 } from '@/lib/phone';
 import { getTwilioBusinessClient } from '@/lib/twilio-client';
 import { logTwilioError } from '@/lib/twilio-logging';
+import { sendAndPersistOutboundMessage } from '@/lib/twilio-messaging';
 import { provisionPhoneNumber } from '@/lib/twilio-provision';
 import { syncTwilioIncomingPhoneNumberWebhooks } from '@/lib/twilio';
-import { businessSettingsSchema, businessTwilioAdminOverrideSchema, buyNumberSchema } from '@/lib/validators';
+import {
+  businessSettingsSchema,
+  businessTwilioAdminOverrideSchema,
+  businessTwilioSetupChoiceSchema,
+  businessTwilioTestSmsSchema,
+  buyNumberSchema,
+} from '@/lib/validators';
 
 async function getBusinessForOwner() {
   return requireBusiness();
@@ -112,6 +121,26 @@ export async function saveBusinessSettingsAction(formData: FormData) {
   redirect('/app/settings?saved=1');
 }
 
+export async function saveBusinessTwilioSetupChoiceAction(formData: FormData) {
+  const business = await getBusinessForOwner();
+  const parsed = businessTwilioSetupChoiceSchema.safeParse(Object.fromEntries(formData));
+  if (!parsed.success) {
+    redirect(`/app/settings?error=${encodeURIComponent(parsed.error.issues[0]?.message || 'Invalid Twilio setup choice')}`);
+  }
+
+  await db.business.update({
+    where: { id: business.id },
+    data: {
+      twilioAccountMode: parsed.data.twilioAccountMode as TwilioAccountMode,
+      twilioNumberSetupMode: parsed.data.twilioNumberSetupMode as TwilioNumberSetupMode,
+      provisioningLastRunAt: new Date(),
+    },
+  });
+
+  revalidatePath('/app/settings');
+  redirect('/app/settings?saved=1');
+}
+
 export async function saveBusinessTwilioAdminOverridesAction(formData: FormData) {
   const business = await getBusinessForOwner();
   const admin = await requireAdmin();
@@ -120,9 +149,16 @@ export async function saveBusinessTwilioAdminOverridesAction(formData: FormData)
     redirect(`/app/settings?error=${encodeURIComponent(parsed.error.issues[0]?.message || 'Invalid Twilio admin update')}`);
   }
 
+  const twilioAccountMode = parsed.data.twilioAccountMode as TwilioAccountMode;
+  const twilioNumberSetupMode = parsed.data.twilioNumberSetupMode as TwilioNumberSetupMode;
+  const twilioSubaccountSid = twilioAccountMode === TwilioAccountMode.MAIN_ACCOUNT ? null : normalizeOptionalSid(parsed.data.twilioSubaccountSid);
   const twilioPhoneNumber = normalizeOptionalE164Phone(parsed.data.twilioPhoneNumber || '', 'Twilio number');
   const twilioPhoneNumberSid = normalizeOptionalSid(parsed.data.twilioPhoneNumberSid);
   const twilioMessagingServiceSid = normalizeOptionalSid(parsed.data.twilioMessagingServiceSid);
+  const a2pCustomerProfileSid = normalizeOptionalSid(parsed.data.a2pCustomerProfileSid);
+  const a2pBrandSid = normalizeOptionalSid(parsed.data.a2pBrandSid);
+  const a2pCampaignSid = normalizeOptionalSid(parsed.data.a2pCampaignSid);
+  const a2pFailureReason = parsed.data.a2pFailureReason?.trim() || null;
   const ownerPhone = normalizeOptionalE164Phone(parsed.data.ownerPhone || '', 'Owner alert phone');
   const notificationSettings = await db.businessNotificationSettings.findUnique({
     where: { businessId: business.id },
@@ -132,6 +168,7 @@ export async function saveBusinessTwilioAdminOverridesAction(formData: FormData)
   const existingTwilioPhoneNumberSid = business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || null;
   const criticalFieldClears = [
     existingOwnerPhone && !ownerPhone ? 'owner alert phone' : null,
+    business.twilioSubaccountSid && !twilioSubaccountSid && twilioAccountMode === TwilioAccountMode.BUSINESS_SUBACCOUNT ? 'Twilio subaccount SID' : null,
     existingTwilioPhoneNumber && !twilioPhoneNumber ? 'Twilio number' : null,
     existingTwilioPhoneNumberSid && !twilioPhoneNumberSid ? 'Twilio number SID' : null,
     business.twilioMessagingServiceSid && !twilioMessagingServiceSid ? 'messaging service SID' : null,
@@ -142,11 +179,29 @@ export async function saveBusinessTwilioAdminOverridesAction(formData: FormData)
   }
 
   const twilioMappingChanged =
+    business.twilioAccountMode !== twilioAccountMode ||
+    business.twilioNumberSetupMode !== twilioNumberSetupMode ||
+    business.twilioSubaccountSid !== twilioSubaccountSid ||
     existingTwilioPhoneNumber !== twilioPhoneNumber ||
     existingTwilioPhoneNumberSid !== twilioPhoneNumberSid ||
     business.twilioMessagingServiceSid !== twilioMessagingServiceSid;
+  const a2pMetadataChanged =
+    business.a2pCustomerProfileSid !== a2pCustomerProfileSid ||
+    business.a2pBrandSid !== a2pBrandSid ||
+    business.a2pCampaignSid !== a2pCampaignSid ||
+    business.a2pFailureReason !== a2pFailureReason;
+  const managedTwilioStatusChanged = business.managedTwilioStatus !== parsed.data.managedTwilioStatus;
 
   const changedFields = [
+    business.twilioAccountMode !== twilioAccountMode
+      ? { key: 'twilioAccountMode', before: business.twilioAccountMode, after: twilioAccountMode }
+      : null,
+    business.twilioNumberSetupMode !== twilioNumberSetupMode
+      ? { key: 'twilioNumberSetupMode', before: business.twilioNumberSetupMode, after: twilioNumberSetupMode }
+      : null,
+    business.twilioSubaccountSid !== twilioSubaccountSid
+      ? { key: 'twilioSubaccountSid', before: business.twilioSubaccountSid, after: twilioSubaccountSid }
+      : null,
     existingOwnerPhone !== ownerPhone ? { key: 'ownerPhone', before: existingOwnerPhone, after: ownerPhone } : null,
     existingTwilioPhoneNumber !== twilioPhoneNumber
       ? { key: 'twilioPhoneNumber', before: existingTwilioPhoneNumber, after: twilioPhoneNumber }
@@ -157,18 +212,52 @@ export async function saveBusinessTwilioAdminOverridesAction(formData: FormData)
     business.twilioMessagingServiceSid !== twilioMessagingServiceSid
       ? { key: 'twilioMessagingServiceSid', before: business.twilioMessagingServiceSid, after: twilioMessagingServiceSid }
       : null,
+    business.a2pCustomerProfileSid !== a2pCustomerProfileSid
+      ? { key: 'a2pCustomerProfileSid', before: business.a2pCustomerProfileSid, after: a2pCustomerProfileSid }
+      : null,
+    business.a2pBrandSid !== a2pBrandSid ? { key: 'a2pBrandSid', before: business.a2pBrandSid, after: a2pBrandSid } : null,
+    business.a2pCampaignSid !== a2pCampaignSid
+      ? { key: 'a2pCampaignSid', before: business.a2pCampaignSid, after: a2pCampaignSid }
+      : null,
+    business.a2pFailureReason !== a2pFailureReason
+      ? { key: 'a2pFailureReason', before: business.a2pFailureReason, after: a2pFailureReason }
+      : null,
+    managedTwilioStatusChanged
+      ? { key: 'managedTwilioStatus', before: business.managedTwilioStatus, after: parsed.data.managedTwilioStatus }
+      : null,
   ].filter(Boolean) as Array<{ key: string; before: string | null; after: string | null }>;
 
   await db.business.update({
     where: { id: business.id },
     data: {
+      twilioAccountMode,
+      twilioNumberSetupMode,
+      twilioSubaccountSid,
       notifyPhone: ownerPhone,
+      managedTwilioStatus: parsed.data.managedTwilioStatus as ManagedTwilioStatus,
+      managedTwilioStatusUpdatedAt: managedTwilioStatusChanged ? new Date() : business.managedTwilioStatusUpdatedAt,
       twilioPhoneNumber,
       twilioPrimaryPhoneNumber: twilioPhoneNumber,
       twilioPhoneNumberSid,
       twilioPrimaryNumberSid: twilioPhoneNumberSid,
       twilioMessagingServiceSid,
+      a2pCustomerProfileSid,
+      a2pBrandSid,
+      a2pCampaignSid,
+      a2pFailureReason,
+      a2pSubmittedAt:
+        managedTwilioStatusChanged &&
+        ['AWAITING_BUSINESS_VERIFICATION', 'BRAND_SUBMITTED', 'CAMPAIGN_SUBMITTED'].includes(parsed.data.managedTwilioStatus)
+          ? business.a2pSubmittedAt || new Date()
+          : business.a2pSubmittedAt,
+      a2pApprovedAt:
+        parsed.data.managedTwilioStatus === ManagedTwilioStatus.COMPLIANT_LIVE
+          ? business.a2pApprovedAt || new Date()
+          : managedTwilioStatusChanged
+            ? null
+            : business.a2pApprovedAt,
       ...(twilioMappingChanged ? { twilioWebhookSyncedAt: null } : {}),
+      ...(twilioMappingChanged || a2pMetadataChanged || managedTwilioStatusChanged ? { provisioningLastRunAt: new Date() } : {}),
     },
   });
 
@@ -199,10 +288,14 @@ export async function saveBusinessTwilioAdminOverridesAction(formData: FormData)
           before:
             change.key === 'ownerPhone' || change.key === 'twilioPhoneNumber'
               ? maskPhoneForAudit(change.before)
+              : change.key === 'a2pFailureReason'
+                ? change.before
               : maskSidForAudit(change.before) ?? change.before,
           after:
             change.key === 'ownerPhone' || change.key === 'twilioPhoneNumber'
               ? maskPhoneForAudit(change.after)
+              : change.key === 'a2pFailureReason'
+                ? change.after
               : maskSidForAudit(change.after) ?? change.after,
         })),
       },
@@ -214,6 +307,93 @@ export async function saveBusinessTwilioAdminOverridesAction(formData: FormData)
   redirect(`/app/settings?adminTwilioSaved=1&adminChanged=${encodeURIComponent(changedFields.map((field) => field.key).join(','))}`);
 }
 
+export async function sendBusinessTwilioTestSmsAction(formData: FormData) {
+  const business = await getBusinessForOwner();
+  const parsed = businessTwilioTestSmsSchema.safeParse(Object.fromEntries(formData));
+  if (!parsed.success) {
+    redirect(`/app/settings?error=${encodeURIComponent(parsed.error.issues[0]?.message || 'Invalid test SMS destination')}`);
+  }
+
+  const destinationPhone = normalizeOptionalE164Phone(parsed.data.destinationPhone, 'Test SMS destination');
+  const fromPhone = business.twilioPrimaryPhoneNumber || business.twilioPhoneNumber;
+  if (!fromPhone) {
+    redirect('/app/settings?error=Assign%20a%20business%20number%20before%20sending%20a%20test%20SMS');
+  }
+
+  try {
+    await recordBusinessOperatorEvent({
+      businessId: business.id,
+      type: 'admin.test_sms_initiated',
+      category: 'ADMIN_ACTIONS',
+      status: 'PENDING',
+      summary: 'Test SMS initiated',
+      details: {
+        destinationPhone: formatPhoneDetail(destinationPhone),
+        fromPhone: formatPhoneDetail(fromPhone),
+      },
+    });
+
+    const result = await sendAndPersistOutboundMessage({
+      businessId: business.id,
+      fromPhone,
+      toPhone: destinationPhone!,
+      body: `CallbackCloser setup test: ${business.name} is using ${fromPhone} for launch verification.`,
+      participant: 'OWNER',
+      context: 'admin_test',
+      twilioSubaccountSid: business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : business.twilioSubaccountSid,
+      messagingServiceSid: business.twilioMessagingServiceSid,
+      managedTwilioStatus: business.managedTwilioStatus,
+      a2pFailureReason: business.a2pFailureReason,
+    });
+
+    if (result.suppressed) {
+      await recordBusinessOperatorEvent({
+        businessId: business.id,
+        type: 'admin.test_sms_suppressed',
+        category: 'ADMIN_ACTIONS',
+        status: 'WARNING',
+        summary: 'Test SMS could not be sent',
+        details: {
+          destinationPhone: formatPhoneDetail(destinationPhone),
+          reason: result.reason,
+        },
+      });
+      redirect(`/app/settings?error=${encodeURIComponent(`Test SMS was suppressed: ${result.reason.replace(/_/g, ' ')}.`)}`);
+    }
+
+    await recordBusinessOperatorEvent({
+      businessId: business.id,
+      type: 'admin.test_sms_accepted',
+      category: 'ADMIN_ACTIONS',
+      status: 'SUCCESS',
+      summary: 'Test SMS accepted by Twilio',
+      details: {
+        destinationPhone: formatPhoneDetail(destinationPhone),
+        fromPhone: formatPhoneDetail(fromPhone),
+        messageSid: maskSid(result.sent.sid),
+      },
+      relatedEntityType: 'message',
+      relatedEntityId: result.message.id,
+    });
+  } catch (error) {
+    const message = error instanceof Error ? error.message : 'Test SMS failed';
+    await recordBusinessOperatorEvent({
+      businessId: business.id,
+      type: 'admin.test_sms_failed',
+      category: 'ADMIN_ACTIONS',
+      status: 'FAILED',
+      summary: 'Test SMS failed',
+      details: {
+        error: message,
+      },
+    });
+    redirect(`/app/settings?error=${encodeURIComponent(message)}`);
+  }
+
+  revalidatePath('/app/settings');
+  redirect('/app/settings?twilioTestSms=1');
+}
+
 export async function buyTwilioNumberAction(formData: FormData) {
   const business = await getBusinessForOwner();
   const parsed = buyNumberSchema.safeParse(Object.fromEntries(formData));
@@ -227,6 +407,12 @@ export async function buyTwilioNumberAction(formData: FormData) {
 
   const correlationId = `settings_buy_${business.id}`;
   try {
+    await db.business.update({
+      where: { id: business.id },
+      data: {
+        twilioNumberSetupMode: 'NEW_NUMBER',
+      },
+    });
     await provisionPhoneNumber({
       businessId: business.id,
       businessName: business.name,
@@ -255,6 +441,13 @@ export async function buyTwilioNumberAction(formData: FormData) {
 
 export async function connectExistingTwilioNumberAction(formData: FormData) {
   void formData;
+  const business = await getBusinessForOwner();
+  await db.business.update({
+    where: { id: business.id },
+    data: {
+      twilioNumberSetupMode: 'EXISTING_NUMBER',
+    },
+  });
   redirect(
     '/app/settings?error=' +
       encodeURIComponent(
@@ -271,7 +464,7 @@ export async function resyncTwilioWebhooksAction() {
   }
 
   try {
-    const client = getTwilioBusinessClient(business.twilioSubaccountSid);
+    const client = getTwilioBusinessClient(business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : business.twilioSubaccountSid);
     const { number } = await syncTwilioIncomingPhoneNumberWebhooks(phoneNumberSid, client);
     const syncedAt = new Date();
 
diff --git a/app/app/settings/page.tsx b/app/app/settings/page.tsx
index 7428395..8bafddc 100644
--- a/app/app/settings/page.tsx
+++ b/app/app/settings/page.tsx
@@ -1,35 +1,88 @@
 import Link from 'next/link';
 
-import { SetupChecklist } from '@/components/setup-checklist';
+import { setBusinessProvisioningStatusAction } from '@/app/admin/actions';
+import { TwilioSetupChecklist } from '@/components/twilio-setup-checklist';
 import { Badge } from '@/components/ui/badge';
 import { Button, buttonVariants } from '@/components/ui/button';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { Select } from '@/components/ui/select';
 import { getAdminSession } from '@/lib/admin';
+import { getAdminTestSmsConfidenceState } from '@/lib/admin-dashboard';
+import { getTwilioWebhookSnapshot } from '@/lib/admin-provisioning';
 import { requireBusiness } from '@/lib/auth';
 import { getBusinessNotificationSettingsForBusiness } from '@/lib/business-access';
+import { TwilioSetupTone, buildTwilioSetupFlow, getTwilioAccountModeLabel, twilioAccountModeOptions, twilioNumberSetupModeOptions } from '@/lib/twilio-setup';
 import { db } from '@/lib/db';
-import { getManagedTextingNumber, getManagedTwilioStatusSummary } from '@/lib/managed-twilio';
+import { getManagedTextingNumber, managedTwilioStatusLabels } from '@/lib/managed-twilio-status';
 import { formatPhoneForDisplay } from '@/lib/phone';
 import { isPortfolioDemoMode } from '@/lib/portfolio-demo';
-import { getBusinessBillingAccessState } from '@/lib/subscription';
-import { isSmsRecipientOptedOut } from '@/lib/twilio-sms-compliance';
 
 import {
   buyTwilioNumberAction,
+  connectExistingTwilioNumberAction,
   resyncTwilioWebhooksAction,
   saveBusinessSettingsAction,
   saveBusinessTwilioAdminOverridesAction,
+  saveBusinessTwilioSetupChoiceAction,
+  sendBusinessTwilioTestSmsAction,
 } from './actions';
 
 const adminChangedFieldLabels: Record<string, string> = {
   ownerPhone: 'owner alert phone',
+  twilioAccountMode: 'Twilio account mode',
+  twilioNumberSetupMode: 'Twilio number path',
+  twilioSubaccountSid: 'Twilio subaccount SID',
   twilioPhoneNumber: 'Twilio number',
   twilioPhoneNumberSid: 'Twilio number SID',
   twilioMessagingServiceSid: 'messaging service SID',
+  a2pCustomerProfileSid: 'A2P customer profile SID',
+  a2pBrandSid: 'A2P brand SID',
+  a2pCampaignSid: 'A2P campaign SID',
+  a2pFailureReason: 'A2P blocker note',
+  managedTwilioStatus: 'A2P status',
 };
 
+type BusinessTwilioDefaults = {
+  twilioAccountMode: string;
+  twilioNumberSetupMode: string;
+  twilioSubaccountSid: string;
+  twilioPhoneNumber: string;
+  twilioPhoneNumberSid: string;
+  twilioMessagingServiceSid: string;
+  a2pCustomerProfileSid: string;
+  a2pBrandSid: string;
+  a2pCampaignSid: string;
+  a2pFailureReason: string;
+  managedTwilioStatus: string;
+  ownerPhone: string;
+};
+
+function HiddenBusinessTwilioFields({
+  defaults,
+  exclude = [],
+}: {
+  defaults: BusinessTwilioDefaults;
+  exclude?: Array<keyof BusinessTwilioDefaults>;
+}) {
+  return (
+    <>
+      {Object.entries(defaults).map(([name, value]) => {
+        if (exclude.includes(name as keyof BusinessTwilioDefaults)) return null;
+        return <input key={name} name={name} type="hidden" value={value} />;
+      })}
+    </>
+  );
+}
+
+function getBadgeVariant(tone: TwilioSetupTone) {
+  if (tone === 'success') return 'success' as const;
+  if (tone === 'attention') return 'destructive' as const;
+  if (tone === 'pending') return 'outline' as const;
+  return 'secondary' as const;
+}
+
 export default async function SettingsPage({ searchParams }: { searchParams?: Record<string, string | string[] | undefined> }) {
   const business = await requireBusiness();
   const demoMode = isPortfolioDemoMode();
@@ -37,126 +90,457 @@ export default async function SettingsPage({ searchParams }: { searchParams?: Re
   const error = typeof searchParams?.error === 'string' ? searchParams.error : undefined;
   const saved = searchParams?.saved === '1';
   const numberBought = searchParams?.numberBought === '1';
-  const twilioConnected = searchParams?.twilioConnected === '1';
   const twilioSynced = searchParams?.twilioSynced === '1';
   const adminTwilioSaved = searchParams?.adminTwilioSaved === '1';
+  const twilioTestSms = searchParams?.twilioTestSms === '1';
   const adminChangedRaw = typeof searchParams?.adminChanged === 'string' ? searchParams.adminChanged : '';
   const adminChanged = adminChangedRaw
     .split(',')
     .map((field) => field.trim())
     .filter(Boolean)
     .map((field) => adminChangedFieldLabels[field] || field);
-  const billingAccess = getBusinessBillingAccessState(business);
-  const subscriptionReady = billingAccess.billingActive;
-  const ownerNotifyPhoneOptedOut =
-    demoMode || !business.notifyPhone
-      ? false
-      : await isSmsRecipientOptedOut({ businessId: business.id, phone: business.notifyPhone });
-  const successfulLeadCount = demoMode
-    ? 1
-    : await db.lead.count({
-        where: {
-          businessId: business.id,
-          OR: [{ ownerNotifiedAt: { not: null } }, { notifiedAt: { not: null } }],
-        },
-      });
-  const notificationSettings = demoMode
-    ? null
-    : await getBusinessNotificationSettingsForBusiness(business.id);
+
+  const [notificationSettings, successfulLeadCount, testSmsEvents, webhookSnapshot] = demoMode
+    ? [null, 1, [], null]
+    : await Promise.all([
+        getBusinessNotificationSettingsForBusiness(business.id),
+        db.lead.count({
+          where: {
+            businessId: business.id,
+            OR: [{ ownerNotifiedAt: { not: null } }, { notifiedAt: { not: null } }],
+          },
+        }),
+        db.businessOperatorEvent.findMany({
+          where: {
+            businessId: business.id,
+            type: {
+              startsWith: 'admin.test_sms_',
+            },
+          },
+          orderBy: { createdAt: 'desc' },
+          take: 20,
+          select: {
+            type: true,
+            status: true,
+            createdAt: true,
+          },
+        }),
+        getTwilioWebhookSnapshot(business),
+      ]);
+
+  const testSmsState = getAdminTestSmsConfidenceState(testSmsEvents);
   const managedTextingNumber = getManagedTextingNumber(business);
-  const managedTwilioSummary = getManagedTwilioStatusSummary(business);
-  const lastManagedSetupRefresh = business.twilioWebhookSyncedAt ? new Date(business.twilioWebhookSyncedAt).toLocaleString() : 'Never';
-  const activationReady =
-    Boolean(business.forwardingNumber) &&
-    managedTwilioSummary.messagingReady &&
-    Boolean(business.notifyPhone) &&
-    !ownerNotifyPhoneOptedOut &&
-    subscriptionReady;
+  const setupFlow = buildTwilioSetupFlow({
+    business,
+    notificationSettings,
+    ownerConnected: true,
+    successfulLeadCount,
+    testSmsState,
+    webhookSnapshot,
+  });
+  const twilioDefaults: BusinessTwilioDefaults = {
+    twilioAccountMode: business.twilioAccountMode,
+    twilioNumberSetupMode: business.twilioNumberSetupMode,
+    twilioSubaccountSid: business.twilioSubaccountSid || '',
+    twilioPhoneNumber: business.twilioPrimaryPhoneNumber || business.twilioPhoneNumber || '',
+    twilioPhoneNumberSid: business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || '',
+    twilioMessagingServiceSid: business.twilioMessagingServiceSid || '',
+    a2pCustomerProfileSid: business.a2pCustomerProfileSid || '',
+    a2pBrandSid: business.a2pBrandSid || '',
+    a2pCampaignSid: business.a2pCampaignSid || '',
+    a2pFailureReason: business.a2pFailureReason || '',
+    managedTwilioStatus: business.managedTwilioStatus,
+    ownerPhone: notificationSettings?.ownerPhone || business.notifyPhone || '',
+  };
+
+  const bannerAction =
+    setupFlow.banner.stepKey === 'voice_webhook_synced' ||
+    setupFlow.banner.stepKey === 'sms_webhook_synced' ||
+    setupFlow.banner.stepKey === 'status_callback_synced' ? (
+      <form action={resyncTwilioWebhooksAction}>
+        <Button size="sm" type="submit">
+          Sync webhooks
+        </Button>
+      </form>
+    ) : setupFlow.banner.stepKey === 'safe_to_mark_live' && adminSession?.isAdmin && setupFlow.safeToMarkLive && business.provisioningStatus !== 'LIVE' ? (
+      <form action={setBusinessProvisioningStatusAction}>
+        <input type="hidden" name="businessId" value={business.id} />
+        <input type="hidden" name="status" value="LIVE" />
+        <Button size="sm" type="submit">
+          Mark live
+        </Button>
+      </form>
+    ) : (
+      <Link
+        className={buttonVariants({ size: 'sm', variant: 'outline' })}
+        href={
+          setupFlow.banner.stepKey === 'account_mode'
+            ? '#account-mode-step'
+            : setupFlow.banner.stepKey === 'number_path'
+              ? '#number-path-step'
+              : setupFlow.banner.stepKey === 'test_sms_delivered'
+                ? '#test-sms-step'
+                : setupFlow.banner.stepKey === 'missed_call_validated'
+                  ? '/app/call-flow'
+                  : '#twilio-setup-flow'
+        }
+      >
+        {setupFlow.banner.stepKey === 'missed_call_validated' ? 'Open call flow' : 'Review step'}
+      </Link>
+    );
+
+  const setupSteps = setupFlow.steps.map((step) => {
+    if (step.key === 'owner_connected') {
+      return {
+        ...step,
+        body: (
+          <div className="flex flex-wrap items-center gap-3 text-sm text-muted-foreground">
+            <Badge variant="success">Connected</Badge>
+            <span>Your signed-in business account is already attached to this workspace.</span>
+          </div>
+        ),
+      };
+    }
+
+    if (step.key === 'account_mode') {
+      return {
+        ...step,
+        body: (
+          <form action={saveBusinessTwilioSetupChoiceAction} className="space-y-4" id="account-mode-step">
+            <input type="hidden" name="twilioNumberSetupMode" value={setupFlow.numberSetupMode} />
+            <div className="grid gap-3 md:grid-cols-2">
+              {twilioAccountModeOptions.map((option) => (
+                <label key={option.value} className="rounded-xl border bg-background/80 p-4 text-sm">
+                  <div className="flex items-start gap-3">
+                    <input defaultChecked={setupFlow.accountMode === option.value} name="twilioAccountMode" type="radio" value={option.value} />
+                    <div className="space-y-1">
+                      <p className="font-medium">{option.label}</p>
+                      <p className="text-muted-foreground">{option.description}</p>
+                    </div>
+                  </div>
+                </label>
+              ))}
+            </div>
+            <Button size="sm" type="submit">
+              Save account mode
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'number_path') {
+      return {
+        ...step,
+        body: (
+          <form action={saveBusinessTwilioSetupChoiceAction} className="space-y-4" id="number-path-step">
+            <input type="hidden" name="twilioAccountMode" value={setupFlow.accountMode} />
+            <div className="grid gap-3 md:grid-cols-2">
+              {twilioNumberSetupModeOptions.map((option) => (
+                <label key={option.value} className="rounded-xl border bg-background/80 p-4 text-sm">
+                  <div className="flex items-start gap-3">
+                    <input defaultChecked={setupFlow.numberSetupMode === option.value} name="twilioNumberSetupMode" type="radio" value={option.value} />
+                    <div className="space-y-1">
+                      <p className="font-medium">{option.label}</p>
+                      <p className="text-muted-foreground">{option.description}</p>
+                    </div>
+                  </div>
+                </label>
+              ))}
+            </div>
+            {setupFlow.numberSetupMode === 'EXISTING_NUMBER' ? (
+              <p className="text-sm text-muted-foreground">{setupFlow.existingNumberMessage}</p>
+            ) : null}
+            <Button size="sm" type="submit" variant="outline">
+              Save number path
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'account_ready') {
+      return {
+        ...step,
+        body: adminSession?.isAdmin ? (
+          <form action={saveBusinessTwilioAdminOverridesAction} className="space-y-4">
+            <HiddenBusinessTwilioFields defaults={twilioDefaults} exclude={['twilioSubaccountSid']} />
+            {setupFlow.accountMode === 'BUSINESS_SUBACCOUNT' ? (
+              <div className="space-y-2">
+                <Label htmlFor="businessTwilioSubaccountSid">Business subaccount SID</Label>
+                <Input
+                  id="businessTwilioSubaccountSid"
+                  name="twilioSubaccountSid"
+                  defaultValue={business.twilioSubaccountSid || ''}
+                  placeholder="AC..."
+                />
+                <p className="text-xs text-muted-foreground">Paste a known subaccount SID to reuse it, or leave this blank and let provisioning create one.</p>
+              </div>
+            ) : (
+              <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground">
+                Main account mode is active. CallbackCloser will use the parent Twilio account directly for this business.
+              </div>
+            )}
+            <Button size="sm" type="submit" variant="outline">
+              Save account target
+            </Button>
+          </form>
+        ) : (
+          <p className="text-sm text-muted-foreground">
+            {setupFlow.accountMode === 'BUSINESS_SUBACCOUNT'
+              ? 'CallbackCloser will create or reuse a dedicated Twilio subaccount for this business during setup.'
+              : 'CallbackCloser will keep this business on the parent Twilio account.'}
+          </p>
+        ),
+      };
+    }
+
+    if (step.key === 'messaging_service_ready') {
+      return {
+        ...step,
+        body: adminSession?.isAdmin ? (
+          <form action={saveBusinessTwilioAdminOverridesAction} className="space-y-4">
+            <HiddenBusinessTwilioFields defaults={twilioDefaults} exclude={['twilioMessagingServiceSid']} />
+            <div className="space-y-2">
+              <Label htmlFor="businessMessagingServiceSid">Messaging Service SID</Label>
+              <Input
+                id="businessMessagingServiceSid"
+                name="twilioMessagingServiceSid"
+                defaultValue={business.twilioMessagingServiceSid || ''}
+                placeholder="MG..."
+              />
+            </div>
+            <Button size="sm" type="submit" variant="outline">
+              Save Messaging Service
+            </Button>
+          </form>
+        ) : (
+          <p className="text-sm text-muted-foreground">Current value: {business.twilioMessagingServiceSid || 'Not recorded yet.'}</p>
+        ),
+      };
+    }
+
+    if (step.key === 'number_assigned') {
+      return {
+        ...step,
+        body: (
+          <div className="space-y-4">
+            <div className="grid gap-3 md:grid-cols-2">
+              <div className="rounded-xl border bg-background/80 p-4 text-sm">
+                <p className="font-medium">Current number</p>
+                <p className="mt-2 text-muted-foreground">
+                  {managedTextingNumber ? formatPhoneForDisplay(managedTextingNumber) : 'No business number recorded yet'}
+                </p>
+              </div>
+              <div className="rounded-xl border bg-background/80 p-4 text-sm">
+                <p className="font-medium">Number path</p>
+                <p className="mt-2 text-muted-foreground">{setupFlow.numberSetupModeLabel}</p>
+              </div>
+            </div>
+
+            {setupFlow.numberSetupMode === 'NEW_NUMBER' ? (
+              <form action={buyTwilioNumberAction} className="flex flex-col gap-3 md:flex-row md:items-end">
+                <div className="w-full md:max-w-xs">
+                  <Label htmlFor="setupAreaCode">Preferred area code</Label>
+                  <Input id="setupAreaCode" name="areaCode" inputMode="numeric" maxLength={3} placeholder="512" />
+                </div>
+                <Button size="sm" type="submit" disabled={Boolean(managedTextingNumber)}>
+                  {managedTextingNumber ? 'Number already assigned' : 'Provision number'}
+                </Button>
+              </form>
+            ) : (
+              <div className="space-y-3">
+                <p className="text-sm text-muted-foreground">{setupFlow.existingNumberMessage}</p>
+                <form action={connectExistingTwilioNumberAction}>
+                  <Button size="sm" type="submit" variant="outline">
+                    Keep existing number
+                  </Button>
+                </form>
+              </div>
+            )}
+
+            {adminSession?.isAdmin ? (
+              <form action={saveBusinessTwilioAdminOverridesAction} className="grid gap-4 md:grid-cols-2">
+                <HiddenBusinessTwilioFields defaults={twilioDefaults} exclude={['twilioPhoneNumber', 'twilioPhoneNumberSid']} />
+                <div className="space-y-2">
+                  <Label htmlFor="businessTwilioPhoneNumber">Twilio number</Label>
+                  <Input id="businessTwilioPhoneNumber" name="twilioPhoneNumber" defaultValue={managedTextingNumber || ''} placeholder="+15551234567" />
+                </div>
+                <div className="space-y-2">
+                  <Label htmlFor="businessTwilioPhoneNumberSid">Twilio number SID</Label>
+                  <Input
+                    id="businessTwilioPhoneNumberSid"
+                    name="twilioPhoneNumberSid"
+                    defaultValue={business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || ''}
+                    placeholder="PN..."
+                  />
+                </div>
+                <div className="md:col-span-2">
+                  <Button size="sm" type="submit" variant="outline">
+                    Save number mapping
+                  </Button>
+                </div>
+              </form>
+            ) : null}
+          </div>
+        ),
+      };
+    }
 
-  const checklistItems = [
-    {
-      key: 'twilio',
-      label: 'Business info submitted',
-      detail: business.name ? `${business.name} is ready for managed setup.` : 'Start with the basic business profile.',
-      complete: Boolean(business.name),
-    },
-    {
-      key: 'texting-line',
-      label: 'Texting number provisioned',
-      detail: managedTextingNumber
-        ? `Your texting line is ${formatPhoneForDisplay(managedTextingNumber)}.`
-        : 'We still need to provision your business texting line.',
-      complete: Boolean(managedTextingNumber),
-    },
-    {
-      key: 'forwarding',
-      label: 'Forwarding configured',
-      detail: business.forwardingNumber
-        ? `Forwarding is set to ${formatPhoneForDisplay(business.forwardingNumber)}.`
-        : 'Add the business line that should ring first.',
-      complete: Boolean(business.forwardingNumber),
-    },
-    {
-      key: 'sms-template',
-      label: 'Messaging infrastructure ready',
-      detail: managedTwilioSummary.onboardingReady
-        ? 'Managed messaging, number assignment, and webhook sync are in place.'
-        : managedTwilioSummary.nextStep,
-      complete: managedTwilioSummary.onboardingReady,
-    },
-    {
-      key: 'compliance',
-      label: managedTwilioSummary.complianceReady ? 'A2P approved' : 'A2P approval still pending',
-      detail: managedTwilioSummary.description,
-      complete: managedTwilioSummary.complianceReady,
-    },
-    {
-      key: 'owner-number',
-      label: 'Owner number verified',
-      detail: business.notifyPhone
-        ? ownerNotifyPhoneOptedOut
-          ? 'Owner number is present but currently opted out.'
-          : `Owner alerts route to ${formatPhoneForDisplay(business.notifyPhone)}.`
-        : 'Add the owner mobile number for alert delivery.',
-      complete: Boolean(business.notifyPhone) && !ownerNotifyPhoneOptedOut,
-    },
-    {
-      key: 'billing',
-      label: 'Billing active',
-      detail: subscriptionReady ? 'Automated SMS follow-up can run on live missed calls.' : 'Activate billing before live auto-texting resumes.',
-      complete: subscriptionReady,
-    },
-    {
-      key: 'test-lead',
-      label: 'Test lead passed',
-      detail:
-        successfulLeadCount > 0
-          ? `${successfulLeadCount} lead${successfulLeadCount === 1 ? '' : 's'} reached the owner-alert stage.`
-          : 'Run your first missed-call test and confirm the owner alert lands.',
-      complete: successfulLeadCount > 0,
-    },
-  ];
+    if (step.key === 'voice_webhook_synced') {
+      return {
+        ...step,
+        body: (
+          <form action={resyncTwilioWebhooksAction} className="flex flex-wrap gap-3">
+            <Button size="sm" type="submit" disabled={!(business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid)}>
+              Sync all webhooks
+            </Button>
+            <span className="text-sm text-muted-foreground">Voice, SMS, and status callback sync all happen together from this page.</span>
+          </form>
+        ),
+      };
+    }
 
-  const firstReplyPreview = `CallbackCloser: We missed your call. What service do you need? Reply 1 ${business.serviceLabel1}, 2 ${business.serviceLabel2}, 3 ${business.serviceLabel3}, or reply with a short description. Reply STOP to opt out or HELP for help. Msg freq varies. Msg & data rates may apply.`;
-  const ownerSummaryPreview = `New missed-call lead: ${business.serviceLabel1} | Urgency: Today | Location: 78704 | Callback: Afternoon | Open in dashboard`;
+    if (step.key === 'a2p_status_recorded') {
+      return {
+        ...step,
+        body: adminSession?.isAdmin ? (
+          <form action={saveBusinessTwilioAdminOverridesAction} className="grid gap-4 md:grid-cols-2">
+            <HiddenBusinessTwilioFields
+              defaults={twilioDefaults}
+              exclude={['managedTwilioStatus', 'a2pCustomerProfileSid', 'a2pBrandSid', 'a2pCampaignSid', 'a2pFailureReason']}
+            />
+            <div className="space-y-2">
+              <Label htmlFor="businessManagedTwilioStatus">A2P status</Label>
+              <Select id="businessManagedTwilioStatus" name="managedTwilioStatus" defaultValue={business.managedTwilioStatus}>
+                {Object.entries(managedTwilioStatusLabels).map(([value, label]) => (
+                  <option key={value} value={value}>
+                    {label}
+                  </option>
+                ))}
+              </Select>
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="businessA2pCustomerProfileSid">Customer profile SID</Label>
+              <Input id="businessA2pCustomerProfileSid" name="a2pCustomerProfileSid" defaultValue={business.a2pCustomerProfileSid || ''} />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="businessA2pBrandSid">Brand SID</Label>
+              <Input id="businessA2pBrandSid" name="a2pBrandSid" defaultValue={business.a2pBrandSid || ''} />
+            </div>
+            <div className="space-y-2">
+              <Label htmlFor="businessA2pCampaignSid">Campaign SID</Label>
+              <Input id="businessA2pCampaignSid" name="a2pCampaignSid" defaultValue={business.a2pCampaignSid || ''} />
+            </div>
+            <div className="space-y-2 md:col-span-2">
+              <Label htmlFor="businessA2pFailureReason">A2P blocker note</Label>
+              <Input
+                id="businessA2pFailureReason"
+                name="a2pFailureReason"
+                defaultValue={business.a2pFailureReason || ''}
+                placeholder="Record why launch is blocked, pending, or approved."
+              />
+            </div>
+            <div className="md:col-span-2">
+              <Button size="sm" type="submit" variant="outline">
+                Save A2P status
+              </Button>
+            </div>
+          </form>
+        ) : (
+          <div className="flex flex-wrap gap-2 text-sm">
+            <Badge variant={getBadgeVariant(step.tone)}>{step.stateLabel}</Badge>
+            <span className="text-muted-foreground">CallbackCloser keeps this launch status truthful even while review is pending.</span>
+          </div>
+        ),
+      };
+    }
+
+    if (step.key === 'test_sms_delivered') {
+      return {
+        ...step,
+        body: (
+          <form action={sendBusinessTwilioTestSmsAction} className="space-y-3" id="test-sms-step">
+            <div className="space-y-2">
+              <Label htmlFor="businessTwilioTestSmsPhone">Test SMS destination</Label>
+              <Input
+                id="businessTwilioTestSmsPhone"
+                name="destinationPhone"
+                defaultValue={notificationSettings?.ownerPhone || business.notifyPhone || ''}
+                placeholder="+15551234567"
+              />
+              <p className="text-xs text-muted-foreground">Send a real test text from the current business line before you treat this setup as launch-ready.</p>
+            </div>
+            <Button size="sm" type="submit">
+              Send test SMS
+            </Button>
+          </form>
+        ),
+      };
+    }
+
+    if (step.key === 'missed_call_validated') {
+      return {
+        ...step,
+        body: (
+          <div className="flex flex-wrap gap-3">
+            <Link className={buttonVariants({ size: 'sm' })} href="/app/call-flow">
+              Open call flow
+            </Link>
+            <Link className={buttonVariants({ size: 'sm', variant: 'outline' })} href="/app/leads">
+              Open recovered leads
+            </Link>
+          </div>
+        ),
+      };
+    }
+
+    if (step.key === 'safe_to_mark_live') {
+      return {
+        ...step,
+        body: adminSession?.isAdmin ? (
+          <div className="flex flex-wrap gap-3">
+            <form action={setBusinessProvisioningStatusAction}>
+              <input type="hidden" name="businessId" value={business.id} />
+              <input type="hidden" name="status" value="LIVE" />
+              <Button size="sm" type="submit" disabled={!setupFlow.safeToMarkLive || business.provisioningStatus === 'LIVE'}>
+                {business.provisioningStatus === 'LIVE' ? 'Already live' : 'Mark live'}
+              </Button>
+            </form>
+            <form action={setBusinessProvisioningStatusAction}>
+              <input type="hidden" name="businessId" value={business.id} />
+              <input type="hidden" name="status" value="PAUSED" />
+              <Button size="sm" type="submit" variant="outline">
+                Pause automation
+              </Button>
+            </form>
+          </div>
+        ) : (
+          <p className="text-sm text-muted-foreground">Launch state is managed after the setup checklist, test SMS, and missed-call validation all clear.</p>
+        ),
+      };
+    }
+
+    return step;
+  });
 
   return (
     <div className="mx-auto max-w-6xl space-y-6">
       <div className="space-y-2">
-        <Badge variant="outline">Business Settings</Badge>
+        <Badge variant="outline">Twilio Setup</Badge>
         <div className="flex flex-col gap-3 lg:flex-row lg:items-end lg:justify-between">
-          <div>
-            <h1 className="text-2xl font-semibold tracking-tight">Business settings and activation</h1>
-            <p className="text-sm text-muted-foreground">
-              Get your missed-call coverage live without digging through setup screens or guessing what comes next.
+          <div className="space-y-2">
+            <h1 className="text-2xl font-semibold tracking-tight">Business Twilio setup</h1>
+            <p className="max-w-3xl text-sm text-muted-foreground">
+              One guided place to choose the Twilio account mode, track each provisioning step, and keep launch status honest without digging through admin screens.
             </p>
           </div>
           <div className="flex flex-wrap gap-2">
             <Link className={buttonVariants({ variant: 'outline' })} href="/app/call-flow">
-              Open Call Flow
+              Open call flow
             </Link>
-            <Link className={buttonVariants({ variant: 'outline' })} href="/app/billing">
-              Open Billing
+            <Link className={buttonVariants({ variant: 'outline' })} href="/app/leads">
+              Open recovered leads
             </Link>
           </div>
         </div>
@@ -164,462 +548,120 @@ export default async function SettingsPage({ searchParams }: { searchParams?: Re
 
       {error ? <div className="rounded-md border border-destructive/30 bg-destructive/5 p-3 text-sm text-destructive">{error}</div> : null}
       {saved ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Business settings saved.</div> : null}
-      {numberBought ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Your business texting line was provisioned, attached to managed messaging, and queued for the remaining A2P approval steps.</div> : null}
-      {twilioConnected ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Your business texting line was connected and the managed setup was refreshed. A2P approval may still be pending.</div> : null}
-      {twilioSynced ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Managed texting setup refreshed.</div> : null}
+      {numberBought ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">A new business number was provisioned for the selected Twilio account mode.</div> : null}
+      {twilioSynced ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Webhook sync completed for the current business number.</div> : null}
+      {twilioTestSms ? <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">Test SMS requested. Wait for delivery before you treat the setup as launch-ready.</div> : null}
       {adminTwilioSaved ? (
         <div className="rounded-md border border-accent bg-accent/40 p-3 text-sm">
-          Internal Twilio mapping saved{adminChanged.length > 0 ? `: ${adminChanged.join(', ')}.` : '.'}
+          Internal setup state saved{adminChanged.length > 0 ? `: ${adminChanged.join(', ')}.` : '.'}
         </div>
       ) : null}
 
-      <SetupChecklist
-        title="Setup checklist"
-        description="The fastest route to first value is simple: get the texting line live, confirm routing, verify alerts, then run the missed-call test."
-        items={checklistItems}
-      />
+      <div id="twilio-setup-flow">
+        <TwilioSetupChecklist
+          title="CallbackCloser Twilio launch flow"
+          description="The same step-by-step provisioning flow powers new-business setup and ongoing business control."
+          banner={setupFlow.banner}
+          bannerAction={bannerAction}
+          steps={setupSteps}
+        />
+      </div>
 
-      <Card className={activationReady ? 'border-accent/40 bg-accent/20' : 'border-primary/20 bg-primary/5'}>
+      <Card className="bg-card/90">
         <CardHeader>
-          <CardTitle>Activation guidance</CardTitle>
-          <CardDescription>Use these prompts to get to the first successful missed-call handoff quickly.</CardDescription>
+          <CardTitle>Business basics</CardTitle>
+          <CardDescription>Keep the live call path and owner routing current while Twilio setup moves forward.</CardDescription>
         </CardHeader>
-        <CardContent className="grid gap-3 lg:grid-cols-3">
-          <div className="rounded-xl border bg-background/80 p-4 text-sm">
-              <p className="font-medium">Run your first test</p>
-              <p className="mt-2 text-muted-foreground">
-                {activationReady
-                ? 'Routing, billing, webhook sync, and A2P approval look ready. Place a missed call and confirm the owner alert arrives.'
-                : 'Finish the incomplete checklist items, then place the missed call and watch Recovered Leads for the handoff.'}
-              </p>
-          </div>
-          <div className="rounded-xl border bg-background/80 p-4 text-sm">
-            <p className="font-medium">Confirm your SMS template</p>
-            <p className="mt-2 text-muted-foreground">
-              Check the first reply and lead questions below so the handoff feels right for your business.
-            </p>
-          </div>
-          <div className="rounded-xl border bg-background/80 p-4 text-sm">
-            <p className="font-medium">Verify your owner alert number</p>
-            <p className="mt-2 text-muted-foreground">
-              {business.notifyPhone && !ownerNotifyPhoneOptedOut
-                ? `Alerts are set to ${formatPhoneForDisplay(business.notifyPhone)}.`
-                : 'Add the owner mobile number so qualified leads reach the right phone immediately.'}
-            </p>
-          </div>
+        <CardContent>
+          <form action={saveBusinessSettingsAction} className="grid gap-4 md:grid-cols-2">
+            <div className="md:col-span-2">
+              <Label htmlFor="settingsBusinessName">Business name</Label>
+              <Input id="settingsBusinessName" name="name" defaultValue={business.name} required />
+            </div>
+            <div>
+              <Label htmlFor="settingsForwardingNumber">Forwarding number</Label>
+              <Input id="settingsForwardingNumber" name="forwardingNumber" defaultValue={business.forwardingNumber} required />
+            </div>
+            <div>
+              <Label htmlFor="settingsNotifyPhone">Owner alert phone</Label>
+              <Input id="settingsNotifyPhone" name="notifyPhone" defaultValue={notificationSettings?.ownerPhone || business.notifyPhone || ''} />
+            </div>
+            <div>
+              <Label htmlFor="settingsOwnerEmail">Owner email</Label>
+              <Input id="settingsOwnerEmail" name="ownerEmail" defaultValue={notificationSettings?.ownerEmail || ''} placeholder="owner@business.com" />
+            </div>
+            <div>
+              <Label htmlFor="settingsTimezone">Timezone</Label>
+              <Input id="settingsTimezone" name="timezone" defaultValue={business.timezone} required />
+            </div>
+            <div>
+              <Label htmlFor="settingsMissedCallSeconds">Missed-call timeout (seconds)</Label>
+              <Input id="settingsMissedCallSeconds" name="missedCallSeconds" type="number" min={5} max={90} defaultValue={business.missedCallSeconds} required />
+            </div>
+            <div>
+              <Label htmlFor="settingsServiceLabel1">Service option 1</Label>
+              <Input id="settingsServiceLabel1" name="serviceLabel1" defaultValue={business.serviceLabel1} required />
+            </div>
+            <div>
+              <Label htmlFor="settingsServiceLabel2">Service option 2</Label>
+              <Input id="settingsServiceLabel2" name="serviceLabel2" defaultValue={business.serviceLabel2} required />
+            </div>
+            <div>
+              <Label htmlFor="settingsServiceLabel3">Service option 3</Label>
+              <Input id="settingsServiceLabel3" name="serviceLabel3" defaultValue={business.serviceLabel3} required />
+            </div>
+            <label className="rounded-xl border bg-background/80 p-4 text-sm">
+              <div className="flex items-start gap-3">
+                <input defaultChecked={notificationSettings?.notifySms ?? true} name="notifySms" type="checkbox" value="true" />
+                <span>Send owner SMS alerts</span>
+              </div>
+            </label>
+            <label className="rounded-xl border bg-background/80 p-4 text-sm">
+              <div className="flex items-start gap-3">
+                <input defaultChecked={notificationSettings?.notifyEmail ?? true} name="notifyEmail" type="checkbox" value="true" />
+                <span>Send owner email alerts</span>
+              </div>
+            </label>
+            <label className="rounded-xl border bg-background/80 p-4 text-sm">
+              <div className="flex items-start gap-3">
+                <input defaultChecked={notificationSettings?.notifyInApp ?? true} name="notifyInApp" type="checkbox" value="true" />
+                <span>Show in-app notifications</span>
+              </div>
+            </label>
+            <label className="rounded-xl border bg-background/80 p-4 text-sm">
+              <div className="flex items-start gap-3">
+                <input defaultChecked={notificationSettings?.urgentOnly ?? false} name="urgentOnly" type="checkbox" value="true" />
+                <span>Urgent leads only</span>
+              </div>
+            </label>
+            <div className="md:col-span-2">
+              <Button type="submit">Save business basics</Button>
+            </div>
+          </form>
         </CardContent>
       </Card>
 
-      <form action={saveBusinessSettingsAction} className="space-y-6">
-        <div className="grid gap-6 xl:grid-cols-[1.05fr_0.95fr]">
-          <div className="space-y-6">
-            <Card className="bg-card/90">
-              <CardHeader>
-                <CardTitle>1. Business Profile</CardTitle>
-                <CardDescription>Core business identity and operating context.</CardDescription>
-              </CardHeader>
-              <CardContent className="grid gap-4 md:grid-cols-2">
-                <div className="md:col-span-2">
-                  <Label htmlFor="name">Business name</Label>
-                  <Input id="name" name="name" defaultValue={business.name} required />
-                </div>
-                <div>
-                  <Label htmlFor="timezone">Timezone</Label>
-                  <Input id="timezone" name="timezone" defaultValue={business.timezone} required />
-                </div>
-                <div>
-                  <Label htmlFor="serviceArea">Service area</Label>
-                  <Input id="serviceArea" defaultValue="Managed during launch" disabled />
-                </div>
-                <div>
-                  <Label htmlFor="ownerName">Owner name</Label>
-                  <Input id="ownerName" defaultValue="Uses your account owner profile" disabled />
-                </div>
-                <div>
-                  <Label htmlFor="supportEmail">Support email</Label>
-                  <Input id="supportEmail" defaultValue="Uses your billing contact email" disabled />
-                </div>
-              </CardContent>
-            </Card>
-
-            <Card className="bg-card/90">
-              <CardHeader>
-                <CardTitle>2. Phone and Routing</CardTitle>
-                <CardDescription>Make sure missed callers get covered and the right phone still rings.</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-5">
-                <div className="grid gap-4 md:grid-cols-2">
-                  <div>
-                    <Label htmlFor="forwardingNumber">Forwarding number</Label>
-                    <Input id="forwardingNumber" name="forwardingNumber" defaultValue={business.forwardingNumber} required />
-                    <p className="mt-1 text-xs text-muted-foreground">This is the real business line that should ring during the live call test.</p>
-                  </div>
-                  <div>
-                    <Label htmlFor="missedCallSeconds">Missed-call timeout (seconds)</Label>
-                    <Input
-                      id="missedCallSeconds"
-                      name="missedCallSeconds"
-                      type="number"
-                      min={5}
-                      max={90}
-                      defaultValue={business.missedCallSeconds}
-                      required
-                    />
-                    <p className="mt-1 text-xs text-muted-foreground">CallbackCloser starts the recovery flow after this unanswered window.</p>
-                  </div>
-                </div>
-
-                <div className="grid gap-3 md:grid-cols-3">
-                  <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <p className="font-medium">Your texting line</p>
-                    <p className="mt-2 text-muted-foreground">
-                      {managedTextingNumber ? formatPhoneForDisplay(managedTextingNumber) : 'No business texting line assigned yet'}
-                    </p>
-                  </div>
-                  <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <p className="font-medium">Setup status</p>
-                    <div className="mt-2 flex flex-wrap gap-2">
-                      <Badge variant={managedTwilioSummary.numberAssigned ? 'success' : 'outline'}>
-                        {managedTwilioSummary.numberAssigned ? 'Line assigned' : 'Needs line'}
-                      </Badge>
-                      <Badge variant={activationReady ? 'success' : 'outline'}>
-                        {activationReady ? 'Ready for test' : 'Action needed'}
-                      </Badge>
-                    </div>
-                  </div>
-                  <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <p className="font-medium">Missed call detection</p>
-                    <p className="mt-2 text-muted-foreground">
-                      {business.forwardingNumber
-                        ? `Calls ring through to ${formatPhoneForDisplay(business.forwardingNumber)} while missed callers stay covered.`
-                        : 'Add the business line that should still ring when new calls come in.'}
-                    </p>
-                  </div>
-                </div>
-
-                <div className="flex flex-wrap gap-3">
-                  {managedTextingNumber ? (
-                    <Link className={buttonVariants()} href={`tel:${managedTextingNumber}`}>
-                      Test Call
-                    </Link>
-                  ) : (
-                    <Button type="button" disabled>
-                      Test Call
-                    </Button>
-                  )}
-                  <Link className={buttonVariants({ variant: 'outline' })} href="/app/call-flow">
-                    Review call flow
-                  </Link>
-                </div>
-              </CardContent>
-            </Card>
-
-            <Card className="bg-card/90">
-              <CardHeader>
-                <CardTitle>3. SMS Behavior</CardTitle>
-                <CardDescription>What the caller sees first and how their lead gets qualified.</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-5">
-                <div className="grid gap-4 md:grid-cols-3">
-                  <div>
-                    <Label htmlFor="serviceLabel1">Service option 1</Label>
-                    <Input id="serviceLabel1" name="serviceLabel1" defaultValue={business.serviceLabel1} required />
-                  </div>
-                  <div>
-                    <Label htmlFor="serviceLabel2">Service option 2</Label>
-                    <Input id="serviceLabel2" name="serviceLabel2" defaultValue={business.serviceLabel2} required />
-                  </div>
-                  <div>
-                    <Label htmlFor="serviceLabel3">Service option 3</Label>
-                    <Input id="serviceLabel3" name="serviceLabel3" defaultValue={business.serviceLabel3} required />
-                  </div>
-                </div>
-
-                <div className="grid gap-4 lg:grid-cols-2">
-                  <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                    <p className="font-medium">First reply template</p>
-                    <p className="mt-2 text-muted-foreground">{firstReplyPreview}</p>
-                  </div>
-                  <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                    <p className="font-medium">Qualification questions</p>
-                    <ol className="mt-2 list-decimal space-y-1 pl-5 text-muted-foreground">
-                      <li>What service do you need?</li>
-                      <li>How urgent is it?</li>
-                      <li>What ZIP code or service area should the owner know?</li>
-                      <li>Would you like a callback today?</li>
-                      <li>Name capture if the caller shares it.</li>
-                    </ol>
-                  </div>
-                </div>
-
-                <div className="grid gap-4 lg:grid-cols-3">
-                  <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <p className="font-medium">Quiet hours</p>
-                    <p className="mt-2 text-muted-foreground">
-                      Standard daytime sending windows are used today. If your team needs a custom quiet-hours schedule, we can set that up during launch.
-                    </p>
-                  </div>
-                  <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <p className="font-medium">STOP / HELP preview</p>
-                    <p className="mt-2 text-muted-foreground">
-                      Leads can reply STOP to opt out, HELP for support details, and START to opt back in.
-                    </p>
-                  </div>
-                  <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <p className="font-medium">Opt-out handling status</p>
-                    <p className="mt-2 text-muted-foreground">
-                      Compliance handling is active for live messaging flows. Owner notify number status: {ownerNotifyPhoneOptedOut ? 'opted out' : 'ready'}.
-                    </p>
-                  </div>
-                </div>
-              </CardContent>
-            </Card>
+      <Card className="bg-card/90">
+        <CardHeader>
+          <CardTitle>Advanced</CardTitle>
+          <CardDescription>Rare setup notes and trust links that should stay visible without crowding the main flow.</CardDescription>
+        </CardHeader>
+        <CardContent className="grid gap-4 md:grid-cols-2">
+          <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground">
+            Existing-number support stays honest here. CallbackCloser does not automatically discover arbitrary Twilio subaccounts or numbers outside the selected account context.
           </div>
-
-          <div className="space-y-6">
-            <Card className="bg-card/90">
-              <CardHeader>
-                <CardTitle>4. Owner Notifications</CardTitle>
-                <CardDescription>Where the ready-to-close handoff goes and what the owner sees.</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-5">
-                <div className="grid gap-4 md:grid-cols-2">
-                  <div>
-                    <Label htmlFor="notifyPhone">Owner mobile number</Label>
-                    <Input id="notifyPhone" name="notifyPhone" defaultValue={notificationSettings?.ownerPhone ?? business.notifyPhone ?? ''} />
-                    <p className="mt-1 text-xs text-muted-foreground">The owner summary SMS is sent here as soon as the lead is qualified.</p>
-                  </div>
-                  <div>
-                    <Label htmlFor="ownerEmail">Owner email</Label>
-                    <Input id="ownerEmail" name="ownerEmail" defaultValue={notificationSettings?.ownerEmail ?? ''} placeholder="owner@business.com" />
-                    <p className="mt-1 text-xs text-muted-foreground">Qualified lead emails include the structured summary and a direct link to the lead.</p>
-                  </div>
-                </div>
-
-                <div className="rounded-xl border bg-background/80 p-4 text-sm">
-                  <p className="font-medium">Summary format preview</p>
-                  <p className="mt-2 text-muted-foreground">{ownerSummaryPreview}</p>
-                </div>
-
-                <div className="grid gap-3 md:grid-cols-2">
-                  <label className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <div className="flex items-start gap-3">
-                      <input defaultChecked={notificationSettings?.notifySms ?? true} name="notifySms" type="checkbox" value="true" />
-                      <div>
-                        <p className="font-medium">Send owner SMS alerts</p>
-                        <p className="mt-2 text-muted-foreground">Useful when the lead needs a fast callback and the owner wants a text immediately.</p>
-                      </div>
-                    </div>
-                  </label>
-                  <label className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <div className="flex items-start gap-3">
-                      <input defaultChecked={notificationSettings?.notifyEmail ?? true} name="notifyEmail" type="checkbox" value="true" />
-                      <div>
-                        <p className="font-medium">Send owner email alerts</p>
-                        <p className="mt-2 text-muted-foreground">Email includes the structured summary and direct link back into CallbackCloser.</p>
-                      </div>
-                    </div>
-                  </label>
-                  <label className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <div className="flex items-start gap-3">
-                      <input defaultChecked={notificationSettings?.notifyInApp ?? true} name="notifyInApp" type="checkbox" value="true" />
-                      <div>
-                        <p className="font-medium">Show in-app notifications</p>
-                        <p className="mt-2 text-muted-foreground">New qualified leads stay visible in the dashboard even if the owner misses the alert.</p>
-                      </div>
-                    </div>
-                  </label>
-                  <label className="rounded-xl border bg-muted/20 p-4 text-sm">
-                    <div className="flex items-start gap-3">
-                      <input defaultChecked={notificationSettings?.urgentOnly ?? false} name="urgentOnly" type="checkbox" value="true" />
-                      <div>
-                        <p className="font-medium">Urgent leads only</p>
-                        <p className="mt-2 text-muted-foreground">Turn this on if the owner only wants outbound alerts for urgent missed-call leads.</p>
-                      </div>
-                    </div>
-                  </label>
-                </div>
-              </CardContent>
-            </Card>
-
-            <Card className="bg-card/90">
-              <CardHeader>
-                <CardTitle>5. Compliance and Trust</CardTitle>
-                <CardDescription>Keep the legal and consent surfaces visible while your texting setup stays easy to understand.</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4 text-sm">
-                <div className="grid gap-3">
-                  <div className="rounded-xl border bg-background/80 p-4">
-                    <p className="font-medium">Privacy policy URL</p>
-                    <p className="mt-2 text-muted-foreground">/privacy</p>
-                    <Link className="mt-2 inline-block underline underline-offset-4" href="/privacy">
-                      Open privacy page
-                    </Link>
-                  </div>
-                  <div className="rounded-xl border bg-background/80 p-4">
-                    <p className="font-medium">Terms URL</p>
-                    <p className="mt-2 text-muted-foreground">/terms</p>
-                    <Link className="mt-2 inline-block underline underline-offset-4" href="/terms">
-                      Open terms page
-                    </Link>
-                  </div>
-                  <div className="rounded-xl border bg-background/80 p-4">
-                    <p className="font-medium">Consent page URL</p>
-                    <p className="mt-2 text-muted-foreground">/sms-consent</p>
-                    <Link className="mt-2 inline-block underline underline-offset-4" href="/sms-consent">
-                      Open consent page
-                    </Link>
-                  </div>
-                </div>
-                <div className="rounded-xl border bg-muted/20 p-4">
-                  <p className="font-medium">Message disclaimer preview</p>
-                  <p className="mt-2 text-muted-foreground">
-                    By providing a phone number and agreeing to receive messages, callers consent to SMS from CallbackCloser related
-                    to callback coordination, customer support, service updates, and account or service notifications tied to their
-                    request. Message frequency varies. Message and data rates may apply. Reply STOP to opt out or HELP for help.
-                  </p>
-                </div>
-              </CardContent>
-            </Card>
-
-            <Card className="bg-card/90">
-              <CardHeader>
-                <CardTitle>Managed texting setup</CardTitle>
-                <CardDescription>
-                  CallbackCloser handles the business texting line and messaging setup for you, but US A2P approval still has to clear before live customer texting is truly ready.
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                <div className="rounded-xl border bg-muted/20 p-4 text-sm">
-                  <p className="font-medium">Current setup</p>
-                  <p className="mt-2 text-muted-foreground">
-                    {managedTextingNumber ? formatPhoneForDisplay(managedTextingNumber) : 'No business texting line assigned yet'}
-                  </p>
-                  <p className="mt-1 text-xs text-muted-foreground">Status: {managedTwilioSummary.label}</p>
-                  <p className="mt-1 text-xs text-muted-foreground">Last setup refresh: {lastManagedSetupRefresh}</p>
-                  <p className="mt-2 text-xs text-muted-foreground">{managedTwilioSummary.description}</p>
-                  <p className="mt-2 text-xs text-muted-foreground">Next step: {managedTwilioSummary.nextStep}</p>
-                </div>
-
-                <form action={buyTwilioNumberAction} className="space-y-3">
-                  <div>
-                    <Label htmlFor="areaCode">Preferred area code (optional)</Label>
-                    <Input
-                      id="areaCode"
-                      name="areaCode"
-                      inputMode="numeric"
-                      placeholder="512"
-                      maxLength={3}
-                      disabled={Boolean(managedTextingNumber)}
-                    />
-                  </div>
-                  <Button type="submit" disabled={Boolean(managedTextingNumber)}>
-                    {managedTextingNumber ? 'Texting Line Already Assigned' : 'Provision Business Texting Line'}
-                  </Button>
-                </form>
-
-                <form action={resyncTwilioWebhooksAction} className="space-y-2">
-                  <Button disabled={!(business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid)} type="submit" variant="outline">
-                    Refresh Managed Setup
-                  </Button>
-                  <p className="text-xs text-muted-foreground">
-                    Refreshes the managed texting-line configuration after provisioning or environment changes.
-                  </p>
-                </form>
-
-                <div className="space-y-2 rounded-xl border p-4">
-                  <p className="text-sm font-medium">Messaging setup</p>
-                  <div className="space-y-2 text-sm text-muted-foreground">
-                    <div className="rounded-md bg-muted/40 p-3">
-                      Messaging infrastructure: {managedTwilioSummary.onboardingReady ? 'Number, service, and webhooks are ready' : 'Still being set up'}
-                    </div>
-                    <div className="rounded-md bg-muted/40 p-3">
-                      Webhook sync: {managedTwilioSummary.webhooksSynced ? 'Current app URL confirmed' : 'Refresh still needed'}
-                    </div>
-                    <div className="rounded-md bg-muted/40 p-3">
-                      A2P readiness: {managedTwilioSummary.complianceReady ? 'Approved for live messaging' : managedTwilioSummary.label}
-                    </div>
-                    <div className="rounded-md bg-muted/40 p-3">
-                      Keep an existing number? That is still an admin-assisted path. Self-serve existing-number attach is not available on this page yet, and
-                      internal platform IDs stay server-side.
-                    </div>
-                  </div>
-                </div>
-
-                {adminSession?.isAdmin ? (
-                  <div className="space-y-4 rounded-xl border border-primary/20 bg-primary/5 p-4">
-                    <div className="space-y-1">
-                      <p className="text-sm font-medium">Internal admin-only Twilio mapping editor</p>
-                      <p className="text-xs text-muted-foreground">
-                        Correct the stored Twilio number, SID, messaging service SID, and owner alert phone without leaving the business workspace. Saved
-                        Twilio numbers are normalized to E.164 and update the voice/SMS lookup fields directly.
-                      </p>
-                    </div>
-
-                    <form action={saveBusinessTwilioAdminOverridesAction} className="grid gap-4 md:grid-cols-2">
-                      <div className="space-y-2">
-                        <Label htmlFor="adminTwilioPhoneNumber">Twilio number</Label>
-                        <Input
-                          id="adminTwilioPhoneNumber"
-                          name="twilioPhoneNumber"
-                          type="tel"
-                          defaultValue={business.twilioPrimaryPhoneNumber || business.twilioPhoneNumber || ''}
-                          placeholder="+18777480449"
-                        />
-                      </div>
-                      <div className="space-y-2">
-                        <Label htmlFor="adminTwilioPhoneNumberSid">Twilio number SID</Label>
-                        <Input
-                          id="adminTwilioPhoneNumberSid"
-                          name="twilioPhoneNumberSid"
-                          defaultValue={business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid || ''}
-                          placeholder="PN..."
-                        />
-                      </div>
-                      <div className="space-y-2">
-                        <Label htmlFor="adminTwilioMessagingServiceSid">Messaging service SID</Label>
-                        <Input
-                          id="adminTwilioMessagingServiceSid"
-                          name="twilioMessagingServiceSid"
-                          defaultValue={business.twilioMessagingServiceSid || ''}
-                          placeholder="MG..."
-                        />
-                      </div>
-                      <div className="space-y-2">
-                        <Label htmlFor="adminOwnerPhone">Owner alert phone</Label>
-                        <Input
-                          id="adminOwnerPhone"
-                          name="ownerPhone"
-                          type="tel"
-                          defaultValue={notificationSettings?.ownerPhone || business.notifyPhone || ''}
-                          placeholder="+15551234567"
-                        />
-                      </div>
-                      <label className="md:col-span-2 flex items-start gap-2 rounded-lg border bg-background/80 p-3 text-sm">
-                        <input className="mt-1" type="checkbox" name="confirmCriticalFieldClears" value="true" />
-                        <span>I understand this may clear live Twilio mappings or owner alert routing and should only be used for internal corrections.</span>
-                      </label>
-                      <div className="md:col-span-2 flex flex-wrap gap-3">
-                        <Button type="submit">Save Internal Mapping</Button>
-                        <p className="text-xs text-muted-foreground">
-                          Manual mapping changes clear the last webhook-sync timestamp so the next refresh can verify the updated number assignment.
-                        </p>
-                      </div>
-                    </form>
-                  </div>
-                ) : null}
-              </CardContent>
-            </Card>
+          <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground">
+            Public trust pages stay linked from setup: <Link className="underline underline-offset-4" href="/privacy">Privacy</Link>,{' '}
+            <Link className="underline underline-offset-4" href="/terms">Terms</Link>, and{' '}
+            <Link className="underline underline-offset-4" href="/sms-consent">SMS consent</Link>.
           </div>
-        </div>
-
-        <div className="flex flex-wrap gap-3">
-          <Button type="submit">Save Business Settings</Button>
-          <Link className={buttonVariants({ variant: 'outline' })} href="/app/leads">
-            Open Recovered Leads
-          </Link>
-        </div>
-      </form>
+          {adminSession?.isAdmin ? (
+            <div className="rounded-xl border bg-background/80 p-4 text-sm text-muted-foreground md:col-span-2">
+              Admin mode is active on this page, so the internal Twilio mapping fields above are editable without leaving the business workspace.
+            </div>
+          ) : null}
+        </CardContent>
+      </Card>
     </div>
   );
 }
diff --git a/components/twilio-setup-checklist.tsx b/components/twilio-setup-checklist.tsx
new file mode 100644
index 0000000..e73914c
--- /dev/null
+++ b/components/twilio-setup-checklist.tsx
@@ -0,0 +1,91 @@
+import { Badge } from '@/components/ui/badge';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { cn } from '@/lib/utils';
+import type { TwilioSetupBanner, TwilioSetupStep, TwilioSetupTone } from '@/lib/twilio-setup';
+
+type StepWithBody = TwilioSetupStep & {
+  body?: React.ReactNode;
+};
+
+function getBadgeVariant(tone: TwilioSetupTone) {
+  if (tone === 'success') return 'success' as const;
+  if (tone === 'attention') return 'destructive' as const;
+  if (tone === 'pending') return 'outline' as const;
+  return 'secondary' as const;
+}
+
+export function TwilioSetupChecklist({
+  title,
+  description,
+  banner,
+  bannerAction,
+  steps,
+  advanced,
+}: {
+  title: string;
+  description: string;
+  banner: TwilioSetupBanner;
+  bannerAction?: React.ReactNode;
+  steps: StepWithBody[];
+  advanced?: React.ReactNode;
+}) {
+  const completedCount = steps.filter((step) => step.complete).length;
+
+  return (
+    <div className="space-y-5">
+      <Card className="border-primary/20 bg-gradient-to-br from-primary/10 via-card to-card">
+        <CardHeader className="space-y-3">
+          <div className="flex flex-wrap items-start justify-between gap-3">
+            <div className="space-y-1">
+              <CardTitle>{title}</CardTitle>
+              <CardDescription>{description}</CardDescription>
+            </div>
+            <Badge variant={completedCount === steps.length ? 'success' : 'outline'}>
+              {completedCount}/{steps.length} complete
+            </Badge>
+          </div>
+          <div
+            className={cn(
+              'rounded-xl border p-4',
+              banner.tone === 'attention'
+                ? 'border-destructive/30 bg-destructive/5'
+                : banner.tone === 'success'
+                  ? 'border-accent/40 bg-accent/20'
+                  : 'bg-background/80'
+            )}
+          >
+            <div className="flex flex-col gap-3 lg:flex-row lg:items-start lg:justify-between">
+              <div className="space-y-2">
+                <div className="flex flex-wrap items-center gap-2">
+                  <Badge variant={getBadgeVariant(banner.tone)}>Next step</Badge>
+                  <p className="font-medium">{banner.title}</p>
+                </div>
+                <p className="text-sm text-muted-foreground">{banner.detail}</p>
+              </div>
+              {bannerAction ? <div className="shrink-0">{bannerAction}</div> : null}
+            </div>
+          </div>
+        </CardHeader>
+      </Card>
+
+      <div className="grid gap-4">
+        {steps.map((step) => (
+          <Card key={step.key} className="bg-card/90">
+            <CardHeader className="pb-4">
+              <div className="flex flex-wrap items-start justify-between gap-3">
+                <div className="space-y-1">
+                  <CardTitle className="text-base">{step.label}</CardTitle>
+                  <CardDescription>{step.detail}</CardDescription>
+                </div>
+                <Badge variant={getBadgeVariant(step.tone)}>{step.stateLabel}</Badge>
+              </div>
+            </CardHeader>
+            {step.body ? <CardContent className="pt-0">{step.body}</CardContent> : null}
+          </Card>
+        ))}
+      </div>
+
+      {advanced ? <div className="pt-1">{advanced}</div> : null}
+    </div>
+  );
+}
diff --git a/lib/admin-dashboard.ts b/lib/admin-dashboard.ts
index 2fa688f..e71c8b3 100644
--- a/lib/admin-dashboard.ts
+++ b/lib/admin-dashboard.ts
@@ -11,6 +11,7 @@ import {
   type OwnerNotification,
 } from '@prisma/client';
 
+import { DEMO_OWNER_CLERK_ID, isTestDemoBusiness } from '@/lib/admin-test-data-reset';
 import { getManagedTextingNumber, getManagedTwilioStatusSummary } from '@/lib/managed-twilio-status';
 import { formatMessageStatus, isMessageDeliveryIssueStatus } from '@/lib/lead-presenters';
 
@@ -28,6 +29,8 @@ type DashboardBusiness = Pick<
   | 'provisioningLastRunAt'
   | 'forwardingNumber'
   | 'notifyPhone'
+  | 'twilioAccountMode'
+  | 'twilioNumberSetupMode'
   | 'twilioSubaccountSid'
   | 'twilioMessagingServiceSid'
   | 'twilioPrimaryNumberSid'
@@ -132,6 +135,8 @@ export type AdminOnboardingConfidence = {
   hasRecentFailures: boolean;
 };
 
+export type AdminTestSmsConfidenceState = 'not_started' | 'pending_delivery' | 'delivered' | 'failed';
+
 export const adminBoardFilterOptions: AdminBoardFilterOption[] = [
   { key: 'all', label: 'All' },
   { key: 'needs_attention', label: 'Needs attention' },
@@ -142,8 +147,6 @@ export const adminBoardFilterOptions: AdminBoardFilterOption[] = [
   { key: 'archived', label: 'Archived' },
 ];
 
-const DEMO_OWNER_CLERK_ID = 'simulator_demo_callbackcloser';
-
 export function isBusinessArchived(business: Pick<DashboardBusiness, 'archivedAt'>) {
   return Boolean(business.archivedAt);
 }
@@ -157,7 +160,7 @@ export function isBusinessAutomationPaused(
 export function canDeleteTestBusiness(
   business: Pick<DashboardBusiness, 'isTestBusiness' | 'ownerClerkId' | 'archivedAt'>
 ) {
-  return isBusinessArchived(business) && (business.isTestBusiness || business.ownerClerkId === DEMO_OWNER_CLERK_ID);
+  return isBusinessArchived(business) && isTestDemoBusiness(business);
 }
 
 export function getDeleteTestBusinessBlockedReason(
@@ -270,10 +273,13 @@ export function buildAdminNextStep(params: {
     };
   }
 
-  if (!business.twilioSubaccountSid) {
+  if (!managedSummary.accountReady) {
     return {
-      title: 'Twilio subaccount is missing',
-      detail: 'Managed provisioning cannot finish until the business has a Twilio subaccount attached.',
+      title: business.twilioAccountMode === 'MAIN_ACCOUNT' ? 'Main Twilio account still needs review' : 'Twilio subaccount is missing',
+      detail:
+        business.twilioAccountMode === 'MAIN_ACCOUNT'
+          ? 'This business is set to use the main Twilio account directly. Confirm the parent-account mapping before continuing.'
+          : 'Managed provisioning cannot finish until the business has a Twilio subaccount attached.',
       tone: 'attention',
       actionLabel: 'Re-run provisioning',
     };
@@ -374,6 +380,32 @@ function milestoneVariant(params: { complete: boolean; blocking?: boolean }) {
   return 'pending' as const;
 }
 
+export function getAdminTestSmsConfidenceState(
+  operatorEvents: Array<{ type: string; status: OperatorEventStatus; createdAt: Date }>
+): AdminTestSmsConfidenceState {
+  const latest = operatorEvents
+    .filter((event) => event.type.startsWith('admin.test_sms_'))
+    .sort((left, right) => right.createdAt.getTime() - left.createdAt.getTime())[0];
+
+  if (!latest) {
+    return 'not_started';
+  }
+
+  if (latest.type === 'admin.test_sms_delivered') {
+    return 'delivered';
+  }
+
+  if (
+    latest.type === 'admin.test_sms_failed' ||
+    latest.type === 'admin.test_sms_suppressed' ||
+    latest.type === 'admin.test_sms_delivery_failed'
+  ) {
+    return 'failed';
+  }
+
+  return 'pending_delivery';
+}
+
 export function buildAdminOnboardingConfidence(params: {
   business: DashboardBusiness;
   notificationSettings: DashboardNotificationSettings | null;
@@ -388,18 +420,16 @@ export function buildAdminOnboardingConfidence(params: {
   const ownerPhone = notificationSettings?.ownerPhone?.trim() || business.notifyPhone || null;
   const hasProfile = Boolean(business.name.trim() && business.forwardingNumber.trim());
   const ownerAlertsReady = Boolean(ownerPhone || ownerEmail);
-  const twilioSetupReady = Boolean(business.twilioSubaccountSid);
+  const twilioSetupReady = managedSummary.accountReady;
   const numberReady = Boolean(getManagedTextingNumber(business) && (business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid));
   const messagingServiceReady = Boolean(business.twilioMessagingServiceSid);
   const webhooksReady = Boolean(business.twilioWebhookSyncedAt);
   const compliancePending =
     managedSummary.onboardingReady && !managedSummary.complianceReady && !managedSummary.attentionRequired;
-  const hasTestSmsSuccess = operatorEvents.some(
-    (event) => event.type === 'admin.test_sms_accepted' && event.status === OperatorEventStatus.SUCCESS
-  );
-  const hasTestSmsFailure = operatorEvents.some(
-    (event) => event.type === 'admin.test_sms_failed' || event.type === 'admin.test_sms_suppressed'
-  );
+  const latestTestSmsState = getAdminTestSmsConfidenceState(operatorEvents);
+  const hasTestSmsSuccess = latestTestSmsState === 'delivered';
+  const hasPendingTestSmsDelivery = latestTestSmsState === 'pending_delivery';
+  const hasTestSmsFailure = latestTestSmsState === 'failed';
   const hasRecentFailures = operatorEvents.some(
     (event) => event.status === OperatorEventStatus.FAILED || event.status === OperatorEventStatus.WARNING
   );
@@ -415,7 +445,12 @@ export function buildAdminOnboardingConfidence(params: {
     state = 'live_with_warnings';
   } else if (business.provisioningStatus === BusinessProvisioningStatus.LIVE && canSafelyMarkLive) {
     state = 'live';
-  } else if (nextStep.tone === 'attention' || managedSummary.attentionRequired || business.provisioningStatus === BusinessProvisioningStatus.NEEDS_ATTENTION) {
+  } else if (
+    nextStep.tone === 'attention' ||
+    managedSummary.attentionRequired ||
+    business.provisioningStatus === BusinessProvisioningStatus.NEEDS_ATTENTION ||
+    hasTestSmsFailure
+  ) {
     state = 'needs_attention';
   } else if (compliancePending) {
     state = 'waiting_on_a2p';
@@ -437,9 +472,15 @@ export function buildAdminOnboardingConfidence(params: {
   if (compliancePending) {
     blockers.push({ level: 'warning', message: 'A2P review is still pending. No operator action is needed unless Twilio asks for changes.' });
   }
-  if (readyForTest && !hasTestSmsSuccess) {
+  if (readyForTest && latestTestSmsState === 'not_started') {
     blockers.push({ level: 'warning', message: 'Run an admin test SMS from the business line before treating this onboarding as launch-ready.' });
   }
+  if (readyForTest && hasPendingTestSmsDelivery) {
+    blockers.push({
+      level: 'warning',
+      message: 'The latest admin test SMS was accepted by Twilio, but delivery has not been confirmed yet. Wait for delivery or inspect recent activity before you go live.',
+    });
+  }
   if (readyForTest && hasTestSmsFailure) {
     blockers.push({ level: 'error', message: 'The latest admin test SMS did not complete cleanly. Fix that before you go live.' });
   }
@@ -512,10 +553,16 @@ export function buildAdminOnboardingConfidence(params: {
     },
     {
       key: 'test_sms',
-      label: 'Test SMS run',
+      label: 'Test SMS passed',
       complete: hasTestSmsSuccess,
       variant: milestoneVariant({ complete: hasTestSmsSuccess, blocking: readyForTest }),
-      detail: hasTestSmsSuccess ? 'Admin test SMS was accepted by Twilio from the business line.' : 'Run the admin test SMS once the business is ready for messaging.',
+      detail: hasTestSmsSuccess
+        ? 'The latest admin test SMS was delivered from the business line.'
+        : hasPendingTestSmsDelivery
+          ? 'The latest admin test SMS was accepted by Twilio, but delivery is still pending confirmation.'
+          : hasTestSmsFailure
+            ? 'The latest admin test SMS failed or was suppressed. Fix messaging before you go live.'
+            : 'Run the admin test SMS once the business is ready for messaging.',
     },
     {
       key: 'missed_call_validation',
@@ -571,7 +618,11 @@ export function buildAdminOnboardingConfidence(params: {
       stateVariant: 'secondary',
       readinessLabel: 'Ready for test',
       readinessVariant: 'secondary',
-      nextAction: hasTestSmsSuccess ? 'Run a real missed-call test' : 'Send a test SMS',
+      nextAction: hasTestSmsSuccess
+        ? 'Run a real missed-call test'
+        : hasPendingTestSmsDelivery
+          ? 'Confirm test SMS delivery'
+          : 'Send a test SMS',
       summary: 'The business looks ready for operator-led validation. Run the checks before you mark it live.',
     },
     ready_to_go_live: {
diff --git a/lib/admin-provisioning-presenters.ts b/lib/admin-provisioning-presenters.ts
index 17a56d7..825c690 100644
--- a/lib/admin-provisioning-presenters.ts
+++ b/lib/admin-provisioning-presenters.ts
@@ -14,6 +14,8 @@ type AdminBusinessSummary = Pick<
   | 'ownerClerkId'
   | 'notifyPhone'
   | 'forwardingNumber'
+  | 'twilioAccountMode'
+  | 'twilioNumberSetupMode'
   | 'twilioSubaccountSid'
   | 'twilioPhoneNumber'
   | 'twilioPhoneNumberSid'
@@ -316,9 +318,14 @@ export function buildAdminProvisioningChecklist({
     },
     {
       key: 'twilio_subaccount',
-      label: 'Twilio subaccount',
-      complete: Boolean(business.twilioSubaccountSid),
-      detail: business.twilioSubaccountSid ? 'Managed Twilio subaccount is attached.' : 'Create the business Twilio subaccount.',
+      label: business.twilioAccountMode === 'MAIN_ACCOUNT' ? 'Twilio account mode' : 'Twilio subaccount',
+      complete: managedSummary.accountReady,
+      detail:
+        business.twilioAccountMode === 'MAIN_ACCOUNT'
+          ? 'This business uses the parent Twilio account directly.'
+          : business.twilioSubaccountSid
+            ? 'Managed Twilio subaccount is attached.'
+            : 'Create the business Twilio subaccount.',
     },
     {
       key: 'texting_number',
diff --git a/lib/admin-provisioning.ts b/lib/admin-provisioning.ts
index b1279f1..476d27d 100644
--- a/lib/admin-provisioning.ts
+++ b/lib/admin-provisioning.ts
@@ -363,7 +363,7 @@ export async function getTwilioWebhookSnapshot(
 }
 
 export async function listAdminTwilioNumbers(
-  business: Pick<Business, 'twilioSubaccountSid'>
+  business: Pick<Business, 'twilioAccountMode' | 'twilioSubaccountSid'>
 ) {
   if (!hasTwilioClientEnv()) {
     return {
@@ -374,7 +374,7 @@ export async function listAdminTwilioNumbers(
   }
 
   try {
-    const client = getTwilioBusinessClient(business.twilioSubaccountSid);
+    const client = getTwilioBusinessClient(business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : business.twilioSubaccountSid);
     const numbers = await client.incomingPhoneNumbers.list({ limit: 20 });
     return {
       numbers: numbers.map((number) => ({
@@ -382,20 +382,20 @@ export async function listAdminTwilioNumbers(
         phoneNumber: normalizePhoneNumber(number.phoneNumber),
         friendlyName: number.friendlyName || null,
       })),
-      sourceLabel: business.twilioSubaccountSid ? 'business subaccount' : 'parent account',
+      sourceLabel: business.twilioAccountMode === 'MAIN_ACCOUNT' ? 'parent account' : 'business subaccount',
       error: null as string | null,
     };
   } catch (error) {
     return {
       numbers: [] as Array<{ sid: string; phoneNumber: string | null; friendlyName: string | null }>,
-      sourceLabel: business.twilioSubaccountSid ? 'business subaccount' : 'parent account',
+      sourceLabel: business.twilioAccountMode === 'MAIN_ACCOUNT' ? 'parent account' : 'business subaccount',
       error: error instanceof Error ? error.message : 'Unable to load Twilio numbers.',
     };
   }
 }
 
 export async function syncBusinessTwilioWebhooks(
-  business: Pick<Business, 'id' | 'twilioSubaccountSid' | 'twilioPhoneNumberSid' | 'twilioPrimaryNumberSid'>,
+  business: Pick<Business, 'id' | 'twilioAccountMode' | 'twilioSubaccountSid' | 'twilioPhoneNumberSid' | 'twilioPrimaryNumberSid'>,
   options: TwilioWebhookSyncOptions
 ) {
   const phoneNumberSid = business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid;
@@ -403,7 +403,7 @@ export async function syncBusinessTwilioWebhooks(
     throw new Error('No Twilio number is assigned to this business yet.');
   }
 
-  const client = getTwilioBusinessClient(business.twilioSubaccountSid);
+  const client = getTwilioBusinessClient(business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : business.twilioSubaccountSid);
   const { number } = await syncTwilioIncomingPhoneNumberWebhooks(phoneNumberSid, client, options);
   const normalizedPhoneNumber = normalizePhoneNumber(number.phoneNumber);
   const syncedAt = new Date();
@@ -441,6 +441,7 @@ export async function attachExistingNumberToBusiness(params: {
     Business,
     | 'id'
     | 'name'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioMessagingServiceSid'
     | 'twilioPrimaryNumberSid'
@@ -452,8 +453,11 @@ export async function attachExistingNumberToBusiness(params: {
   correlationId?: string;
 }) {
   const correlationId = params.correlationId ?? `admin_existing_${params.business.id}`;
-  const subaccountSid = params.business.twilioSubaccountSid || (await createSubaccountForBusiness(params.business, correlationId));
-  const client = getTwilioBusinessClient(subaccountSid);
+  const subaccountSid =
+    params.business.twilioAccountMode === 'MAIN_ACCOUNT'
+      ? null
+      : params.business.twilioSubaccountSid || (await createSubaccountForBusiness(params.business, correlationId));
+  const client = getTwilioBusinessClient(params.business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : subaccountSid);
 
   const existingNumber = await client.incomingPhoneNumbers(params.phoneNumberSid).fetch();
   const normalizedPhoneNumber = normalizePhoneNumber(existingNumber.phoneNumber);
@@ -547,7 +551,9 @@ export async function runAdminProvisioning(params: {
     select: {
       id: true,
       name: true,
+      twilioAccountMode: true,
       twilioSubaccountSid: true,
+      twilioNumberSetupMode: true,
       twilioMessagingServiceSid: true,
       twilioPrimaryNumberSid: true,
       twilioPrimaryPhoneNumber: true,
@@ -568,6 +574,7 @@ export async function runAdminProvisioning(params: {
       provisioningStatus: BusinessProvisioningStatus.ONBOARDING,
       provisioningLastRunAt: new Date(),
       provisioningError: null,
+      twilioNumberSetupMode: params.mode,
     },
   });
   await recordBusinessOperatorEvent({
@@ -595,6 +602,7 @@ export async function runAdminProvisioning(params: {
         {
           id: business.id,
           name: business.name,
+          twilioAccountMode: business.twilioAccountMode,
           twilioSubaccountSid: business.twilioSubaccountSid,
           twilioMessagingServiceSid: business.twilioMessagingServiceSid,
           twilioPrimaryNumberSid: business.twilioPrimaryNumberSid,
diff --git a/lib/admin-test-data-reset.ts b/lib/admin-test-data-reset.ts
new file mode 100644
index 0000000..20a7e13
--- /dev/null
+++ b/lib/admin-test-data-reset.ts
@@ -0,0 +1,77 @@
+import type { Business, Prisma } from '@prisma/client';
+
+import { db } from '@/lib/db';
+
+export const DEMO_OWNER_CLERK_ID = 'simulator_demo_callbackcloser';
+export const BULK_TEST_DATA_RESET_CONFIRMATION = 'DELETE TEST BUSINESSES';
+
+type TestDemoBusinessMarker = Pick<Business, 'isTestBusiness' | 'ownerClerkId'>;
+
+export type TestDemoBusinessResetCandidate = Pick<Business, 'id' | 'name' | 'isTestBusiness' | 'ownerClerkId' | 'archivedAt'>;
+
+function normalizeConfirmation(value: string | null | undefined) {
+  return value?.trim().toUpperCase() || '';
+}
+
+export function isTestDemoBusiness(business: TestDemoBusinessMarker) {
+  return business.isTestBusiness || business.ownerClerkId === DEMO_OWNER_CLERK_ID;
+}
+
+export function buildTestDemoBusinessWhere(): Prisma.BusinessWhereInput {
+  return {
+    OR: [{ isTestBusiness: true }, { ownerClerkId: DEMO_OWNER_CLERK_ID }],
+  };
+}
+
+export async function listTestDemoBusinessesForReset(candidateIds?: string[]) {
+  return db.business.findMany({
+    where: {
+      AND: [
+        buildTestDemoBusinessWhere(),
+        candidateIds?.length
+          ? {
+              id: {
+                in: candidateIds,
+              },
+            }
+          : {},
+      ],
+    },
+    orderBy: [{ isTestBusiness: 'desc' }, { updatedAt: 'desc' }],
+    select: {
+      id: true,
+      name: true,
+      isTestBusiness: true,
+      ownerClerkId: true,
+      archivedAt: true,
+    },
+  });
+}
+
+export async function bulkDeleteTestDemoBusinesses(params: { confirmation: string; candidateIds?: string[] }) {
+  if (normalizeConfirmation(params.confirmation) !== BULK_TEST_DATA_RESET_CONFIRMATION) {
+    throw new Error(`Type ${BULK_TEST_DATA_RESET_CONFIRMATION} to confirm deleting all test/demo businesses.`);
+  }
+
+  const candidates = await listTestDemoBusinessesForReset(params.candidateIds);
+  const candidateIds = candidates.map((business) => business.id);
+  if (candidateIds.length === 0) {
+    return {
+      deletedCount: 0,
+      deletedBusinessNames: [] as string[],
+    };
+  }
+
+  const result = await db.business.deleteMany({
+    where: {
+      id: {
+        in: candidateIds,
+      },
+    },
+  });
+
+  return {
+    deletedCount: result.count,
+    deletedBusinessNames: candidates.map((business) => business.name),
+  };
+}
diff --git a/lib/business.ts b/lib/business.ts
index e12f3b4..f3565d8 100644
--- a/lib/business.ts
+++ b/lib/business.ts
@@ -1,4 +1,4 @@
-import { BusinessProvisioningStatus, ManagedTwilioStatus, type Prisma, SubscriptionStatus } from '@prisma/client';
+import { BusinessProvisioningStatus, ManagedTwilioStatus, TwilioAccountMode, TwilioNumberSetupMode, type Prisma, SubscriptionStatus } from '@prisma/client';
 
 import { db } from '@/lib/db';
 import { normalizePhoneNumber, normalizePhoneNumberToE164, phoneNumbersEqual } from '@/lib/phone';
@@ -9,6 +9,8 @@ export async function upsertBusinessForOwner(ownerClerkId: string, input: {
   forwardingNumber: string;
   notifyPhone?: string | null;
   ownerEmail?: string | null;
+  twilioAccountMode?: TwilioAccountMode | null;
+  twilioNumberSetupMode?: TwilioNumberSetupMode | null;
   missedCallSeconds: number;
   serviceLabel1: string;
   serviceLabel2: string;
@@ -20,8 +22,10 @@ export async function upsertBusinessForOwner(ownerClerkId: string, input: {
     name: input.name,
     ownerName: input.ownerName?.trim() || null,
     forwardingNumber: normalizePhoneNumber(input.forwardingNumber),
-    notifyPhone: normalizePhoneNumber(input.notifyPhone || '' ) || null,
+    notifyPhone: normalizePhoneNumber(input.notifyPhone || '') || null,
     provisioningStatus: BusinessProvisioningStatus.DRAFT,
+    twilioAccountMode: input.twilioAccountMode || TwilioAccountMode.BUSINESS_SUBACCOUNT,
+    twilioNumberSetupMode: input.twilioNumberSetupMode || TwilioNumberSetupMode.NEW_NUMBER,
     missedCallSeconds: input.missedCallSeconds,
     serviceLabel1: input.serviceLabel1,
     serviceLabel2: input.serviceLabel2,
@@ -40,6 +44,8 @@ export async function upsertBusinessForOwner(ownerClerkId: string, input: {
       ownerName: data.ownerName,
       forwardingNumber: data.forwardingNumber,
       notifyPhone: data.notifyPhone,
+      twilioAccountMode: data.twilioAccountMode,
+      twilioNumberSetupMode: data.twilioNumberSetupMode,
       missedCallSeconds: data.missedCallSeconds,
       serviceLabel1: data.serviceLabel1,
       serviceLabel2: data.serviceLabel2,
diff --git a/lib/lead-presenters.ts b/lib/lead-presenters.ts
index 76d4f97..068c8d8 100644
--- a/lib/lead-presenters.ts
+++ b/lib/lead-presenters.ts
@@ -38,7 +38,7 @@ export const smsStateLabels: Record<SmsConversationState, string> = {
 
 export function isMessageDeliveryIssueStatus(status: string | null | undefined) {
   const normalized = status?.trim().toLowerCase();
-  return normalized === 'failed' || normalized === 'fallback_webhook_response';
+  return normalized === 'failed' || normalized === 'undelivered' || normalized === 'fallback_webhook_response';
 }
 
 export function formatMessageStatus(status: string | null | undefined) {
@@ -49,6 +49,7 @@ export function formatMessageStatus(status: string | null | undefined) {
   if (normalized === 'sent') return 'Sent';
   if (normalized === 'queued') return 'Queued';
   if (normalized === 'failed') return 'Failed';
+  if (normalized === 'undelivered') return 'Undelivered';
   if (normalized === 'fallback_webhook_response') return 'Sent via webhook fallback';
 
   return normalized.replace(/_/g, ' ');
diff --git a/lib/managed-twilio-status.ts b/lib/managed-twilio-status.ts
index 301ac5c..d287a17 100644
--- a/lib/managed-twilio-status.ts
+++ b/lib/managed-twilio-status.ts
@@ -1,4 +1,4 @@
-import { ManagedTwilioStatus, type Business } from '@prisma/client';
+import { ManagedTwilioStatus, TwilioAccountMode, type Business } from '@prisma/client';
 
 type ManagedTwilioBlockerKey =
   | 'subaccount'
@@ -14,6 +14,8 @@ type ManagedTwilioBlockerKey =
 export type ManagedTwilioSummary = {
   label: string;
   description: string;
+  accountMode: TwilioAccountMode;
+  accountReady: boolean;
   subaccountReady: boolean;
   numberAssigned: boolean;
   messagingServiceReady: boolean;
@@ -65,6 +67,7 @@ export function resolveManagedTwilioStatus(
   business: Pick<
     Business,
     | 'managedTwilioStatus'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioMessagingServiceSid'
     | 'twilioPrimaryNumberSid'
@@ -113,6 +116,7 @@ export function getManagedTwilioStatusSummary(
   business: Pick<
     Business,
     | 'managedTwilioStatus'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioPrimaryPhoneNumber'
     | 'twilioPhoneNumber'
@@ -133,7 +137,10 @@ export function getManagedTwilioStatusSummary(
     business.a2pFailureReason && managedTwilioStatus === ManagedTwilioStatus.FAILED_REVIEW
       ? business.a2pFailureReason
       : managedTwilioStatusDescriptions[managedTwilioStatus];
+  const accountMode = business.twilioAccountMode || TwilioAccountMode.BUSINESS_SUBACCOUNT;
+  const requiresSubaccount = accountMode === TwilioAccountMode.BUSINESS_SUBACCOUNT;
   const subaccountReady = Boolean(business.twilioSubaccountSid);
+  const accountReady = requiresSubaccount ? subaccountReady : true;
   const numberAssigned = hasManagedTwilioNumber(business);
   const messagingServiceReady = Boolean(business.twilioMessagingServiceSid);
   const webhooksSynced = Boolean(business.twilioWebhookSyncedAt);
@@ -143,11 +150,13 @@ export function getManagedTwilioStatusSummary(
   );
   const blockers: ManagedTwilioSummary['blockers'] = [];
 
-  if (!subaccountReady) {
+  if (!accountReady) {
     blockers.push({
       key: 'subaccount',
-      label: 'Create Twilio subaccount',
-      detail: 'Create or reconnect the managed Twilio subaccount for this business.',
+      label: requiresSubaccount ? 'Create Twilio subaccount' : 'Confirm Twilio account mode',
+      detail: requiresSubaccount
+        ? 'Create or reconnect the managed Twilio subaccount for this business.'
+        : 'This business is using the parent Twilio account directly, so the parent-account mapping needs to stay accurate.',
     });
   }
 
@@ -215,7 +224,7 @@ export function getManagedTwilioStatusSummary(
     });
   }
 
-  const onboardingReady = subaccountReady && numberAssigned && messagingServiceReady && webhooksSynced;
+  const onboardingReady = accountReady && numberAssigned && messagingServiceReady && webhooksSynced;
   const messagingReady = onboardingReady && complianceReady;
   const attentionRequired =
     managedTwilioStatus === ManagedTwilioStatus.PAUSED_NONCOMPLIANT || managedTwilioStatus === ManagedTwilioStatus.FAILED_REVIEW;
@@ -223,6 +232,8 @@ export function getManagedTwilioStatusSummary(
   return {
     label,
     description,
+    accountMode,
+    accountReady,
     subaccountReady,
     numberAssigned,
     messagingServiceReady,
diff --git a/lib/managed-twilio.ts b/lib/managed-twilio.ts
index b1b14cb..983cd8c 100644
--- a/lib/managed-twilio.ts
+++ b/lib/managed-twilio.ts
@@ -1,4 +1,4 @@
-import { ManagedTwilioStatus, type Business } from '@prisma/client';
+import { ManagedTwilioStatus, TwilioAccountMode, type Business } from '@prisma/client';
 
 import { db } from '@/lib/db';
 import {
@@ -13,13 +13,14 @@ import { formatPhoneDetail, maskSid, recordBusinessOperatorEvent } from '@/lib/o
 import { normalizePhoneNumber } from '@/lib/phone';
 import { logTwilioInfo } from '@/lib/twilio-logging';
 import { getTwilioWebhookConfig, syncTwilioIncomingPhoneNumberWebhooks } from '@/lib/twilio';
-import { getTwilioSubaccountClient } from '@/lib/twilio-client';
+import { getTwilioClient, getTwilioSubaccountClient } from '@/lib/twilio-client';
 import { ensureTwilioSubaccount } from '@/lib/twilio-provision';
 
 type ManagedTwilioBusiness = Pick<
   Business,
   | 'id'
   | 'name'
+  | 'twilioAccountMode'
   | 'twilioSubaccountSid'
   | 'twilioMessagingServiceSid'
   | 'twilioPrimaryNumberSid'
@@ -37,6 +38,31 @@ type ManagedTwilioBusiness = Pick<
 
 type AreaCodeInput = string | number | null | undefined;
 
+function getTwilioAccountMode(business: Pick<ManagedTwilioBusiness, 'twilioAccountMode'>) {
+  return business.twilioAccountMode || TwilioAccountMode.BUSINESS_SUBACCOUNT;
+}
+
+async function getProvisioningClient(
+  business: Pick<ManagedTwilioBusiness, 'id' | 'name' | 'twilioAccountMode' | 'twilioSubaccountSid'>,
+  correlationId: string
+) {
+  const accountMode = getTwilioAccountMode(business);
+  if (accountMode === TwilioAccountMode.MAIN_ACCOUNT) {
+    return {
+      accountMode,
+      client: getTwilioClient(),
+      subaccountSid: null as string | null,
+    };
+  }
+
+  const subaccountSid = business.twilioSubaccountSid || (await createSubaccountForBusiness(business, correlationId));
+  return {
+    accountMode,
+    client: getTwilioSubaccountClient(subaccountSid),
+    subaccountSid,
+  };
+}
+
 function parseAreaCode(areaCode: AreaCodeInput) {
   if (typeof areaCode === 'number' && Number.isInteger(areaCode) && areaCode >= 100 && areaCode <= 999) {
     return areaCode;
@@ -167,7 +193,7 @@ export async function createSubaccountForBusiness(business: Pick<ManagedTwilioBu
 }
 
 export async function createMessagingServiceForBusiness(
-  business: Pick<ManagedTwilioBusiness, 'id' | 'name' | 'twilioSubaccountSid' | 'twilioMessagingServiceSid'>,
+  business: Pick<ManagedTwilioBusiness, 'id' | 'name' | 'twilioAccountMode' | 'twilioSubaccountSid' | 'twilioMessagingServiceSid'>,
   correlationId = 'n/a'
 ) {
   if (business.twilioMessagingServiceSid) {
@@ -185,8 +211,7 @@ export async function createMessagingServiceForBusiness(
     return business.twilioMessagingServiceSid;
   }
 
-  const subaccountSid = business.twilioSubaccountSid || (await createSubaccountForBusiness(business, correlationId));
-  const client = getTwilioSubaccountClient(subaccountSid);
+  const { client, subaccountSid } = await getProvisioningClient(business, correlationId);
   const service = await client.messaging.v1.services.create({
     friendlyName: getFriendlyManagedTwilioName(business.name),
     useInboundWebhookOnNumber: true,
@@ -221,7 +246,10 @@ export async function createMessagingServiceForBusiness(
 }
 
 export async function buyOrProvisionPrimaryNumberForBusiness(
-  business: Pick<ManagedTwilioBusiness, 'id' | 'name' | 'twilioSubaccountSid' | 'twilioPrimaryNumberSid' | 'twilioPrimaryPhoneNumber'>,
+  business: Pick<
+    ManagedTwilioBusiness,
+    'id' | 'name' | 'twilioAccountMode' | 'twilioSubaccountSid' | 'twilioPrimaryNumberSid' | 'twilioPrimaryPhoneNumber'
+  >,
   options: { areaCode?: AreaCodeInput; correlationId?: string } = {}
 ) {
   const correlationId = options.correlationId ?? 'n/a';
@@ -245,8 +273,7 @@ export async function buyOrProvisionPrimaryNumberForBusiness(
     };
   }
 
-  const subaccountSid = business.twilioSubaccountSid || (await createSubaccountForBusiness(business, correlationId));
-  const client = getTwilioSubaccountClient(subaccountSid);
+  const { client, subaccountSid } = await getProvisioningClient(business, correlationId);
   const areaCode = parseAreaCode(options.areaCode);
   const candidates = await client.availablePhoneNumbers('US').local.list({
     limit: 1,
@@ -313,6 +340,7 @@ export async function syncManagedTwilioNumberWebhooks(
     ManagedTwilioBusiness,
     | 'id'
     | 'name'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioPrimaryNumberSid'
     | 'twilioPhoneNumberSid'
@@ -326,8 +354,7 @@ export async function syncManagedTwilioNumberWebhooks(
     throw new Error('Managed Twilio primary number is missing');
   }
 
-  const subaccountSid = business.twilioSubaccountSid || (await createSubaccountForBusiness(business, correlationId));
-  const client = getTwilioSubaccountClient(subaccountSid);
+  const { client, subaccountSid } = await getProvisioningClient(business, correlationId);
   const { number } = await syncTwilioIncomingPhoneNumberWebhooks(phoneNumberSid, client);
   const normalized = normalizePhoneNumber(number.phoneNumber);
   const syncedAt = new Date();
@@ -372,18 +399,20 @@ export async function syncManagedTwilioNumberWebhooks(
 }
 
 export async function attachNumberToMessagingService(
-  business: Pick<ManagedTwilioBusiness, 'id' | 'name' | 'twilioSubaccountSid' | 'twilioMessagingServiceSid' | 'twilioPrimaryNumberSid'>,
+  business: Pick<
+    ManagedTwilioBusiness,
+    'id' | 'name' | 'twilioAccountMode' | 'twilioSubaccountSid' | 'twilioMessagingServiceSid' | 'twilioPrimaryNumberSid'
+  >,
   correlationId = 'n/a'
 ) {
   const messagingServiceSid = await createMessagingServiceForBusiness(business, correlationId);
   const primaryNumberSid = business.twilioPrimaryNumberSid;
-  const subaccountSid = business.twilioSubaccountSid || (await createSubaccountForBusiness(business, correlationId));
 
   if (!primaryNumberSid) {
     throw new Error('Managed Twilio primary number is missing');
   }
 
-  const client = getTwilioSubaccountClient(subaccountSid);
+  const { client, subaccountSid } = await getProvisioningClient(business, correlationId);
   try {
     await client.messaging.v1.services(messagingServiceSid).phoneNumbers.create({
       phoneNumberSid: primaryNumberSid,
@@ -435,6 +464,7 @@ export async function syncComplianceStatus(
     ManagedTwilioBusiness,
     | 'id'
     | 'managedTwilioStatus'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioMessagingServiceSid'
     | 'twilioPrimaryNumberSid'
@@ -456,7 +486,13 @@ export async function syncComplianceStatus(
 export async function provisionManagedTwilioForBusiness(
   business: Pick<
     ManagedTwilioBusiness,
-    'id' | 'name' | 'twilioSubaccountSid' | 'twilioMessagingServiceSid' | 'twilioPrimaryNumberSid' | 'twilioPrimaryPhoneNumber'
+    | 'id'
+    | 'name'
+    | 'twilioAccountMode'
+    | 'twilioSubaccountSid'
+    | 'twilioMessagingServiceSid'
+    | 'twilioPrimaryNumberSid'
+    | 'twilioPrimaryPhoneNumber'
   >,
   options: { areaCode?: AreaCodeInput; correlationId?: string } = {}
 ) {
@@ -476,7 +512,8 @@ export async function provisionManagedTwilioForBusiness(
     twilioProvisioningStartedAt: new Date(),
   });
 
-  const subaccountSid = await createSubaccountForBusiness(business, correlationId);
+  const provisioningTarget = await getProvisioningClient(business, correlationId);
+  const subaccountSid = provisioningTarget.subaccountSid;
   const messagingServiceSid = await createMessagingServiceForBusiness(
     { ...business, twilioSubaccountSid: subaccountSid, twilioMessagingServiceSid: business.twilioMessagingServiceSid },
     correlationId
diff --git a/lib/missed-call-flow.ts b/lib/missed-call-flow.ts
index efdfc13..9edefc3 100644
--- a/lib/missed-call-flow.ts
+++ b/lib/missed-call-flow.ts
@@ -15,6 +15,7 @@ type LeadFlowBusiness = Pick<
   | 'name'
   | 'ownerClerkId'
   | 'notifyPhone'
+  | 'twilioAccountMode'
   | 'twilioSubaccountSid'
   | 'twilioMessagingServiceSid'
   | 'twilioPhoneNumber'
@@ -180,7 +181,7 @@ export async function startMissedCallRecovery(params: StartRecoveryParams) {
     body: prompt,
     transport: params.transport ?? (params.isSimulator ? 'simulated' : 'twilio'),
     isSimulator: params.isSimulator,
-    twilioSubaccountSid: params.business.twilioSubaccountSid,
+    twilioSubaccountSid: params.business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : params.business.twilioSubaccountSid,
     twilioMessagingServiceSid: params.business.twilioMessagingServiceSid,
     managedTwilioStatus: params.business.managedTwilioStatus,
     a2pFailureReason: params.business.a2pFailureReason,
@@ -278,7 +279,7 @@ export async function processLeadInboundReply(params: ProcessReplyParams) {
     body: transition.responseText,
     transport: params.transport ?? (lead.isSimulator ? 'simulated' : 'twilio'),
     isSimulator: lead.isSimulator,
-    twilioSubaccountSid: params.business.twilioSubaccountSid,
+    twilioSubaccountSid: params.business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : params.business.twilioSubaccountSid,
     twilioMessagingServiceSid: params.business.twilioMessagingServiceSid,
     managedTwilioStatus: params.business.managedTwilioStatus,
     a2pFailureReason: params.business.a2pFailureReason,
diff --git a/lib/outbound-message-events.ts b/lib/outbound-message-events.ts
new file mode 100644
index 0000000..4c9a7b4
--- /dev/null
+++ b/lib/outbound-message-events.ts
@@ -0,0 +1,96 @@
+import { OperatorEventCategory, OperatorEventStatus, type Message } from '@prisma/client';
+
+export type OutboundMessageContext = 'lead_recovery' | 'owner_alert' | 'admin_test';
+
+type OperatorMessageRecord = Pick<Message, 'leadId' | 'participant' | 'body'>;
+
+export function normalizeOutboundMessageStatus(status: string | null | undefined) {
+  const normalized = status?.trim().toLowerCase();
+  return normalized || null;
+}
+
+export function isTerminalOutboundMessageStatus(status: string | null | undefined) {
+  const normalized = normalizeOutboundMessageStatus(status);
+  return normalized === 'delivered' || normalized === 'failed' || normalized === 'undelivered';
+}
+
+export function isFailedOutboundMessageStatus(status: string | null | undefined) {
+  const normalized = normalizeOutboundMessageStatus(status);
+  return normalized === 'failed' || normalized === 'undelivered';
+}
+
+export function getOutboundMessageContext(message: OperatorMessageRecord): OutboundMessageContext {
+  if (!message.leadId && message.participant === 'OWNER' && message.body.startsWith('CallbackCloser admin test:')) {
+    return 'admin_test';
+  }
+
+  if (message.participant === 'OWNER') {
+    return 'owner_alert';
+  }
+
+  return 'lead_recovery';
+}
+
+export function buildOutboundMessageStatusEvent(
+  message: OperatorMessageRecord,
+  status: string | null | undefined
+): {
+  type: string;
+  category: OperatorEventCategory;
+  status: OperatorEventStatus;
+  summary: string;
+} | null {
+  const normalized = normalizeOutboundMessageStatus(status);
+  if (!isTerminalOutboundMessageStatus(normalized)) {
+    return null;
+  }
+
+  const failed = isFailedOutboundMessageStatus(normalized);
+  const context = getOutboundMessageContext(message);
+
+  if (context === 'admin_test') {
+    return failed
+      ? {
+          type: 'admin.test_sms_delivery_failed',
+          category: OperatorEventCategory.ADMIN_ACTIONS,
+          status: OperatorEventStatus.FAILED,
+          summary: 'Test SMS delivery failed',
+        }
+      : {
+          type: 'admin.test_sms_delivered',
+          category: OperatorEventCategory.ADMIN_ACTIONS,
+          status: OperatorEventStatus.SUCCESS,
+          summary: 'Test SMS delivered',
+        };
+  }
+
+  if (context === 'owner_alert') {
+    return failed
+      ? {
+          type: 'owner_alert.sms_delivery_failed',
+          category: OperatorEventCategory.OWNER_ALERTS,
+          status: OperatorEventStatus.FAILED,
+          summary: 'Owner SMS alert delivery failed',
+        }
+      : {
+          type: 'owner_alert.sms_delivered',
+          category: OperatorEventCategory.OWNER_ALERTS,
+          status: OperatorEventStatus.SUCCESS,
+          summary: 'Owner SMS alert delivered',
+        };
+  }
+
+  return failed
+    ? {
+        type: 'messaging.outbound_sms_delivery_failed',
+        category: OperatorEventCategory.MESSAGING,
+        status: OperatorEventStatus.FAILED,
+        summary: 'Outbound lead SMS delivery failed',
+      }
+    : {
+        type: 'messaging.outbound_sms_delivered',
+        category: OperatorEventCategory.MESSAGING,
+        status: OperatorEventStatus.SUCCESS,
+        summary: 'Outbound lead SMS delivered',
+      };
+}
diff --git a/lib/owner-notifications.ts b/lib/owner-notifications.ts
index d2c1cf2..b608850 100644
--- a/lib/owner-notifications.ts
+++ b/lib/owner-notifications.ts
@@ -19,6 +19,7 @@ type NotificationLeadRecord = Lead & {
     | 'name'
     | 'ownerClerkId'
     | 'notifyPhone'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioMessagingServiceSid'
     | 'twilioPrimaryPhoneNumber'
@@ -133,6 +134,7 @@ async function getLeadForOwnerNotifications(leadId: string) {
           name: true,
           ownerClerkId: true,
           notifyPhone: true,
+          twilioAccountMode: true,
           twilioSubaccountSid: true,
           twilioMessagingServiceSid: true,
           twilioPrimaryPhoneNumber: true,
@@ -233,7 +235,8 @@ export async function sendOwnerLeadSms(leadId: string) {
       toPhone: destination,
       body,
       participant: 'OWNER',
-      twilioSubaccountSid: lead.business.twilioSubaccountSid,
+      context: 'owner_alert',
+      twilioSubaccountSid: lead.business.twilioAccountMode === 'MAIN_ACCOUNT' ? null : lead.business.twilioSubaccountSid,
       messagingServiceSid: lead.business.twilioMessagingServiceSid,
       managedTwilioStatus: lead.business.managedTwilioStatus,
       a2pFailureReason: lead.business.a2pFailureReason,
diff --git a/lib/portfolio-demo.ts b/lib/portfolio-demo.ts
index 458b2ea..75c1dc1 100644
--- a/lib/portfolio-demo.ts
+++ b/lib/portfolio-demo.ts
@@ -49,6 +49,8 @@ const demoBusiness: Business = {
   serviceLabel2: 'Install',
   serviceLabel3: 'Maintenance',
   timezone: 'America/Chicago',
+  twilioAccountMode: 'BUSINESS_SUBACCOUNT',
+  twilioNumberSetupMode: 'NEW_NUMBER',
   twilioSubaccountSid: 'ACbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
   twilioMessagingServiceSid: 'MGbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb',
   twilioPrimaryNumberSid: 'PNxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
diff --git a/lib/simulator.ts b/lib/simulator.ts
index 8fa5655..09fe9e4 100644
--- a/lib/simulator.ts
+++ b/lib/simulator.ts
@@ -45,6 +45,7 @@ export async function getSimulatorBusiness() {
       name: true,
       ownerClerkId: true,
       notifyPhone: true,
+      twilioAccountMode: true,
       twilioSubaccountSid: true,
       twilioMessagingServiceSid: true,
       twilioPhoneNumber: true,
@@ -80,6 +81,7 @@ export async function getSimulatorRun(publicId: string) {
         select: {
           id: true,
           name: true,
+          twilioAccountMode: true,
           twilioSubaccountSid: true,
           twilioMessagingServiceSid: true,
           twilioPhoneNumber: true,
@@ -103,6 +105,7 @@ export type SimulatorRunRecord = SimulatorRun & {
     Business,
     | 'id'
     | 'name'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioMessagingServiceSid'
     | 'twilioPhoneNumber'
diff --git a/lib/system-status.ts b/lib/system-status.ts
index cad7b62..228d70f 100644
--- a/lib/system-status.ts
+++ b/lib/system-status.ts
@@ -5,6 +5,7 @@ import { getManagedTwilioStatusSummary } from '@/lib/managed-twilio-status';
 type StatusBusiness = Pick<
   Business,
   | 'managedTwilioStatus'
+  | 'twilioAccountMode'
   | 'twilioSubaccountSid'
   | 'twilioPrimaryPhoneNumber'
   | 'twilioPhoneNumber'
diff --git a/lib/twilio-messaging.ts b/lib/twilio-messaging.ts
index 0843a5b..9169517 100644
--- a/lib/twilio-messaging.ts
+++ b/lib/twilio-messaging.ts
@@ -1,12 +1,13 @@
-import { ManagedTwilioStatus, Prisma, MessageParticipant } from '@prisma/client';
+import { ManagedTwilioStatus, MessageParticipant, Prisma } from '@prisma/client';
 
 import { db } from '@/lib/db';
 import { getManagedTwilioStatusSummary } from '@/lib/managed-twilio';
+import { type OutboundMessageContext } from '@/lib/outbound-message-events';
 import { formatPhoneDetail, recordBusinessOperatorEvent } from '@/lib/operator-events';
 import { normalizePhoneNumber } from '@/lib/phone';
 import { logTwilioError, logTwilioInfo, logTwilioWarn } from '@/lib/twilio-logging';
 import { isSmsRecipientOptedOut } from '@/lib/twilio-sms-compliance';
-import { getTwilioBusinessClient } from '@/lib/twilio';
+import { getTwilioBusinessClient, getTwilioMessageStatusCallbackUrl } from '@/lib/twilio';
 
 export async function persistInboundMessage(params: {
   businessId: string;
@@ -77,6 +78,7 @@ export async function sendAndPersistOutboundMessage(params: {
   toPhone: string;
   body: string;
   participant?: MessageParticipant;
+  context?: OutboundMessageContext;
   twilioSubaccountSid?: string | null;
   messagingServiceSid?: string | null;
   managedTwilioStatus?: ManagedTwilioStatus | null;
@@ -86,6 +88,8 @@ export async function sendAndPersistOutboundMessage(params: {
   const from = normalizePhoneNumber(params.fromPhone) || params.fromPhone;
   const to = normalizePhoneNumber(params.toPhone) || params.toPhone;
   const participant = params.participant ?? 'LEAD';
+  const context =
+    params.context ?? (!params.leadId && participant === 'OWNER' && params.body.startsWith('CallbackCloser admin test:') ? 'admin_test' : participant === 'OWNER' ? 'owner_alert' : 'lead_recovery');
   const recipientLabel = participant === 'OWNER' ? 'owner SMS' : 'lead SMS';
 
   if (await isSmsRecipientOptedOut({ businessId: params.businessId, phone: to })) {
@@ -123,6 +127,7 @@ export async function sendAndPersistOutboundMessage(params: {
   ) {
     const managedSummary = getManagedTwilioStatusSummary({
       managedTwilioStatus: params.managedTwilioStatus,
+      twilioAccountMode: params.twilioSubaccountSid ? 'BUSINESS_SUBACCOUNT' : 'MAIN_ACCOUNT',
       twilioSubaccountSid: params.twilioSubaccountSid ?? null,
       twilioPrimaryPhoneNumber: from,
       twilioPhoneNumber: from,
@@ -193,11 +198,13 @@ export async function sendAndPersistOutboundMessage(params: {
           messagingServiceSid: params.messagingServiceSid,
           to,
           body: params.body,
+          statusCallback: getTwilioMessageStatusCallbackUrl(),
         }
       : {
           from,
           to,
           body: params.body,
+          statusCallback: getTwilioMessageStatusCallbackUrl(),
         }
   );
 
@@ -210,6 +217,10 @@ export async function sendAndPersistOutboundMessage(params: {
     participant,
     twilioSid: sent.sid,
     status: sent.status,
+    rawPayload: {
+      source: 'twilio_api',
+      context,
+    },
     twilioCreatedAt: sent.dateCreated ?? undefined,
   });
   await recordBusinessOperatorEvent({
diff --git a/lib/twilio-provision.ts b/lib/twilio-provision.ts
index 8d98ed8..d522d00 100644
--- a/lib/twilio-provision.ts
+++ b/lib/twilio-provision.ts
@@ -15,6 +15,7 @@ type ProvisionableBusiness = Pick<
   Business,
   | 'id'
   | 'name'
+  | 'twilioAccountMode'
   | 'twilioSubaccountSid'
   | 'twilioPhoneNumber'
   | 'twilioPhoneNumberSid'
@@ -118,6 +119,7 @@ export async function provisionPhoneNumber(options: ProvisionPhoneNumberOptions)
     select: {
       id: true,
       name: true,
+      twilioAccountMode: true,
       twilioSubaccountSid: true,
       twilioMessagingServiceSid: true,
       twilioPrimaryNumberSid: true,
diff --git a/lib/twilio-provisioning-input.ts b/lib/twilio-provisioning-input.ts
index 0c6d0bf..8a77918 100644
--- a/lib/twilio-provisioning-input.ts
+++ b/lib/twilio-provisioning-input.ts
@@ -5,6 +5,7 @@ export function buildManagedProvisioningBusinessInput(
     Business,
     | 'id'
     | 'name'
+    | 'twilioAccountMode'
     | 'twilioSubaccountSid'
     | 'twilioMessagingServiceSid'
     | 'twilioPrimaryNumberSid'
@@ -17,6 +18,7 @@ export function buildManagedProvisioningBusinessInput(
   return {
     id: business.id,
     name: business.name || fallbackBusinessName,
+    twilioAccountMode: business.twilioAccountMode,
     twilioSubaccountSid: business.twilioSubaccountSid,
     twilioMessagingServiceSid: business.twilioMessagingServiceSid,
     twilioPrimaryNumberSid: business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid,
diff --git a/lib/twilio-setup.ts b/lib/twilio-setup.ts
new file mode 100644
index 0000000..362a88a
--- /dev/null
+++ b/lib/twilio-setup.ts
@@ -0,0 +1,473 @@
+import {
+  BusinessProvisioningStatus,
+  ManagedTwilioStatus,
+  TwilioAccountMode,
+  TwilioNumberSetupMode,
+  type Business,
+  type BusinessNotificationSettings,
+} from '@prisma/client';
+
+import type { TwilioWebhookSnapshot } from '@/lib/admin-provisioning-presenters';
+import { getManagedTextingNumber, getManagedTwilioStatusSummary } from '@/lib/managed-twilio-status';
+import { formatPhoneForDisplay } from '@/lib/phone';
+
+type SetupBusiness = Pick<
+  Business,
+  | 'name'
+  | 'notifyPhone'
+  | 'forwardingNumber'
+  | 'provisioningStatus'
+  | 'twilioAccountMode'
+  | 'twilioNumberSetupMode'
+  | 'twilioSubaccountSid'
+  | 'twilioMessagingServiceSid'
+  | 'twilioPrimaryNumberSid'
+  | 'twilioPhoneNumberSid'
+  | 'twilioPrimaryPhoneNumber'
+  | 'twilioPhoneNumber'
+  | 'twilioWebhookSyncedAt'
+  | 'managedTwilioStatus'
+  | 'a2pCustomerProfileSid'
+  | 'a2pBrandSid'
+  | 'a2pCampaignSid'
+  | 'a2pFailureReason'
+  | 'a2pApprovedAt'
+>;
+
+type SetupNotificationSettings = Pick<BusinessNotificationSettings, 'ownerPhone' | 'ownerEmail'> | null;
+
+export type TwilioSetupStepKey =
+  | 'owner_connected'
+  | 'account_mode'
+  | 'number_path'
+  | 'account_ready'
+  | 'messaging_service_ready'
+  | 'number_assigned'
+  | 'voice_webhook_synced'
+  | 'sms_webhook_synced'
+  | 'status_callback_synced'
+  | 'a2p_status_recorded'
+  | 'test_sms_delivered'
+  | 'missed_call_validated'
+  | 'safe_to_mark_live';
+
+export type TwilioSetupTone = 'success' | 'pending' | 'attention' | 'neutral';
+
+export type TwilioSetupStep = {
+  key: TwilioSetupStepKey;
+  label: string;
+  complete: boolean;
+  tone: TwilioSetupTone;
+  stateLabel: string;
+  detail: string;
+};
+
+export type TwilioSetupBanner = {
+  title: string;
+  detail: string;
+  tone: TwilioSetupTone;
+  stepKey: TwilioSetupStepKey;
+};
+
+export type TwilioSetupFlow = {
+  accountMode: TwilioAccountMode;
+  numberSetupMode: TwilioNumberSetupMode;
+  accountModeLabel: string;
+  numberSetupModeLabel: string;
+  accountModeDescription: string;
+  numberSetupModeDescription: string;
+  existingNumberMessage: string;
+  safeToMarkLive: boolean;
+  liveGateDetail: string;
+  banner: TwilioSetupBanner;
+  steps: TwilioSetupStep[];
+};
+
+export const twilioAccountModeOptions = [
+  {
+    value: TwilioAccountMode.MAIN_ACCOUNT,
+    label: 'Main account',
+    description:
+      'Use the parent Twilio account directly for this business. CallbackCloser keeps the business mapped inside the main account instead of creating a dedicated subaccount.',
+  },
+  {
+    value: TwilioAccountMode.BUSINESS_SUBACCOUNT,
+    label: 'Business subaccount (recommended)',
+    description:
+      'Create or reuse a dedicated Twilio subaccount for this business. This matches the managed per-business provisioning direction and keeps Twilio setup scoped cleanly.',
+  },
+] as const;
+
+export const twilioNumberSetupModeOptions = [
+  {
+    value: TwilioNumberSetupMode.NEW_NUMBER,
+    label: 'New business number',
+    description: 'Provision a fresh Twilio number inside the selected account context and wire it into CallbackCloser.',
+  },
+  {
+    value: TwilioNumberSetupMode.EXISTING_NUMBER,
+    label: 'Existing number',
+    description:
+      'Keep the business on an existing Twilio number. This stays admin-assisted unless the number already lives in the selected account context.',
+  },
+] as const;
+
+export function getTwilioAccountModeLabel(mode: TwilioAccountMode) {
+  return twilioAccountModeOptions.find((option) => option.value === mode)?.label || 'Business subaccount (recommended)';
+}
+
+export function getTwilioAccountModeDescription(mode: TwilioAccountMode) {
+  return twilioAccountModeOptions.find((option) => option.value === mode)?.description || twilioAccountModeOptions[1].description;
+}
+
+export function getTwilioNumberSetupModeLabel(mode: TwilioNumberSetupMode) {
+  return twilioNumberSetupModeOptions.find((option) => option.value === mode)?.label || 'New business number';
+}
+
+export function getTwilioNumberSetupModeDescription(mode: TwilioNumberSetupMode) {
+  return twilioNumberSetupModeOptions.find((option) => option.value === mode)?.description || twilioNumberSetupModeOptions[0].description;
+}
+
+export function usesBusinessSubaccount(mode: TwilioAccountMode) {
+  return mode === TwilioAccountMode.BUSINESS_SUBACCOUNT;
+}
+
+function buildTone(complete: boolean, attention = false): TwilioSetupTone {
+  if (complete) return 'success';
+  if (attention) return 'attention';
+  return 'pending';
+}
+
+function buildWebhookState(snapshot: TwilioWebhookSnapshot | null, type: 'voice' | 'sms' | 'status') {
+  if (!snapshot) {
+    return {
+      synced: false,
+      detail: 'Webhook status will appear after CallbackCloser can read the assigned number.',
+      attention: false,
+    };
+  }
+
+  if (snapshot.error) {
+    return {
+      synced: false,
+      detail: snapshot.error,
+      attention: true,
+    };
+  }
+
+  if (type === 'voice') {
+    return {
+      synced: snapshot.voiceSynced,
+      detail: snapshot.voiceSynced
+        ? 'Voice webhook matches the current CallbackCloser URL.'
+        : 'Voice webhook still needs to be synced to the current CallbackCloser URL.',
+      attention: false,
+    };
+  }
+
+  if (type === 'sms') {
+    return {
+      synced: snapshot.smsSynced,
+      detail: snapshot.smsSynced
+        ? 'SMS webhook matches the current CallbackCloser URL.'
+        : 'SMS webhook still needs to be synced to the current CallbackCloser URL.',
+      attention: false,
+    };
+  }
+
+  return {
+    synced: snapshot.statusSynced,
+    detail: snapshot.statusSynced
+      ? 'Status callback matches the current CallbackCloser URL.'
+      : 'Status callback still needs to be synced to the current CallbackCloser URL.',
+    attention: false,
+  };
+}
+
+function formatA2pDetail(business: SetupBusiness) {
+  const managedSummary = getManagedTwilioStatusSummary(business);
+  const hasRecordedStatus =
+    business.managedTwilioStatus !== ManagedTwilioStatus.DRAFT ||
+    Boolean(
+      business.a2pCustomerProfileSid || business.a2pBrandSid || business.a2pCampaignSid || business.a2pFailureReason || business.a2pApprovedAt
+    );
+
+  if (!hasRecordedStatus) {
+    return {
+      complete: false,
+      detail: 'Record whether A2P is not started, pending review, approved, or blocked so launch status stays truthful.',
+      stateLabel: 'Needs update',
+      tone: 'pending' as const,
+    };
+  }
+
+  if (managedSummary.complianceReady) {
+    return {
+      complete: true,
+      detail: business.a2pApprovedAt ? `Recorded as approved on ${business.a2pApprovedAt.toLocaleDateString()}.` : 'Recorded as approved for live messaging.',
+      stateLabel: 'Approved',
+      tone: 'success' as const,
+    };
+  }
+
+  if (managedSummary.attentionRequired) {
+    return {
+      complete: true,
+      detail: business.a2pFailureReason || managedSummary.description,
+      stateLabel: 'Needs attention',
+      tone: 'attention' as const,
+    };
+  }
+
+  return {
+    complete: true,
+    detail: managedSummary.description,
+    stateLabel: managedSummary.label,
+    tone: 'pending' as const,
+  };
+}
+
+export function buildTwilioSetupFlow(params: {
+  business: SetupBusiness;
+  notificationSettings: SetupNotificationSettings;
+  ownerConnected: boolean;
+  successfulLeadCount: number;
+  testSmsState: 'not_started' | 'pending_delivery' | 'delivered' | 'failed';
+  webhookSnapshot: TwilioWebhookSnapshot | null;
+}) {
+  const { business, notificationSettings, ownerConnected, successfulLeadCount, testSmsState, webhookSnapshot } = params;
+  const accountMode = business.twilioAccountMode || TwilioAccountMode.BUSINESS_SUBACCOUNT;
+  const numberSetupMode = business.twilioNumberSetupMode || TwilioNumberSetupMode.NEW_NUMBER;
+  const managedSummary = getManagedTwilioStatusSummary(business);
+  const assignedNumber = getManagedTextingNumber(business);
+  const ownerEmail = notificationSettings?.ownerEmail?.trim() || null;
+  const ownerPhone = notificationSettings?.ownerPhone?.trim() || business.notifyPhone || null;
+  const usingSubaccount = usesBusinessSubaccount(accountMode);
+  const accountReady = usingSubaccount ? Boolean(business.twilioSubaccountSid) : true;
+  const messagingServiceReady = Boolean(business.twilioMessagingServiceSid);
+  const numberAssigned = Boolean(assignedNumber && (business.twilioPrimaryNumberSid || business.twilioPhoneNumberSid));
+  const voiceWebhook = buildWebhookState(webhookSnapshot, 'voice');
+  const smsWebhook = buildWebhookState(webhookSnapshot, 'sms');
+  const statusWebhook = buildWebhookState(webhookSnapshot, 'status');
+  const a2p = formatA2pDetail(business);
+  const testSmsDelivered = testSmsState === 'delivered';
+  const hasOwnerRouting = Boolean(ownerPhone || ownerEmail);
+  const hasForwardingNumber = Boolean(business.forwardingNumber?.trim());
+  const missedCallValidated = successfulLeadCount > 0;
+  const existingNumberMessage =
+    'Existing-number support stays truthful here: CallbackCloser can only attach a number that already lives in the selected Twilio account context. Numbers that live elsewhere still need admin assistance.';
+
+  const liveBlockers: string[] = [];
+  if (!ownerConnected) liveBlockers.push('connect the owner account');
+  if (!accountReady) liveBlockers.push(usingSubaccount ? 'create or reconnect the business subaccount' : 'confirm the parent account mapping');
+  if (!numberAssigned) liveBlockers.push('assign the business number');
+  if (!messagingServiceReady) liveBlockers.push('finish the Messaging Service');
+  if (!voiceWebhook.synced) liveBlockers.push('sync the voice webhook');
+  if (!smsWebhook.synced) liveBlockers.push('sync the SMS webhook');
+  if (!statusWebhook.synced) liveBlockers.push('sync the status callback');
+  if (!managedSummary.complianceReady) liveBlockers.push('clear A2P approval');
+  if (!testSmsDelivered) liveBlockers.push('deliver a test SMS');
+  if (!missedCallValidated) liveBlockers.push('validate the missed-call flow');
+  if (!hasForwardingNumber) liveBlockers.push('save the forwarding number');
+  if (!hasOwnerRouting) liveBlockers.push('save an owner alert destination');
+
+  const safeToMarkLive = liveBlockers.length === 0;
+  const liveGateDetail = safeToMarkLive
+    ? business.provisioningStatus === BusinessProvisioningStatus.LIVE
+      ? 'This business is already live and the current setup still clears the launch gate.'
+      : 'This business clears the Twilio launch gate. It is safe to mark live.'
+    : `Before this business goes live, ${liveBlockers.join(', ')}.`;
+
+  const steps: TwilioSetupStep[] = [
+    {
+      key: 'owner_connected',
+      label: '1. Owner connected',
+      complete: ownerConnected,
+      tone: buildTone(ownerConnected, !ownerConnected),
+      stateLabel: ownerConnected ? 'Done' : 'Needs action',
+      detail: ownerConnected
+        ? 'The owner account is connected to this business.'
+        : ownerEmail
+          ? 'The owner email is saved, but the owner account still needs to be connected.'
+          : 'Save the owner email first, then connect or invite the owner.',
+    },
+    {
+      key: 'account_mode',
+      label: '2. Twilio account mode chosen',
+      complete: true,
+      tone: 'success',
+      stateLabel: getTwilioAccountModeLabel(accountMode),
+      detail: getTwilioAccountModeDescription(accountMode),
+    },
+    {
+      key: 'number_path',
+      label: '3. Number path chosen',
+      complete: true,
+      tone: 'success',
+      stateLabel: getTwilioNumberSetupModeLabel(numberSetupMode),
+      detail:
+        numberSetupMode === TwilioNumberSetupMode.EXISTING_NUMBER
+          ? `${getTwilioNumberSetupModeDescription(numberSetupMode)} ${existingNumberMessage}`
+          : getTwilioNumberSetupModeDescription(numberSetupMode),
+    },
+    {
+      key: 'account_ready',
+      label: '4. Twilio account/subaccount ready',
+      complete: accountReady,
+      tone: buildTone(accountReady, usingSubaccount),
+      stateLabel: accountReady
+        ? usingSubaccount
+          ? 'Subaccount ready'
+          : 'Main account ready'
+        : 'Needs action',
+      detail: usingSubaccount
+        ? business.twilioSubaccountSid
+          ? `Business subaccount ${business.twilioSubaccountSid} is saved for this business.`
+          : 'Create, select, or paste the business subaccount SID before continuing.'
+        : 'This business uses the parent Twilio account directly. No business subaccount is required.',
+    },
+    {
+      key: 'messaging_service_ready',
+      label: '5. Messaging Service ready',
+      complete: messagingServiceReady,
+      tone: buildTone(messagingServiceReady),
+      stateLabel: messagingServiceReady ? 'Ready' : 'Missing',
+      detail: messagingServiceReady
+        ? `Messaging Service ${business.twilioMessagingServiceSid} is saved for this business.`
+        : 'Create or record the Messaging Service that should send business SMS.',
+    },
+    {
+      key: 'number_assigned',
+      label: '6. Number assigned',
+      complete: numberAssigned,
+      tone: buildTone(numberAssigned),
+      stateLabel: numberAssigned ? 'Ready' : 'Missing',
+      detail: numberAssigned
+        ? `${formatPhoneForDisplay(assignedNumber)} is assigned to this business.`
+        : numberSetupMode === TwilioNumberSetupMode.EXISTING_NUMBER
+          ? existingNumberMessage
+          : 'Provision a new number for this business.',
+    },
+    {
+      key: 'voice_webhook_synced',
+      label: '7. Voice webhook synced',
+      complete: voiceWebhook.synced,
+      tone: buildTone(voiceWebhook.synced, voiceWebhook.attention),
+      stateLabel: voiceWebhook.synced ? 'Synced' : 'Needs sync',
+      detail: voiceWebhook.detail,
+    },
+    {
+      key: 'sms_webhook_synced',
+      label: '8. SMS webhook synced',
+      complete: smsWebhook.synced,
+      tone: buildTone(smsWebhook.synced, smsWebhook.attention),
+      stateLabel: smsWebhook.synced ? 'Synced' : 'Needs sync',
+      detail: smsWebhook.detail,
+    },
+    {
+      key: 'status_callback_synced',
+      label: '9. Status callback synced',
+      complete: statusWebhook.synced,
+      tone: buildTone(statusWebhook.synced, statusWebhook.attention),
+      stateLabel: statusWebhook.synced ? 'Synced' : 'Needs sync',
+      detail: statusWebhook.detail,
+    },
+    {
+      key: 'a2p_status_recorded',
+      label: '10. A2P status recorded',
+      complete: a2p.complete,
+      tone: a2p.tone,
+      stateLabel: a2p.stateLabel,
+      detail: a2p.detail,
+    },
+    {
+      key: 'test_sms_delivered',
+      label: '11. Test SMS delivered',
+      complete: testSmsDelivered,
+      tone: buildTone(testSmsDelivered, testSmsState === 'failed'),
+      stateLabel:
+        testSmsState === 'delivered'
+          ? 'Delivered'
+          : testSmsState === 'pending_delivery'
+            ? 'Waiting'
+            : testSmsState === 'failed'
+              ? 'Failed'
+              : 'Not run',
+      detail:
+        testSmsState === 'delivered'
+          ? 'A test SMS has been delivered from the current business setup.'
+          : testSmsState === 'pending_delivery'
+            ? 'The latest test SMS was accepted by Twilio, but delivery has not been confirmed yet.'
+            : testSmsState === 'failed'
+              ? 'The latest test SMS failed. Fix delivery before going live.'
+              : 'Send a test SMS from the assigned business line before going live.',
+    },
+    {
+      key: 'missed_call_validated',
+      label: '12. Missed-call flow validated',
+      complete: missedCallValidated,
+      tone: buildTone(missedCallValidated),
+      stateLabel: missedCallValidated ? 'Validated' : 'Still needed',
+      detail: missedCallValidated
+        ? `${successfulLeadCount} missed-call test${successfulLeadCount === 1 ? '' : 's'} reached owner-notification visibility.`
+        : !hasForwardingNumber
+          ? 'Save the forwarding number first so the live call path is accurate before testing.'
+          : !hasOwnerRouting
+            ? 'Save an owner alert destination before the missed-call validation test.'
+            : 'Run one real missed call and confirm the owner alert and lead handoff both land correctly.',
+    },
+    {
+      key: 'safe_to_mark_live',
+      label: '13. Safe to mark live',
+      complete: safeToMarkLive || business.provisioningStatus === BusinessProvisioningStatus.LIVE,
+      tone: safeToMarkLive || business.provisioningStatus === BusinessProvisioningStatus.LIVE ? 'success' : 'pending',
+      stateLabel:
+        business.provisioningStatus === BusinessProvisioningStatus.LIVE
+          ? 'Live'
+          : safeToMarkLive
+            ? 'Ready'
+            : 'Blocked',
+      detail: liveGateDetail,
+    },
+  ];
+
+  const nextIncompleteStep = steps.find((step) => !step.complete);
+  const banner: TwilioSetupBanner = nextIncompleteStep
+    ? {
+        title:
+          nextIncompleteStep.key === 'account_mode'
+            ? 'Choose how this business should use Twilio'
+            : nextIncompleteStep.key === 'number_path'
+              ? 'Choose the number path before provisioning'
+              : nextIncompleteStep.key === 'a2p_status_recorded' && managedSummary.complianceReady === false
+                ? 'Keep A2P status accurate before launch'
+                : nextIncompleteStep.key === 'test_sms_delivered'
+                  ? 'Send the live test text next'
+                  : nextIncompleteStep.key === 'missed_call_validated'
+                    ? 'Run the missed-call validation next'
+                    : 'Next setup step',
+        detail: nextIncompleteStep.detail,
+        tone: nextIncompleteStep.tone,
+        stepKey: nextIncompleteStep.key,
+      }
+    : {
+        title: business.provisioningStatus === BusinessProvisioningStatus.LIVE ? 'This business is live' : 'This business is safe to mark live',
+        detail: liveGateDetail,
+        tone: 'success',
+        stepKey: 'safe_to_mark_live',
+      };
+
+  return {
+    accountMode,
+    numberSetupMode,
+    accountModeLabel: getTwilioAccountModeLabel(accountMode),
+    numberSetupModeLabel: getTwilioNumberSetupModeLabel(numberSetupMode),
+    accountModeDescription: getTwilioAccountModeDescription(accountMode),
+    numberSetupModeDescription: getTwilioNumberSetupModeDescription(numberSetupMode),
+    existingNumberMessage,
+    safeToMarkLive,
+    liveGateDetail,
+    banner,
+    steps,
+  } satisfies TwilioSetupFlow;
+}
diff --git a/lib/twilio.ts b/lib/twilio.ts
index 87284ea..4066458 100644
--- a/lib/twilio.ts
+++ b/lib/twilio.ts
@@ -17,7 +17,7 @@ export type TwilioWebhookConfig = {
 export { getTwilioBusinessClient, getTwilioClient, getTwilioSubaccountClient } from '@/lib/twilio-client';
 export type { TwilioClient } from '@/lib/twilio-client';
 
-export function getTwilioWebhookConfig(): TwilioWebhookConfig {
+function buildConfiguredTwilioWebhookUrl(path: string) {
   const appBaseUrl = getConfiguredAppBaseUrl();
   if (!appBaseUrl) {
     const resolution = resolveConfiguredAppBaseUrl();
@@ -46,22 +46,34 @@ export function getTwilioWebhookConfig(): TwilioWebhookConfig {
   }
 
   const normalizedBaseUrl = parsed.toString().replace(/\/$/, '');
-  const buildUrl = (path: string) => {
-    const next = new URL(path, `${normalizedBaseUrl}/`);
-    if (usesSharedWebhookToken && webhookToken) {
-      next.searchParams.set('webhook_token', webhookToken);
-    }
-    return next.toString();
-  };
+  const next = new URL(path, `${normalizedBaseUrl}/`);
+  if (usesSharedWebhookToken && webhookToken) {
+    next.searchParams.set('webhook_token', webhookToken);
+  }
 
   return {
     appBaseUrl: normalizedBaseUrl,
-    voiceUrl: buildUrl('/api/twilio/voice'),
-    smsUrl: buildUrl('/api/twilio/sms'),
-    statusUrl: buildUrl('/api/twilio/status'),
+    url: next.toString(),
   };
 }
 
+export function getTwilioWebhookConfig(): TwilioWebhookConfig {
+  const voice = buildConfiguredTwilioWebhookUrl('/api/twilio/voice');
+  const sms = buildConfiguredTwilioWebhookUrl('/api/twilio/sms');
+  const status = buildConfiguredTwilioWebhookUrl('/api/twilio/status');
+
+  return {
+    appBaseUrl: voice.appBaseUrl,
+    voiceUrl: voice.url,
+    smsUrl: sms.url,
+    statusUrl: status.url,
+  };
+}
+
+export function getTwilioMessageStatusCallbackUrl() {
+  return buildConfiguredTwilioWebhookUrl('/api/twilio/message-status').url;
+}
+
 export async function syncTwilioIncomingPhoneNumberWebhooks(
   phoneNumberSid: string,
   client: TwilioClient = getTwilioClient(),
diff --git a/lib/validators.ts b/lib/validators.ts
index 13cb232..8807d46 100644
--- a/lib/validators.ts
+++ b/lib/validators.ts
@@ -1,9 +1,14 @@
 import { z } from 'zod';
 
+const twilioAccountModeSchema = z.enum(['MAIN_ACCOUNT', 'BUSINESS_SUBACCOUNT']);
+const twilioNumberSetupModeSchema = z.enum(['NEW_NUMBER', 'EXISTING_NUMBER']);
+
 export const onboardingSchema = z.object({
   name: z.string().min(2).max(120),
   forwardingNumber: z.string().min(7).max(30),
   notifyPhone: z.string().max(30).optional().or(z.literal('')),
+  twilioAccountMode: twilioAccountModeSchema.default('BUSINESS_SUBACCOUNT'),
+  twilioNumberSetupMode: twilioNumberSetupModeSchema.default('NEW_NUMBER'),
   missedCallSeconds: z.coerce.number().int().min(5).max(90).default(20),
   serviceLabel1: z.string().min(1).max(40),
   serviceLabel2: z.string().min(1).max(40),
@@ -61,6 +66,9 @@ export const adminBusinessUpdateSchema = adminBusinessDraftSchema.extend({
   businessId: z.string().min(1),
   ownerClerkId: z.string().trim().optional().or(z.literal('')),
   internalNotes: z.string().trim().max(5_000).optional().or(z.literal('')),
+  twilioAccountMode: twilioAccountModeSchema.default('BUSINESS_SUBACCOUNT'),
+  twilioNumberSetupMode: twilioNumberSetupModeSchema.default('NEW_NUMBER'),
+  twilioSubaccountSid: z.string().trim().max(64).optional().or(z.literal('')),
   twilioPhoneNumber: z.string().trim().max(30).optional().or(z.literal('')),
   twilioPhoneNumberSid: z.string().trim().max(64).optional().or(z.literal('')),
   twilioMessagingServiceSid: z.string().trim().max(64).optional().or(z.literal('')),
@@ -142,6 +150,33 @@ export const adminSendTestSmsSchema = z.object({
   destinationPhone: z.string().trim().min(7).max(30),
 });
 
+export const adminTwilioSetupSchema = z.object({
+  businessId: z.string().min(1),
+  twilioAccountMode: twilioAccountModeSchema.default('BUSINESS_SUBACCOUNT'),
+  twilioNumberSetupMode: twilioNumberSetupModeSchema.default('NEW_NUMBER'),
+  twilioSubaccountSid: z.string().trim().max(64).optional().or(z.literal('')),
+  twilioPhoneNumber: z.string().trim().max(30).optional().or(z.literal('')),
+  twilioPhoneNumberSid: z.string().trim().max(64).optional().or(z.literal('')),
+  twilioMessagingServiceSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pCustomerProfileSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pBrandSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pCampaignSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pFailureReason: z.string().trim().max(500).optional().or(z.literal('')),
+  managedTwilioStatus: z
+    .enum([
+      'DRAFT',
+      'PROVISIONING',
+      'AWAITING_BUSINESS_VERIFICATION',
+      'BRAND_SUBMITTED',
+      'CAMPAIGN_SUBMITTED',
+      'COMPLIANT_LIVE',
+      'PAUSED_NONCOMPLIANT',
+      'FAILED_REVIEW',
+    ])
+    .default('DRAFT'),
+  confirmCriticalFieldClears: z.coerce.boolean().optional().default(false),
+});
+
 export const adminArchiveBusinessSchema = z.object({
   businessId: z.string().min(1),
   confirmationName: z.string().trim().min(1),
@@ -154,10 +189,42 @@ export const adminDeleteBusinessSchema = z.object({
   returnTo: z.string().trim().optional().or(z.literal('')),
 });
 
+export const adminBulkDeleteTestBusinessesSchema = z.object({
+  confirmationText: z.string().trim().min(1),
+});
+
 export const businessTwilioAdminOverrideSchema = z.object({
+  twilioAccountMode: twilioAccountModeSchema.default('BUSINESS_SUBACCOUNT'),
+  twilioNumberSetupMode: twilioNumberSetupModeSchema.default('NEW_NUMBER'),
+  twilioSubaccountSid: z.string().trim().max(64).optional().or(z.literal('')),
   twilioPhoneNumber: z.string().trim().max(30).optional().or(z.literal('')),
   twilioPhoneNumberSid: z.string().trim().max(64).optional().or(z.literal('')),
   twilioMessagingServiceSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pCustomerProfileSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pBrandSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pCampaignSid: z.string().trim().max(64).optional().or(z.literal('')),
+  a2pFailureReason: z.string().trim().max(500).optional().or(z.literal('')),
+  managedTwilioStatus: z
+    .enum([
+      'DRAFT',
+      'PROVISIONING',
+      'AWAITING_BUSINESS_VERIFICATION',
+      'BRAND_SUBMITTED',
+      'CAMPAIGN_SUBMITTED',
+      'COMPLIANT_LIVE',
+      'PAUSED_NONCOMPLIANT',
+      'FAILED_REVIEW',
+    ])
+    .default('DRAFT'),
   ownerPhone: z.string().trim().max(30).optional().or(z.literal('')),
   confirmCriticalFieldClears: z.coerce.boolean().optional().default(false),
 });
+
+export const businessTwilioSetupChoiceSchema = z.object({
+  twilioAccountMode: twilioAccountModeSchema.default('BUSINESS_SUBACCOUNT'),
+  twilioNumberSetupMode: twilioNumberSetupModeSchema.default('NEW_NUMBER'),
+});
+
+export const businessTwilioTestSmsSchema = z.object({
+  destinationPhone: z.string().trim().min(7).max(30),
+});
diff --git a/prisma/migrations/20260421101500_add_twilio_setup_modes/migration.sql b/prisma/migrations/20260421101500_add_twilio_setup_modes/migration.sql
new file mode 100644
index 0000000..e0368f8
--- /dev/null
+++ b/prisma/migrations/20260421101500_add_twilio_setup_modes/migration.sql
@@ -0,0 +1,16 @@
+-- CreateEnum
+CREATE TYPE "TwilioAccountMode" AS ENUM (
+    'MAIN_ACCOUNT',
+    'BUSINESS_SUBACCOUNT'
+);
+
+-- CreateEnum
+CREATE TYPE "TwilioNumberSetupMode" AS ENUM (
+    'NEW_NUMBER',
+    'EXISTING_NUMBER'
+);
+
+-- AlterTable
+ALTER TABLE "Business"
+ADD COLUMN "twilioAccountMode" "TwilioAccountMode" NOT NULL DEFAULT 'BUSINESS_SUBACCOUNT',
+ADD COLUMN "twilioNumberSetupMode" "TwilioNumberSetupMode" NOT NULL DEFAULT 'NEW_NUMBER';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 08e5a06..eadb9b9 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -32,6 +32,8 @@ model Business {
   twilioMessagingServiceSid   String?            @unique
   twilioPrimaryNumberSid      String?            @unique
   twilioPrimaryPhoneNumber    String?            @unique
+  twilioAccountMode           TwilioAccountMode  @default(BUSINESS_SUBACCOUNT)
+  twilioNumberSetupMode       TwilioNumberSetupMode @default(NEW_NUMBER)
   a2pCustomerProfileSid       String?            @unique
   a2pBrandSid                 String?            @unique
   a2pCampaignSid              String?            @unique
@@ -354,6 +356,16 @@ enum ManagedTwilioStatus {
   FAILED_REVIEW
 }
 
+enum TwilioAccountMode {
+  MAIN_ACCOUNT
+  BUSINESS_SUBACCOUNT
+}
+
+enum TwilioNumberSetupMode {
+  NEW_NUMBER
+  EXISTING_NUMBER
+}
+
 enum BusinessProvisioningStatus {
   DRAFT
   ONBOARDING
diff --git a/tests/admin-bulk-delete-action.test.ts b/tests/admin-bulk-delete-action.test.ts
new file mode 100644
index 0000000..3d0ea7e
--- /dev/null
+++ b/tests/admin-bulk-delete-action.test.ts
@@ -0,0 +1,30 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readFileSync } from 'node:fs';
+
+function read(path: string) {
+  return readFileSync(new URL(`../${path}`, import.meta.url), 'utf8');
+}
+
+test('bulk delete action keeps redirect outside the try/catch and returns plain admin UI states', () => {
+  const actions = read('app/admin/actions.ts');
+  const adminPage = read('app/admin/page.tsx');
+
+  const actionSection = actions.slice(actions.indexOf('export async function bulkDeleteTestBusinessesAction'));
+  const catchStart = actionSection.indexOf('} catch (error) {');
+  const finalRedirectStart = actionSection.lastIndexOf('\n\n  redirect(redirectPath);');
+  const catchSection = actionSection.slice(catchStart, finalRedirectStart);
+
+  assert.match(actions, /export async function bulkDeleteTestBusinessesAction/);
+  assert.match(actions, /let redirectPath = '\/admin'/);
+  assert.match(actions, /redirectPath = `\/admin\?error=\$\{encodeURIComponent\(message\)\}`/);
+  assert.match(actions, /redirect\(redirectPath\);/);
+  assert.notEqual(catchStart, -1);
+  assert.notEqual(finalRedirectStart, -1);
+  assert.doesNotMatch(catchSection, /redirect\(/);
+
+  assert.match(adminPage, /resetResult === 'deleted'/);
+  assert.match(adminPage, /Deleted \{resetDeleted\} test\/demo/);
+  assert.match(adminPage, /resetResult === 'noop'/);
+  assert.match(adminPage, /No test\/demo businesses were eligible for deletion/);
+});
diff --git a/tests/admin-dashboard.test.ts b/tests/admin-dashboard.test.ts
index c668a4d..32ff9a0 100644
--- a/tests/admin-dashboard.test.ts
+++ b/tests/admin-dashboard.test.ts
@@ -1,7 +1,14 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { BusinessProvisioningStatus, ManagedTwilioStatus, OperatorEventStatus, SubscriptionStatus } from '@prisma/client';
+import {
+  BusinessProvisioningStatus,
+  ManagedTwilioStatus,
+  OperatorEventStatus,
+  SubscriptionStatus,
+  TwilioAccountMode,
+  TwilioNumberSetupMode,
+} from '@prisma/client';
 
 import {
   buildAdminBusinessPickerLabel,
@@ -9,6 +16,7 @@ import {
   buildAdminBusinessEvents,
   buildAdminNextStep,
   canDeleteTestBusiness,
+  getAdminTestSmsConfidenceState,
   getDeleteTestBusinessBlockedReason,
   matchesAdminBoardFilter,
 } from '../lib/admin-dashboard.ts';
@@ -27,6 +35,8 @@ function createBusiness(overrides: Record<string, unknown> = {}) {
     provisioningStatus: BusinessProvisioningStatus.ONBOARDING,
     provisioningLastRunAt: new Date('2026-04-15T00:00:00.000Z'),
     provisioningError: null,
+    twilioAccountMode: TwilioAccountMode.BUSINESS_SUBACCOUNT,
+    twilioNumberSetupMode: TwilioNumberSetupMode.NEW_NUMBER,
     twilioSubaccountSid: 'AC_TEST_SUBACCOUNT',
     twilioMessagingServiceSid: 'MG_TEST_SERVICE',
     twilioPrimaryNumberSid: 'PN_TEST_PRIMARY',
@@ -257,7 +267,7 @@ test('onboarding confidence distinguishes ready-for-test from ready-for-live', (
     successfulLeadCount: 1,
     operatorEvents: [
       {
-        type: 'admin.test_sms_accepted',
+        type: 'admin.test_sms_delivered',
         status: OperatorEventStatus.SUCCESS,
         createdAt: new Date('2026-04-17T12:00:00.000Z'),
       },
@@ -269,6 +279,51 @@ test('onboarding confidence distinguishes ready-for-test from ready-for-live', (
   assert.equal(readyForLive.readinessLabel, 'Ready for live');
 });
 
+test('admin test SMS confidence waits for delivery confirmation', () => {
+  assert.equal(
+    getAdminTestSmsConfidenceState([
+      {
+        type: 'admin.test_sms_accepted',
+        status: OperatorEventStatus.SUCCESS,
+        createdAt: new Date('2026-04-17T12:00:00.000Z'),
+      },
+    ]),
+    'pending_delivery'
+  );
+
+  assert.equal(
+    getAdminTestSmsConfidenceState([
+      {
+        type: 'admin.test_sms_accepted',
+        status: OperatorEventStatus.SUCCESS,
+        createdAt: new Date('2026-04-17T12:00:00.000Z'),
+      },
+      {
+        type: 'admin.test_sms_delivered',
+        status: OperatorEventStatus.SUCCESS,
+        createdAt: new Date('2026-04-17T12:01:00.000Z'),
+      },
+    ]),
+    'delivered'
+  );
+
+  assert.equal(
+    getAdminTestSmsConfidenceState([
+      {
+        type: 'admin.test_sms_delivered',
+        status: OperatorEventStatus.SUCCESS,
+        createdAt: new Date('2026-04-17T12:00:00.000Z'),
+      },
+      {
+        type: 'admin.test_sms_delivery_failed',
+        status: OperatorEventStatus.FAILED,
+        createdAt: new Date('2026-04-17T12:02:00.000Z'),
+      },
+    ]),
+    'failed'
+  );
+});
+
 test('onboarding confidence stays honest when A2P is pending or live has warnings', () => {
   const waitingOnA2p = buildAdminOnboardingConfidence({
     business: createBusiness({
diff --git a/tests/admin-operator-routes.test.ts b/tests/admin-operator-routes.test.ts
index e7b9652..e907734 100644
--- a/tests/admin-operator-routes.test.ts
+++ b/tests/admin-operator-routes.test.ts
@@ -10,28 +10,32 @@ test('admin routes expose support workspace and safe lifecycle controls', () =>
   const adminHome = read('app/admin/page.tsx');
   const adminDetail = read('app/admin/[businessId]/page.tsx');
   const supportWorkspace = read('app/admin/[businessId]/workspace/page.tsx');
+  const adminActions = read('app/admin/actions.ts');
   const businessPicker = read('components/admin-business-picker.tsx');
   const appLayout = read('app/app/layout.tsx');
 
   assert.match(adminHome, /Operator control panel/);
   assert.match(adminHome, /Fast onboard/);
-  assert.match(adminHome, /Create workspace and start provisioning/);
+  assert.match(adminHome, /Create business workspace/);
+  assert.match(adminHome, /Reset test data/);
+  assert.match(adminHome, /Delete all test\/demo businesses/);
+  assert.match(adminHome, /BULK_TEST_DATA_RESET_CONFIRMATION/);
   assert.match(adminHome, /Business triage board/);
   assert.match(adminHome, /Open customer workspace/);
   assert.match(adminHome, /Delete demo\/test business permanently/);
   assert.match(adminHome, /Type business name to permanently delete/);
   assert.match(adminHome, /Open customer leads/);
+  assert.match(adminActions, /export async function bulkDeleteTestBusinessesAction/);
+  assert.match(adminActions, /export async function saveAdminTwilioSetupAction/);
+  assert.match(adminActions, /const admin = await requireAdmin\(\)/);
   assert.match(adminHome, /View support workspace snapshot/);
   assert.match(businessPicker, /Jump to business/);
   assert.match(businessPicker, /Clear selection/);
-  assert.match(adminDetail, /Onboarding confidence/);
-  assert.match(adminDetail, /Business info/);
-  assert.match(adminDetail, /Provisioning health/);
-  assert.match(adminDetail, /Messaging \/ A2P readiness/);
-  assert.match(adminDetail, /Automation settings/);
-  assert.match(adminDetail, /Account \/ commercial state/);
-  assert.match(adminDetail, /Recent activity/);
-  assert.match(adminDetail, /Advanced \/ rare actions/);
+  assert.match(adminDetail, /Twilio setup control panel/);
+  assert.match(adminDetail, /main Twilio account or business subaccount/i);
+  assert.match(adminDetail, /CallbackCloser Twilio launch flow/);
+  assert.match(adminDetail, /Mark live/);
+  assert.match(adminDetail, /Advanced/);
   assert.match(adminDetail, /Invite owner by email/);
   assert.match(adminDetail, /Connect existing owner/);
   assert.match(adminDetail, /Send test SMS/);
diff --git a/tests/admin-provisioning.test.ts b/tests/admin-provisioning.test.ts
index 5c4471c..1e25a8d 100644
--- a/tests/admin-provisioning.test.ts
+++ b/tests/admin-provisioning.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { BusinessProvisioningStatus, ManagedTwilioStatus, SubscriptionStatus } from '@prisma/client';
+import { BusinessProvisioningStatus, ManagedTwilioStatus, SubscriptionStatus, TwilioAccountMode, TwilioNumberSetupMode } from '@prisma/client';
 
 import {
   buildAdminProvisioningChecklist,
@@ -24,6 +24,8 @@ function createBusiness(overrides: Record<string, unknown> = {}) {
     serviceLabel3: 'Maintenance',
     missedCallSeconds: 20,
     subscriptionStatus: SubscriptionStatus.ACTIVE,
+    twilioAccountMode: TwilioAccountMode.BUSINESS_SUBACCOUNT,
+    twilioNumberSetupMode: TwilioNumberSetupMode.NEW_NUMBER,
     managedTwilioStatus: ManagedTwilioStatus.AWAITING_BUSINESS_VERIFICATION,
     managedTwilioStatusUpdatedAt: new Date('2026-04-15T00:00:00.000Z'),
     twilioSubaccountSid: 'AC_TEST_SUBACCOUNT',
diff --git a/tests/admin-test-data-reset.test.ts b/tests/admin-test-data-reset.test.ts
new file mode 100644
index 0000000..8e660b0
--- /dev/null
+++ b/tests/admin-test-data-reset.test.ts
@@ -0,0 +1,193 @@
+import assert from 'node:assert/strict';
+import { randomUUID } from 'node:crypto';
+import test from 'node:test';
+
+import {
+  bulkDeleteTestDemoBusinesses,
+  BULK_TEST_DATA_RESET_CONFIRMATION,
+  DEMO_OWNER_CLERK_ID,
+  isTestDemoBusiness,
+} from '../lib/admin-test-data-reset.ts';
+import { db } from '../lib/db.ts';
+
+function uniqueDigits(seed: string) {
+  const digits = seed.replace(/\D/g, '').padEnd(10, '7');
+  return digits.slice(-10);
+}
+
+function makePhone(seed: string, suffix: string) {
+  return `+1${uniqueDigits(`${seed}${suffix}`)}`;
+}
+
+function makeSid(prefix: string, seed: string) {
+  const normalized = seed.replace(/-/g, '').padEnd(32, '0');
+  return `${prefix}${normalized.slice(0, 32)}`;
+}
+
+async function seedResetCandidateBusiness(params: { seed: string; testBusiness: boolean }) {
+  const now = new Date('2026-04-20T12:00:00.000Z');
+  const ownerClerkId = `owner_${params.seed}`;
+  const business = await db.business.create({
+    data: {
+      ownerClerkId,
+      name: `Reset Candidate ${params.seed.slice(0, 6)}`,
+      isTestBusiness: params.testBusiness,
+      forwardingNumber: makePhone(params.seed, '100'),
+      notifyPhone: makePhone(params.seed, '200'),
+      missedCallSeconds: 20,
+      timezone: 'America/New_York',
+      serviceLabel1: 'Repair',
+      serviceLabel2: 'Install',
+      serviceLabel3: 'Maintenance',
+      twilioPhoneNumber: makePhone(params.seed, '300'),
+      twilioPrimaryPhoneNumber: makePhone(params.seed, '300'),
+      twilioPhoneNumberSid: makeSid('PN', `${params.seed}phone`),
+      twilioPrimaryNumberSid: makeSid('PX', `${params.seed}primary`),
+      twilioMessagingServiceSid: makeSid('MG', `${params.seed}service`),
+      twilioSubaccountSid: makeSid('AC', `${params.seed}subaccount`),
+      ownerInviteSentAt: now,
+      notificationSettings: {
+        create: {
+          ownerEmail: `owner-${params.seed.slice(0, 8)}@example.com`,
+          ownerPhone: makePhone(params.seed, '200'),
+        },
+      },
+    },
+  });
+
+  const call = await db.call.create({
+    data: {
+      businessId: business.id,
+      twilioCallSid: makeSid('CA', `${params.seed}call`),
+      fromPhone: makePhone(params.seed, '400'),
+      fromPhoneNormalized: makePhone(params.seed, '400'),
+      toPhone: business.twilioPrimaryPhoneNumber!,
+      toPhoneNormalized: business.twilioPrimaryPhoneNumber!,
+      status: 'MISSED',
+      missed: true,
+    },
+  });
+
+  const lead = await db.lead.create({
+    data: {
+      businessId: business.id,
+      callId: call.id,
+      callerPhone: call.fromPhone,
+      callerPhoneNormalized: call.fromPhoneNormalized,
+      summary: 'Reset candidate lead',
+    },
+  });
+
+  await db.message.create({
+    data: {
+      businessId: business.id,
+      leadId: lead.id,
+      direction: 'OUTBOUND',
+      participant: 'LEAD',
+      fromPhone: business.twilioPrimaryPhoneNumber!,
+      toPhone: lead.callerPhoneNormalized,
+      body: 'Reset candidate outbound message',
+    },
+  });
+
+  await db.ownerNotification.create({
+    data: {
+      businessId: business.id,
+      leadId: lead.id,
+      channel: 'SMS',
+      destination: makePhone(params.seed, '200'),
+      body: 'Reset candidate owner notification',
+    },
+  });
+
+  await db.businessOperatorEvent.create({
+    data: {
+      businessId: business.id,
+      type: 'admin.reset_candidate_created',
+      category: 'ADMIN_ACTIONS',
+      status: 'INFO',
+      summary: 'Reset candidate created',
+    },
+  });
+
+  await db.simulatorRun.create({
+    data: {
+      businessId: business.id,
+      leadId: lead.id,
+      publicId: `sim_${params.seed.replace(/-/g, '')}`,
+      callerPhone: lead.callerPhoneNormalized,
+    },
+  });
+
+  await db.smsConsent.create({
+    data: {
+      businessId: business.id,
+      phoneNormalized: lead.callerPhoneNormalized,
+      phoneRawLastSeen: lead.callerPhone,
+      optedOut: false,
+    },
+  });
+
+  return { business, call, lead };
+}
+
+test('bulkDeleteTestDemoBusinesses deletes only test/demo businesses and cascades business-owned data', async () => {
+  const seed = randomUUID();
+  const preservedSeed = randomUUID();
+  const deletable = await seedResetCandidateBusiness({ seed, testBusiness: true });
+  const preserved = await seedResetCandidateBusiness({ seed: preservedSeed, testBusiness: false });
+
+  try {
+    const result = await bulkDeleteTestDemoBusinesses({
+      confirmation: BULK_TEST_DATA_RESET_CONFIRMATION,
+      candidateIds: [deletable.business.id, preserved.business.id],
+    });
+
+    assert.equal(result.deletedCount >= 1, true);
+    assert.equal(result.deletedBusinessNames.includes(deletable.business.name), true);
+
+    assert.equal(await db.business.findUnique({ where: { id: deletable.business.id } }), null);
+    assert.equal(await db.call.findUnique({ where: { id: deletable.call.id } }), null);
+    assert.equal(await db.lead.findUnique({ where: { id: deletable.lead.id } }), null);
+    assert.equal(await db.message.count({ where: { businessId: deletable.business.id } }), 0);
+    assert.equal(await db.ownerNotification.count({ where: { businessId: deletable.business.id } }), 0);
+    assert.equal(await db.businessOperatorEvent.count({ where: { businessId: deletable.business.id } }), 0);
+    assert.equal(await db.businessNotificationSettings.count({ where: { businessId: deletable.business.id } }), 0);
+    assert.equal(await db.simulatorRun.count({ where: { businessId: deletable.business.id } }), 0);
+    assert.equal(await db.smsConsent.count({ where: { businessId: deletable.business.id } }), 0);
+
+    assert.notEqual(await db.business.findUnique({ where: { id: preserved.business.id } }), null);
+    assert.equal(await db.message.count({ where: { businessId: preserved.business.id } }) > 0, true);
+  } finally {
+    await db.business.deleteMany({ where: { id: { in: [deletable.business.id, preserved.business.id] } } });
+  }
+});
+
+test('isTestDemoBusiness includes the dedicated demo workspace even without the test flag', () => {
+  assert.equal(
+    isTestDemoBusiness({
+      isTestBusiness: false,
+      ownerClerkId: DEMO_OWNER_CLERK_ID,
+    }),
+    true
+  );
+});
+
+test('bulkDeleteTestDemoBusinesses requires explicit confirmation and preserves data when confirmation is wrong', async () => {
+  const seed = randomUUID();
+  const businessRecord = await seedResetCandidateBusiness({ seed, testBusiness: true });
+
+  try {
+    await assert.rejects(
+      bulkDeleteTestDemoBusinesses({
+        confirmation: 'delete please',
+        candidateIds: [businessRecord.business.id],
+      }),
+      /DELETE TEST BUSINESSES/
+    );
+
+    assert.notEqual(await db.business.findUnique({ where: { id: businessRecord.business.id } }), null);
+  } finally {
+    await db.business.deleteMany({ where: { id: businessRecord.business.id } });
+  }
+});
diff --git a/tests/business-upsert.test.ts b/tests/business-upsert.test.ts
new file mode 100644
index 0000000..91dafa4
--- /dev/null
+++ b/tests/business-upsert.test.ts
@@ -0,0 +1,52 @@
+import assert from 'node:assert/strict';
+import { randomUUID } from 'node:crypto';
+import test from 'node:test';
+
+import { TwilioAccountMode, TwilioNumberSetupMode } from '@prisma/client';
+
+import { upsertBusinessForOwner } from '../lib/business.ts';
+import { db } from '../lib/db.ts';
+
+test('upsertBusinessForOwner persists the selected Twilio account mode and number path', async () => {
+  const seed = randomUUID();
+  const ownerClerkId = `owner-${seed}`;
+
+  try {
+    const created = await upsertBusinessForOwner(ownerClerkId, {
+      name: `Acme ${seed.slice(0, 6)}`,
+      forwardingNumber: '+15125550100',
+      notifyPhone: '+15125550101',
+      ownerEmail: `owner-${seed.slice(0, 8)}@example.com`,
+      twilioAccountMode: TwilioAccountMode.MAIN_ACCOUNT,
+      twilioNumberSetupMode: TwilioNumberSetupMode.EXISTING_NUMBER,
+      missedCallSeconds: 20,
+      serviceLabel1: 'Repair',
+      serviceLabel2: 'Install',
+      serviceLabel3: 'Maintenance',
+      timezone: 'America/New_York',
+    });
+
+    assert.equal(created.twilioAccountMode, TwilioAccountMode.MAIN_ACCOUNT);
+    assert.equal(created.twilioNumberSetupMode, TwilioNumberSetupMode.EXISTING_NUMBER);
+
+    const updated = await upsertBusinessForOwner(ownerClerkId, {
+      name: `Acme ${seed.slice(0, 6)} Updated`,
+      forwardingNumber: '+15125550199',
+      notifyPhone: '+15125550102',
+      ownerEmail: `owner-${seed.slice(0, 8)}@example.com`,
+      twilioAccountMode: TwilioAccountMode.BUSINESS_SUBACCOUNT,
+      twilioNumberSetupMode: TwilioNumberSetupMode.NEW_NUMBER,
+      missedCallSeconds: 25,
+      serviceLabel1: 'Repair',
+      serviceLabel2: 'Install',
+      serviceLabel3: 'Maintenance',
+      timezone: 'America/New_York',
+    });
+
+    assert.equal(updated.twilioAccountMode, TwilioAccountMode.BUSINESS_SUBACCOUNT);
+    assert.equal(updated.twilioNumberSetupMode, TwilioNumberSetupMode.NEW_NUMBER);
+    assert.equal(updated.forwardingNumber, '+15125550199');
+  } finally {
+    await db.business.deleteMany({ where: { ownerClerkId } });
+  }
+});
diff --git a/tests/managed-twilio-status.test.ts b/tests/managed-twilio-status.test.ts
index 5986e0b..953dfaa 100644
--- a/tests/managed-twilio-status.test.ts
+++ b/tests/managed-twilio-status.test.ts
@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
 
-import { ManagedTwilioStatus, SubscriptionStatus } from '@prisma/client';
+import { ManagedTwilioStatus, SubscriptionStatus, TwilioAccountMode } from '@prisma/client';
 
 import { getManagedTwilioStatusSummary, resolveManagedTwilioStatus } from '../lib/managed-twilio-status.ts';
 import { getCustomerSystemStatus } from '../lib/system-status.ts';
@@ -10,6 +10,7 @@ function createManagedBusiness(
   overrides: Record<string, unknown> = {}
 ) {
   return {
+    twilioAccountMode: TwilioAccountMode.BUSINESS_SUBACCOUNT,
     managedTwilioStatus: ManagedTwilioStatus.DRAFT,
     twilioSubaccountSid: null,
     twilioPrimaryPhoneNumber: null,
diff --git a/tests/pilot-safety.test.ts b/tests/pilot-safety.test.ts
index cf5629d..caa1b88 100644
--- a/tests/pilot-safety.test.ts
+++ b/tests/pilot-safety.test.ts
@@ -13,8 +13,22 @@ test('settings page no longer exposes shared Twilio number inventory', () => {
   const settingsPage = read('app/app/settings/page.tsx');
 
   assert.doesNotMatch(settingsPage, /incomingPhoneNumbers\.list/);
-  assert.match(settingsPage, /internal platform IDs stay server-side/i);
-  assert.match(settingsPage, /CallbackCloser handles the business texting line and messaging setup for you/i);
+  assert.match(settingsPage, /account mode/);
+  assert.match(settingsPage, /Existing-number support stays honest/i);
+});
+
+test('onboarding page persists Twilio account mode before the shared setup flow continues', () => {
+  const onboardingPage = read('app/app/onboarding/page.tsx');
+  const onboardingAction = read('app/app/onboarding/actions.ts');
+  const twilioSetup = read('lib/twilio-setup.ts');
+
+  assert.match(onboardingPage, /Twilio account mode/i);
+  assert.match(onboardingPage, /TwilioSetupChecklist/);
+  assert.match(onboardingPage, /twilioAccountModeOptions/);
+  assert.match(onboardingPage, /twilioNumberSetupModeOptions/);
+  assert.match(twilioSetup, /Business subaccount \(recommended\)/i);
+  assert.match(twilioSetup, /Main account/i);
+  assert.doesNotMatch(onboardingAction, /provisionPhoneNumber/);
 });
 
 test('landing page product promise stays aligned to missed-call recovery workflow', () => {
@@ -26,7 +40,9 @@ test('landing page product promise stays aligned to missed-call recovery workflo
 
 test('message delivery issue helpers flag failed and fallback statuses', () => {
   assert.equal(isMessageDeliveryIssueStatus('failed'), true);
+  assert.equal(isMessageDeliveryIssueStatus('undelivered'), true);
   assert.equal(isMessageDeliveryIssueStatus('fallback_webhook_response'), true);
   assert.equal(isMessageDeliveryIssueStatus('delivered'), false);
+  assert.equal(formatMessageStatus('undelivered'), 'Undelivered');
   assert.equal(formatMessageStatus('fallback_webhook_response'), 'Sent via webhook fallback');
 });
diff --git a/tests/twilio-messaging.test.ts b/tests/twilio-messaging.test.ts
new file mode 100644
index 0000000..d64c877
--- /dev/null
+++ b/tests/twilio-messaging.test.ts
@@ -0,0 +1,69 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { OperatorEventCategory, OperatorEventStatus } from '@prisma/client';
+
+import { buildOutboundMessageStatusEvent, getOutboundMessageContext } from '../lib/outbound-message-events.ts';
+
+test('outbound message context distinguishes admin test, owner alert, and lead flows', () => {
+  assert.equal(
+    getOutboundMessageContext({
+      leadId: null,
+      participant: 'OWNER',
+      body: 'CallbackCloser admin test: Acme Plumbing is using +15550001111 for live support verification.',
+    }),
+    'admin_test'
+  );
+
+  assert.equal(
+    getOutboundMessageContext({
+      leadId: 'lead_123',
+      participant: 'OWNER',
+      body: 'CallbackCloser lead for Acme Plumbing: Emergency repair.',
+    }),
+    'owner_alert'
+  );
+
+  assert.equal(
+    getOutboundMessageContext({
+      leadId: 'lead_456',
+      participant: 'LEAD',
+      body: 'What service do you need help with?',
+    }),
+    'lead_recovery'
+  );
+});
+
+test('terminal outbound message status events stay founder-facing', () => {
+  const deliveredTest = buildOutboundMessageStatusEvent(
+    {
+      leadId: null,
+      participant: 'OWNER',
+      body: 'CallbackCloser admin test: Acme Plumbing is using +15550001111 for live support verification.',
+    },
+    'delivered'
+  );
+
+  assert.deepEqual(deliveredTest, {
+    type: 'admin.test_sms_delivered',
+    category: OperatorEventCategory.ADMIN_ACTIONS,
+    status: OperatorEventStatus.SUCCESS,
+    summary: 'Test SMS delivered',
+  });
+
+  const failedOwnerAlert = buildOutboundMessageStatusEvent(
+    {
+      leadId: 'lead_123',
+      participant: 'OWNER',
+      body: 'CallbackCloser lead for Acme Plumbing: Emergency repair.',
+    },
+    'undelivered'
+  );
+
+  assert.deepEqual(failedOwnerAlert, {
+    type: 'owner_alert.sms_delivery_failed',
+    category: OperatorEventCategory.OWNER_ALERTS,
+    status: OperatorEventStatus.FAILED,
+    summary: 'Owner SMS alert delivery failed',
+  });
+});
diff --git a/tests/twilio-provision.test.ts b/tests/twilio-provision.test.ts
index eb5c5fd..ed67735 100644
--- a/tests/twilio-provision.test.ts
+++ b/tests/twilio-provision.test.ts
@@ -8,6 +8,7 @@ test('managed provisioning input reuses existing subaccount, messaging service,
     {
       id: 'biz_123',
       name: 'Acme Plumbing',
+      twilioAccountMode: 'BUSINESS_SUBACCOUNT',
       twilioSubaccountSid: 'AC_SUBACCOUNT',
       twilioMessagingServiceSid: 'MG_SERVICE',
       twilioPrimaryNumberSid: null,
@@ -21,6 +22,7 @@ test('managed provisioning input reuses existing subaccount, messaging service,
   assert.deepEqual(input, {
     id: 'biz_123',
     name: 'Acme Plumbing',
+    twilioAccountMode: 'BUSINESS_SUBACCOUNT',
     twilioSubaccountSid: 'AC_SUBACCOUNT',
     twilioMessagingServiceSid: 'MG_SERVICE',
     twilioPrimaryNumberSid: 'PN_FALLBACK',
@@ -33,6 +35,7 @@ test('managed provisioning input falls back to the provided business name when t
     {
       id: 'biz_123',
       name: '',
+      twilioAccountMode: 'BUSINESS_SUBACCOUNT',
       twilioSubaccountSid: null,
       twilioMessagingServiceSid: null,
       twilioPrimaryNumberSid: null,
diff --git a/tests/twilio-setup-flow.test.ts b/tests/twilio-setup-flow.test.ts
new file mode 100644
index 0000000..00ddabe
--- /dev/null
+++ b/tests/twilio-setup-flow.test.ts
@@ -0,0 +1,126 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { BusinessProvisioningStatus, ManagedTwilioStatus, TwilioAccountMode, TwilioNumberSetupMode } from '@prisma/client';
+
+import { buildTwilioSetupFlow } from '../lib/twilio-setup.ts';
+
+function createBusiness(overrides: Record<string, unknown> = {}) {
+  return {
+    name: 'Acme Plumbing',
+    notifyPhone: '+15551234567',
+    forwardingNumber: '+15557654321',
+    provisioningStatus: BusinessProvisioningStatus.ONBOARDING,
+    twilioAccountMode: TwilioAccountMode.BUSINESS_SUBACCOUNT,
+    twilioNumberSetupMode: TwilioNumberSetupMode.NEW_NUMBER,
+    twilioSubaccountSid: 'AC_TEST_SUBACCOUNT',
+    twilioMessagingServiceSid: 'MG_TEST_SERVICE',
+    twilioPrimaryNumberSid: 'PN_TEST_PRIMARY',
+    twilioPhoneNumberSid: 'PN_TEST_PRIMARY',
+    twilioPrimaryPhoneNumber: '+15550001111',
+    twilioPhoneNumber: '+15550001111',
+    twilioWebhookSyncedAt: new Date('2026-04-20T00:00:00.000Z'),
+    managedTwilioStatus: ManagedTwilioStatus.COMPLIANT_LIVE,
+    a2pCustomerProfileSid: 'BU_TEST_PROFILE',
+    a2pBrandSid: 'BN_TEST_BRAND',
+    a2pCampaignSid: 'QE_TEST_CAMPAIGN',
+    a2pFailureReason: null,
+    a2pApprovedAt: new Date('2026-04-20T00:00:00.000Z'),
+    ...overrides,
+  };
+}
+
+function createNotificationSettings(overrides: Record<string, unknown> = {}) {
+  return {
+    ownerPhone: '+15551234567',
+    ownerEmail: 'owner@example.com',
+    ...overrides,
+  };
+}
+
+function createWebhookSnapshot(overrides: Record<string, unknown> = {}) {
+  return {
+    voiceSynced: true,
+    smsSynced: true,
+    statusSynced: true,
+    currentVoiceUrl: 'https://callbackcloser.com/api/twilio/voice',
+    currentSmsUrl: 'https://callbackcloser.com/api/twilio/sms',
+    currentStatusUrl: 'https://callbackcloser.com/api/twilio/status',
+    expectedVoiceUrl: 'https://callbackcloser.com/api/twilio/voice',
+    expectedSmsUrl: 'https://callbackcloser.com/api/twilio/sms',
+    expectedStatusUrl: 'https://callbackcloser.com/api/twilio/status',
+    error: null,
+    ...overrides,
+  };
+}
+
+test('main account mode removes the subaccount blocker but keeps the mode explicit', () => {
+  const flow = buildTwilioSetupFlow({
+    business: createBusiness({
+      twilioAccountMode: 'MAIN_ACCOUNT',
+      twilioSubaccountSid: null,
+    }),
+    notificationSettings: createNotificationSettings(),
+    ownerConnected: true,
+    successfulLeadCount: 0,
+    testSmsState: 'not_started',
+    webhookSnapshot: createWebhookSnapshot(),
+  });
+
+  const accountStep = flow.steps.find((step) => step.key === 'account_ready');
+  assert.equal(flow.accountModeLabel, 'Main account');
+  assert.equal(accountStep?.complete, true);
+  assert.match(accountStep?.detail || '', /parent Twilio account directly/i);
+});
+
+test('safe-to-go-live stays blocked until test SMS and missed-call validation both pass', () => {
+  const blocked = buildTwilioSetupFlow({
+    business: createBusiness(),
+    notificationSettings: createNotificationSettings(),
+    ownerConnected: true,
+    successfulLeadCount: 0,
+    testSmsState: 'pending_delivery',
+    webhookSnapshot: createWebhookSnapshot(),
+  });
+
+  assert.equal(blocked.safeToMarkLive, false);
+  assert.match(blocked.liveGateDetail, /deliver a test SMS/i);
+  assert.match(blocked.liveGateDetail, /validate the missed-call flow/i);
+
+  const ready = buildTwilioSetupFlow({
+    business: createBusiness(),
+    notificationSettings: createNotificationSettings(),
+    ownerConnected: true,
+    successfulLeadCount: 1,
+    testSmsState: 'delivered',
+    webhookSnapshot: createWebhookSnapshot(),
+  });
+
+  assert.equal(ready.safeToMarkLive, true);
+  assert.match(ready.liveGateDetail, /safe to mark live/i);
+});
+
+test('existing-number path messaging stays truthful about admin assistance', () => {
+  const flow = buildTwilioSetupFlow({
+    business: createBusiness({
+      twilioNumberSetupMode: 'EXISTING_NUMBER',
+      twilioPrimaryNumberSid: null,
+      twilioPhoneNumberSid: null,
+      twilioPrimaryPhoneNumber: null,
+      twilioPhoneNumber: null,
+    }),
+    notificationSettings: createNotificationSettings(),
+    ownerConnected: true,
+    successfulLeadCount: 0,
+    testSmsState: 'not_started',
+    webhookSnapshot: createWebhookSnapshot({
+      voiceSynced: false,
+      smsSynced: false,
+      statusSynced: false,
+    }),
+  });
+
+  const numberPathStep = flow.steps.find((step) => step.key === 'number_path');
+  assert.match(numberPathStep?.detail || '', /admin-assisted/i);
+  assert.match(numberPathStep?.detail || '', /selected Twilio account context/i);
+});