@pellux/goodvibes-tui 0.19.31 → 0.19.33

package/src/cli/management.ts

@@ -21,6 +21,7 @@ import { inspectProviderAuth } from '@pellux/goodvibes-sdk/platform/runtime/auth
 import { getOrCreateCompanionToken, buildCompanionConnectionInfo, encodeConnectionPayload, formatConnectionBlock } from '@pellux/goodvibes-sdk/platform/pairing/index';
 import { generateQrMatrix, renderQrToString } from '@pellux/goodvibes-sdk/platform/pairing/qr-generator';
 import type { GoodVibesCliParseResult } from './types.ts';
+import { formatProviderAuthRoute, summarizeProviderAuthRoutes } from './provider-auth-routes.ts';
 import { classifyProviderSetup } from './provider-classification.ts';
 import { resolveRuntimeEndpointBinding } from './endpoints.ts';
 import { applyRuntimeEndpointFlagOverrides } from './config-overrides.ts';
@@ -378,11 +379,23 @@ async function renderProviders(runtime: CliCommandRuntime): Promise<string> {
     const snapshots = await listProviderRuntimeSnapshots(services.providerRegistry);
     const current = services.providerRegistry.getCurrentModel();
     if (sub === 'current') {
-      const value = { provider: current.provider, model: current.registryKey };
+      const snapshot = snapshots.find((candidate) => candidate.providerId === current.provider);
+      const authRoutes = snapshot?.runtime.auth?.routes ?? [];
+      const value = {
+        provider: current.provider,
+        model: current.registryKey,
+        configured: snapshot?.runtime.auth?.configured ?? true,
+        configuredVia: snapshot?.runtime.auth?.mode ?? 'unknown',
+        authRoutes,
+        authRouteSummary: summarizeProviderAuthRoutes(authRoutes),
+      };
       return formatJsonOrText(runtime.cli)(value, [
         'GoodVibes current provider',
         `  provider: ${current.provider}`,
         `  model: ${current.registryKey}`,
+        `  configured: ${yesNo(value.configured)}`,
+        `  via: ${value.configuredVia}`,
+        `  auth routes: ${value.authRouteSummary}`,
       ].join('\n'));
     }
     if (sub === 'use' || sub === 'set') {
@@ -417,13 +430,21 @@ async function renderProviders(runtime: CliCommandRuntime): Promise<string> {
         configured: snapshot.runtime.auth?.configured ?? true,
         modelCount: snapshot.modelCount,
       });
-      return formatJsonOrText(runtime.cli)({ ...snapshot, setup }, [
+      const authRoutes = snapshot.runtime.auth?.routes ?? [];
+      return formatJsonOrText(runtime.cli)({
+        ...snapshot,
+        setup,
+        authRoutes,
+        authRouteSummary: summarizeProviderAuthRoutes(authRoutes),
+      }, [
         `Provider ${snapshot.providerId}`,
         `  active: ${yesNo(snapshot.active)}`,
         `  setup: ${setup.setupLabel}`,
         `  configured: ${yesNo(snapshot.runtime.auth?.configured ?? true)}`,
         `  via: ${snapshot.runtime.auth?.mode ?? 'unknown'}`,
         `  models: ${snapshot.modelCount}`,
+        `  auth routes: ${summarizeProviderAuthRoutes(authRoutes)}`,
+        ...authRoutes.map((route) => `    ${formatProviderAuthRoute(route)}`),
         `  detail: ${snapshot.runtime.auth?.detail ?? snapshot.runtime.notes?.join('; ') ?? ''}`,
       ].join('\n'));
     }
@@ -442,11 +463,13 @@ async function renderProviders(runtime: CliCommandRuntime): Promise<string> {
       models: snapshot.modelCount,
       current: current.provider === snapshot.providerId,
       detail: snapshot.runtime.auth?.detail ?? snapshot.runtime.notes?.join('; ') ?? '',
+      authRoutes: snapshot.runtime.auth?.routes ?? [],
+      authRouteSummary: summarizeProviderAuthRoutes(snapshot.runtime.auth?.routes),
     }));
     return formatJsonOrText(runtime.cli)(value, [
       'GoodVibes providers',
       ...value.map((provider) =>
-        `  ${provider.current ? '*' : ' '} ${provider.provider.padEnd(18)} setup=${provider.setupClass} configured=${yesNo(provider.configured)} via=${provider.configuredVia ?? 'n/a'} models=${provider.models} ${provider.detail ?? ''}`.trimEnd(),
+        `  ${provider.current ? '*' : ' '} ${provider.provider.padEnd(18)} setup=${provider.setupClass} configured=${yesNo(provider.configured)} via=${provider.configuredVia ?? 'n/a'} models=${provider.models} routes=${provider.authRouteSummary} ${provider.detail ?? ''}`.trimEnd(),
       ),
     ].join('\n'));
   });

