@pellux/goodvibes-tui 1.1.0 → 1.7.0

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,17 +179,34 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
   const lineCount = history.getLineCount();
   const keybindings = context.keybindingsManager;
 
-  // A single stdin chunk can tokenize into several 'text' tokens (fast-typed
-  // burst) or one 'text' token with a multi-char value (bracketed paste).
-  // Computed once per feed() call, not per token, so per-token cost stays
-  // the same O(1) check it always was.
-  let totalPrintableChars = 0;
-  for (const t of tokens) {
-    if (t.type === 'text') totalPrintableChars += t.value.length;
-  }
-  const isPrintableBurst = totalPrintableChars > 1;
+  // 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;
@@ -210,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,
@@ -224,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,
@@ -330,7 +344,17 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       panelManager: context.panelManager,
       keybindingsManager: context.keybindingsManager,
       onPanelInputConsumed: context.onPanelInputConsumed,
-      isPrintableBurst,
+      // 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) {
@@ -340,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;
@@ -422,7 +446,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         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

@@ -225,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,

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

@@ -5,7 +5,6 @@ import type { CapabilityFilter, CategoryFilter, ModelPickerModal } from './model
 import { MODEL_PICKER_CHROME_LINES } from '../renderer/model-picker-overlay.ts';
 import { resolveAndValidatePath } from '@pellux/goodvibes-sdk/platform/utils';
 import { logger } from '@pellux/goodvibes-sdk/platform/utils';
