@pellux/goodvibes-tui 0.20.3 → 0.21.0

package/src/input/handler-modal-routes.ts

@@ -2,6 +2,7 @@ import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { SelectionResult, SelectionAction } from './selection-modal.ts';
 import type { CommandContext } from './command-registry.ts';
 import { openTtsProviderPicker, openTtsVoicePicker } from './tts-settings-actions.ts';
+import { isTextBackspace } from './delete-key-policy.ts';
 
 type SelectionRouteState = {
   selectionModal: {
@@ -136,10 +137,13 @@ export function handleSelectionModalToken(state: SelectionRouteState, token: Inp
           getAdjustmentStep(selected, token.shift),
         );
       }
-    } else if (token.logicalName === 'backspace') {
+    } else if (isTextBackspace(token.logicalName ?? '')) {
       if (state.selectionModal.allowSearch && state.selectionModal.searchFocused && state.selectionModal.query.length > 0) {
         state.selectionModal.setQuery(state.selectionModal.query.slice(0, -1));
       }
+      // 'delete' is intentionally absent here: modal search filters are
+      // end-anchored with no cursor, so forward-delete is a no-op per the
+      // delete-key policy (src/input/delete-key-policy.ts).
     } else if (state.selectionModal.allowSearch && !state.selectionModal.searchFocused && token.logicalName === '/') {
       state.selectionModal.focusSearch();
     } else if (!state.selectionModal.searchFocused && token.logicalName && token.logicalName.length === 1) {
@@ -212,9 +216,14 @@ type SettingsRouteState = {
     editingMode: boolean;
     currentCategory: string;
     focusPane?: 'categories' | 'settings';
+    /** True when the user is actively typing into the search input bar. */
+    searchFocused: boolean;
+    /** Current cross-category search query. */
+    searchQuery: string;
     commitEdit: () => void;
     toggleSelectedFlag: () => void;
     activateSelected: () => void;
+    handleSubscriptionLogoutKey?: (key: string) => 'confirmed' | 'cancelled' | 'absorbed' | 'inactive';
     adjustSelected: (direction: 'left' | 'right', step?: number) => void;
     moveFocusedUp?: () => void;
     moveFocusedDown?: () => void;
@@ -227,6 +236,16 @@ type SettingsRouteState = {
     prevCategory?: () => void;
     editBackspace: () => void;
     editChar: (char: string) => void;
+    /** Enter search mode (focus the search input bar). */
+    focusSearch: () => void;
+    /** Exit search mode without clearing the query. */
+    blurSearch: () => void;
+    /** Set search query and recompute results. */
+    setSearchQuery: (query: string) => void;
+    /** Clear search query, results, and exit search mode. */
+    clearSearch: () => void;
+    /** Cancel inline edit without saving (mirrors SettingsModal.cancelEdit). */
+    cancelEdit: () => void;
     pendingModelPickerTarget: import('./model-picker.ts').ModelPickerTarget | null;
     pendingProviderModelPickerTarget?: import('./model-picker.ts').ModelPickerTarget | null;
     pendingSettingsPickerAction?: 'tts-provider' | 'tts-voice' | null;
@@ -279,42 +298,104 @@ function consumeSettingsPickerRequest(state: SettingsRouteState): void {
 export function handleSettingsModalToken(state: SettingsRouteState, token: InputToken): boolean {
   if (!state.settingsModal.active) return false;
 
+  // Subscription logout confirm gate: routes all keys through the unified
+  // confirm contract before normal dispatch when a confirm is pending.
+  if (state.settingsModal.handleSubscriptionLogoutKey) {
+    const key = token.type === 'key'
+      ? (token.logicalName ?? '')
+      : token.type === 'text'
+        ? token.value
+        : '';
+    const logoutResult = state.settingsModal.handleSubscriptionLogoutKey(key);
+    if (logoutResult !== 'inactive') {
+      state.requestRender();
+      return true;
+    }
+  }
+
   if (token.type === 'key') {
     const focusPane = state.settingsModal.focusPane ?? 'settings';
     if (token.logicalName === 'escape') {
+      // Cancel inline edit first — mirrors the global contract in handler-modal-stack.ts.
+      // Must check editingMode before searchFocused: the reachable path
+      // search→Enter(string/number)→Esc must cancel the edit, NOT just clear search.
+      if (state.settingsModal.editingMode) {
+        state.settingsModal.cancelEdit();
+        state.requestRender();
+        return true;
+      }
+      // Two-stage escape: if in search mode, first Esc exits search (clearSearch),
+      // second Esc closes the modal.
+      if (state.settingsModal.searchFocused) {
+        state.settingsModal.clearSearch();
+        state.requestRender();
+        return true;
+      }
       state.handleEscape();
       return true;
     }
-    if (token.logicalName === 'enter' || (token.logicalName === 'space' && !state.settingsModal.editingMode)) {
+    if (token.logicalName === 'enter' || (token.logicalName === 'space' && !state.settingsModal.editingMode && !state.settingsModal.searchFocused)) {
       if (state.settingsModal.editingMode) state.settingsModal.commitEdit();
-      else if (focusPane === 'categories') state.settingsModal.focusSettings?.();
+      else if (state.settingsModal.searchFocused) {
+        // Enter in search mode: activate the selected search result
+        state.settingsModal.activateSelected();
+        consumeSettingsPickerRequest(state);
+      } else if (focusPane === 'categories') state.settingsModal.focusSettings?.();
       else if (state.settingsModal.currentCategory === 'flags') state.settingsModal.toggleSelectedFlag();
       else {
         state.settingsModal.activateSelected();
         consumeSettingsPickerRequest(state);
       }
-    } else if ((token.logicalName === 'left' || token.logicalName === 'right') && !state.settingsModal.editingMode) {
+    } else if ((token.logicalName === 'left' || token.logicalName === 'right') && !state.settingsModal.editingMode && !state.settingsModal.searchFocused) {
       if (token.logicalName === 'left') state.settingsModal.focusCategories?.();
       else state.settingsModal.focusSettings?.();
     } else if (token.logicalName === 'up') {
-      if (state.settingsModal.moveFocusedUp) state.settingsModal.moveFocusedUp();
+      if (state.settingsModal.searchFocused) {
+        state.settingsModal.moveUp?.();
+      } else if (state.settingsModal.moveFocusedUp) state.settingsModal.moveFocusedUp();
       else state.settingsModal.moveUp?.();
     } else if (token.logicalName === 'down') {
-      if (state.settingsModal.moveFocusedDown) state.settingsModal.moveFocusedDown();
+      if (state.settingsModal.searchFocused) {
+        state.settingsModal.moveDown?.();
+      } else if (state.settingsModal.moveFocusedDown) state.settingsModal.moveFocusedDown();
       else state.settingsModal.moveDown?.();
     }
-    else if (token.logicalName === 'r' && !state.settingsModal.editingMode) {
+    else if (token.logicalName === 'r' && !state.settingsModal.editingMode && !state.settingsModal.searchFocused) {
       const reset = state.settingsModal.resetSelected?.();
       if (reset) syncRuntimeAfterSettingReset(state.commandContext, reset.key, reset.value);
     }
-    else if (token.logicalName === 'tab') {
+    else if (token.logicalName === 'tab' && !state.settingsModal.searchFocused) {
       if (state.settingsModal.toggleFocusPane) state.settingsModal.toggleFocusPane();
       else if (focusPane === 'categories') state.settingsModal.focusSettings?.();
       else state.settingsModal.focusCategories?.();
     }
-    else if (token.logicalName === 'backspace' && state.settingsModal.editingMode) state.settingsModal.editBackspace();
+    else if (isTextBackspace(token.logicalName ?? '')) {
+      if (state.settingsModal.editingMode) {
+        state.settingsModal.editBackspace();
+      } else if (state.settingsModal.searchFocused) {
+        // Backspace in search mode: trim query
+        const trimmed = state.settingsModal.searchQuery.slice(0, -1);
+        state.settingsModal.setSearchQuery(trimmed);
+      }
+    }
+    // token.logicalName === 'delete' is intentionally absent: search filters
+    // are end-anchored with no cursor, so forward-delete is a no-op per
+    // delete-key policy (src/input/delete-key-policy.ts).
+    else if (!state.settingsModal.editingMode && !state.settingsModal.searchFocused && token.logicalName === '/') {
+      state.settingsModal.focusSearch();
+    }
   } else if (token.type === 'text') {
-    if (token.value === ' ' && !state.settingsModal.editingMode) {
+    if (state.settingsModal.editingMode) {
+      // editingMode takes priority over search — Enter on a string/number search
+      // result enters inline edit; subsequent chars must go to editChar, not the query.
+      state.settingsModal.editChar(token.value);
+    } else if (state.settingsModal.searchFocused) {
+      // Any printable char in search mode appends to the query
+      state.settingsModal.setSearchQuery(state.settingsModal.searchQuery + token.value);
+    } else if (token.value === '/' && !state.settingsModal.editingMode) {
+      // / enters search mode
+      state.settingsModal.focusSearch();
+    } else if (token.value === ' ' && !state.settingsModal.editingMode) {
       const focusPane = state.settingsModal.focusPane ?? 'settings';
       if (focusPane === 'categories') state.settingsModal.focusSettings?.();
       else if (state.settingsModal.currentCategory === 'flags') state.settingsModal.toggleSelectedFlag();
@@ -322,8 +403,6 @@ export function handleSettingsModalToken(state: SettingsRouteState, token: Input
         state.settingsModal.activateSelected();
         consumeSettingsPickerRequest(state);
       }
-    } else if (state.settingsModal.editingMode) {
-      state.settingsModal.editChar(token.value);
     } else if (token.value === 'r') {
       const reset = state.settingsModal.resetSelected?.();
       if (reset) syncRuntimeAfterSettingReset(state.commandContext, reset.key, reset.value);

package/src/input/handler-modal-token-routes.ts

@@ -92,6 +92,8 @@ export type ModalTokenRouteState = {
   restoreOnboardingModelPickerCancelState?: () => void;
   onModelPickerCommit?: () => boolean;
   onOnboardingAction?: (action: OnboardingWizardAction) => void;
+  /** Called after any wizard step navigation so the handler can persist progress. */
+  onStepChange?: () => void;
 };
 
 export function handleModalTokenRoutes(state: ModalTokenRouteState, token: InputToken): {
@@ -216,6 +218,7 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     handleEscape: state.handleEscape,
     openModelPickerWithTarget: state.openModelPickerWithTarget,
     onAction: state.onOnboardingAction,
+    onStepChange: state.onStepChange,
   }, token)) {
     return withState(state, true);
   }

package/src/input/handler-onboarding-cloudflare.ts

@@ -12,7 +12,7 @@ import {
   type CloudflareVerifyResult,
 } from '../runtime/cloudflare-control-plane.ts';
 import type { OnboardingVerificationItem } from '../runtime/onboarding/index.ts';
-import type { InputHandler } from './handler.ts';
+import type { InputHandlerLike as InputHandler } from './handler-types.ts';
 import type { OnboardingWizardAction, OnboardingWizardApplyFeedback } from './onboarding/onboarding-wizard.ts';
 import {
   buildCloudflareApiTokenRef,

package/src/input/handler-onboarding.ts

@@ -5,11 +5,17 @@ import { getProviderIdFromModel } from '../config/provider-model.ts';
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import { OnboardingWizardController, type OnboardingWizardAction, type OnboardingWizardApplyFeedback } from './onboarding/onboarding-wizard.ts';
 import { handleCloudflareOnboardingActionForHandler, maybeProvisionCloudflareOnFinalApplyForHandler } from './handler-onboarding-cloudflare.ts';
-import { applyOnboardingRequest, collectOnboardingSnapshot, verifyOnboardingRequest } from '../runtime/onboarding/index.ts';
+import { applyOnboardingRequest, collectOnboardingSnapshot, deleteWizardProgress, verifyOnboardingRequest, writeOnboardingCheckMarker, writeWizardProgress } from '../runtime/onboarding/index.ts';
 import type { OnboardingApplyRequest, OnboardingVerificationItem } from '../runtime/onboarding/index.ts';
+import {
+  dedupeOnboardingVerificationItems,
+  extractAuthorizationCode,
+  formatOnboardingApplyCompletionMessage,
+  isLoopbackHostValue,
+} from './onboarding/onboarding-verification-helpers.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
 import { captureOnboardingWizardSnapshot, restoreOnboardingWizardSnapshot } from './handler-ui-state.ts';
-import type { InputHandler } from './handler.ts';
+import type { InputHandlerLike as InputHandler, OnboardingRuntimePosture } from './handler-types.ts';
 import {
   formatRuntimeActiveSuccessMessage,
   getRuntimeEndpointStatus,
@@ -20,73 +26,6 @@ import {
   type OnboardingRuntimeEndpoint,
 } from './onboarding/onboarding-runtime-status.ts';
 
-export interface OnboardingRuntimePosture {
-  readonly serviceEnabled: boolean;
-  readonly serviceAutostart: boolean;
-  readonly restartOnFailure: boolean;
-  readonly expectedDaemon: boolean;
-  readonly expectedHttpListener: boolean;
-  readonly serverBacked: boolean;
-  readonly remoteExposure: boolean;
-}
-
-function extractAuthorizationCode(input: string): string | null {
-  const trimmed = input.trim();
-  if (!trimmed) return null;
-
-  try {
-    const url = new URL(trimmed);
-    return url.searchParams.get('code');
-  } catch {
-    return trimmed;
-  }
-}
-
-function isLoopbackHostValue(value: string | null | undefined): boolean {
-  const normalized = (value ?? '').trim().toLowerCase();
-  if (normalized.length === 0) return false;
-  return normalized === 'localhost'
-    || normalized === '::1'
-    || normalized === '[::1]'
-    || normalized === '0:0:0:0:0:0:0:1'
-    || /^127(?:\.\d{1,3}){3}$/.test(normalized);
-}
-
-function onboardingVerificationStatusRank(item: OnboardingVerificationItem): number {
-  if (item.status === 'fail') return 3;
-  if (item.status === 'warn') return 2;
-  return 1;
-}
-
-function dedupeOnboardingVerificationItems(
-  items: readonly OnboardingVerificationItem[],
-): OnboardingVerificationItem[] {
-  const order: string[] = [];
-  const byId = new Map<string, OnboardingVerificationItem>();
-  for (const item of items) {
-    const existing = byId.get(item.id);
-    if (!existing) {
-      order.push(item.id);
-      byId.set(item.id, item);
-      continue;
-    }
-    if (onboardingVerificationStatusRank(item) > onboardingVerificationStatusRank(existing)) {
-      byId.set(item.id, item);
-    }
-  }
-  return order.map((id) => byId.get(id)).filter((item): item is OnboardingVerificationItem => Boolean(item));
-}
-
-function formatOnboardingApplyCompletionMessage(items: readonly OnboardingVerificationItem[]): string {
-  const warnings = items.filter((item) => item.status === 'warn');
-  if (warnings.length === 0) return `Onboarding applied and verified ${items.length} item(s).`;
-  const passed = items.filter((item) => item.status === 'pass').length;
-  return [
-    `Onboarding settings applied. ${passed} verification item(s) passed; ${warnings.length} warning(s) need attention.`,
-    ...warnings.map((warning) => `  warning ${warning.id}: ${warning.message}`),
-  ].join('\n');
-}
-
 function getRuntimeEndpointBinding(
   handler: InputHandler,
   request: OnboardingApplyRequest,
@@ -292,6 +231,18 @@ export async function handleOnboardingActionForHandler(handler: InputHandler, ac
       }
 
       if (appliedErrors.length === 0) {
+        try {
+          writeOnboardingCheckMarker(handler.uiServices.environment.shellPaths, {
+            scope: 'user',
+            source: 'wizard',
+            mode: request.mode,
+          });
+          deleteWizardProgress(handler.uiServices.environment.shellPaths);
+        } catch (markerError) {
+          handler.commandContext?.print?.(
+            `Onboarding check marker could not be written: ${markerError instanceof Error ? markerError.message : String(markerError)}`,
+          );
+        }
         const activationVerification = await handler.restartOnboardingExternalServicesIfNeeded(request);
         runtimeWarnings = dedupeOnboardingVerificationItems([...activationVerification, ...handler.verifyOnboardingRuntimePosture(request)]
           .map((item): OnboardingVerificationItem => item.status === 'fail'
@@ -540,6 +491,41 @@ export async function handleOpenAiSubscriptionFinishForHandler(handler: InputHan
     }
   }
 
+/**
+ * Persist the current wizard field state to onboarding-progress.json.
+ *
+ * Called after each step navigation so the user can resume a partially
+ * completed wizard after a restart. Masked fields (kind === 'masked') are
+ * excluded from the persisted textState to avoid writing secrets to disk.
+ *
+ * This is a best-effort write: if it fails the wizard continues normally.
+ */
+export function saveWizardProgressForHandler(handler: InputHandler): void {
+  const wizard = handler.onboardingWizard;
+  if (!wizard.active) return;
+  try {
+    // Exclude masked fields to avoid persisting secrets.
+    const maskedFieldIds = new Set<string>();
+    for (const step of wizard.steps) {
+      for (const field of step.fields) {
+        if (field.kind === 'masked') maskedFieldIds.add(field.id);
+      }
+    }
+    const safeTextState = [...wizard.textState.entries()]
+      .filter(([id]) => !maskedFieldIds.has(id)) as Array<[string, string]>;
+
+    writeWizardProgress(handler.uiServices.environment.shellPaths, {
+      mode: wizard.mode,
+      stepIndex: wizard.stepIndex,
+      toggleState: [...wizard.toggleState.entries()],
+      radioState: [...wizard.radioState.entries()],
+      textState: safeTextState,
+    });
+  } catch {
+    // Best-effort: never block wizard interaction on a progress write failure.
+  }
+}
+
 export function syncRuntimeFromOnboardingRequestForHandler(handler: InputHandler, request: ReturnType<OnboardingWizardController['buildApplyRequest']>): void {
     const runtime = handler.commandContext?.session.runtime;
     if (!runtime) return;

package/src/input/handler-types.ts

@@ -0,0 +1,163 @@
+/**
+ * handler-types.ts — Leaf interface for InputHandler.
+ *
+ * Extracted from handler.ts to break circular import chains between handler.ts
+ * and handler-interactions.ts / handler-onboarding.ts / handler-onboarding-cloudflare.ts.
+ *
+ * The interface is the union of all `handler.*` accesses in those three files.
+ * InputHandler declares `implements InputHandlerLike`; no cycle is created
+ * because this file imports only from leaf modules (no import from handler.ts).
+ */
+import { type createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config';
+import type { OnboardingWizardController, OnboardingWizardAction } from './onboarding/onboarding-wizard.ts';
+import type { OnboardingWizardSnapshot, OpenOnboardingWizardOptions } from './handler-ui-state.ts';
+import type {
+  OnboardingApplyRequest,
+  OnboardingVerificationItem,
+} from '../runtime/onboarding/index.ts';
+import type { UiRuntimeServices } from '../runtime/ui-services.ts';
+import type { CommandContext } from './command-registry.ts';
+import type { ConversationManager } from '../core/conversation';
+import type { ModelPickerModal, ModelPickerTarget } from './model-picker.ts';
+import type { SelectionManager } from './selection.ts';
+import type { InfiniteBuffer } from '../core/history.ts';
+import type { AutocompleteEngine } from './autocomplete.ts';
+import type { BookmarkModal } from './bookmark-modal.ts';
+import type { AgentDetailModal } from '../renderer/agent-detail-modal.ts';
+import type { LiveTailModal } from '../renderer/live-tail-modal.ts';
+import type { SettingsModal } from './settings-modal.ts';
+import type { McpWorkspace } from './mcp-workspace.ts';
+import type { SessionPickerModal } from './session-picker-modal.ts';
+import type { ProfilePickerModal } from './profile-picker-modal.ts';
+import type { ContextInspectorModal } from '../renderer/context-inspector.ts';
+import type { ProcessModal } from '../renderer/process-modal.ts';
+import type { FilePickerModal } from './file-picker.ts';
+import type { BlockActionsMenu } from '../renderer/block-actions.ts';
+import type { SelectionModal } from './selection-modal.ts';
+import type { SelectionResult } from './selection-modal.ts';
+export interface OnboardingRuntimePosture {
+  readonly serviceEnabled: boolean;
+  readonly serviceAutostart: boolean;
+  readonly restartOnFailure: boolean;
+  readonly expectedDaemon: boolean;
+  readonly expectedHttpListener: boolean;
+  readonly serverBacked: boolean;
+  readonly remoteExposure: boolean;
+}
+
+type SelectionModalCallback = (result: SelectionResult | null) => void;
+
+/**
+ * Public surface of InputHandler consumed by handler-interactions.ts,
+ * handler-onboarding.ts, and handler-onboarding-cloudflare.ts.
+ */
+export interface InputHandlerLike {
+  // ── Core render / lifecycle ──────────────────────────────────────────────
+  requestRender: () => void;
+  exitApp: () => void;
+
+  // ── Services ─────────────────────────────────────────────────────────────
+  readonly uiServices: Pick<UiRuntimeServices,
+    | 'agents'
+    | 'environment'
+    | 'platform'
+    | 'providers'
+    | 'sessions'
+    | 'shell'
+  >;
+  commandContext: CommandContext | undefined;
+
+  // ── Prompt / cursor state ────────────────────────────────────────────────
+  prompt: string;
+  cursorPos: number;
+  showExitNotice: boolean;
+
+  // ── Selection / history ──────────────────────────────────────────────────
+  selection: SelectionManager;
+  getHistory: () => InfiniteBuffer;
+  getScrollTop: () => number;
+  conversationManager: ConversationManager | null;
+
+  // ── Paste / image registries ─────────────────────────────────────────────
+  pasteRegistry: Map<string, string>;
+  nextPasteId: number;
+  imageRegistry: Map<string, { data: string; mediaType: string }>;
+  nextImageId: number;
+
+  // ── Timing ───────────────────────────────────────────────────────────────
+  lastCopyTime: number;
+  lastBlockCopyTime: number;
+  lastCtrlCTime: number;
+
+  // ── Modal state ───────────────────────────────────────────────────────────
+  commandMode: boolean;
+  modalStack: string[];
+  modalReturnFocus: 'prompt' | 'panel' | 'indicator';
+  panelFocused: boolean;
+  indicatorFocused: boolean;
+  helpOverlayActive: boolean;
+  helpScrollOffset: number;
+  shortcutsOverlayActive: boolean;
+  shortcutsScrollOffset: number;
+  selectionCallback: SelectionModalCallback | null;
+  autocomplete: AutocompleteEngine | null;
+
+  // ── Modal objects ─────────────────────────────────────────────────────────
+  bookmarkModal: BookmarkModal;
+  agentDetailModal: AgentDetailModal;
+  liveTailModal: LiveTailModal;
+  settingsModal: SettingsModal;
+  mcpWorkspace: McpWorkspace;
+  sessionPickerModal: SessionPickerModal;
+  profilePickerModal: ProfilePickerModal;
+  contextInspectorModal: ContextInspectorModal;
+  processModal: ProcessModal;
+  modelPicker: ModelPickerModal;
+  filePicker: FilePickerModal;
+  blockActionsMenu: BlockActionsMenu;
+  selectionModal: SelectionModal;
+
+  // ── Onboarding ────────────────────────────────────────────────────────────
+  onboardingWizard: OnboardingWizardController;
+  onboardingModelPickerCancelSnapshot: OnboardingWizardSnapshot | null;
+  onboardingHydrationSerial: number;
+  onboardingApplyPending: boolean;
+  onboardingOpenAiListenerSerial: number;
+
+  // ── Methods: modal lifecycle ──────────────────────────────────────────────
+  modalOpened(name: string): void;
+  saveUndoState(): void;
+
+  // ── Methods: block actions (dispatched in executeBlockAction) ────────────
+  handleBlockCopy(): void;
+  handleBookmark(): void;
+  handleBlockToggle(): void;
+  handleDiffApply(): boolean;
+  handleBlockRerun(): void;
+
+  // ── Methods: onboarding ───────────────────────────────────────────────────
+  hydrateOnboardingWizardFromRuntime(hydrationSerial: number): Promise<void>;
+  clearOnboardingModelPickerCancelState(): void;
+  restoreOnboardingModelPickerCancelState(): void;
+  clearOnboardingPendingModelPickerTarget(): void;
+  refreshOnboardingHydration(options?: { readonly preserveValues?: boolean; readonly targetStepId?: string }): Promise<void>;
+  handleOpenAiSubscriptionStart(): Promise<void>;
+  handleOpenAiSubscriptionFinish(): Promise<void>;
+  syncRuntimeFromOnboardingRequest(request: ReturnType<OnboardingWizardController['buildApplyRequest']>): void;
+  getOnboardingConfigValue(request: OnboardingApplyRequest, key: string): unknown;
+  getOnboardingRuntimePosture(request: OnboardingApplyRequest): OnboardingRuntimePosture;
+  restartOnboardingExternalServicesIfNeeded(request: OnboardingApplyRequest): Promise<OnboardingVerificationItem[]>;
+  verifyOnboardingRuntimePosture(request: OnboardingApplyRequest): OnboardingVerificationItem[];
+
+  // ── Method: model picker ──────────────────────────────────────────────────
+  openModelPickerWithTarget(target: ModelPickerTarget, source?: 'settings' | 'onboarding'): boolean;
+  openProviderModelPickerWithTarget(target: ModelPickerTarget, source?: 'settings' | 'onboarding'): boolean;
+
+  // ── Method: onboarding action ─────────────────────────────────────────────
+  completeOpenAiSubscriptionFromListener(
+    listener: Awaited<ReturnType<typeof createOAuthLocalListener>>,
+    verifier: string,
+    serial: number,
+  ): Promise<void>;
+  handleOnboardingAction(action: OnboardingWizardAction): Promise<void>;
+}

package/src/input/handler.ts

@@ -3,7 +3,8 @@ import { dirname } from 'node:path';
 import { InputTokenizer } from '@pellux/goodvibes-sdk/platform/core';
 import { createOAuthLocalListener } from '@pellux/goodvibes-sdk/platform/config';
 import { clearModalStackForHandler, cleanupMarkerRegistryForHandler, executeBlockActionForHandler, expandPromptForHandler, findMarkerAtPosForHandler, getImageAttachmentsForHandler, handleBlockCopyForHandler, handleBlockRerunForHandler, handleBlockSaveForHandler, handleBlockToggleForHandler, handleBookmarkForHandler, handleCopyForHandler, handleCtrlCForHandler, handleDiffApplyForHandler, handleEscapeForHandler, hydrateOnboardingWizardFromRuntimeForHandler, modalOpenedForHandler, openOnboardingWizardForHandler, registerPasteForHandler } from './handler-interactions.ts';
-import { clearOnboardingModelPickerCancelStateForHandler, clearOnboardingPendingModelPickerTargetForHandler, completeOpenAiSubscriptionFromListenerForHandler, getOnboardingConfigValueForHandler, getOnboardingRuntimePostureForHandler, handleModelPickerCommitForHandler, handleOnboardingActionForHandler, handleOpenAiSubscriptionFinishForHandler, handleOpenAiSubscriptionStartForHandler, openModelPickerWithTargetForHandler, openProviderModelPickerWithTargetForHandler, refreshOnboardingHydrationForHandler, restartOnboardingExternalServicesIfNeededForHandler, restoreOnboardingModelPickerCancelStateForHandler, syncRuntimeFromOnboardingRequestForHandler, verifyOnboardingRuntimePostureForHandler, type OnboardingRuntimePosture } from './handler-onboarding.ts';
+import { clearOnboardingModelPickerCancelStateForHandler, clearOnboardingPendingModelPickerTargetForHandler, completeOpenAiSubscriptionFromListenerForHandler, getOnboardingConfigValueForHandler, getOnboardingRuntimePostureForHandler, handleModelPickerCommitForHandler, handleOnboardingActionForHandler, handleOpenAiSubscriptionFinishForHandler, handleOpenAiSubscriptionStartForHandler, openModelPickerWithTargetForHandler, openProviderModelPickerWithTargetForHandler, refreshOnboardingHydrationForHandler, restartOnboardingExternalServicesIfNeededForHandler, restoreOnboardingModelPickerCancelStateForHandler, saveWizardProgressForHandler, syncRuntimeFromOnboardingRequestForHandler, verifyOnboardingRuntimePostureForHandler, } from './handler-onboarding.ts';
+import type { OnboardingRuntimePosture } from './handler-types.ts';
 import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
 import { openExternalUrl } from '@pellux/goodvibes-sdk/platform/utils';
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
@@ -109,6 +110,7 @@ import {
 } from './handler-picker-routes.ts';
 import { handleGlobalShortcutToken } from './handler-shortcuts.ts';
 import { feedInputTokens } from './handler-feed.ts';
+import type { InputHandlerLike } from './handler-types.ts';
 import { buildInitialFeedContext, syncFeedContextMutableFields } from './feed-context-factory.ts';
 import { handlePanelIntegrationAction as runPanelIntegrationAction } from './panel-integration-actions.ts';
 import type { Panel } from '../panels/types.ts';
@@ -123,7 +125,7 @@ type SelectionModalCallback = (result: SelectionResult | null) => void;
  * InputHandler - Owns prompt text, paste registry, and keyboard/mouse handling.
  * Extracted from main.ts and StateManager.
  */
-export class InputHandler {
+export class InputHandler implements InputHandlerLike {
   public prompt = '';
   public cursorPos = 0;
   public showExitNotice = false;
@@ -335,6 +337,7 @@ export class InputHandler {
           this.openProviderModelPickerWithTarget(target, source),
         onModelPickerCommit: () => this.handleModelPickerCommit(),
         onOnboardingAction: (action: OnboardingWizardAction) => { void this.handleOnboardingAction(action); },
+        onStepChange: () => { saveWizardProgressForHandler(this); },
       },
     );
   }