@pellux/goodvibes-tui 2.0.21 → 2.1.1

package/src/input/handler-feed.ts

@@ -1,6 +1,7 @@
 import type { InputToken } from '@pellux/goodvibes-sdk/platform/core';
 import type { InfiniteBuffer } from '@pellux/goodvibes-terminal-shell';
 import type { CommandContext, CommandRegistry } from './command-registry.ts';
+import type { SurfaceModalHost } from './surface-modal-host.ts';
 import { AutocompleteEngine } from './autocomplete.ts';
 import { FilePickerModal } from './file-picker.ts';
 import { ModelPickerModal } from './model-picker.ts';
@@ -11,6 +12,7 @@ import type { InputHistory, HistorySearch } from './input-history.ts';
 import type { BlockMeta, ConversationManager } from '../core/conversation';
 import { BlockActionsMenu } from '../renderer/block-actions.ts';
 import { ContextInspectorModal } from '../renderer/context-inspector.ts';
+import type { OverlayFilters } from './overlay-filter.ts';
 import { BookmarkModal } from './bookmark-modal.ts';
 import { SettingsModal } from './settings-modal.ts';
 import type { McpWorkspace } from './mcp-workspace.ts';
@@ -27,21 +29,17 @@ import {
 import {
   handleIndicatorFocusToken,
   handleMouseToken,
-  handlePanelFocusToken,
   handlePromptKeyToken,
   handlePromptTextToken,
-  type PanelMouseLayout,
 } from './handler-feed-routes.ts';
-import type { PanelBurstGuardState } from './panel-paste-flood-guard.ts';
 import type { WrappedPromptInfo } from './handler-prompt-buffer.ts';
 import { getViewportBottomLine } from '../renderer/conversation-layout.ts';
+import { handleWorkTreeToken } from './handler-work-tree-route.ts';
+import { handleSessionViewToken } from './handler-session-view-route.ts';
 import { handleModalTokenRoutes } from './handler-modal-token-routes.ts';
 import { handleCommandModeToken } from './handler-command-route.ts';
 import { handleGlobalShortcutToken } from './handler-shortcuts.ts';
-import type { Panel } from '../panels/types.ts';
-import { handlePanelIntegrationAction } from './panel-integration-actions.ts';
 import { SelectionManager } from '@pellux/goodvibes-terminal-shell';
-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';
@@ -55,7 +53,7 @@ import type { FocusTracker } from '@pellux/goodvibes-sdk/platform/runtime/operat
  * **Mutable per-feed** (synced from handler at the top of every feed() call, and
  * updated inside action closures via syncFeedContextMutableFields):
  *   - `prompt`, `cursorPos`, current text buffer state
- *   - `commandMode`, `panelFocused`, `indicatorFocused`, focus-mode flags
+ *   - `commandMode`, `indicatorFocused`, focus-mode flags
  *   - `helpOverlayActive`, `helpScrollOffset`, help overlay visibility and scroll
  *   - `shortcutsOverlayActive`, `shortcutsScrollOffset`, shortcuts overlay state
  *   - `nextPasteId`, `nextImageId`, monotonically increasing ID counters
@@ -76,7 +74,7 @@ import type { FocusTracker } from '@pellux/goodvibes-sdk/platform/runtime/operat
  *   - `filePicker`, `modelPicker`, `onboardingWizard`,
  *     `contextInspectorModal`, `blockActionsMenu`, `searchManager`, `historySearch`,
  *     service objects constructed once
- *   - `panelManager`, `keybindingsManager`, from uiServices, stable for app lifetime
+ *   - `keybindingsManager`, from uiServices, stable for app lifetime
  *   - `modalStack`, reference to the handler's shared array (mutated in place)
  *   - `getHistory`, `getViewportHeight`, `getScrollTop`, `scroll`, `exitApp`, stable
  *     callbacks bound in the InputHandler constructor
@@ -90,7 +88,6 @@ export interface InputFeedContext {
   cursorPos: number;
   inputScrollTop: number;
   commandMode: boolean;
-  panelFocused: boolean;
   indicatorFocused: boolean;
   helpOverlayActive: boolean;
   helpScrollOffset: number;
@@ -121,10 +118,11 @@ export interface InputFeedContext {
   readonly modelPicker: ModelPickerModal;
   readonly onboardingWizard: OnboardingWizardController;
   readonly contextInspectorModal: ContextInspectorModal;
+  readonly overlayFilters: OverlayFilters;
   readonly blockActionsMenu: BlockActionsMenu;
+  /** Kit modals (command palette, confirm dialog, ...): they take every key while open. */
+  readonly surfaceModals?: SurfaceModalHost;
   readonly searchManager: SearchManager;
-  readonly panelManager: PanelManager;
-  panelMouseLayout: PanelMouseLayout | null;
   readonly keybindingsManager: KeybindingsManager;
   readonly modalStack: string[];
   inputHistory: InputHistory | null;
@@ -132,14 +130,14 @@ export interface InputFeedContext {
   readonly killRing: KillRing;
   /** Terminal focus tracker, updated here from 'focus' tokens, read by the unfocused-alert notifiers in core/. */
   readonly focusTracker: FocusTracker;
-  /** item 5, the paste-flood guard's persistent state, mutated in place across tokens by handlePanelFocusToken (see panel-paste-flood-guard.ts). Never reallocated. */
-  readonly panelBurstGuard: PanelBurstGuardState;
   readonly getHistory: () => InfiniteBuffer;
   readonly getViewportHeight: () => number;
   readonly getScrollTop: () => number;
   readonly scroll: (delta: number) => void;
   requestRender: () => void;
   readonly modalOpened: (name: string) => void;
+  /** The agent or process view controls (null before the shell wires them). */
+  readonly getSessionView: () => import('./handler-session-view-route.ts').SessionViewControls | null;
   readonly handleEscape: () => void;
   /** Deliver a concealed submission; returns true when concealed mode consumed it. */
   readonly submitConcealedInput: (value: string) => boolean;
@@ -160,11 +158,12 @@ export interface InputFeedContext {
   readonly ensureInputCursorVisible: (contentWidth?: number) => void;
   readonly registerPaste: (content: string) => string;
   readonly executeBlockAction: (id: string) => void;
-  readonly cyclePanelTab: (direction: 'next' | 'prev') => void;
-  readonly onPanelInputConsumed: (activePanel: Panel | null, key: string) => void;
   readonly getWrappedPromptInfo: (contentWidth: number) => WrappedPromptInfo;
   readonly moveCursorVertical: (direction: -1 | 1) => boolean;
   readonly handlePathCompletion: () => boolean;
+  readonly footerTargetAt: (row: number) => import('../renderer/footer-targets.ts').FooterTarget | undefined;
+  readonly openFooterTarget: (target: import('../renderer/footer-targets.ts').FooterTarget) => void;
+  readonly bodyTopRow: () => number;
   readonly handleBlockToggle: () => void;
   readonly findMarkerAtPos: (pos: number) => { start: number; end: number } | null;
   readonly cleanupMarkerRegistry: (text: string) => void;
@@ -185,31 +184,11 @@ 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 (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;
+  // The footer process indicator's Enter opens the Agents modal (so does F2).
+  const openAgentsView = (): void => {
+    context.commandContext?.openAgents?.();
   };
 
-  // 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.
-  // item 5's flood guard reuses that same per-token model but adds
-  // real timing: one `now` per feed() call (not per token) is intentional,
-  // a genuine flood delivers many tokens in one drain, and they should all
-  // measure as arriving "at once", not spread across meaningless sub-ms noise.
-  const now = Date.now();
   for (const token of tokens) {
     // Focus-reporting tokens (CSI ?1004h) never reach the composer or any
     // modal route, consumed here, first, unconditionally. No render needed.
@@ -223,6 +202,16 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       continue;
     }
 
+    // Kit modals sit on top of everything else: focus belongs to the top one.
+    // Esc goes through the shared chain (handler-modal-stack.ts), which pops
+    // exactly one level of the host before anything else.
+    if (context.surfaceModals?.active && (token.type === 'key' || token.type === 'text')) {
+      if (token.type === 'key' && token.logicalName === 'escape') context.handleEscape();
+      else context.surfaceModals.handleToken(token);
+      context.requestRender();
+      continue;
+    }
+
     const modalRoute = handleModalTokenRoutes({
       history,
       conversationManager: context.conversationManager,
@@ -254,6 +243,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       requestRender: context.requestRender,
       handleEscape: context.handleEscape,
       contextInspectorModal: context.contextInspectorModal,
+      overlayFilters: context.overlayFilters,
       modalOpened: context.modalOpened,
       filePicker: context.filePicker,
       imageRegistry: context.imageRegistry,
@@ -286,19 +276,46 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       continue;
     }
 
+    // An agent or process open full screen, and the session chips' Tab (handler-session-view-route.ts).
+    const sessionView = context.getSessionView();
+    const viewState = {
+      controls: sessionView,
+      prompt: context.prompt,
+      cursorPos: context.cursorPos,
+      commandMode: context.commandMode,
+      saveUndoState: context.saveUndoState,
+      requestRender: context.requestRender,
+    };
+    if (handleSessionViewToken(viewState, token)) {
+      context.prompt = viewState.prompt;
+      context.cursorPos = viewState.cursorPos;
+      continue;
+    }
+
+    // The keyboard inside the work tree (Alt+Up enters, Esc leaves; see
+    // handler-work-tree-route.ts). The work tree is main's: inside a view it is not on screen.
+    if (!sessionView?.active && handleWorkTreeToken({
+      conversationManager: context.conversationManager,
+      enterMatch: token.type === 'key' && keybindings.matches('focus-work-tree', token),
+      anchorLine: getViewportBottomLine(scrollTop, viewportHeight, lineCount),
+      scrollTop: context.getScrollTop(),
+      viewportHeight,
+      scroll: context.scroll,
+      requestRender: context.requestRender,
+      onCopied: () => { /* the copy receipt is the transcript line handleBlockCopy logs */ },
+      openAgent: (id) => context.commandContext?.openSessionView?.({ kind: 'agent', id }) ?? false,
+      openProcess: (id) => context.commandContext?.openSessionView?.({ kind: 'process', id }) ?? false,
+    }, token)) {
+      continue;
+    }
+
     if (token.type === 'key') {
-      // Focus can never disagree with workspace visibility: PanelManager owns
-      // focusTarget and self-heals it, and context.panelFocused was seeded from
-      // it at feed entry, so no manual "unfocus if panels vanished" patch is
-      // needed here anymore.
-      // Snapshot these four BEFORE dispatch so the write-back below can tell
-      // a pipeline-driven change (see comment there) from a stale copy.
+      // Snapshot these BEFORE dispatch so the write-back below can tell a
+      // pipeline-driven change (see comment there) from a stale copy.
       const promptBefore = context.prompt;
       const cursorPosBefore = context.cursorPos;
       const commandModeBefore = context.commandMode;
-      const panelFocusedBefore = context.panelFocused;
       const shortcutState = {
-        panelFocused: context.panelFocused,
         prompt: context.prompt,
         cursorPos: context.cursorPos,
         commandMode: context.commandMode,
@@ -324,8 +341,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         handleRedo: context.handleRedo,
         handlePaste: context.handlePaste,
         handleEscape: context.handleEscape,
-        cyclePanelTab: context.cyclePanelTab,
-        panelManager: context.panelManager,
         keybindingsManager: context.keybindingsManager,
         killRing: context.killRing,
       };
@@ -345,7 +360,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         context.prompt = context.prompt === promptBefore ? shortcutState.prompt : context.prompt;
         context.cursorPos = context.cursorPos === cursorPosBefore ? shortcutState.cursorPos : context.cursorPos;
         context.commandMode = context.commandMode === commandModeBefore ? shortcutState.commandMode : context.commandMode;
-        context.panelFocused = context.panelFocused === panelFocusedBefore ? shortcutState.panelFocused : context.panelFocused;
         if (context.commandMode) {
           if (!context.prompt.startsWith('/')) {
             context.commandMode = false;
@@ -363,40 +377,10 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       }
     }
 
-    const panelRoute = handlePanelFocusToken({
-      panelFocused: context.panelFocused,
-      commandMode: context.commandMode,
-      searchActive: context.searchManager.active,
-      autocompleteActive: !!context.autocomplete?.isActive,
-      requestRender: context.requestRender,
-      handlePathCompletion: context.handlePathCompletion,
-      cyclePanelTab: context.cyclePanelTab,
-      panelManager: context.panelManager,
-      keybindingsManager: context.keybindingsManager,
-      onPanelInputConsumed: context.onPanelInputConsumed,
-      now,
-      burstGuard: context.panelBurstGuard,
-      // 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) {
-      continue;
-    }
-
     const indicatorRoute = handleIndicatorFocusToken({
       indicatorFocused: context.indicatorFocused,
       modalOpened: context.modalOpened,
-      openFleetPanel,
+      openAgentsView,
       requestRender: context.requestRender,
     }, token);
     context.indicatorFocused = indicatorRoute.indicatorFocused;
@@ -441,8 +425,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         modalStack: context.modalStack,
         commandRegistry: context.commandRegistry,
         commandContext: context.commandContext,
-        panelFocused: context.panelFocused,
-        panelManager: context.panelManager,
         conversationManager: context.conversationManager,
         requestRender: context.requestRender,
         handleEscape: context.handleEscape,
@@ -458,7 +440,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         context.commandMode = commandState.commandMode;
         context.prompt = commandState.prompt;
         context.cursorPos = commandState.cursorPos;
-        context.panelFocused = commandState.panelFocused;
         context.nextPasteId = commandState.nextPasteId;
         context.nextImageId = commandState.nextImageId;
         continue;
@@ -480,7 +461,7 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         autocomplete: context.autocomplete,
         blockActionsMenu: { open: (block: BlockMeta) => context.blockActionsMenu.open(block) },
         getBlockAnchorLine: () => getViewportBottomLine(scrollTop, viewportHeight, lineCount),
-        openFleetPanel,
+        openAgentsView,
         modalOpened: context.modalOpened,
         saveUndoState: context.saveUndoState,
         breakUndoCoalesce: context.breakUndoCoalesce,
@@ -509,8 +490,6 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       const mouseRoute = handleMouseToken({
         conversationManager: context.conversationManager,
         selection: context.selection,
-        panelManager: context.panelManager,
-        panelMouseLayout: context.panelMouseLayout,
         mouseDownRow: context.mouseDownRow,
         mouseDownCol: context.mouseDownCol,
         scrollTop,
@@ -520,6 +499,9 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
         requestRender: context.requestRender,
         handlePaste: context.handlePaste,
         handleCopy: context.handleCopy,
+        footerTargetAt: context.footerTargetAt,
+        openFooterTarget: context.openFooterTarget,
+        bodyTopRow: context.bodyTopRow,
       }, token);
       context.mouseDownRow = mouseRoute.mouseDownRow;
       context.mouseDownCol = mouseRoute.mouseDownCol;
@@ -531,12 +513,3 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
 
   context.requestRender();
 }
-
-export function defaultPanelInputConsumer(
-  panelManager: PanelManager,
-  activePanel: Panel | null,
-  key: string,
-  commandContext?: CommandContext,
-): void {
-  handlePanelIntegrationAction(panelManager, activePanel, key, commandContext);
-}

package/src/input/handler-interactions.ts

@@ -1,3 +1,4 @@
+import { activeTokens } from '../renderer/theme.ts';
 import { buildProviderAccountSnapshot } from '@/runtime/index.ts';
 import { enrichProviderAccountsSnapshot } from '../runtime/onboarding/provider-key-capture.ts';
 import type { OnboardingWizardMode } from './onboarding/onboarding-wizard.ts';
@@ -91,7 +92,7 @@ export function handlePasteForHandler(handler: InputHandler): ReturnType<typeof
   handler.nextPasteId = result.nextPasteId;
 
   if (!result.pasted) {
-    handler.conversationManager?.log('[Paste: clipboard does not contain supported text or image data]', { fg: '240' });
+    handler.conversationManager?.log('[Paste: clipboard does not contain supported text or image data]', { fg: activeTokens().textFaint });
     handler.requestRender();
   }
   return result;
@@ -270,12 +271,14 @@ export function handleEscapeForHandler(handler: InputHandler): void {
       modelPicker: handler.modelPicker,
       filePicker: handler.filePicker,
       blockActionsMenu: handler.blockActionsMenu,
+      surfaceModals: handler.surfaceModals,
+      sessionView: handler.sessionView ?? undefined,
+      transcriptScroll: handler.transcriptScroll ?? undefined,
       selectionModal: handler.selectionModal,
       onboardingWizard: handler.onboardingWizard,
       commandMode: handler.commandMode,
       modalStack: handler.modalStack,
       modalReturnFocus: handler.modalReturnFocus,
-      panelFocused: handler.panelFocused,
       indicatorFocused: handler.indicatorFocused,
       prompt: handler.prompt,
       cursorPos: handler.cursorPos,
@@ -298,7 +301,6 @@ export function handleEscapeForHandler(handler: InputHandler): void {
     handler.shortcutsOverlayActive = result.shortcutsOverlayActive;
     handler.shortcutsScrollOffset = result.shortcutsScrollOffset;
     handler.selectionCallback = result.selectionCallback;
-    handler.panelFocused = result.panelFocused;
     handler.indicatorFocused = result.indicatorFocused;
     handler.modalReturnFocus = result.modalReturnFocus;
 }