-import type { ProcessEntry } from '../renderer/process-modal.ts';
 import type { BlockActionId } from '../renderer/block-actions.ts';
 
 type ModelPickerRouteState = {
@@ -93,6 +92,13 @@ export function handleModelPickerToken(state: ModelPickerRouteState, token: Inpu
         }
         state.modelPicker.close();
         if (state.modalStack[state.modalStack.length - 1] === 'modelPicker') state.modalStack.pop();
+      } else if (mode === 'embeddingProvider') {
+        const selectedProvider = state.modelPicker.embeddingProviders[idx];
+        if (selectedProvider) {
+          state.commandContext?.completeEmbeddingProviderSelection?.(selectedProvider.id);
+        }
+        state.modelPicker.close();
+        if (state.modalStack[state.modalStack.length - 1] === 'modelPicker') state.modalStack.pop();
       } else if (mode === 'contextCap') {
         const capModel = state.modelPicker.contextCapPendingModel;
         if (capModel) {
@@ -201,99 +207,10 @@ function cycleCapabilityFilter(modelPicker: ModelPickerModal): void {
   modelPicker.setCapabilityFilter(cycle[(cur + 1) % cycle.length]!);
 }
 
-type ProcessRouteState = {
-  processModal: {
-    active: boolean;
-    moveUp: () => void;
-    moveDown: () => void;
-    getSelected: () => ProcessEntry | undefined;
-    close: () => void;
-    open: () => void;
-    killSelected: () => boolean;
-    refresh: () => void;
-  };
-  liveTailModal: {
-    open: (entry: ProcessEntry) => void;
-  };
-  agentDetailModal: {
-    open: (id: string) => void;
-  };
-  modalOpened: (name: string) => void;
-  requestRender: () => void;
-  handleEscape: () => void;
-};
-
-export function handleProcessModalToken(state: ProcessRouteState, token: InputToken): boolean {
-  if (!state.processModal.active) return false;
-
-  if (token.type === 'key') {
-    if (token.logicalName === 'escape') {
-      state.handleEscape();
-      return true;
-    }
-    if (token.logicalName === 'up') state.processModal.moveUp();
-    else if (token.logicalName === 'down') state.processModal.moveDown();
-    else if (token.logicalName === 'enter') {
-      const entry = state.processModal.getSelected();
-      if (entry) {
-        if (entry.type === 'agent') {
-          state.modalOpened('agentDetail');
-          state.processModal.close();
-          state.agentDetailModal.open(entry.id);
-        } else {
-          state.modalOpened('liveTail');
-          state.processModal.close();
-          state.liveTailModal.open(entry);
-        }
-      }
-    }
-  } else if (token.type === 'text' && token.value === 'k') {
-    const killed = state.processModal.killSelected();
-    if (killed) state.processModal.refresh();
-  }
-
-  state.requestRender();
-  return true;
-}
-
-type LiveTailRouteState = {
-  liveTailModal: {
-    active: boolean;
-    scrollUp: () => void;
-    scrollDown: () => void;
-    killProcess: () => void;
-    close: () => void;
-  };
-  processModal: {
-    open: () => void;
-  };
-  requestRender: () => void;
-  handleEscape: () => void;
-};
-
-export function handleLiveTailToken(state: LiveTailRouteState, token: InputToken): boolean {
-  if (!state.liveTailModal.active) return false;
-
-  const killAndReturn = (): void => {
-    state.liveTailModal.killProcess();
-    state.handleEscape();
-  };
-
-  if (token.type === 'key') {
-    if (token.logicalName === 'escape') {
-      state.handleEscape();
-      return true;
-    }
-    if (token.logicalName === 'up') state.liveTailModal.scrollUp();
-    else if (token.logicalName === 'down') state.liveTailModal.scrollDown();
-    else if (token.logicalName === 'k') killAndReturn();
-  } else if (token.type === 'text' && token.value === 'k') {
-    killAndReturn();
-  }
-
-  state.requestRender();
-  return true;
-}
+// W6.2 e / W6.1 retirement: the process-modal and live-tail-modal token routes
+// were removed with those modals (F2 now opens Fleet, which subsumes the live
+// process tree). ProcessModal/AgentDetailModal/LiveTailModal were structurally
+// unreachable after the F2 repoint and were deleted.
 
 type EscapeOnlyModalRouteState = {
   active: boolean;

package/src/input/handler-shortcuts.ts

@@ -55,13 +55,16 @@ export function handleGlobalShortcutToken(
 ): boolean {
   if (token.type !== 'key') return false;
 
-  // Fast-path: bare pageup/pagedown have no keybinding entry.
-  if (token.logicalName === 'pageup') {
+  // Fast-path: BARE pageup/pagedown scroll the transcript. The `!token.ctrl`
+  // guard is load-bearing: Ctrl+PageUp/PageDown are the panel-tab-prev/next
+  // chords, so they must fall through to the keybinding lookup below instead of
+  // being swallowed here as a scroll.
+  if (token.logicalName === 'pageup' && !token.ctrl) {
     if (state.panelFocused) return false;
     state.scroll(-Math.max(1, viewportHeight - 2));
     return true;
   }
-  if (token.logicalName === 'pagedown') {
+  if (token.logicalName === 'pagedown' && !token.ctrl) {
     if (state.panelFocused) return false;
     state.scroll(Math.max(1, viewportHeight - 2));
     return true;
@@ -101,6 +104,13 @@ export function handleGlobalShortcutToken(
     case 'panel-close': {
       const pm = state.panelManager;
       const active = pm.getActivePanel();
+      // Wave-3: give the active panel a chance to consume Ctrl+X for an
+      // in-panel action (FleetPanel session-tab detach) before it closes the
+      // panel outright — see Panel.interceptPanelClose's doc comment.
+      if (active?.interceptPanelClose?.()) {
+        state.requestRender();
+        return true;
+      }
       if (active) {
         pm.close(active.id);
         state.requestRender();
@@ -160,17 +170,17 @@ export function handleGlobalShortcutToken(
     }
 
     case 'panel-ops': {
-      // Ctrl+O: open the Ops Control panel. Prefer the command-context callback
-      // (wired only when the operator-control-plane feature flag is on) so it
-      // reuses whatever show/open semantics bootstrap.ts set up; otherwise fall
-      // back to opening the always-registered 'ops-control' panel type directly
-      // — it renders an honest not-configured state when its deps are absent.
-      if (state.commandContext?.openOpsPanel) {
-        state.commandContext.openOpsPanel();
-      } else {
-        state.panelManager.open('ops-control');
-        state.requestRender();
-      }
+      // Ctrl+O: open AND focus the Fleet panel. The former Ops Control panel was
+      // retired to an 'ops-control' -> 'fleet' alias (W6.1); rather than route
+      // through the now-aliased openOpsPanel callback (which opens without
+      // transferring focus), open 'fleet' directly and grab focus — mirroring
+      // the footer indicator's [Enter] -> openFleetPanel path so j/k/i/K land in
+      // the panel immediately instead of the composer.
+      const pm = state.panelManager;
+      pm.open('fleet');
+      pm.focusPanels();
+      state.panelFocused = true;
+      state.requestRender();
       return true;
     }
 

package/src/input/handler-types.ts

@@ -23,14 +23,12 @@ 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 { ConfigModal } from './config-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';
@@ -105,14 +103,12 @@ export interface InputHandlerLike {
 
   // ── Modal objects ─────────────────────────────────────────────────────────
   bookmarkModal: BookmarkModal;
-  agentDetailModal: AgentDetailModal;
-  liveTailModal: LiveTailModal;
   settingsModal: SettingsModal;
   mcpWorkspace: McpWorkspace;
   sessionPickerModal: SessionPickerModal;
   profilePickerModal: ProfilePickerModal;
+  configModal: ConfigModal;
   contextInspectorModal: ContextInspectorModal;
-  processModal: ProcessModal;
   modelPicker: ModelPickerModal;
   filePicker: FilePickerModal;
   blockActionsMenu: BlockActionsMenu;