package/src/cli/provider-auth-routes.ts

@@ -0,0 +1,22 @@
+import type { ProviderAuthRouteDescriptor } from '@pellux/goodvibes-sdk/platform/providers/interface';
+
+function routeUsable(route: ProviderAuthRouteDescriptor): boolean {
+  return route.usable ?? route.configured;
+}
+
+export function summarizeProviderAuthRoutes(routes: readonly ProviderAuthRouteDescriptor[] | undefined): string {
+  if (!routes?.length) return 'n/a';
+  const configured = routes.filter((route) => route.configured).length;
+  const usable = routes.filter(routeUsable).length;
+  return `${configured}/${routes.length} configured, ${usable}/${routes.length} usable`;
+}
+
+export function formatProviderAuthRoute(route: ProviderAuthRouteDescriptor): string {
+  const status = [
+    route.configured ? 'configured' : 'not configured',
+    routeUsable(route) ? 'usable' : 'not usable',
+    route.freshness,
+  ].filter((part): part is string => Boolean(part));
+  const detail = route.detail?.trim();
+  return `${route.label} [${route.route}; ${status.join(', ')}]${detail ? ` - ${detail}` : ''}`;
+}

package/src/input/command-registry.ts

@@ -19,6 +19,7 @@ import type { OpsApi } from '@pellux/goodvibes-sdk/platform/runtime/ops-api';
 import type { OperatorClient } from '@pellux/goodvibes-sdk/platform/runtime/operator-client';
 import type { PeerClient } from '@pellux/goodvibes-sdk/platform/runtime/peer-client';
 import type { DirectTransport } from '@pellux/goodvibes-sdk/platform/runtime/transports/direct';
+import type { VoiceProviderRegistry, VoiceService } from '@pellux/goodvibes-sdk/platform/voice/index';
 import type {
   CommandWorkspaceShellServices,
 } from '@pellux/goodvibes-sdk/platform/runtime/shell-command-workspace';
