@pellux/goodvibes-tui 1.0.0 → 1.7.0

package/src/input/handler-content-actions.ts

@@ -427,6 +427,8 @@ export function handleCtrlC(
   lastCtrlCTime: number,
   setLastCtrlCTime: (value: number) => void,
   setShowExitNotice: (value: boolean) => void,
+  lastCtrlCTimeoutId: ReturnType<typeof setTimeout> | null,
+  setLastCtrlCTimeoutId: (value: ReturnType<typeof setTimeout> | null) => void,
 ): void {
   if (prompt.length > 0) {
     saveUndoState();
@@ -436,17 +438,29 @@ export function handleCtrlC(
   }
   cancelGeneration?.();
   const now = Date.now();
+  // Clear any hide-timer pending from a prior press before deciding this
+  // one's outcome, whichever branch below runs. Without this, a hide-timer
+  // scheduled by an earlier press could still fire after a newer notice
+  // window opened, or after exitApp() was just called (if exitApp isn't
+  // synchronous) — flipping showExitNotice/requestRender during a shutdown
+  // the user already believes is in progress.
+  if (lastCtrlCTimeoutId !== null) {
+    clearTimeout(lastCtrlCTimeoutId);
+    setLastCtrlCTimeoutId(null);
+  }
   if (now - lastCtrlCTime < 1000) {
     exitApp();
-  } else {
-    setLastCtrlCTime(now);
-    setShowExitNotice(true);
-    requestRender();
-    setTimeout(() => {
-      setShowExitNotice(false);
-      requestRender();
-    }, 1000);
+    return;
   }
+  setLastCtrlCTime(now);
+  setShowExitNotice(true);
+  requestRender();
+  const timeoutId = setTimeout(() => {
+    setShowExitNotice(false);
+    setLastCtrlCTimeoutId(null);
+    requestRender();
+  }, 1000);
+  setLastCtrlCTimeoutId(timeoutId);
 }
 
 export function handleClipboardPaste(

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

@@ -30,6 +30,27 @@ export type PanelFocusRouteState = {
   handlePathCompletion: () => boolean;
   cyclePanelTab: (direction: 'next' | 'prev') => void;
   onPanelInputConsumed?: (activePanel: import('../panels/types.ts').Panel | null, key: string) => void;
+  /**
+   * True when THIS token is a paste: a single 'text' token whose value holds
+   * more than one character. The SDK tokenizer emits a bracketed paste
+   * (\x1b[?2004h, enabled in main.ts init) as exactly one such token; discrete
+   * keystrokes — even several batched into one feed() by render-tick latency —
+   * arrive as separate 1-char tokens. See the text-token branch below.
+   */
+  isPasteToken: boolean;
+  /**
+   * One-shot hint emitted when a paste is dropped because the focused panel has
+   * no text capture (Invariant A: focus must not silently flip to the composer).
+   */
+  onPasteDropped?: (panelName: string) => void;
+  /**
+   * True while a turn is actively streaming; gates Escape's cancel-first
+   * precedence (I6.1) ahead of the panel's own two-stage escape contract
+   * below.
+   */
+  isTurnActive: () => boolean;
+  /** Cancel the active turn. Wired to commandContext.cancelGeneration. */
+  cancelGeneration: () => void;
 };
 
 export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputToken): {
@@ -66,6 +87,25 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
     // (e.g. dismiss a confirm dialog or clear search). Only unfocus if the
     // panel returns false (unconsumed) or there is no active panel.
     if (token.logicalName === 'escape') {
+      // I6.1: while a turn is streaming, a focused panel must not be able to
+      // swallow the only way to cancel it (replay R5) — Escape's first job is
+      // always cancel-turn. The panel's own two-stage consume-or-unfocus
+      // contract below only runs once no turn is active, so a *second*
+      // Escape (now with the turn already cancelled) falls through to it
+      // normally. panelFocused is left unchanged here (panel stays open and
+      // focused) — the panel close moves to that second Escape, or to
+      // Ctrl+X (panel-close, keybindings.ts), which is handled earlier in
+      // handleGlobalShortcutToken and is unaffected by this branch. This
+      // deliberately calls cancelGeneration() directly instead of routing
+      // through the shared handleEscape() (handler-modal-stack.ts) — that
+      // function's fallthrough order (modal-pop -> active-modal-close ->
+      // clear-nonempty-prompt -> cancelGeneration) is not guaranteed to reach
+      // cancelGeneration first in every state combination.
+      if (state.isTurnActive()) {
+        state.cancelGeneration();
+        state.requestRender();
+        return { handled: true, panelFocused };
+      }
       const activePanel = state.panelManager.getActive();
       const panelConsumedEscape = activePanel?.handleInput?.('escape') ?? false;
       if (panelConsumedEscape) {
@@ -113,6 +153,20 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
 
   if (token.type === 'text' && token.value) {
     const activePanel = state.panelManager.getActive();
+    // Invariant A/B (W6.2). A paste (isPasteToken: one multi-char text token)
+    // into a focused text-capturing panel (a `/`-search or steer-draft field —
+    // isCapturingTextBurst) is forwarded verbatim below; into any other focused
+    // panel it is DROPPED with a one-shot hint — never exploded into per-char
+    // hotkeys, and never a silent focus flip to the composer (what the old
+    // per-feed char-sum burst guard did, which also misfired on two quick nav
+    // keys in one feed). Focus moves only on an explicit transfer verb, so
+    // panelFocused is left unchanged. Discrete 1-char keystrokes are not pastes
+    // and fall through to the per-char dispatch below, one at a time.
+    if (state.isPasteToken && !activePanel?.isCapturingTextBurst?.()) {
+      state.onPasteDropped?.(activePanel?.name ?? 'the panel');
+      state.requestRender();
+      return { handled: true, panelFocused };
+    }
     if (activePanel?.handleInput) {
       for (const ch of token.value) {
         activePanel.handleInput(ch);
@@ -128,7 +182,8 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
 export type IndicatorFocusRouteState = {
   indicatorFocused: boolean;
   modalOpened: (name: string) => void;
-  processModal: { open: () => void };
+  /** W2.2: the footer process indicator's [Enter] opens the Fleet panel (F2 also opens the Fleet panel; the retired process modal was removed in W6.2). */
+  openFleetPanel: () => void;
   requestRender: () => void;
 };
 
@@ -149,8 +204,9 @@ export function handleIndicatorFocusToken(state: IndicatorFocusRouteState, token
     }
     if (token.logicalName === 'enter') {
       indicatorFocused = false;
-      state.modalOpened('process');
-      state.processModal.open();
+      // W2.2: repointed from the retired process modal (removed in W6.2) to the
+      // Fleet panel — F2 also opens the Fleet panel (handlePromptKeyToken f2).
+      state.openFleetPanel();
       state.requestRender();
       return { handled: true, indicatorFocused };
     }
@@ -229,7 +285,15 @@ export function handlePromptTextToken(state: TextRouteState, token: InputToken):
     }
   }
 
-  if (prompt === '/' && state.commandRegistry) {
+  if (prompt === '/') {
+    // Arm commandMode as soon as the prompt becomes a bare '/', regardless of
+    // whether commandRegistry has been (re)attached yet — this is a one-shot
+    // transition (the only place commandMode ever becomes true), and gating
+    // it on commandRegistry meant a transient null during a modal/overlay
+    // handoff would permanently miss the window: every following keystroke
+    // is then processed as plain chat text with no way to recover. Dispatch
+    // (handleCommandModeToken, and the enter-key fallback below) still checks
+    // commandRegistry itself before actually running anything.
     commandMode = true;
     state.modalOpened('command');
     state.autocomplete?.update('');
@@ -257,9 +321,18 @@ export type KeyRouteState = {
   indicatorFocused: boolean;
   conversationManager: ConversationManager | null;
   commandContext: CommandContext | undefined;
+  /**
+   * Optional: only used by the enter-key desync safety net below (a stray
+   * slash-prefixed submission with commandMode somehow still false). When
+   * absent, that fallback simply doesn't trigger — the primary fix (arming
+   * commandMode on the '/' keystroke regardless of registry attachment, in
+   * handlePromptTextToken above) is what actually prevents the desync.
+   */
+  commandRegistry?: CommandRegistry | null;
   autocomplete: AutocompleteEngine | null;
   blockActionsMenu: { open: (block: BlockMeta) => void };
-  processModal: { open: () => void };
+  /** W6.2 e: F2 opens+focuses the Fleet panel (which subsumes the retired process modal). */
+  openFleetPanel: () => void;
   modalOpened: (name: string) => void;
   saveUndoState: () => void;
   /** Break the undo coalescing group (call on cursor moves). */
@@ -351,6 +424,30 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
       return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
     }
     if (text) {
+      // Safety net for a desynced commandMode: text is command-shaped (starts
+      // with '/') but commandMode never armed — e.g. the '/' keystroke landed
+      // during a modal/overlay handoff window. handleCommandModeToken (the
+      // normal dispatch path for '/name ...') never runs in this state since
+      // it early-returns when commandMode is false, so without this the text
+      // would fall straight through to submitInput as ordinary chat. Re-derive
+      // intent from the literal text instead of trusting commandMode alone.
+      if (!commandMode && text.startsWith('/') && state.commandRegistry && state.commandContext?.executeCommand) {
+        const parts = text.slice(1).trim().split(/\s+/);
+        const name = parts[0];
+        const args = parts.slice(1);
+        prompt = '';
+        cursorPos = 0;
+        if (name) {
+          const executeCommand = state.commandContext.executeCommand;
+          void executeCommand(name, args).then((handled) => {
+            if (!handled) {
+              state.commandContext?.submitInput?.(text);
+            }
+            state.requestRender();
+          });
+        }
+        return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
+      }
       const expanded = state.expandPrompt(text);
       const historyRecallText = typeof expanded === 'string'
         ? expanded
@@ -508,8 +605,11 @@ export function handlePromptKeyToken(state: KeyRouteState, token: InputToken): {
 
   if (token.logicalName === 'f2') {
     indicatorFocused = false;
-    state.modalOpened('process');
-    state.processModal.open();
+    // W6.2 e: F2 opens AND focuses the Fleet panel, which subsumes the deleted
+    // process modal (ProcessModal/AgentDetailModal/LiveTailModal — removed in
+    // W6.1 once this repoint made them unreachable). openFleetPanel sets
+    // panelFocused on the shared context directly, so nothing more is returned.
+    state.openFleetPanel();
     return { handled: true, prompt, cursorPos, inputScrollTop, commandMode, indicatorFocused };
   }
 

package/src/input/handler-feed.ts

@@ -9,15 +9,13 @@ import type { SelectionResult } from './selection-modal.ts';
 import { SearchManager } from './search.ts';
 import type { InputHistory, HistorySearch } from './input-history.ts';
 import type { BlockMeta, ConversationManager } from '../core/conversation';
-import { ProcessModal } from '../renderer/process-modal.ts';
-import { LiveTailModal } from '../renderer/live-tail-modal.ts';
 import { BlockActionsMenu } from '../renderer/block-actions.ts';
-import { AgentDetailModal } from '../renderer/agent-detail-modal.ts';
 import { ContextInspectorModal } from '../renderer/context-inspector.ts';
 import { BookmarkModal } from './bookmark-modal.ts';
 import { SettingsModal } from './settings-modal.ts';
 import type { McpWorkspace } from './mcp-workspace.ts';
 import { SessionPickerModal } from './session-picker-modal.ts';
+import type { ConfigModal } from './config-modal.ts';
 import { ProfilePickerModal } from './profile-picker-modal.ts';
 import type { OnboardingWizardController } from './onboarding/onboarding-wizard.ts';
 import type { OnboardingWizardAction } from './onboarding/onboarding-wizard.ts';
@@ -45,6 +43,7 @@ import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
 import type { ModelPickerTarget } from './model-picker.ts';
 import type { KillRing } from './kill-ring.ts';
+import type { FocusTracker } from '../core/focus-tracker.ts';
 
 /**
  * InputFeedContext — The single long-lived context object passed to feedInputTokens
@@ -72,8 +71,8 @@ import type { KillRing } from './kill-ring.ts';
  *   - `pasteRegistry`, `imageRegistry` — owned Maps, never replaced
  *   - `selectionModal`, `bookmarkModal`, `settingsModal`, `sessionPickerModal`,
  *     `profilePickerModal` — modal objects constructed once in InputHandler constructor
- *   - `filePicker`, `modelPicker`, `onboardingWizard`, `processModal`, `liveTailModal`,
- *     `agentDetailModal`, `contextInspectorModal`, `blockActionsMenu`, `searchManager`, `historySearch` —
+ *   - `filePicker`, `modelPicker`, `onboardingWizard`,
+ *     `contextInspectorModal`, `blockActionsMenu`, `searchManager`, `historySearch` —
  *     service objects constructed once
  *   - `panelManager`, `keybindingsManager` — from uiServices, stable for app lifetime
  *   - `modalStack` — reference to the handler's shared array (mutated in place)
@@ -111,6 +110,7 @@ export interface InputFeedContext {
   readonly mcpWorkspace: McpWorkspace;
   readonly sessionPickerModal: SessionPickerModal;
   readonly profilePickerModal: ProfilePickerModal;
+  readonly configModal: ConfigModal;
   readonly historySearch: HistorySearch;
   commandRegistry: CommandRegistry | null;
   commandContext: CommandContext | undefined;
@@ -118,9 +118,6 @@ export interface InputFeedContext {
   readonly filePicker: FilePickerModal;
   readonly modelPicker: ModelPickerModal;
   readonly onboardingWizard: OnboardingWizardController;
-  readonly processModal: ProcessModal;
-  readonly liveTailModal: LiveTailModal;
-  readonly agentDetailModal: AgentDetailModal;
   readonly contextInspectorModal: ContextInspectorModal;
   readonly blockActionsMenu: BlockActionsMenu;
   readonly searchManager: SearchManager;
@@ -131,6 +128,8 @@ export interface InputFeedContext {
   inputHistory: InputHistory | null;
   conversationManager: ConversationManager | null;
   readonly killRing: KillRing;
+  /** Terminal focus tracker (W2.3) — updated here from 'focus' tokens, read by the unfocused-alert notifiers in core/. */
+  readonly focusTracker: FocusTracker;
   readonly getHistory: () => InfiniteBuffer;
   readonly getViewportHeight: () => number;
   readonly getScrollTop: () => number;
@@ -180,7 +179,34 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
   const lineCount = history.getLineCount();
   const keybindings = context.keybindingsManager;
 
+  // Shared opener for the Fleet panel: makes it visible AND transfers keyboard
+  // focus to it. panelManager.open() only makes the panel active — focus is a
+  // separate axis (see PanelManager.focusPanels()/getFocusTarget()); without the
+  // focusPanels() call, j/k/i/K land silently in the composer until Tab. Used by
+  // the footer indicator's [Enter] and by F2 (W6.2 e: F2 and the footer
+  // indicator both subsume the retired process modal). Mirrors the Ctrl+P
+  // panel-picker launcher (ui-openers.ts openPanelPicker).
+  const openFleetPanel = (): void => {
+    context.panelManager.open('fleet');
+    context.panelManager.focusPanels();
+    context.panelFocused = true;
+  };
+
+  // Paste-ness is a per-TOKEN property, computed at the handlePanelFocusToken
+  // call below — never a per-feed character sum. The SDK tokenizer emits a
+  // bracketed paste (\x1b[?2004h, enabled in main.ts terminal init) as ONE
+  // 'text' token holding the whole payload, while discrete keystrokes — even
+  // several batched into one feed() by render-tick latency — arrive as
+  // separate 1-char 'text' tokens. The old per-feed sum misread two quick nav
+  // keystrokes (e.g. j then k in one drain) as a "burst" and yanked focus.
   for (const token of tokens) {
+    // Focus-reporting tokens (CSI ?1004h, W2.3) never reach the composer or any
+    // modal route — consumed here, first, unconditionally. No render needed.
+    if (token.type === 'focus') {
+      context.focusTracker.setFocused(token.action === 'in');
+      continue;
+    }
+
     if (token.type === 'key' && context.keybindingsManager.matches('clear-cancel', token)) {
       context.handleCtrlC();
       continue;
@@ -200,6 +226,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       mcpWorkspace: context.mcpWorkspace,
       sessionPickerModal: context.sessionPickerModal,
       profilePickerModal: context.profilePickerModal,
+      configModal: context.configModal,
       onboardingWizard: context.onboardingWizard,
       helpOverlayActive: context.helpOverlayActive,
       helpScrollOffset: context.helpScrollOffset,
@@ -214,9 +241,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       getViewportHeight: context.getViewportHeight,
       requestRender: context.requestRender,
       handleEscape: context.handleEscape,
-      liveTailModal: context.liveTailModal,
-      processModal: context.processModal,
-      agentDetailModal: context.agentDetailModal,
       contextInspectorModal: context.contextInspectorModal,
       modalOpened: context.modalOpened,
       filePicker: context.filePicker,
@@ -320,6 +344,17 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       panelManager: context.panelManager,
       keybindingsManager: context.keybindingsManager,
       onPanelInputConsumed: context.onPanelInputConsumed,
+      // Per-token paste classification (Invariant B): a paste is a single
+      // 'text' token whose value holds more than one character.
+      isPasteToken: token.type === 'text' && token.value.length > 1,
+      // One-shot honesty hint when a paste is dropped into a non-capturing
+      // focused panel (Invariant A: focus never silently flips to the composer).
+      onPasteDropped: (panelName: string) =>
+        context.commandContext?.print(
+          `paste ignored — focus is on ${panelName}; Tab returns to composer`,
+        ),
+      isTurnActive: () => context.commandContext?.isGenerating?.() ?? false,
+      cancelGeneration: () => context.commandContext?.cancelGeneration?.(),
     }, token);
     context.panelFocused = panelRoute.panelFocused;
     if (panelRoute.handled) {
@@ -329,7 +364,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
     const indicatorRoute = handleIndicatorFocusToken({
       indicatorFocused: context.indicatorFocused,
       modalOpened: context.modalOpened,
-      processModal: context.processModal,
+      openFleetPanel,
       requestRender: context.requestRender,
     }, token);
     context.indicatorFocused = indicatorRoute.indicatorFocused;
@@ -408,9 +443,10 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         indicatorFocused: context.indicatorFocused,
         conversationManager: context.conversationManager,
         commandContext: context.commandContext,
+        commandRegistry: context.commandRegistry,
         autocomplete: context.autocomplete,
         blockActionsMenu: { open: (block: BlockMeta) => context.blockActionsMenu.open(block) },
-        processModal: context.processModal,
+        openFleetPanel,
         modalOpened: context.modalOpened,
         saveUndoState: context.saveUndoState,
         breakUndoCoalesce: context.breakUndoCoalesce,

package/src/input/handler-interactions.ts

@@ -193,6 +193,8 @@ export function handleCtrlCForHandler(handler: InputHandler): void {
       handler.lastCtrlCTime,
       (value) => { handler.lastCtrlCTime = value; },
       (value) => { handler.showExitNotice = value; },
+      handler.lastCtrlCTimeoutId,
+      (value) => { handler.lastCtrlCTimeoutId = value; },
     );
   }
 
@@ -223,14 +225,12 @@ export function handleEscapeForHandler(handler: InputHandler): void {
       helpOverlayActive: handler.helpOverlayActive,
       shortcutsOverlayActive: handler.shortcutsOverlayActive,
       bookmarkModal: handler.bookmarkModal,
-      agentDetailModal: handler.agentDetailModal,
-      liveTailModal: handler.liveTailModal,
       settingsModal: handler.settingsModal,
       mcpWorkspace: handler.mcpWorkspace,
       sessionPickerModal: handler.sessionPickerModal,
       profilePickerModal: handler.profilePickerModal,
+      configModal: handler.configModal,
       contextInspectorModal: handler.contextInspectorModal,
-      processModal: handler.processModal,
       modelPicker: handler.modelPicker,
       filePicker: handler.filePicker,
       blockActionsMenu: handler.blockActionsMenu,

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

@@ -1,6 +1,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 type { ConfigModal } from './config-modal.ts';
 import { openTtsProviderPicker, openTtsVoicePicker } from './tts-settings-actions.ts';
 import { isTextBackspace } from './delete-key-policy.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
@@ -533,3 +534,67 @@ export function handleProfilePickerToken(state: ProfilePickerRouteState, token:
   state.requestRender();
   return true;
 }
+
+type ConfigModalRouteState = {
+  configModal: ConfigModal;
+  commandContext?: CommandContext;
+  requestRender: () => void;
+  handleEscape: () => void;
+};
+
+/**
+ * Route a key to the generic config-modal host (W6.1 MIGRATE-TO-MODAL
+ * surfaces). The host owns the reserved navigation keys (Esc, up/down/j/k tab
+ * left/right); every other key is offered to the active surface's declarative
+ * action table (fireAction handles the two-press confirm for destructive
+ * actions). Any unrecognised key is absorbed so the modal stays modal — this is
+ * the same "active modal captures all keys" shape as the other modal routers.
+ */
+export function handleConfigModalToken(state: ConfigModalRouteState, token: InputToken): boolean {
+  if (!state.configModal.active) return false;
+
+  if (token.type === 'key') {
+    switch (token.logicalName) {
+      case 'escape':
+        state.handleEscape();
+        return true;
+      case 'up':
+        state.configModal.moveUp();
+        state.requestRender();
+        return true;
+      case 'down':
+        state.configModal.moveDown();
+        state.requestRender();
+        return true;
+      case 'left':
+        state.configModal.prevTab();
+        state.requestRender();
+        return true;
+      case 'right':
+      case 'tab':
+        state.configModal.nextTab();
+        state.requestRender();
+        return true;
+    }
+  } else if (token.type === 'text') {
+    if (token.value === 'j') { state.configModal.moveDown(); state.requestRender(); return true; }
+    if (token.value === 'k') { state.configModal.moveUp(); state.requestRender(); return true; }
+  }
+
+  const actionKey = token.type === 'key' ? (token.logicalName ?? '') : token.type === 'text' ? token.value : '';
+  const fired = actionKey.length > 0 && state.configModal.fireAction(actionKey, {
+    print: (message: string) => state.commandContext?.print(message),
+    executeCommand: state.commandContext?.executeCommand,
+    openModal: state.commandContext?.openModal,
+  });
+  if (fired) {
+    state.requestRender();
+    return true;
+  }
+
+  // Unhandled key while a config modal is open: drop any pending confirm and
+  // absorb the key (the modal owns the keyboard while it is active).
+  state.configModal.clearConfirmOnMiss();
+  state.requestRender();
+  return true;
+}

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

@@ -40,12 +40,12 @@ export type EscapeState = ModalStackState & {
   selectionCallback: ((result: SelectionResult | null) => void) | null;
   bookmarkModal: ModalStackState['bookmarkModal'] & { open: () => void };
   contextInspectorModal: ModalStackState['contextInspectorModal'] & { open: () => void };
-  processModal: ModalStackState['processModal'] & { open: () => void };
   settingsModal: ModalStackState['settingsModal'] & {
     editingMode: boolean;
     cancelEdit: () => void;
   };
   mcpWorkspace?: ModalStackState['mcpWorkspace'];
+  configModal: ModalStackState['configModal'] & { reopen: () => void };
   selectionModal: ModalStackState['selectionModal'];
   autocompleteReset: () => void;
   autocompleteUpdate?: (query: string) => void;
@@ -120,14 +120,12 @@ export function handleEscape(state: EscapeState): {
         shortcutsScrollOffset = 0;
       },
       closeBookmark: () => state.bookmarkModal.close(),
-      closeAgentDetail: () => state.agentDetailModal.close(),
-      closeLiveTail: () => state.liveTailModal.close(),
       closeSettings: () => state.settingsModal.close(),
       closeMcpWorkspace: () => state.mcpWorkspace?.close(),
       closeSessionPicker: () => state.sessionPickerModal.close(),
       closeProfilePicker: () => state.profilePickerModal.close(),
+      closeConfigModal: () => state.configModal.close(),
       closeContextInspector: () => state.contextInspectorModal.close(),
-      closeProcess: () => state.processModal.close(),
       closeModelPicker: () => {
         state.modelPicker.close();
         state.restoreOnboardingModelPickerCancelState?.();
@@ -161,8 +159,8 @@ export function handleEscape(state: EscapeState): {
       openHelp: () => { helpOverlayActive = true; },
       openShortcuts: () => { shortcutsOverlayActive = true; },
       openBookmark: () => state.bookmarkModal.open(),
-      openProcess: () => state.processModal.open(),
       openContextInspector: () => state.contextInspectorModal.open(),
+      openConfigModal: () => state.configModal.reopen(),
       openMcpWorkspace: () => state.mcpWorkspace?.reopen(),
       openOnboarding: () => state.onboardingWizard?.reopen(),
       openCommandMode: () => {

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

@@ -5,13 +5,11 @@ import type { BookmarkModal } from './bookmark-modal.ts';
 import type { SettingsModal } from './settings-modal.ts';
 import type { SessionPickerModal } from './session-picker-modal.ts';
 import type { ProfilePickerModal } from './profile-picker-modal.ts';
+import type { ConfigModal } from './config-modal.ts';
 import type { HistorySearch } from './input-history.ts';
 import type { ModelPickerModal } from './model-picker.ts';
 import { handleMcpWorkspaceToken, type McpWorkspace } from './mcp-workspace.ts';
 import type { CommandContext } from './command-registry.ts';
-import type { LiveTailModal } from '../renderer/live-tail-modal.ts';
-import type { ProcessModal } from '../renderer/process-modal.ts';
-import type { AgentDetailModal } from '../renderer/agent-detail-modal.ts';
 import type { ContextInspectorModal } from '../renderer/context-inspector.ts';
 import type { FilePickerModal } from './file-picker.ts';
 import type { BlockActionsMenu, BlockActionId } from '../renderer/block-actions.ts';
@@ -21,6 +19,7 @@ import { handleHistorySearchToken, handleOverlayToken, handleSearchModeToken } f
 import { handleOnboardingWizardToken } from './onboarding/handler-onboarding-routes.ts';
 import {
   handleBookmarkModalToken,
+  handleConfigModalToken,
   handleProfilePickerToken,
   handleSelectionModalToken,
   handleSessionPickerToken,
@@ -30,9 +29,7 @@ import {
   handleBlockActionsToken,
   handleEscapeOnlyModalToken,
   handleFilePickerToken,
-  handleLiveTailToken,
   handleModelPickerToken,
-  handleProcessModalToken,
 } from './handler-picker-routes.ts';
 
 export type ModalTokenRouteState = {
@@ -47,6 +44,7 @@ export type ModalTokenRouteState = {
   mcpWorkspace: McpWorkspace;
   sessionPickerModal: SessionPickerModal;
   profilePickerModal: ProfilePickerModal;
+  configModal: ConfigModal;
   onboardingWizard: OnboardingWizardController;
   helpOverlayActive: boolean;
   helpScrollOffset: number;
@@ -61,9 +59,6 @@ export type ModalTokenRouteState = {
   getViewportHeight: () => number;
   requestRender: () => void;
   handleEscape: () => void;
-  liveTailModal: LiveTailModal;
-  processModal: ProcessModal;
-  agentDetailModal: AgentDetailModal;
   contextInspectorModal: ContextInspectorModal;
   modalOpened: (name: string) => void;
   filePicker: FilePickerModal;
@@ -177,6 +172,15 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     return withState(state, true);
   }
 
+  if (handleConfigModalToken({
+    configModal: state.configModal,
+    commandContext: state.commandContext,
+    requestRender: state.requestRender,
+    handleEscape: state.handleEscape,
+  }, token)) {
+    return withState(state, true);
+  }
+
   const overlayState = {
     helpOverlayActive: state.helpOverlayActive,
     helpScrollOffset: state.helpScrollOffset,
@@ -223,36 +227,10 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     return withState(state, true);
   }
 
-  if (handleLiveTailToken({
-    liveTailModal: state.liveTailModal,
-    processModal: state.processModal,
-    requestRender: state.requestRender,
-    handleEscape: state.handleEscape,
-  }, token)) {
-    return withState(state, true);
-  }
-
-  // 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);
-  }
+  // W6.1 retirement: the live-tail, agent-detail, and process-modal token
+  // routes were removed with those modals (F2 now opens Fleet, which subsumes
+  // the live process tree; the three modals were structurally unreachable after
+  // the F2 repoint and were deleted).
 
   if (handleEscapeOnlyModalToken({
     active: state.contextInspectorModal.active,
@@ -262,17 +240,6 @@ export function handleModalTokenRoutes(state: ModalTokenRouteState, token: Input
     return withState(state, true);
   }
 
-  if (handleProcessModalToken({
-    processModal: state.processModal,
-    liveTailModal: state.liveTailModal,
-    agentDetailModal: state.agentDetailModal,
-    modalOpened: state.modalOpened,
-    requestRender: state.requestRender,
-    handleEscape: state.handleEscape,
-  }, token)) {
-    return withState(state, true);
-  }
-
   const filePickerState = {
     filePicker: state.filePicker,
     prompt: state.prompt,