@pellux/goodvibes-tui 0.20.3 → 0.22.0

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

@@ -1,5 +1,4 @@
 import { writeFile } from 'node:fs/promises';
-import { resolve } from 'path';
 import type { CommandRegistry } from '../command-registry.ts';
 import {
   type ExportMessage,
@@ -11,13 +10,21 @@ import {
 import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { requireShellPaths } from './runtime-services.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import { calcSessionCost } from '../../export/cost-utils.ts';
+import {
+  GistUploadTarget,
+  NO_TOKEN_GUIDANCE,
+  resolveGithubToken,
+} from '../../export/gist-uploader.ts';
+import { copyToClipboard } from '../../utils/clipboard.ts';
+import { openBrowser } from '../../cli/management.ts';
 
 export function registerShareRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
     name: 'share',
     aliases: [],
     description: 'Export the current session to a shareable format (html, json, md)',
-    usage: '<html|json|md> [path] [--redact]',
+    usage: '<html|json|md> [path] [--redact] [--upload] [--copy] [--open]',
     argsHint: '<html|json|md> [path]',
     async handler(args, ctx) {
       const shellPaths = requireShellPaths(ctx);
@@ -27,20 +34,28 @@ export function registerShareRuntimeCommands(registry: CommandRegistry): void {
       const format = args[0]?.toLowerCase() as Format | undefined;
       if (!format || !FORMATS.includes(format)) {
         ctx.print(
-          'Usage: /share <html|json|md> [path] [--redact]\n'
+          'Usage: /share <html|json|md> [path] [--redact] [--upload] [--copy] [--open]\n'
           + '  html  — self-contained HTML with syntax highlighting\n'
           + '  json  — structured JSON (machine-readable)\n'
           + '  md    — Markdown\n\n'
           + 'Options:\n'
-          + '  --redact  Redact API keys and personal paths from output\n\n'
+          + '  --redact  Redact API keys and personal paths from output\n'
+          + '  --upload  Upload export as a secret GitHub Gist and print the share link\n'
+          + '  --copy    Copy the export file path to the clipboard\n'
+          + '  --open    Open HTML export in the default browser\n\n'
           + 'Default path: ~/goodvibes-exports/session-<timestamp>.<ext>',
         );
         return;
       }
 
       const remainingArgs = args.slice(1);
-      const redact = remainingArgs.includes('--redact');
-      const pathArgs = remainingArgs.filter(a => a !== '--redact');
+      const redact  = remainingArgs.includes('--redact');
+      const upload  = remainingArgs.includes('--upload');
+      const doCopy  = remainingArgs.includes('--copy');
+      const doOpen  = remainingArgs.includes('--open');
+      const pathArgs = remainingArgs.filter(
+        (a) => a !== '--redact' && a !== '--upload' && a !== '--copy' && a !== '--open',
+      );
       const outputPath = pathArgs.length > 0
         ? shellPaths.resolveWorkspacePath(pathArgs[0])
         : defaultExportPath(format, shellPaths.homeDirectory);
@@ -69,7 +84,7 @@ export function registerShareRuntimeCommands(registry: CommandRegistry): void {
         return;
       }
 
-      const messages: ExportMessage[] = convData.messages.map(m => ({
+      const messages: ExportMessage[] = convData.messages.map((m) => ({
         role: m.role as ExportMessage['role'],
         content: m.content as string,
         toolCalls: m.toolCalls,
@@ -80,13 +95,32 @@ export function registerShareRuntimeCommands(registry: CommandRegistry): void {
         usage: m.usage,
         cancelled: m.cancelled,
       }));
+
+      // Accumulate per-message usage totals for session cost calculation.
+      let totalInput = 0;
+      let totalOutput = 0;
+      let totalCacheRead = 0;
+      let totalCacheWrite = 0;
+      for (const m of convData.messages) {
+        if (m.usage) {
+          totalInput      += m.usage.inputTokens ?? 0;
+          totalOutput     += m.usage.outputTokens ?? 0;
+          totalCacheRead  += m.usage.cacheReadTokens ?? 0;
+          totalCacheWrite += m.usage.cacheWriteTokens ?? 0;
+        }
+      }
+      const sessionModel = ctx.session.runtime.model;
+      const sessionCostUsd = calcSessionCost(
+        totalInput, totalOutput, totalCacheRead, totalCacheWrite, sessionModel,
+      );
+
       const metadata = {
-        model: ctx.session.runtime.model,
+        model: sessionModel,
         provider: ctx.session.runtime.provider,
         sessionId: ctx.session.runtime.sessionId,
         title: ctx.session.conversationManager.title || undefined,
       };
-      const options = { redact };
+      const options = { redact, cost: sessionCostUsd };
 
       let outputContent: string;
       try {
@@ -99,11 +133,14 @@ export function registerShareRuntimeCommands(registry: CommandRegistry): void {
       }
 
       const { mkdirSync } = await import('node:fs');
-      const { dirname } = await import('node:path');
+      const { dirname, basename } = await import('node:path');
       try {
         mkdirSync(dirname(outputPath), { recursive: true });
       } catch (mkdirErr) {
-        logger.warn(`[share] mkdir failed for ${dirname(outputPath)}:`, mkdirErr instanceof Error ? { message: mkdirErr.message } : undefined);
+        logger.warn(
+          `[share] mkdir failed for ${dirname(outputPath)}:`,
+          mkdirErr instanceof Error ? { message: mkdirErr.message } : undefined,
+        );
       }
 
       try {
@@ -113,7 +150,57 @@ export function registerShareRuntimeCommands(registry: CommandRegistry): void {
         return;
       }
 
-      ctx.print(`Exported ${format.toUpperCase()} session to ${outputPath}${redact ? ' (sensitive data redacted)' : ''}`);
+      // Optional Gist upload: resolve auth token then push content as a secret gist.
+      let shareLink: string | undefined;
+      if (upload) {
+        let authHeaders: Record<string, string> | null = null;
+        try {
+          const svcRegistry = ctx.platform.serviceRegistry;
+          if (svcRegistry) {
+            authHeaders = await svcRegistry.resolveAuth('github').catch(() => null);
+          }
+        } catch {
+          // serviceRegistry absent or resolveAuth threw — fall through to env var
+        }
+
+        const token = resolveGithubToken(authHeaders ?? undefined);
+        if (!token) {
+          ctx.print(NO_TOKEN_GUIDANCE);
+        } else {
+          const gistFilename = basename(outputPath);
+          const description = metadata.title
+            ? `GoodVibes session: ${metadata.title}`
+            : 'GoodVibes session export';
+          const uploader = new GistUploadTarget(token, description);
+          const result = await uploader.upload(outputContent, gistFilename);
+          if (result.ok) {
+            shareLink = result.url;
+          } else {
+            ctx.print(`Upload failed: ${result.error}`);
+          }
+        }
+      }
+
+      // Copy export path to clipboard if requested.
+      if (doCopy) {
+        copyToClipboard(outputPath);
+      }
+
+      // Open the exported HTML in the default browser if requested.
+      if (doOpen && format === 'html') {
+        openBrowser(`file://${outputPath}`);
+      }
+
+      // Emit the summary line, with all post-export hints inline.
+      const hints: string[] = [];
+      if (redact) hints.push('(sensitive data redacted)');
+      if (shareLink) hints.push(`Share link: ${shareLink}`);
+      if (doCopy) hints.push('(path copied to clipboard)');
+      if (doOpen && format === 'html') hints.push('(opened in browser)');
+      if (doOpen && format !== 'html') hints.push('(--open ignored: only applies to html)');
+
+      const hint = hints.length > 0 ? '  ' + hints.join('  ') : '';
+      ctx.print(`Exported ${format.toUpperCase()} session to ${outputPath}${hint}`);
     },
   });
 }

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

@@ -3,19 +3,46 @@ import type { CommandRegistry } from '../command-registry.ts';
 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',
+    description: 'Submit a prompt for live TTS playback, or control always-speak mode',
+    usage: '<prompt>|stop|on|off',
     handler(args, ctx) {
       const first = (args[0] ?? '').toLowerCase();
+
+      // /tts stop — cancel active playback
       if (first === 'stop' || first === 'cancel') {
         ctx.stopSpokenOutput?.();
         ctx.print('Live TTS playback stopped.');
         return;
       }
 
+      // /tts on — enable always-speak mode (every turn spoken automatically)
+      if (first === 'on') {
+        if (!ctx.platform.voiceService) {
+          ctx.print('Live TTS is not available in this runtime.');
+          return;
+        }
+        ctx.platform.configManager.setDynamic('ui.voiceEnabled', true);
+        ctx.platform.configManager.save();
+        ctx.print('Always-speak mode enabled. Every submitted turn will be played through live TTS.');
+        ctx.renderRequest();
+        return;
+      }
+
+      // /tts off — disable always-speak mode
+      if (first === 'off') {
+        ctx.platform.configManager.setDynamic('ui.voiceEnabled', false);
+        ctx.platform.configManager.save();
+        ctx.print('Always-speak mode disabled. Use /tts <prompt> to speak individual turns.');
+        ctx.renderRequest();
+        return;
+      }
+
+      // /tts <prompt> — mark this prompt for spoken output
       const prompt = args.join(' ').trim();
       if (!prompt) {
-        ctx.print('Usage: /tts <prompt> or /tts stop');
+        const enabled = ctx.platform.configManager.get('ui.voiceEnabled');
+        ctx.print(`Usage: /tts <prompt>, /tts stop, /tts on, /tts off
+Always-speak mode is currently ${enabled ? 'on' : 'off'}.`);
         return;
       }
       if (!ctx.submitSpokenInput) {
@@ -25,5 +52,4 @@ export function registerTtsRuntimeCommands(registry: CommandRegistry): void {
       ctx.submitSpokenInput(prompt);
     },
   });
-
 }

package/src/input/commands.ts

@@ -7,13 +7,12 @@ import { recallCommand } from './commands/memory.ts';
 import { knowledgeCommand } from './commands/knowledge.ts';
 import { registerShellCoreCommands } from './commands/shell-core.ts';
 import { registerConfigCommand } from './commands/config.ts';
-import { registerSessionWorkflowCommands } from './commands/session-workflow.ts';
 import { registerDiscoveryRuntimeCommands } from './commands/discovery-runtime.ts';
 import { registerPlanningRuntimeCommands } from './commands/planning-runtime.ts';
 import { registerScheduleRuntimeCommands } from './commands/schedule-runtime.ts';
 import { registerBranchRuntimeCommands } from './commands/branch-runtime.ts';
 import { registerOperatorRuntimeCommands } from './commands/operator-runtime.ts';
-import { registerIntegrationRuntimeCommands } from './commands/integration-runtime.ts';
+import { registerPluginRuntimeCommands } from './commands/plugin-runtime.ts';
 import { registerDiffRuntimeCommands } from './commands/diff-runtime.ts';
 import { registerGitRuntimeCommands } from './commands/git-runtime.ts';
 import { registerNotifyRuntimeCommands } from './commands/notify-runtime.ts';
@@ -65,7 +64,7 @@ export function registerBuiltinCommands(registry: CommandRegistry): void {
   registerShellCoreCommands(registry);
   registerConfigCommand(registry);
   registerOperatorRuntimeCommands(registry);
-  registerIntegrationRuntimeCommands(registry);
+  registerPluginRuntimeCommands(registry);
   registerDiffRuntimeCommands(registry);
   registerGitRuntimeCommands(registry);
   registerNotifyRuntimeCommands(registry);
@@ -107,7 +106,6 @@ export function registerBuiltinCommands(registry: CommandRegistry): void {
   registerCloudflareRuntimeCommands(registry);
   registerWorkPlanRuntimeCommands(registry);
   registerLocalRuntimeCommands(registry);
-  registerSessionWorkflowCommands(registry);
   registerDiscoveryRuntimeCommands(registry);
   registerPlanningRuntimeCommands(registry);
   registerScheduleRuntimeCommands(registry);

package/src/input/delete-key-policy.ts

@@ -0,0 +1,46 @@
+// ---------------------------------------------------------------------------
+// Delete-key policy — single source of truth for text-editing key semantics
+//
+// In text-editing contexts:
+//   'backspace'  → delete one character backward (the character before cursor /
+//                  the last character in an end-anchored buffer)
+//   'delete'     → forward-delete (the character after cursor) when a moveable
+//                  cursor exists; a no-op in cursorless/end-anchored contexts,
+//                  EXCEPT where it opens a confirmation-gated clear action
+//                  (see planning panel: Delete opens the ConfirmState gate that
+//                  lets the user clear their entire draft answer).
+//
+// Consequences for each surface:
+//   Panel search filters (end-anchored, no cursor)
+//     'backspace' → remove last char   ✓
+//     'delete'    → no-op              ✓ (no cursor; nothing is "forward")
+//
+//   Selection modal filters (end-anchored, no cursor)
+//     'backspace' → remove last char   ✓
+//     'delete'    → no-op              ✓
+//
+//   Planning panel draft answer (end-anchored, no cursor)
+//     'backspace' → remove last char   ✓
+//     'delete'    → open ConfirmState gate (y/Enter confirms clear; n/Esc cancels)
+//                   The draft is NOT wiped until the user confirms.
+//
+// NEVER assign bulk-destructive actions (clear / wipe) to the Delete key
+// without an explicit confirmation gate.
+// ---------------------------------------------------------------------------
+
+/**
+ * Returns true when `key` should perform a backward-delete (remove the
+ * character before the cursor / at end of an end-anchored buffer).
+ */
+export function isTextBackspace(key: string): boolean {
+  return key === 'backspace';
+}
+
+/**
+ * Returns true when `key` should perform a forward-delete (remove the
+ * character after the cursor). Only meaningful when a moveable cursor
+ * exists; callers should treat this as a no-op when there is no cursor.
+ */
+export function isTextForwardDelete(key: string): boolean {
+  return key === 'delete';
+}

package/src/input/feed-context-factory.ts

@@ -161,6 +161,8 @@ export interface FeedContextClosures {
   openProviderModelPickerWithTarget: (target: ModelPickerTarget, source?: 'settings' | 'onboarding') => boolean;
   onModelPickerCommit: () => boolean;
   onOnboardingAction: (action: import('./onboarding/onboarding-wizard.ts').OnboardingWizardAction) => void;
+  /** Called after any wizard step navigation so the handler can persist progress. */
+  onStepChange?: () => void;
 }
 
 /**

package/src/input/handler-feed.ts

@@ -162,6 +162,8 @@ export interface InputFeedContext {
   readonly openProviderModelPickerWithTarget: (target: ModelPickerTarget, source?: 'settings' | 'onboarding') => boolean;
   readonly onModelPickerCommit: () => boolean;
   readonly onOnboardingAction: (action: OnboardingWizardAction) => void;
+  /** Called after any wizard step navigation so the handler can persist progress. */
+  readonly onStepChange?: () => void;
   readonly exitApp: () => void;
 }
 
@@ -228,6 +230,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       openProviderModelPickerWithTarget: context.openProviderModelPickerWithTarget,
       onModelPickerCommit: context.onModelPickerCommit,
       onOnboardingAction: context.onOnboardingAction,
+      onStepChange: context.onStepChange,
     }, token);
     context.selectionCallback = modalRoute.selectionCallback;
     context.helpOverlayActive = modalRoute.helpOverlayActive;

package/src/input/handler-interactions.ts

@@ -1,29 +1,16 @@
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import type { OnboardingWizardMode } from './onboarding/onboarding-wizard.ts';
-import { collectOnboardingSnapshot, readOnboardingCheckMarker, writeOnboardingCheckMarker } from '../runtime/onboarding/index.ts';
+import { collectOnboardingSnapshot } from '../runtime/onboarding/index.ts';
 import { cleanupMarkerRegistry, expandPrompt, findMarkerAtPos, handleBlockCopy, handleBlockRerun, handleBlockSave, handleBlockToggle, handleBookmark, handleClipboardPaste, handleCopy, handleCtrlC, handleDiffApply, registerPaste } from './handler-content-actions.ts';
 import { clearModalStack, handleEscape, modalOpened } from './handler-modal-stack.ts';
 import { openOnboardingWizardState, type OpenOnboardingWizardOptions } from './handler-ui-state.ts';
-import type { InputHandler } from './handler.ts';
+import type { InputHandlerLike as InputHandler } from './handler-types.ts';
 
 export function openOnboardingWizardForHandler(
   handler: InputHandler,
     modeOrOptions: OnboardingWizardMode | OpenOnboardingWizardOptions = 'new',
   ): void {
     const options = typeof modeOrOptions === 'string' ? { mode: modeOrOptions } : modeOrOptions;
-    const userMarker = readOnboardingCheckMarker(handler.uiServices.environment.shellPaths, 'user');
-    if (!userMarker.payload) {
-      try {
-        writeOnboardingCheckMarker(handler.uiServices.environment.shellPaths, {
-          scope: 'user',
-          source: 'wizard',
-          mode: options.mode ?? 'new',
-        });
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        handler.commandContext?.print?.(`Onboarding check marker could not be written: ${message}`);
-      }
-    }
     if (!handler.modalStack.includes('onboarding')) handler.modalOpened('onboarding');
     handler.clearOnboardingModelPickerCancelState();
     openOnboardingWizardState(handler.onboardingWizard, options);

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,10 +236,29 @@ 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;
     resetSelected?: () => { key: string; value: unknown } | null;
+    initiateResetCategory?: () => void;
+    initiateResetAll?: () => void;
+    handleResetConfirmKey?: (
+      key: string,
+    ) =>
+      | { result: 'confirmed'; entries: ReadonlyArray<{ key: string; value: unknown }> }
+      | 'cancelled'
+      | 'absorbed'
+      | 'inactive';
   };
   commandContext?: CommandContext;
   /** Called when the settings modal requests the model picker for a non-main target. */
@@ -279,42 +307,132 @@ 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;
+    }
+  }
+
+  // Reset confirm gate: routes all keys through the confirm contract before
+  // normal dispatch when a category or all-settings reset is pending.
+  if (state.settingsModal.handleResetConfirmKey) {
+    const key = token.type === 'key'
+      ? (token.logicalName ?? '')
+      : token.type === 'text'
+        ? token.value
+        : '';
+    const resetResult = state.settingsModal.handleResetConfirmKey(key);
+    if (resetResult !== 'inactive') {
+      if (typeof resetResult === 'object' && resetResult.result === 'confirmed') {
+        // Sync runtime for every reset entry so provider.model / reasoningEffort
+        // stay consistent with the live session without requiring a restart.
+        for (const entry of resetResult.entries) {
+          syncRuntimeAfterSettingReset(state.commandContext, entry.key, entry.value);
+        }
+      }
+      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' && token.shift && token.ctrl && !state.settingsModal.editingMode && !state.settingsModal.searchFocused) {
+      state.settingsModal.initiateResetAll?.();
+    }
+    else if (token.logicalName === 'r' && token.shift && !state.settingsModal.editingMode && !state.settingsModal.searchFocused) {
+      state.settingsModal.initiateResetCategory?.();
+    }
+    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 +440,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);
   }
@@ -229,11 +232,25 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     return withState(state, true);
   }
 
-  if (handleEscapeOnlyModalToken({
-    active: state.agentDetailModal.active,
-    requestRender: state.requestRender,
-    handleEscape: state.handleEscape,
-  }, token)) {
+  // Agent detail modal: route c + confirm keys before escape-close.
+  // handleKey() consumes confirm-flow keys (y, Enter, n, Esc) and the 'c'
+  // initiator; unhandled keys (including Esc when no confirm is pending)
+  // fall through to escape-close below.
+  if (state.agentDetailModal.active) {
+    const keyStr: string =
+      token.type === 'key' ? (token.logicalName ?? '') :
+      token.type === 'text' ? token.value : '';
+    if (keyStr && state.agentDetailModal.handleKey(keyStr)) {
+      state.requestRender();
+      return withState(state, true);
+    }
+    // 'c' was not consumed (non-cancellable), or any other key.
+    // Esc closes the modal; all other keys are absorbed by the active modal.
+    if (token.type === 'key' && token.logicalName === 'escape') {
+      state.handleEscape();
+      return withState(state, true);
+    }
+    state.requestRender();
     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,