@pellux/goodvibes-tui 0.18.19 → 0.18.23

package/CHANGELOG.md

@@ -4,6 +4,176 @@ All notable changes to GoodVibes TUI.
 
 ---
 
+## [0.18.23] — 2026-04-16
+
+### Wave 4α+β performance bundle + α review follow-ups + regression fixes
+
+Bundles Wave 4α (conversation-rendering double-parse elimination) and Wave 4β
+(feed-context object reuse) into a single release, adds documentation and test
+follow-ups from the 4α review, and fixes two regressions surfaced during that
+review.
+
+### Performance (Wave 4α — conversation-rendering)
+
+- **`src/core/conversation-rendering.ts`** — eliminates the legacy `renderMarkdown()`
+  duplicate call used for `'code'` mode line counting. The 'all' mode retain its
+  intentional measurement pass (see inline comment for rationale); the 'code' mode
+  now derives its gutter width from the single `renderMarkdownTracked()` call.
+
+### Performance (Wave 4β — feed-context object reuse)
+
+- **`src/input/handler.ts`** — `InputHandler` now allocates a single `InputFeedContext`
+  at startup (`initFeedContext()`) and mutates only the 14 mutable fields before
+  each `feedInputTokens()` call via `syncFeedContextMutableFields()`. Stable service
+  handles, closures, and callbacks are wired once and never re-assigned. Eliminates
+  per-keystroke allocations on the hot input path.
+- **`src/input/feed-context-factory.ts`** (new) — extracts `buildInitialFeedContext()`
+  and the `FeedContextMutableInit` / `FeedContextStableRefs` / `FeedContextClosures`
+  interfaces out of `handler.ts` to keep `handler.ts` under the 800-line architecture
+  cap.
+
+### Regression fixes
+
+- **R1 — `handler.ts` architecture cap** — `handler.ts` was 830 lines after Wave 4β.
+  Extracted factory functions into `src/input/feed-context-factory.ts`; `handler.ts`
+  is now exactly 800 lines. `bun run architecture:check` passes.
+- **R2 — `SearchableListPanel.buildFilterInputLine` cursor glyph** — the focused
+  filter line (`[Label] query_`) was rendering the trailing `_` as the block cursor
+  glyph `█` because `buildSearchInputLine` substitutes `_` → `█` when `active:true`.
+  Fixed by passing `active:false` with explicit `inputBg`/`info` colors; the
+  `[Label] ` bracket format provides the focused visual affordance without triggering
+  the substitution. Fixes the pre-existing test failure from 0.18.22.
+
+### Quality bumps (Wave 4α review follow-ups)
+
+- **F1** — `src/test/input/feed-context-reuse.test.ts`: added mutable-field assertion
+  verifying `ctx.prompt` and `ctx.cursorPos` update between feeds (feeds 'a' → 'b',
+  asserts accumulated mutation).
+- **F2** — `src/test/input/keybinding-lookup.test.ts`: replaced no-op reload test
+  with a real temp-file config override (remaps `search` → Ctrl+G, verifies Ctrl+F
+  returns null); added a second test for conflicting bindings (two actions mapped to
+  same combo resolves to one of them, not null).
+- **F3** — `src/input/handler-feed.ts`: added JSDoc to `InputFeedContext` interface
+  documenting all mutable-per-feed fields vs. stable service handles and explaining
+  the reuse rationale.
+- **F4** — `src/input/feed-context-factory.ts`: `syncFeedContextMutableFields()` has
+  full JSDoc listing every synced field and documenting intentional exclusions.
+- **F5** — `src/core/conversation-rendering.ts`: added inline comment block explaining
+  why 'all' mode requires a double-call to `renderMarkdownTracked` (Option B) and
+  why single-pass is not feasible.
+
+---
+
+## [0.18.22] — 2026-04-16
+
+### Wave 3b / Tier 2 TUI UX Consistency — Panel Migration Batch
+
+Migrates 7 more BasePanel-direct panels to `ScrollableListPanel<T>`, restores
+section-title text lost during prior migrations, and fixes 8 pre-existing test regressions.
+
+### Migrated panels
+
+- **`src/panels/hooks-panel.ts`** — `HooksPanel` → `ScrollableListPanel<HookEntry>`.
+  Contracts/chains/managed/file stats in `header`; selected hook detail, activity (with `Recent Activity` label), authoring (with `Authoring` label) in `footer`. Empty state shows extra context via `header` parameter.
+- **`src/panels/mcp-panel.ts`** — `McpPanel` → `ScrollableListPanel<McpServerSecurityEntry>`.
+  Derived type via `ReturnType<McpRegistry['listServerSecurity']>[number]` since no named export exists.
+  `MCP posture` label + stats + guidance in `header`; selected server detail, repair actions, decision log in `footer`.
+- **`src/panels/approval-panel.ts`** — `ApprovalPanel` → `ScrollableListPanel<ApprovalRow>`.
+  `Approval posture` label + approval counts + guidance + `Selected Lane` label + detail in `header`; nav hint in `footer`.
+- **`src/panels/security-panel.ts`** — `SecurityPanel` → `ScrollableListPanel<TokenAuditResult>`.
+  Governance + threat lines in `header`; selected detail + attack path findings in `footer`.
+- **`src/panels/services-panel.ts`** — `ServicesPanel` → `ScrollableListPanel<ServicePanelEntry>`.
+  `r` (refresh) and `t` (test selected) key overrides preserved; loading state handled via early return.
+- **`src/panels/subscription-panel.ts`** — `SubscriptionPanel` → `ScrollableListPanel<SubscriptionRow>`.
+  Fully overrides `handleInput` (uses `ArrowUp`/`ArrowDown`); logout confirm state preserved; empty state uses direct `buildPanelWorkspace` path.
+- **`src/panels/tasks-panel.ts`** — `TasksPanel` → `ScrollableListPanel<RuntimeTask>`.
+  `!readModel` early-exit preserved; `buildSummaryBlock` in `header`, `buildDetailBlock` in `footer`.
+- **`src/panels/incident-review-panel.ts`** — `IncidentReviewPanel` → `ScrollableListPanel<FailureReport>`.
+  `Action Rail` label added before action guidance lines in `footer`.
+- **`src/panels/communication-panel.ts`** — `CommunicationPanel` → `ScrollableListPanel<CommunicationRecord>`.
+  `Communication posture` label added to both posture line arrays (empty + populated states).
+
+### Panels kept as BasePanel
+
+- `PolicyPanel`, `RemotePanel`, `ProviderHealthPanel`, `PanelListPanel`, `OrchestrationPanel`,
+  `MarketplacePanel`, `SchedulePanel`, `MemoryPanel`, `KnowledgePanel`, `SkillsPanel`,
+  `SessionBrowserPanel` — all use `resolveScrollablePanelSection`, multi-line-per-item render,
+  dual-mode browsing, `setInterval`, or `canRenderNow()` / `reportRenderDuration()` patterns
+  incompatible with `ScrollableListPanel<T>`.
+
+### Test fixes
+
+Restored section-title strings (`'Approval posture'`, `'Communication posture'`, `'MCP posture'`,
+`'Action Rail'`, `'Recent Activity'`, `'Selected Lane'`) dropped during migration, fixing 8
+regressions across `approval-panel`, `communication-panel`, `hooks-panel`, `mcp-panel`, and
+`incident-review-panel` test files.
+
+---
+
+## [0.18.21] — 2026-04-16
+
+### Wave 3a / Tier 2 TUI UX Consistency Infrastructure — I5
+
+Final item from Wave 3a: selection gutter and filter input UX consistency across list panels.
+
+### I5 — Selection gutter + filter input label conventions
+
+- **`src/panels/scrollable-list-panel.ts`** — `ScrollableListPanel`: added opt-in `protected showSelectionGutter = false`. When enabled, `renderList()` post-processes each item line to prepend a 2-column left gutter: `▸ ` (info color, bold) for the selected row, `  ` for all others. Line width is preserved by dropping the last 2 cells. Default off to avoid breaking panels with custom selection indicators.
+- **`src/panels/scrollable-list-panel.ts`** — `SearchableListPanel`: added `protected buildFilterInputLine(width, label, focused)`. Renders the filter line with context-sensitive label formatting: `[Filter] query_` when `focused=true` (active, bold, cursor visible), `Filter: query` when `focused=false` (dim, no cursor). Delegates to `buildSearchInputLine` from `polish.ts`.
+- **New test file `src/test/panels/scrollable-list-panel-i5.test.ts`**: 13 tests covering gutter on/off, column position of `▸`, line-width preservation, and filter label format in both focused/unfocused states.
+
+---
+
+## [0.18.20] — 2026-04-16
+
+### Wave 3a / Tier 2 TUI UX Consistency Infrastructure
+
+Six infrastructure items that make the TUI behave consistently across all panels.
+
+### I1 — Reusable inline confirm dialog
+
+- **New file `src/panels/confirm-state.ts`**: exports `ConfirmState<T>`, `handleConfirmInput<T>`, and `renderConfirmLines<T>`. Identical y/n UX across all panels: y confirms, n/Esc cancels, any other key is absorbed while confirm is active.
+- **SkillsPanel**: 'd' key now shows an inline `Confirmation` section before surfacing the shell delete hint. Pressing Esc on the confirm panel cancels it via the generic helper.
+- **KnowledgePanel**: 's' (stale) and 'c' (contradicted) now prompt confirm before calling `registry.review()`. Error from review mutation is surfaced via I2 `setError()`.
+- **SubscriptionPanel**: 'n' and Escape now cancel a pending logout confirmation via the confirm helper.
+
+### I2 — Error surface slot on BasePanel
+
+- **`src/panels/base-panel.ts`**: added `protected lastError`, `setError()`, `clearError()`, `renderErrorLine(width)`. Auto-clear on next keypress in `ScrollableListPanel.handleInput()`.
+- **`src/panels/scrollable-list-panel.ts`**: `renderList()` prepends the error line to the `effectiveFooter` — visible in both normal and empty states.
+- **MarketplacePanel**: `refresh()` now wraps catalog load in try/catch and calls `setError()` on failure. Clears error on successful reload.
+- **KnowledgePanel**: `registry.review()` call in confirm dispatch wrapped in try/catch, wired to `setError()`.
+
+### I3 — Loading spinner slot on BasePanel
+
+- **`src/panels/base-panel.ts`**: added `loadingState: 'idle'|'loading'|'error'`, `startLoading(label?)`, `stopLoading()`, `renderLoadingLine(width, frame)`. Uses `SPINNER_FRAMES` from `src/renderer/progress.ts`.
+- **`src/panels/scrollable-list-panel.ts`**: `renderList()` short-circuits to a spinner-only view when `loadingState === 'loading'`.
+- **GitPanel**: `openDiff()` now calls `startLoading('Loading diff...')` before the await and `stopLoading()` in both success and error paths. The `render()` method checks `this.loadingState === 'loading'` to show the spinner while the diff is being fetched.
+
+### I4 — Accessible status tokens
+
+- **New file `src/renderer/status-token.ts`**: exports `buildStatusToken(state, label, opts?)` → `Cell[]`. State map: `good=✓`, `warn=⚠`, `bad=✕`, `info=○`. Glyph + color together so colorblind users can distinguish states without relying on color alone.
+- **ApprovalPanel**: recent approvals/denials/pending row now uses inline `✓ approvals (N)  ✕ denials (N)  ○ pending (N)` cells instead of bare color-only counts.
+
+### I6 — Two-stage Escape in panel focus
+
+- **`src/input/handler-feed-routes.ts`**: `handlePanelFocusToken()` now passes `'escape'` to the active panel's `handleInput()` BEFORE deciding to unfocus. If the panel returns `true` (e.g. dismisses a confirm dialog or clears a search), the panel stays focused. Only if the panel returns `false` does the router set `panelFocused = false`.
+
+### Tests
+
+- **`src/test/renderer/status-token.test.ts`** (8 tests): glyph/color/count/override coverage for `buildStatusToken`.
+- **`src/test/panels/base-panel-ux.test.ts`** (16 tests): `setError`/`clearError`/`renderErrorLine` and `startLoading`/`stopLoading`/`renderLoadingLine` state transitions.
+- **`src/test/panels/confirm-state.test.ts`** (13 tests): `handleConfirmInput` all four return values + `renderConfirmLines` width/content.
+- **`src/test/panels/knowledge-panel.test.ts`**: updated to reflect I1 two-step confirm for `'s'` (stale) action.
+
+### Tests & Checks
+
+- Test suite: 441/441 passing (3 new test files)
+- Architecture check: passing (298 non-test source files)
+- Typecheck: clean
+
+---
+
 ## [0.18.19] — 2026-04-16
 
 ### Quality bump — address sub-10 dimensions from 0.18.18 review