@@ -58,6 +59,8 @@ export interface CommandUiActions {
   print: (text: string) => void;
   exit: () => void;
   submitInput?: (text: string, content?: import('@pellux/goodvibes-sdk/platform/providers/interface').ContentPart[]) => void;
+  submitSpokenInput?: (text: string, content?: import('@pellux/goodvibes-sdk/platform/providers/interface').ContentPart[]) => void;
+  stopSpokenOutput?: () => void;
   executeCommand?: (name: string, args: string[]) => Promise<boolean>;
   cancelGeneration?: () => void;
   completeModelSelection?: (selection: {
@@ -76,6 +79,7 @@ export interface CommandShellUiOpeners {
   reloadSystemPrompt?: () => string;
   openOnboardingWizard?: (modeOrOptions?: OnboardingWizardMode | OpenOnboardingWizardOptions) => void;
   openModelPicker?: () => void;
+  openModelPickerWithTarget?: (target: import('./model-picker.ts').ModelPickerTarget) => boolean;
   openProviderPicker?: () => void;
   openContextInspector?: () => void;
   openBookmarkModal?: () => void;
@@ -146,6 +150,8 @@ export interface CommandWorkspaceServices
 export interface CommandPlatformConfigServices {
   readonly config: DeepReadonly<GoodVibesConfig>;
   readonly configManager: ConfigManager;
+  readonly voiceProviderRegistry?: VoiceProviderRegistry;
+  readonly voiceService?: VoiceService;
 }
 
 export interface CommandPlatformServices

package/src/input/commands/tts-runtime.ts

@@ -0,0 +1,334 @@
+import type { ConfigKey } from '@pellux/goodvibes-sdk/platform/config/schema';
+import type { CommandContext, CommandRegistry } from '../command-registry.ts';
+import type { SelectionItem } from '../selection-modal.ts';
+
+const TTS_CONFIG_KEYS = new Set(['provider', 'voice', 'llm-provider', 'llm-model']);
+
+export function registerTtsRuntimeCommands(registry: CommandRegistry): void {
+  registry.register({
+    name: 'tts',
+    description: 'Submit a normal prompt and play the assistant response through live TTS',
+    usage: '<prompt>|stop',
+    handler(args, ctx) {
+      const first = (args[0] ?? '').toLowerCase();
+      if (first === 'stop' || first === 'cancel') {
+        ctx.stopSpokenOutput?.();
+        ctx.print('Live TTS playback stopped.');
+        return;
+      }
+
+      const prompt = args.join(' ').trim();
+      if (!prompt) {
+        ctx.print('Usage: /tts <prompt> or /tts stop');
+        return;
+      }
+      if (!ctx.submitSpokenInput) {
+        ctx.print('Live TTS is not available in this runtime.');
+        return;
+      }
+      ctx.submitSpokenInput(prompt);
+    },
+  });
+
+  registry.register({
+    name: 'config-tts',
+    aliases: ['tts-config'],
+    description: 'Configure live TTS provider, voice, and optional spoken-turn LLM overrides',
+    usage: '[show|providers|voices [provider]|provider <id|clear>|voice <id|clear>|llm|llm clear|llm-provider <id|clear>|llm-model <id|clear>]',
+    async handler(args, ctx) {
+      const sub = (args[0] ?? 'show').toLowerCase();
+      if (sub === 'show') {
+        if (args.length === 0 && openTtsConfigModal(ctx)) return;
+        ctx.print(formatTtsConfig(ctx));
+        return;
+      }
+      if (sub === 'providers') {
+        if (openTtsProviderPicker(ctx)) return;
+        printTtsProviders(ctx);
+        return;
+      }
+      if (sub === 'voices') {
+        if (await openTtsVoicePicker(ctx, args[1])) return;
+        await printTtsVoices(ctx, args[1]);
+        return;
+      }
+      if (sub === 'llm' || sub === 'model') {
+        const action = (args[1] ?? '').toLowerCase();
+        if (action === 'clear' || action === 'default') {
+          setTtsConfigValue(ctx, 'tts.llmProvider', '');
+          setTtsConfigValue(ctx, 'tts.llmModel', '');
+          ctx.print('TTS LLM override cleared. /tts will use the current chat model.');
+          return;
+        }
+        if (ctx.openModelPickerWithTarget?.('tts')) return;
+        ctx.print('TTS LLM picker is not available in this runtime. Use /config-tts llm-provider <id> and /config-tts llm-model <model>.');
+        return;
+      }
+      if (TTS_CONFIG_KEYS.has(sub)) {
+        const value = args.slice(1).join(' ').trim();
+        if (!value) {
+          ctx.print(`Usage: /config-tts ${sub} <value|clear>`);
+          return;
+        }
+        const key = ttsConfigKeyForSubcommand(sub);
+        const nextValue = value.toLowerCase() === 'clear' ? '' : value;
+        const previousProvider = key === 'tts.provider'
+          ? String(ctx.platform.configManager.get('tts.provider') ?? '').trim()
+          : '';
+        setTtsConfigValue(ctx, key, nextValue);
+        if (key === 'tts.provider' && previousProvider && previousProvider !== nextValue) {
+          setTtsConfigValue(ctx, 'tts.voice', '');
+        }
+        ctx.print(`${key} ${nextValue ? `set to ${nextValue}` : 'cleared'}.`);
+        return;
+      }
+      ctx.print('Usage: /config-tts [show|providers|voices [provider]|provider <id|clear>|voice <id|clear>|llm|llm clear|llm-provider <id|clear>|llm-model <id|clear>]');
+    },
+  });
+}
+
+function ttsConfigKeyForSubcommand(subcommand: string): ConfigKey {
+  switch (subcommand) {
+    case 'provider': return 'tts.provider';
+    case 'voice': return 'tts.voice';
+    case 'llm-provider': return 'tts.llmProvider';
+    case 'llm-model': return 'tts.llmModel';
+    default: throw new Error(`Unknown TTS config key: ${subcommand}`);
+  }
+}
+
+function formatTtsConfig(ctx: CommandContext): string {
+  const cm = ctx.platform.configManager;
+  const llmProvider = String(cm.get('tts.llmProvider') ?? '').trim();
+  const llmModel = String(cm.get('tts.llmModel') ?? '').trim();
+  return [
+    'TTS Configuration',
+    `  provider: ${formatValue(cm.get('tts.provider'))}`,
+    `  voice: ${formatValue(cm.get('tts.voice'))}`,
+    `  spoken-turn llm provider override: ${llmProvider || '(current chat provider)'}`,
+    `  spoken-turn llm model override: ${llmModel || '(current chat model)'}`,
+    '  playback: live streaming through local mpv or ffplay',
+    '  commands: /tts <prompt>, /tts stop, /config-tts, /config-tts providers, /config-tts voices [provider], /config-tts llm',
+  ].join('\n');
+}
+
+function openTtsConfigModal(ctx: CommandContext): boolean {
+  if (!ctx.openSelection) return false;
+  const cm = ctx.platform.configManager;
+  const provider = String(cm.get('tts.provider') ?? '').trim() || '(default)';
+  const voice = String(cm.get('tts.voice') ?? '').trim() || '(provider default)';
+  const llmProvider = String(cm.get('tts.llmProvider') ?? '').trim();
+  const llmModel = String(cm.get('tts.llmModel') ?? '').trim();
+  const llm = llmProvider || llmModel ? `${llmProvider || 'provider'} / ${llmModel || 'model'}` : '(current chat model)';
+  const items: SelectionItem[] = [
+    {
+      id: 'provider',
+      label: 'TTS provider',
+      detail: provider,
+      category: 'speech output',
+      primaryAction: 'select',
+      actions: '[Enter] choose',
+    },
+    {
+      id: 'voice',
+      label: 'TTS voice',
+      detail: voice,
+      category: 'speech output',
+      primaryAction: 'select',
+      actions: '[Enter] choose',
+    },
+    {
+      id: 'llm',
+      label: 'TTS response model override',
+      detail: llm,
+      category: 'response generation',
+      primaryAction: 'select',
+      actions: '[Enter] choose model',
+    },
+    {
+      id: 'clear-voice',
+      label: 'Use provider default voice',
+      detail: 'clears tts.voice',
+      category: 'clear values',
+      primaryAction: 'select',
+    },
+    {
+      id: 'clear-llm',
+      label: 'Use current chat model for /tts',
+      detail: 'clears tts.llmProvider and tts.llmModel',
+      category: 'clear values',
+      primaryAction: 'select',
+    },
+  ];
+
+  ctx.openSelection('TTS Configuration', items, { allowSearch: true }, (result) => {
+    if (!result) return;
+    if (result.item.id === 'provider') {
+      openTtsProviderPicker(ctx);
+      return;
+    }
+    if (result.item.id === 'voice') {
+      void openTtsVoicePicker(ctx);
+      return;
+    }
+    if (result.item.id === 'llm') {
+      if (!ctx.openModelPickerWithTarget?.('tts')) {
+        ctx.print('TTS LLM picker is not available in this runtime.');
+      }
+      return;
+    }
+    if (result.item.id === 'clear-voice') {
+      setTtsConfigValue(ctx, 'tts.voice', '');
+      ctx.print('TTS voice cleared. The provider default voice will be used.');
+      return;
+    }
+    if (result.item.id === 'clear-llm') {
+      setTtsConfigValue(ctx, 'tts.llmProvider', '');
+      setTtsConfigValue(ctx, 'tts.llmModel', '');
+      ctx.print('TTS LLM override cleared. /tts will use the current chat model.');
+    }
+  });
+  return true;
+}
+
+function getStreamingTtsProviders(ctx: CommandContext): Array<{ id: string; label: string; capabilities: readonly string[] }> {
+  const registry = ctx.platform.voiceProviderRegistry;
+  if (!registry) {
+    return [];
+  }
+  return registry.list().filter((provider) => provider.capabilities.includes('tts-stream'));
+}
+
+function openTtsProviderPicker(ctx: CommandContext): boolean {
+  if (!ctx.openSelection) return false;
+  const registry = ctx.platform.voiceProviderRegistry;
+  if (!registry) {
+    ctx.print('Voice provider registry is not available in this runtime.');
+    return true;
+  }
+  const providers = getStreamingTtsProviders(ctx);
+  if (providers.length === 0) {
+    ctx.print('No streaming TTS providers are registered.');
+    return true;
+  }
+  const current = String(ctx.platform.configManager.get('tts.provider') ?? '').trim();
+  const items: SelectionItem[] = providers.map((provider) => ({
+    id: provider.id,
+    label: provider.label,
+    detail: provider.id === current ? `${provider.id}  (current)` : provider.id,
+    category: 'streaming TTS providers',
+    primaryAction: 'select',
+    actions: '[Enter] set provider',
+  }));
+  ctx.openSelection('Choose TTS Provider', items, { preSelectId: current, allowSearch: true }, (result) => {
+    if (!result) return;
+    const previous = String(ctx.platform.configManager.get('tts.provider') ?? '').trim();
+    setTtsConfigValue(ctx, 'tts.provider', result.item.id);
+    if (previous && previous !== result.item.id) {
+      setTtsConfigValue(ctx, 'tts.voice', '');
+      ctx.print(`TTS provider set to ${result.item.id}. TTS voice was cleared because voices are provider-specific.`);
+    } else {
+      ctx.print(`TTS provider set to ${result.item.id}.`);
+    }
+  });
+  return true;
+}
+
+function printTtsProviders(ctx: CommandContext): void {
+  const registry = ctx.platform.voiceProviderRegistry;
+  if (!registry) {
+    ctx.print('Voice provider registry is not available in this runtime.');
+    return;
+  }
+  const providers = getStreamingTtsProviders(ctx);
+  if (providers.length === 0) {
+    ctx.print('No streaming TTS providers are registered.');
+    return;
+  }
+  ctx.print([
+    'Streaming TTS Providers',
+    ...providers.map((provider) => `  ${provider.id}: ${provider.label}`),
+    '',
+    'Set provider: /config-tts provider <provider-id>',
+  ].join('\n'));
+}
+
+async function openTtsVoicePicker(ctx: CommandContext, providerArg?: string): Promise<boolean> {
+  if (!ctx.openSelection) return false;
+  const service = ctx.platform.voiceService;
+  if (!service) {
+    ctx.print('Voice service is not available in this runtime.');
+    return true;
+  }
+  const providerId = (providerArg ?? String(ctx.platform.configManager.get('tts.provider') ?? '')).trim() || undefined;
+  try {
+    const voices = await service.listVoices(providerId);
+    if (voices.length === 0) {
+      ctx.print(providerId ? `No voices returned for ${providerId}.` : 'No TTS voices returned.');
+      return true;
+    }
+    const current = String(ctx.platform.configManager.get('tts.voice') ?? '').trim();
+    const items: SelectionItem[] = [
+      {
+        id: '__default__',
+        label: 'Use provider default voice',
+        detail: current ? 'clears tts.voice' : '(current)',
+        category: 'voice',
+        primaryAction: 'select',
+      },
+      ...voices.map((voice) => ({
+        id: voice.id,
+        label: voice.label || voice.id,
+        detail: voice.id === current ? `${voice.id}  (current)` : voice.id,
+        category: providerId ?? 'voices',
+        primaryAction: 'select' as const,
+        actions: '[Enter] set voice',
+      })),
+    ];
+    ctx.openSelection(`Choose TTS Voice${providerId ? ` (${providerId})` : ''}`, items, { preSelectId: current || '__default__', allowSearch: true }, (result) => {
+      if (!result) return;
+      const nextVoice = result.item.id === '__default__' ? '' : result.item.id;
+      setTtsConfigValue(ctx, 'tts.voice', nextVoice);
+      ctx.print(nextVoice ? `TTS voice set to ${nextVoice}.` : 'TTS voice cleared. The provider default voice will be used.');
+    });
+    return true;
+  } catch (error) {
+    ctx.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
+    return true;
+  }
+}
+
+async function printTtsVoices(ctx: CommandContext, providerArg?: string): Promise<void> {
+  const service = ctx.platform.voiceService;
+  if (!service) {
+    ctx.print('Voice service is not available in this runtime.');
+    return;
+  }
+  const providerId = (providerArg ?? String(ctx.platform.configManager.get('tts.provider') ?? '')).trim() || undefined;
+  try {
+    const voices = await service.listVoices(providerId);
+    if (voices.length === 0) {
+      ctx.print(providerId ? `No voices returned for ${providerId}.` : 'No TTS voices returned.');
+      return;
+    }
+    ctx.print([
+      `TTS Voices${providerId ? ` (${providerId})` : ''}`,
+      ...voices.slice(0, 60).map((voice) => `  ${voice.id}: ${voice.label}`),
+      ...(voices.length > 60 ? [`  ... ${voices.length - 60} more`] : []),
+      '',
+      'Set voice: /config-tts voice <voice-id>',
+      'Use provider default voice: /config-tts voice clear',
+    ].join('\n'));
+  } catch (error) {
+    ctx.print(`Unable to list TTS voices: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+
+function setTtsConfigValue(ctx: CommandContext, key: ConfigKey, value: string): void {
+  ctx.platform.configManager.setDynamic(key, value);
+}
+
+function formatValue(value: unknown): string {
+  const text = String(value ?? '').trim();
+  return text || '(default)';
+}

package/src/input/commands.ts

@@ -54,6 +54,7 @@ import { registerIntelligenceRuntimeCommands } from './commands/intelligence-run
 import { registerConversationRuntimeCommands } from './commands/conversation-runtime.ts';
 import { registerQrcodeRuntimeCommands } from './commands/qrcode-runtime.ts';
 import { registerOnboardingRuntimeCommands } from './commands/onboarding-runtime.ts';
+import { registerTtsRuntimeCommands } from './commands/tts-runtime.ts';
 
 /**
  * registerBuiltinCommands - Register all built-in slash commands into the registry.
@@ -102,6 +103,7 @@ export function registerBuiltinCommands(registry: CommandRegistry): void {
   registerConversationRuntimeCommands(registry);
   registerQrcodeRuntimeCommands(registry);
   registerOnboardingRuntimeCommands(registry);
+  registerTtsRuntimeCommands(registry);
   registerLocalRuntimeCommands(registry);
   registerSessionWorkflowCommands(registry);
   registerDiscoveryRuntimeCommands(registry);

package/src/input/handler-onboarding.ts

@@ -145,6 +145,13 @@ function showOnboardingApplyFeedbackForHandler(handler: InputHandler, feedback:
     handler.requestRender();
   }
 
+function continueOnboardingSection(handler: InputHandler): void {
+    handler.onboardingWizard.commitEdit();
+    handler.onboardingWizard.clearApplyFeedback();
+    handler.onboardingWizard.nextStep();
+    handler.requestRender();
+  }
+
 export function clearOnboardingPendingModelPickerTargetForHandler(handler: InputHandler): void {
     handler.onboardingWizard.clearPendingModelPickerTarget();
   }
@@ -215,6 +222,11 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
       await handler.handleOpenAiSubscriptionFinish();
       return;
     }
+    if (action === 'apply-and-continue') {
+      if (handler.onboardingApplyPending) return;
+      continueOnboardingSection(handler);
+      return;
+    }
     if (action !== 'apply') return;
     if (handler.onboardingApplyPending) return;
     const blockers = handler.onboardingWizard.getBlockingFieldLabels();

package/src/input/model-picker.ts

@@ -12,8 +12,9 @@ export type PickerMode = 'model' | 'provider' | 'effort' | 'contextCap';
  * 'main'   → provider.provider + provider.model (default)
  * 'helper' → helper.globalProvider + helper.globalModel (+ helper.enabled: true)
  * 'tool'   → tools.llmProvider + tools.llmModel (+ tools.llmEnabled: true)
+ * 'tts'    → tts.llmProvider + tts.llmModel
  */
-export type ModelPickerTarget = 'main' | 'helper' | 'tool';
+export type ModelPickerTarget = 'main' | 'helper' | 'tool' | 'tts';
 
 /**
  * Pricing tier filter.

package/src/input/onboarding/onboarding-wizard-steps.ts

@@ -8,7 +8,7 @@ import {
 } from './onboarding-wizard-external-surfaces.ts';
 import { countSelected, modelSelectionLabel, normalizeText } from './onboarding-wizard-helpers.ts';
 import type { OnboardingWizardController } from './onboarding-wizard.ts';
-import type { OnboardingWizardAcknowledgementFieldDefinition, OnboardingWizardChecklistFieldDefinition, OnboardingWizardExternalSurfaceStepId, OnboardingWizardFieldDefinition, OnboardingWizardModelPickerFieldDefinition, OnboardingWizardRadioFieldDefinition, OnboardingWizardRadioOption, OnboardingWizardStepDefinition } from './onboarding-wizard-types.ts';
+import type { OnboardingWizardAcknowledgementFieldDefinition, OnboardingWizardActionFieldDefinition, OnboardingWizardChecklistFieldDefinition, OnboardingWizardExternalSurfaceStepId, OnboardingWizardFieldDefinition, OnboardingWizardModelPickerFieldDefinition, OnboardingWizardRadioFieldDefinition, OnboardingWizardRadioOption, OnboardingWizardStepDefinition } from './onboarding-wizard-types.ts';
 
 export function buildOnboardingWizardSteps(controller: OnboardingWizardController): readonly OnboardingWizardStepDefinition[] {
   if (controller.hydrationPending || controller.hydrationError !== null) return [buildLoadingStep(controller)];
@@ -40,9 +40,32 @@ export function buildOnboardingWizardSteps(controller: OnboardingWizardControlle
   steps.push(buildExperienceStep(controller));
   steps.push(buildReviewStep(controller));
 
-  return steps;
+  return steps.map(addApplyAndContinueAction);
 }
 
+function buildApplyAndContinueAction(step: OnboardingWizardStepDefinition): OnboardingWizardActionFieldDefinition {
+    return {
+      kind: 'action',
+      id: `${step.id}.apply-and-continue`,
+      action: 'apply-and-continue',
+      label: 'Apply & Continue To Next Section',
+      hint: 'Persist the current wizard settings, verify them, and move to the next onboarding section.',
+      defaultValue: 'Apply & next',
+      spacerBeforeRows: 2,
+    };
+  }
+
+function addApplyAndContinueAction(step: OnboardingWizardStepDefinition): OnboardingWizardStepDefinition {
+    if (step.id === 'loading' || step.id === 'review') return step;
+    return {
+      ...step,
+      fields: [
+        ...step.fields,
+        buildApplyAndContinueAction(step),
+      ],
+    };
+  }
+
 export function buildLoadingStep(controller: OnboardingWizardController): OnboardingWizardStepDefinition {
     const failed = controller.hydrationError !== null;
     return {

package/src/input/onboarding/onboarding-wizard-types.ts

@@ -42,6 +42,7 @@ export type OnboardingWizardFieldKind =
 
 export type OnboardingWizardAction =
   | 'apply'
+  | 'apply-and-continue'
   | 'select-all-capabilities'
   | 'clear-capabilities'
   | 'select-all-external-surfaces'
@@ -75,6 +76,7 @@ interface OnboardingWizardFieldBase {
   readonly kind: OnboardingWizardFieldKind;
   readonly label: string;
   readonly hint: string;
+  readonly spacerBeforeRows?: number;
 }
 
 export interface OnboardingWizardChecklistFieldDefinition extends OnboardingWizardFieldBase {