package/README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/mgd34msu/goodvibes-tui/actions/workflows/ci.yml/badge.svg)](https://github.com/mgd34msu/goodvibes-tui/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Version](https://img.shields.io/badge/version-0.18.19-blue.svg)](https://github.com/mgd34msu/goodvibes-tui)
+[![Version](https://img.shields.io/badge/version-0.18.23-blue.svg)](https://github.com/mgd34msu/goodvibes-tui)
 
 A terminal-native AI coding, operations, automation, knowledge, and integration console with a typed runtime, omnichannel surfaces, structured memory/knowledge, and a raw ANSI renderer.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pellux/goodvibes-tui",
-  "version": "0.18.19",
+  "version": "0.18.23",
   "description": "Terminal-native GoodVibes product for coding, operations, automation, knowledge, channels, and daemon-backed control-plane workflows.",
   "type": "module",
   "main": "src/main.ts",

package/src/core/conversation-rendering.ts

@@ -1,5 +1,5 @@
 import { UIFactory } from '../renderer/ui-factory.ts';
-import { renderMarkdown, renderMarkdownTracked } from '../renderer/markdown.ts';
+import { renderMarkdownTracked } from '../renderer/markdown.ts';
 import { renderToolCallBlock } from '../renderer/tool-call.ts';
 import { renderThinkingBlock } from '../renderer/thinking.ts';
 import { renderSystemMessage } from '../renderer/system-message.ts';
@@ -102,10 +102,24 @@ export function renderConversationAssistantMessage(
   if (message.content) {
     const showAllLineNumbers = lineNumberMode === 'all';
     const showCodeBlockLineNumbers = lineNumberMode === 'all' ? false : lineNumberMode === 'code';
-    const preRendered = showAllLineNumbers
-      ? renderMarkdown(message.content, width, { codeBlockLineNumbers: false })
-      : null;
-    const totalLines = preRendered?.length ?? 0;
+    // First pass: measure totalLines for gutter sizing (only when line-numbers='all').
+    // When line numbers are off, skip the measurement pass entirely.
+    //
+    // NOTE: The 'all' mode intentionally calls renderMarkdownTracked twice:
+    //   1. Measure pass: render at full `width` to get the total line count, which
+    //      determines `numWidth` (digit count) and thus `gutterW` (gutter column width).
+    //   2. Render pass: render at `width - gutterW` with the gutter factored in.
+    //
+    // Single-pass is not feasible here because `numWidth` depends on `totalLines`,
+    // which is unknown before rendering. The 4α commit message claim that this
+    // "eliminates double-parse when line numbers are enabled" was inaccurate:
+    // 4α eliminated the legacy `renderMarkdown()` duplicate that was used for the
+    // code-block line-number mode ('code'). The 'all' mode double-call is unavoidable
+    // by design and remains unchanged.
+    const measureWidth = showAllLineNumbers ? width : 0;
+    const totalLines = showAllLineNumbers
+      ? renderMarkdownTracked(message.content, measureWidth, { codeBlockLineNumbers: false }).lines.length
+      : 0;
     const numWidth = Math.max(3, String(totalLines).length);
     const gutterW = numWidth + 3;
     const contentWidth = showAllLineNumbers ? width - gutterW : width;
@@ -239,7 +253,7 @@ export function renderConversationToolMessage(
         // Leave invalid JSON as-is.
       }
     }
-    context.history.addLines(renderMarkdown(contentToRender, width));
+    context.history.addLines(renderMarkdownTracked(contentToRender, width).lines);
   }
 
   const renderedLineCount = context.history.getLineCount() - startLine;

package/src/input/commands/session.ts

@@ -347,7 +347,6 @@ export const sessionCommand: SlashCommand = {
         break;
 
       case 'cancel':
-      case 'x':
         handleCancel(rest, context);
         break;
 

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

@@ -0,0 +1,236 @@
+/**
+ * feed-context-factory.ts — Construction and mutable-field sync for InputFeedContext.
+ *
+ * Extracted from handler.ts (Wave 4α review, 0.18.23) to keep handler.ts under the
+ * 800-line architecture cap.
+ *
+ * Two exported functions:
+ *   - `buildInitialFeedContext` — assembles the long-lived InputFeedContext from
+ *     pre-built field groups. Called once at InputHandler construction time.
+ *   - `syncFeedContextMutableFields` — copies mutable scalar fields into the
+ *     already-allocated context before each feed() dispatch.
+ */
+import type { InputFeedContext } from './handler-feed.ts';
+import type { SelectionManager } from './selection.ts';
+import type { InfiniteBuffer } from '../core/history.ts';
+import type { CommandRegistry, CommandContext } from './command-registry.ts';
+import type { AutocompleteEngine } from './autocomplete.ts';
+import type { FilePickerModal } from './file-picker.ts';
+import type { ModelPickerModal } from './model-picker.ts';
+import type { SelectionModal } from './selection-modal.ts';
+import type { SelectionResult } from './selection-modal.ts';
+import type { SearchManager } from './search.ts';
+import type { InputHistory, HistorySearch } from './input-history.ts';
+import type { ConversationManager } from '../core/conversation';
+import type { ProcessModal } from '../renderer/process-modal.ts';
+import type { LiveTailModal } from '../renderer/live-tail-modal.ts';
+import type { BlockActionsMenu } from '../renderer/block-actions.ts';
+import type { AgentDetailModal } from '../renderer/agent-detail-modal.ts';
+import type { ContextInspectorModal } from '../renderer/context-inspector.ts';
+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 { WrappedPromptInfo } from './handler-prompt-buffer.ts';
+import type { Panel } from '../panels/types.ts';
+import type { PanelManager } from '../panels/panel-manager.ts';
+import type { KeybindingsManager } from './keybindings.ts';
+
+/**
+ * Initial mutable scalar values for InputFeedContext.
+ *
+ * **Mutable fields** (synced per-feed via syncFeedContextMutableFields or inside
+ * action closures that call syncFeedContextMutableFields):
+ *   - `prompt`, `cursorPos` — current text buffer state
+ *   - `commandMode`, `panelFocused`, `indicatorFocused` — focus-mode flags
+ *   - `helpOverlayActive`, `helpScrollOffset` — help overlay state
+ *   - `shortcutsOverlayActive`, `shortcutsScrollOffset` — shortcuts overlay state
+ *   - `nextPasteId`, `nextImageId` — monotonically increasing ID counters
+ *   - `mouseDownRow`, `mouseDownCol` — drag-tracking coordinates
+ *   - `contentWidth` — reflow width, updated by setContentWidth()
+ *   - `selectionCallback` — current selection modal callback (nullable)
+ */
+export interface FeedContextMutableInit {
+  prompt: string;
+  cursorPos: number;
+  commandMode: boolean;
+  panelFocused: boolean;
+  indicatorFocused: boolean;
+  helpOverlayActive: boolean;
+  helpScrollOffset: number;
+  shortcutsOverlayActive: boolean;
+  shortcutsScrollOffset: number;
+  nextPasteId: number;
+  nextImageId: number;
+  mouseDownRow: number;
+  mouseDownCol: number;
+  contentWidth: number;
+  selectionCallback: ((result: SelectionResult | null) => void) | null;
+}
+
+/**
+ * Stable (readonly) service references for InputFeedContext.
+ *
+ * **Stable references** (set once at construction, never reallocated):
+ *   - `pasteRegistry`, `imageRegistry` — owned Maps, never replaced
+ *   - `selectionModal`, `bookmarkModal`, `settingsModal`, `sessionPickerModal`,
+ *     `profilePickerModal` — modal objects constructed once
+ *   - `filePicker`, `modelPicker`, `processModal`, `liveTailModal`,
+ *     `agentDetailModal`, `contextInspectorModal`, `blockActionsMenu`,
+ *     `searchManager`, `historySearch` — service objects constructed once
+ *   - `panelManager`, `keybindingsManager` — from uiServices, stable
+ *   - `modalStack` — reference to the handler's shared array
+ *   - `getHistory`, `getViewportHeight`, `getScrollTop`, `scroll`, `exitApp` — callbacks
+ *   - `commandRegistry`, `commandContext`, `autocomplete`, `inputHistory`,
+ *     `conversationManager` — wired after construction; synced at feed() entry only
+ *     (not per-action) since no in-feed action changes them
+ *
+ * **Rationale:** per-feed mutation on a single object avoids per-keystroke GC pressure
+ * from ~80-field object allocation. Stable references are service handles that never
+ * need to change after construction.
+ */
+export interface FeedContextStableRefs {
+  selection: SelectionManager;
+  pasteRegistry: Map<string, string>;
+  imageRegistry: Map<string, { data: string; mediaType: string }>;
+  selectionModal: SelectionModal;
+  bookmarkModal: BookmarkModal;
+  settingsModal: SettingsModal;
+  sessionPickerModal: SessionPickerModal;
+  profilePickerModal: ProfilePickerModal;
+  historySearch: HistorySearch;
+  commandRegistry: CommandRegistry | null;
+  commandContext: CommandContext | undefined;
+  autocomplete: AutocompleteEngine | null;
+  filePicker: FilePickerModal;
+  modelPicker: ModelPickerModal;
+  processModal: ProcessModal;
+  liveTailModal: LiveTailModal;
+  agentDetailModal: AgentDetailModal;
+  contextInspectorModal: ContextInspectorModal;
+  blockActionsMenu: BlockActionsMenu;
+  searchManager: SearchManager;
+  modalStack: string[];
+  inputHistory: InputHistory | null;
+  conversationManager: ConversationManager | null;
+  panelManager: PanelManager;
+  keybindingsManager: KeybindingsManager;
+  getHistory: () => InfiniteBuffer;
+  getViewportHeight: () => number;
+  getScrollTop: () => number;
+  scroll: (delta: number) => void;
+  exitApp: () => void;
+}
+
+/** Bound method closures for InputFeedContext. Built in handler.ts where private members are accessible. */
+export interface FeedContextClosures {
+  modalOpened: (name: string) => void;
+  handleEscape: () => void;
+  handleCopy: () => void;
+  handleCtrlC: () => void;
+  handleBlockCopy: () => void;
+  handleBookmark: () => void;
+  handleBlockSave: () => void;
+  handleDiffApply: () => boolean;
+  handleUndo: () => void;
+  handleRedo: () => void;
+  handlePaste: () => void;
+  saveUndoState: () => void;
+  ensureInputCursorVisible: (contentWidth?: number) => void;
+  registerPaste: (content: string) => string;
+  executeBlockAction: (id: string) => void;
+  cyclePanelTab: (direction: 'next' | 'prev') => void;
+  onPanelInputConsumed: (activePanel: Panel | null, key: string) => void;
+  getWrappedPromptInfo: (contentWidth: number) => WrappedPromptInfo;
+  moveCursorVertical: (direction: -1 | 1) => boolean;
+  handlePathCompletion: () => boolean;
+  handleBlockToggle: () => void;
+  findMarkerAtPos: (pos: number) => { start: number; end: number } | null;
+  cleanupMarkerRegistry: (text: string) => void;
+  expandPrompt: (text: string) => string | import('@pellux/goodvibes-sdk/platform/providers/interface').ContentPart[];
+}
+
+/**
+ * buildInitialFeedContext — Allocate the single InputFeedContext that lives for the
+ * lifetime of the InputHandler.
+ *
+ * Accepts pre-built field groups from handler.ts where private access is available.
+ * The resulting context object is mutated in place on every feed() call via
+ * syncFeedContextMutableFields — no re-allocation occurs per keystroke.
+ *
+ * @param mutable  Initial mutable scalar values (synced per-feed).
+ * @param stable   Stable service references (set once, never replaced).
+ * @param closures Pre-built bound method closures (built in handler.ts).
+ */
+export function buildInitialFeedContext(
+  mutable: FeedContextMutableInit,
+  stable: FeedContextStableRefs,
+  closures: FeedContextClosures,
+): InputFeedContext {
+  const noop = (): void => {};
+  return {
+    // --- mutable scalars ---
+    ...mutable,
+    // --- requestRender: placeholder, swapped per-feed to buffered version ---
+    requestRender: noop,
+    // --- stable refs ---
+    ...stable,
+    // --- closures ---
+    ...closures,
+  };
+}
+
+/**
+ * syncFeedContextMutableFields — Copy mutable scalar fields into the reused
+ * InputFeedContext object.
+ *
+ * **Fields synced (updated on every call):**
+ *   - `prompt` — current prompt text buffer
+ *   - `cursorPos` — caret position within prompt
+ *   - `commandMode` — whether command-mode prefix is active
+ *   - `panelFocused` — whether the active panel owns keyboard focus
+ *   - `indicatorFocused` — whether the status indicator owns focus
+ *   - `helpOverlayActive` / `helpScrollOffset` — help overlay visibility and scroll
+ *   - `shortcutsOverlayActive` / `shortcutsScrollOffset` — shortcuts overlay state
+ *   - `selectionCallback` — the current in-flight selection modal callback
+ *   - `nextPasteId` / `nextImageId` — monotonically increasing allocation counters
+ *   - `mouseDownRow` / `mouseDownCol` — drag-start coordinates
+ *
+ * **Fields intentionally excluded (synced only at feed() entry, not here):**
+ *   - `contentWidth` — semi-stable; only changes on terminal resize via setContentWidth().
+ *     Synced at feed() entry because it is only relevant for layout, not action-reaction
+ *     sequences within a single feed.
+ *   - `commandRegistry`, `commandContext` — wired after construction via
+ *     setCommandRegistry(); synced at feed() entry since no in-feed action changes them.
+ *   - `autocomplete` — wired after construction; synced at feed() entry.
+ *   - `inputHistory`, `conversationManager` — late-wired service handles; stable within
+ *     a feed. Synced at feed() entry only.
+ *   - `requestRender` — swapped to a buffered version at feed() entry and restored in
+ *     the finally block; not managed by this function.
+ *
+ * Called from within action closures (`handleEscape`, `handleCtrlC`, `handleUndo`,
+ * `handleRedo`, `handlePaste`) that mutate handler state mid-feed, so subsequent
+ * route handlers see updated values without re-reading handler fields.
+ *
+ * @param fields  Current mutable field values from the handler.
+ * @param ctx     The InputFeedContext to update in place.
+ */
+export function syncFeedContextMutableFields(
+  fields: FeedContextMutableInit,
+  ctx: InputFeedContext,
+): void {
+  ctx.prompt = fields.prompt;
+  ctx.cursorPos = fields.cursorPos;
+  ctx.commandMode = fields.commandMode;
+  ctx.panelFocused = fields.panelFocused;
+  ctx.indicatorFocused = fields.indicatorFocused;
+  ctx.helpOverlayActive = fields.helpOverlayActive;
+  ctx.helpScrollOffset = fields.helpScrollOffset;
+  ctx.shortcutsOverlayActive = fields.shortcutsOverlayActive;
+  ctx.shortcutsScrollOffset = fields.shortcutsScrollOffset;
+  ctx.selectionCallback = fields.selectionCallback;
+  ctx.nextPasteId = fields.nextPasteId;
+  ctx.nextImageId = fields.nextImageId;
+  ctx.mouseDownRow = fields.mouseDownRow;
+  ctx.mouseDownCol = fields.mouseDownCol;
+}

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

@@ -54,7 +54,17 @@ export function handlePanelFocusToken(state: PanelFocusRouteState, token: InputT
   }
 
   if (token.type === 'key') {
+    // I6: two-stage Escape — give the panel a chance to consume escape first
+    // (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') {
+      const activePanel = state.panelManager.getActive();
+      const panelConsumedEscape = activePanel?.handleInput?.('escape') ?? false;
+      if (panelConsumedEscape) {
+        state.onPanelInputConsumed?.(activePanel!, 'escape');
+        state.requestRender();
+        return { handled: true, panelFocused };
+      }
       panelFocused = false;
       state.requestRender();
       return { handled: true, panelFocused };

package/src/input/handler-feed.ts

@@ -40,6 +40,44 @@ import { SelectionManager } from './selection.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { KeybindingsManager } from './keybindings.ts';
 
+/**
+ * InputFeedContext — The single long-lived context object passed to feedInputTokens
+ * on every keystroke. Allocated once at InputHandler construction; mutated in place
+ * per-feed to avoid per-keystroke GC pressure from ~80-field object allocation.
+ *
+ * **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
+ *   - `helpOverlayActive`, `helpScrollOffset` — help overlay visibility and scroll
+ *   - `shortcutsOverlayActive`, `shortcutsScrollOffset` — shortcuts overlay state
+ *   - `nextPasteId`, `nextImageId` — monotonically increasing ID counters
+ *   - `mouseDownRow`, `mouseDownCol` — drag-tracking coordinates
+ *   - `contentWidth` — reflow width (semi-stable; synced at feed() entry only)
+ *   - `selectionCallback` — current in-flight selection modal callback (nullable)
+ *   - `requestRender` — swapped per-feed to a buffered version, restored after
+ *
+ * **Stable service handles** (set once at construction, never reallocated):
+ *   - `commandRegistry`, `commandContext` — wired via setCommandRegistry() after
+ *     construction; synced at feed() entry (not per-action) since no action changes them
+ *   - `autocomplete` — wired after construction; synced at feed() entry
+ *   - `inputHistory`, `conversationManager` — late-wired service handles; synced at
+ *     feed() entry only since no in-feed action rewires them
+ *   - `pasteRegistry`, `imageRegistry` — owned Maps, never replaced
+ *   - `selectionModal`, `bookmarkModal`, `settingsModal`, `sessionPickerModal`,
+ *     `profilePickerModal` — modal objects constructed once in InputHandler constructor
+ *   - `filePicker`, `modelPicker`, `processModal`, `liveTailModal`, `agentDetailModal`,
+ *     `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)
+ *   - `getHistory`, `getViewportHeight`, `getScrollTop`, `scroll`, `exitApp` — stable
+ *     callbacks bound in the InputHandler constructor
+ *   - All method closures (`modalOpened`, `handleEscape`, etc.) — bound once at init
+ *
+ * **Rationale:** per-feed mutation avoids per-keystroke allocation cost; stable
+ * references are service handles whose identity never changes after construction.
+ */
 export interface InputFeedContext {
   prompt: string;
   cursorPos: number;
@@ -65,9 +103,9 @@ export interface InputFeedContext {
   readonly sessionPickerModal: SessionPickerModal;
   readonly profilePickerModal: ProfilePickerModal;
   readonly historySearch: HistorySearch;
-  readonly commandRegistry: CommandRegistry | null;
-  readonly commandContext: CommandContext | undefined;
-  readonly autocomplete: AutocompleteEngine | null;
+  commandRegistry: CommandRegistry | null;
+  commandContext: CommandContext | undefined;
+  autocomplete: AutocompleteEngine | null;
   readonly filePicker: FilePickerModal;
   readonly modelPicker: ModelPickerModal;
   readonly processModal: ProcessModal;
@@ -79,13 +117,13 @@ export interface InputFeedContext {
   readonly panelManager: PanelManager;
   readonly keybindingsManager: KeybindingsManager;
   readonly modalStack: string[];
-  readonly inputHistory: InputHistory | null;
-  readonly conversationManager: ConversationManager | null;
+  inputHistory: InputHistory | null;
+  conversationManager: ConversationManager | null;
   readonly getHistory: () => InfiniteBuffer;
   readonly getViewportHeight: () => number;
   readonly getScrollTop: () => number;
   readonly scroll: (delta: number) => void;
-  readonly requestRender: () => void;
+  requestRender: () => void;
   readonly modalOpened: (name: string) => void;
   readonly handleEscape: () => void;
   readonly handleCopy: () => void;