@pellux/goodvibes-tui 1.0.0 → 1.7.0

package/src/input/panel-integration-actions.ts

@@ -1,64 +1,16 @@
 import type { CommandContext } from './command-registry.ts';
-import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import type { Panel } from '../panels/types.ts';
 import type { PanelManager } from '../panels/panel-manager.ts';
-import { FileExplorerPanel } from '../panels/file-explorer-panel.ts';
-import { FilePreviewPanel } from '../panels/file-preview-panel.ts';
-import { SymbolOutlinePanel } from '../panels/symbol-outline-panel.ts';
-import { ApprovalPanel } from '../panels/approval-panel.ts';
-import { TasksPanel } from '../panels/tasks-panel.ts';
-import { OrchestrationPanel } from '../panels/orchestration-panel.ts';
-import { AgentInspectorPanel } from '../panels/agent-inspector-panel.ts';
-import { DiffPanel } from '../panels/diff-panel.ts';
-
-function ensurePreviewPanel(panelManager: PanelManager): FilePreviewPanel | null {
-  const existing = panelManager.getPanel('preview');
-  if (existing instanceof FilePreviewPanel) {
-    const pane = panelManager.getPaneOf('preview');
-    panelManager.activateById('preview');
-    if (pane) panelManager.focusPane(pane);
-    return existing;
-  }
-  const targetPane: 'top' | 'bottom' = panelManager.isBottomPaneVisible()
-    ? (panelManager.getFocusedPane() === 'top' ? 'bottom' : 'top')
-    : 'bottom';
-  const opened = panelManager.open('preview', targetPane);
-  panelManager.show();
-  panelManager.focusPane(targetPane);
-  return opened instanceof FilePreviewPanel ? opened : null;
-}
-
-// WO-133: shared by explorer's and preview's 'd' (diff) key — same
-// open/focus bridge as ensurePreviewPanel above.
-function ensureDiffPanel(panelManager: PanelManager): DiffPanel | null {
-  const existing = panelManager.getPanel('diff');
-  if (existing instanceof DiffPanel) {
-    const pane = panelManager.getPaneOf('diff');
-    panelManager.activateById('diff');
-    if (pane) panelManager.focusPane(pane);
-    return existing;
-  }
-  const targetPane: 'top' | 'bottom' = panelManager.isBottomPaneVisible()
-    ? (panelManager.getFocusedPane() === 'top' ? 'bottom' : 'top')
-    : 'bottom';
-  const opened = panelManager.open('diff', targetPane);
-  panelManager.show();
-  panelManager.focusPane(targetPane);
-  return opened instanceof DiffPanel ? opened : null;
-}
-
-// Exported so a future preview-reload action (e.g. an explicit "r" reload
-// key) can re-sync the outline against the same file without duplicating
-// this lookup — the panel-integration wiring for that key lands separately.
-export function syncSymbolOutlineFromPreview(panelManager: PanelManager, previewPanel: FilePreviewPanel): void {
-  const symbols = panelManager.getPanel('symbols');
-  const filePath = previewPanel.getCurrentFilePath();
-  const source = previewPanel.getSource();
-  if (symbols instanceof SymbolOutlinePanel && filePath && source !== null) {
-    symbols.loadFile(filePath, source);
-  }
-}
 
+// W6.1 (the purge): every instanceof-routed branch this file used to carry
+// (FileExplorerPanel/FilePreviewPanel/SymbolOutlinePanel — DELETE;
+// ApprovalPanel/TasksPanel/OrchestrationPanel/AgentInspectorPanel —
+// RETIRE-INTO-FLEET) targeted a panel class that no longer exists. Panels
+// migrated onto the formal `Panel.handlePanelIntegrationAction` hook (the
+// preferred seam — see the comment below) are unaffected; this function now
+// only provides that passthrough. See
+// .goodvibes/audit/2026-07-04-wave6-briefs.json (W6.1) for the disposition
+// map.
 export function handlePanelIntegrationAction(
   panelManager: PanelManager,
   activePanel: Panel | null,
@@ -77,118 +29,5 @@ export function handlePanelIntegrationAction(
     if (consumed) return true;
   }
 
-  if ((key === 'enter' || key === 'return' || key === 'right') && activePanel instanceof FileExplorerPanel) {
-    const filePath = activePanel.getFocusedFilePath();
-    if (!filePath) return false;
-    const previewPanel = ensurePreviewPanel(panelManager);
-    if (!previewPanel) return false;
-    previewPanel.openFile(filePath);
-    syncSymbolOutlineFromPreview(panelManager, previewPanel);
-    return true;
-  }
-
-  // WO-133: 'd' on the explorer diffs the currently focused file, and 'd' on
-  // the preview diffs whatever file is currently open — both against HEAD,
-  // both via the same DiffPanel.showFileDiffs entry point.
-  if (key === 'd' && activePanel instanceof FileExplorerPanel) {
-    const filePath = activePanel.getFocusedFilePath();
-    if (!filePath) return false;
-    const diffPanel = ensureDiffPanel(panelManager);
-    if (!diffPanel) return false;
-    void diffPanel.showFileDiffs([filePath], 'HEAD').catch((err) => {
-      logger.debug('explorer diff dispatch failed', { err });
-    });
-    return true;
-  }
-
-  if (key === 'd' && activePanel instanceof FilePreviewPanel) {
-    const filePath = activePanel.getCurrentFilePath();
-    if (!filePath) return false;
-    const diffPanel = ensureDiffPanel(panelManager);
-    if (!diffPanel) return false;
-    void diffPanel.showFileDiffs([filePath], 'HEAD').catch((err) => {
-      logger.debug('preview diff dispatch failed', { err });
-    });
-    return true;
-  }
-
-  // WO-133: 'r' on the preview reloads the open file from disk, then
-  // re-syncs the symbol outline against the refreshed content (WO-126's
-  // async tree-sitter loadFile via syncSymbolOutlineFromPreview above) once
-  // the reload actually settles.
-  if (key === 'r' && activePanel instanceof FilePreviewPanel) {
-    const reloaded = activePanel.consumePendingReload();
-    if (!reloaded) return false;
-    void reloaded.then(() => syncSymbolOutlineFromPreview(panelManager, activePanel)).catch((err) => {
-      logger.debug('preview reload dispatch failed', { err });
-    });
-    return true;
-  }
-
-  if ((key === 'enter' || key === 'return') && activePanel instanceof SymbolOutlinePanel) {
-    const location = activePanel.getSelectedLocation();
-    if (!location) return false;
-    const previewPanel = ensurePreviewPanel(panelManager);
-    if (!previewPanel) return false;
-    if (previewPanel.getCurrentFilePath() !== location.path) {
-      previewPanel.openFile(location.path);
-      syncSymbolOutlineFromPreview(panelManager, previewPanel);
-    }
-    previewPanel.goToLine(location.line);
-    return true;
-  }
-
-  if ((key === 'enter' || key === 'return') && activePanel instanceof ApprovalPanel) {
-    const command = activePanel.getSelectedCommand();
-    if (!command || !commandContext?.executeCommand) return false;
-    const parts = command.replace(/^\//, '').split(/\s+/).filter(Boolean);
-    const [name, ...args] = parts;
-    if (!name) return false;
-    void commandContext.executeCommand(name, args).catch((err) => { logger.debug('approval panel command dispatch failed', { err }); });
-    return true;
-  }
-
-  // WO-131: Enter on a Tasks row — agent-kind tasks jump straight to the Agent
-  // Inspector (which owns the deep per-agent timeline); everything else's
-  // advertised worktree follow-up is dispatched for real via ctx.executeCommand
-  // instead of being printed as a static "/worktree task <task-id>" signpost.
-  // w dispatches the task-family posture review the header line advertises.
-  if ((key === 'enter' || key === 'return' || key === 'w') && activePanel instanceof TasksPanel) {
-    const followUp = activePanel.consumePendingFollowUp();
-    if (!followUp) return false;
-    if (followUp.kind === 'agent-jump') {
-      const inspector = panelManager.open('inspector');
-      if (!(inspector instanceof AgentInspectorPanel)) return false;
-      inspector.inspectAgent(followUp.agentId);
-      return true;
-    }
-    if (!commandContext?.executeCommand) return false;
-    if (followUp.kind === 'teamwork-review') {
-      void commandContext.executeCommand('teamwork', ['review']).catch((err) => {
-        logger.debug('tasks panel teamwork review dispatch failed', { err });
-      });
-      return true;
-    }
-    void commandContext.executeCommand('worktree', ['task', followUp.taskId]).catch((err) => {
-      logger.debug('tasks panel worktree review dispatch failed', { err });
-    });
-    return true;
-  }
-
-  // WO-131: Enter on a node-focused Orchestration row jumps to the Agent
-  // Inspector (agent-backed nodes) or the Tasks panel (task-backed nodes).
-  if ((key === 'enter' || key === 'return') && activePanel instanceof OrchestrationPanel) {
-    const jump = activePanel.consumePendingNodeJump();
-    if (!jump) return false;
-    if (jump.kind === 'agent-jump') {
-      const inspector = panelManager.open('inspector');
-      if (!(inspector instanceof AgentInspectorPanel)) return false;
-      inspector.inspectAgent(jump.id);
-      return true;
-    }
-    panelManager.open('tasks');
-    return true;
-  }
-
   return false;
 }

package/src/input/settings-modal-data.ts

@@ -14,6 +14,7 @@ import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
 import { buildSubscriptionEntries } from './settings-modal-subscriptions.ts';
 import type { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
 import type { ServiceInspectionQuery } from '../runtime/ui-service-queries.ts';
+import { CODE_INDEX_ENABLED_CONFIG_KEY } from '../runtime/code-index-services.ts';
 import {
   SETTINGS_CATEGORIES,
   type FlagEntry,
@@ -130,6 +131,25 @@ export function buildSettingGroups(
     behaviorEntries.push(buildNotifyAfterSecondsSyntheticEntry(configManager));
   }
 
+  // Inject the W2.3 alert-class toggles + master focus gate. TUI-local
+  // synthetic settings, same rationale as notifyAfterSeconds above.
+  if (behaviorEntries) {
+    for (const entry of buildNotifyAlertSyntheticEntries(configManager)) {
+      if (!behaviorEntries.some((e) => e.setting.key === entry.setting.key)) {
+        behaviorEntries.push(entry);
+      }
+    }
+  }
+
+  // Wave 5 (wo804): inject the storage.codeIndexEnabled toggle into the
+  // storage category. TUI-local synthetic setting (not in the SDK ConfigKey
+  // union — see code-index-services.ts), same rationale as
+  // notifyAfterSeconds above: opt-in, default off, states its own bounds.
+  const storageEntries = groups.get('storage');
+  if (storageEntries && !storageEntries.some((e) => e.setting.key === (CODE_INDEX_ENABLED_CONFIG_KEY as ConfigKey))) {
+    storageEntries.push(buildCodeIndexEnabledSyntheticEntry(configManager));
+  }
+
   return groups;
 }
 
@@ -224,6 +244,81 @@ export function buildNotifyAfterSecondsSyntheticEntry(configManager: Pick<Config
   };
 }
 
+// ---------------------------------------------------------------------------
+// W2.3 alert-class synthetic settings — behavior.notifyOn* + notifyOnlyWhenUnfocused
+// ---------------------------------------------------------------------------
+
+/**
+ * The five W2.3 alert-gating booleans, all TUI-local (not yet in the SDK
+ * ConfigKey union), all defaulting to on. Read/written generically by
+ * core/alert-gating.ts (readBooleanConfig) and the per-alert-class modules
+ * (budget-breach-notifier.ts, approval-alert.ts, turn-event-wiring.ts,
+ * long-task-notifier.ts) — this is only the settings-modal-visible surface.
+ */
+const NOTIFY_ALERT_SYNTHETIC_SETTINGS: ReadonlyArray<{ readonly key: string; readonly description: string }> = [
+  {
+    key: 'behavior.notifyOnBudgetBreach',
+    description: 'Alert when session cost crosses the configured budget (set via the Cost panel\'s "b" key).',
+  },
+  {
+    key: 'behavior.notifyOnAgentFailure',
+    description: 'Alert when a delegated or background agent fails.',
+  },
+  {
+    key: 'behavior.notifyOnChainFailure',
+    description: 'Alert when a WRFC review chain fails.',
+  },
+  {
+    key: 'behavior.notifyOnApprovalPending',
+    description: 'Alert when a tool call is waiting on your approval.',
+  },
+  {
+    key: 'behavior.notifyOnlyWhenUnfocused',
+    description: 'Master gate for the four alerts above: fire only when the terminal window is unfocused, or when focus state was never observed (terminal does not report focus). Turn off to always fire regardless of focus.',
+  },
+];
+
+function buildBooleanSyntheticEntry(
+  configManager: Pick<ConfigManager, 'get'>,
+  key: string,
+  description: string,
+  defaultValue: boolean,
+): SettingEntry {
+  const raw = configManager.get(key as ConfigKey);
+  const currentValue = typeof raw === 'boolean' ? raw : defaultValue;
+  return {
+    setting: { key: key as ConfigKey, type: 'boolean', default: defaultValue, description },
+    currentValue,
+    isDefault: currentValue === defaultValue,
+  };
+}
+
+/** Build the five synthetic SettingEntry rows for the behavior category. */
+export function buildNotifyAlertSyntheticEntries(configManager: Pick<ConfigManager, 'get'>): SettingEntry[] {
+  return NOTIFY_ALERT_SYNTHETIC_SETTINGS.map((spec) => buildBooleanSyntheticEntry(configManager, spec.key, spec.description, true));
+}
+
+// ---------------------------------------------------------------------------
+// Wave 5 (wo804) — storage.codeIndexEnabled synthetic setting
+// ---------------------------------------------------------------------------
+
+/**
+ * The repo source-tree code index's auto-build-on-startup toggle
+ * (code-index-services.ts). TUI-local, default OFF: /codebase build is the
+ * explicit trigger unless a user opts in here. Honest bounds stated inline
+ * so enabling this isn't a surprise — see code-index-services.ts's
+ * CODE_INDEX_MAX_FILES/CODE_INDEX_MAX_FILE_BYTES for the numbers this
+ * description would otherwise duplicate as magic numbers.
+ */
+export function buildCodeIndexEnabledSyntheticEntry(configManager: Pick<ConfigManager, 'get'>): SettingEntry {
+  return buildBooleanSyntheticEntry(
+    configManager,
+    CODE_INDEX_ENABLED_CONFIG_KEY,
+    'Auto-build the repo source-tree code index on startup (bounded file/size scan; see /codebase status for bounds). Off by default — /codebase build indexes on demand.',
+    false,
+  );
+}
+
 // ---------------------------------------------------------------------------
 // buildFlagEntries — snapshot of current feature flag states
 // ---------------------------------------------------------------------------

package/src/input/settings-modal-mutations.ts

@@ -113,13 +113,15 @@ export function persistFlagState(
   if (newState === 'killed') return; // never persist killed state
 
   try {
-    const current = (configManager.getCategory('featureFlags') as Record<string, PersistedFlagState>) ?? {};
     if (newState === defaultState) {
-      delete current[flagId];
+      // Back at the default: the override must be REMOVED, not merged.
+      // getCategory clones and mergeCategory only sets keys, so the old
+      // delete-then-merge approach left the stale override on disk and the
+      // flag silently reloaded in the overridden state on the next start.
+      configManager.removeCategoryKey('featureFlags', flagId);
     } else {
-      current[flagId] = newState;
+      configManager.mergeCategory('featureFlags', { [flagId]: newState } as Record<string, PersistedFlagState>);
     }
-    configManager.mergeCategory('featureFlags', current);
   } catch (e) {
     logger.error('SettingsModal: failed to persist flag state', { flagId, error: summarizeError(e) });
   }

package/src/main.ts

@@ -12,7 +12,7 @@ import { registerAllTools } from '@pellux/goodvibes-sdk/platform/tools';
 import { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
 import { PermissionManager } from '@pellux/goodvibes-sdk/platform/permissions';
 import { AcpManager } from '@pellux/goodvibes-sdk/platform/acp';
-import { PermissionPromptUI } from './permissions/prompt.ts';
+import { PermissionPromptUI, buildPendingPermissionExtras } from './permissions/prompt.ts';
 import { CommandRegistry } from './input/command-registry.ts';
 import type { CommandContext } from './input/command-registry.ts';
 import { renderProcessIndicator } from './renderer/process-indicator.ts';
@@ -32,6 +32,7 @@ import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { registerBuiltinPanels } from './panels/builtin-panels.ts';
 import { bootstrapRuntime } from './runtime/bootstrap.ts';
 import type { BootstrapContext } from './runtime/bootstrap.ts';
+import { buildSharedOrchestratorCoreServices } from './runtime/orchestrator-core-services.ts';
 import type { HITLMode } from '@pellux/goodvibes-sdk/platform/state';
 import {
   checkRecoveryFile,
@@ -62,12 +63,16 @@ import { wireStreamEventMetrics, type StreamMetrics, type WireStreamEventMetrics
 import { wireTurnEventHandlers } from './core/turn-event-wiring.ts';
 import { buildContextStatusHint } from './renderer/context-status-hint.ts';
 import { evaluateSessionMaintenance } from '@/runtime/index.ts';
+import { createCancelGeneration } from './core/turn-cancellation.ts';
+import { wrapRequestPermissionWithAlert } from './core/approval-alert.ts';
+import { setPanelFrameRequester } from './panels/base-panel.ts';
 
 const ALT_SCREEN_ENTER = '\x1b[?1049h'; const ALT_SCREEN_EXIT  = '\x1b[?1049l';
 const MOUSE_ENABLE     = '\x1b[?1000h\x1b[?1002h\x1b[?1006h'; const MOUSE_DISABLE    = '\x1b[?1006l\x1b[?1002l\x1b[?1000l';
 const CURSOR_HIDE      = '\x1b[?25l'; const CURSOR_SHOW = '\x1b[?25h'; const CLEAR_SCREEN = '\x1b[2J\x1b[3J\x1b[H';
 const KEYBOARD_EXT_ENABLE  = '\x1b[>4;2m' + '\x1b[?1u'; const KEYBOARD_EXT_DISABLE = '\x1b[>4;0m' + '\x1b[?1l';
 const PASTE_ENABLE = '\x1b[?2004h'; const PASTE_DISABLE = '\x1b[?2004l';
+const FOCUS_ENABLE     = '\x1b[?1004h'; const FOCUS_DISABLE    = '\x1b[?1004l';
 
 async function main() {
   const stdout = process.stdout;
@@ -103,22 +108,17 @@ async function main() {
     permissionPromptRef,
     _writeLastSessionPointer: writeLastSessionPointer,
     systemMessageRouter,
-    setOpenAgentDetail,
   } = ctx;
   const workingDir = ctx.services.workingDirectory;
   const homeDirectory = ctx.services.homeDirectory;
   const { approvalBroker, agentManager, modeManager, processManager, providerRegistry, secretsManager, subscriptionManager } = ctx.services;
   conversation.setSessionMemoryStore(ctx.services.sessionMemoryStore);
   conversation.setSessionLineageTracker(ctx.services.sessionLineageTracker);
+  // Shared payload (single source of truth, includes wo805's memoryRegistry —
+  // see orchestrator-core-services.ts) plus this site's favoritesStore.
   orchestrator.setCoreServices({
-    configManager,
-    providerRegistry,
+    ...buildSharedOrchestratorCoreServices({ services: ctx.services, configManager, providerRegistry }),
     favoritesStore: ctx.services.favoritesStore,
-    planManager: ctx.services.planManager,
-    adaptivePlanner: ctx.services.adaptivePlanner,
-    sessionMemoryStore: ctx.services.sessionMemoryStore,
-    sessionLineageTracker: ctx.services.sessionLineageTracker,
-    idempotencyStore: ctx.services.idempotencyStore,
   });
   ctx.services.wrfcController.setPlanManager(ctx.services.planManager);
   let activeConversationWidth = stdout.columns || 80;
@@ -130,13 +130,9 @@ async function main() {
     }
   }
 
-  // TUI default: show token speed ON. The SDK schema default is false;
-  // applyRuntimeConfigDefault reads both the global settings file and the project
-  // settings file from disk before deciding whether to apply the default. If the
-  // user has explicitly set this key to false in EITHER their global or project
-  // persisted config, their value is respected and the default is NOT applied.
-  // Only when the key is absent from both files (e.g. a new install) does the
-  // TUI default of true take effect in-memory — no disk write occurs either way.
+  // TUI default: show token speed ON (SDK schema default is false). applyRuntimeConfigDefault
+  // reads the global + project settings files and only applies the default in-memory when the
+  // key is absent from both (e.g. a new install); an explicit user value is respected. No disk write.
   applyRuntimeConfigDefault(configManager, 'display.showTokenSpeed', true);
 
   const panelManager = ctx.services.panelManager;
@@ -180,6 +176,8 @@ async function main() {
     ttftRecorded: false,
     activeToolStartedAtMs: undefined,
     activeToolName: undefined,
+    lastDeltaAtMs: undefined, stallEpisode: 0,
+    reconnectAttempt: undefined, reconnectMaxAttempts: undefined,
   };
 
   const getPromptContentWidth = () => computePromptContentWidth(stdout.columns);
@@ -190,10 +188,8 @@ async function main() {
     const currentModel = providerRegistry.getCurrentModel();
     const contextWindow = providerRegistry.getContextWindowForModel(currentModel);
     const rows = stdout.rows || 24;
-    // Compact threshold must match buildShellFooter's `compact: height < 30`
-    // posture below — otherwise the cached-height fast path in
-    // estimateShellFooterHeight can answer a compact-vs-non-compact query
-    // with the wrong cached mode and throw the viewport math off by several rows.
+    // Compact threshold must match buildShellFooter's `compact: height < 30` posture below,
+    // else estimateShellFooterHeight's cached-height fast path answers with the wrong mode.
     return rows - 2 - estimateShellFooterHeight(promptLines, contextWindow, rows < 30);
   };
 
@@ -223,7 +219,7 @@ async function main() {
     stdout,
     ctx,
     noAltScreen: cli.flags.noAltScreen,
-    ansi: { CLEAR_SCREEN, ALT_SCREEN_EXIT, PASTE_DISABLE, KEYBOARD_EXT_DISABLE, MOUSE_DISABLE, CURSOR_SHOW },
+    ansi: { CLEAR_SCREEN, ALT_SCREEN_EXIT, PASTE_DISABLE, KEYBOARD_EXT_DISABLE, MOUSE_DISABLE, CURSOR_SHOW, FOCUS_DISABLE },
     getInput: () => input,
     render: () => renderScheduler.flushNow(), // resize: synchronous immediate path
     getPromptContentWidth,
@@ -307,12 +303,7 @@ async function main() {
     }
   };
 
-  const cancelGeneration = () => {
-    spokenTurns.stop('Spoken output stopped.');
-    if (orchestrator.isThinking) {
-      orchestrator.abort();
-    }
-  };
+  const cancelGeneration = createCancelGeneration(orchestrator, spokenTurns);
 
   const jumpToBookmark = (key: string) => {
     conversation.getDisplayBlocks();
@@ -341,6 +332,7 @@ async function main() {
   commandContext.pasteFromClipboard = () => input.handlePaste();
   commandContext.executeCommand = (name, args) => commandRegistry.execute(name, args, commandContext);
   commandContext.cancelGeneration = cancelGeneration;
+  commandContext.isGenerating = () => orchestrator.isThinking;
   commandContext.jumpToBookmark = jumpToBookmark;
   commandContext.scrollToLine = scrollToLine;
   commandContext.clearScreen = () => {
@@ -348,14 +340,15 @@ async function main() {
     allowTerminalWrite(() => stdout.write(CLEAR_SCREEN));
     render();
   };
-  permissionPromptRef.requestPermission = (request) =>
+  commandContext.requestFullRepaint = () => { compositor.resetDiff(); render(); };
+  permissionPromptRef.requestPermission = wrapRequestPermissionWithAlert((request) =>
     new Promise((resolve) => {
       pendingPermission = {
         ...request,
-        resolve: (approved: boolean, remember = false) => resolve({ approved, remember }),
+        ...buildPendingPermissionExtras(request, resolve),
       };
       render();
-    });
+    }), { focusTracker: ctx.services.focusTracker, configGet: (k: string) => configManager.get(k as Parameters<typeof configManager.get>[0]), webhookNotifier: ctx.services.webhookNotifier });
 
   const input: InputHandler = new InputHandler(
     () => render(),
@@ -388,7 +381,7 @@ async function main() {
         replayEngine: ctx.services.replayEngine,
         webhookNotifier: ctx.services.webhookNotifier,
         policyRuntimeState: ctx.services.policyRuntimeState,
-        externalServices: uiServices.platform.externalServices,
+        externalServices: uiServices.platform.externalServices, focusTracker: ctx.services.focusTracker,
       },
       shell: {
         bookmarkManager: ctx.services.bookmarkManager,
@@ -418,9 +411,8 @@ async function main() {
   input.setConversationManager(conversation);
   input.setContentWidth(getPromptContentWidth());
   input.filePicker.setOnUpdate(() => render());
-  input.agentDetailModal.setOnRefresh(() => render());
-  input.processModal.setOnRefresh(() => render());
-  setOpenAgentDetail((id) => input.agentDetailModal.open(id));
+  // W6.1 retirement: agentDetailModal/processModal setOnRefresh wiring removed —
+  // those modals were deleted (Fleet subsumes the live process tree via F2).
 
   // Model picker callback is handled in bootstrap.ts — do not duplicate here.
   input.setHistory(inputHistory);
@@ -514,6 +506,8 @@ async function main() {
       hitlMode: modeManager.getHITLMode(),
       runningAgentCount,
       runningProcessCount,
+      // Composer must not read as focused while the panel/process indicator owns keyboard focus.
+      promptFocused: !input.panelFocused && !input.indicatorFocused,
       indicatorFocused: input.indicatorFocused,
       runningAgentProgress: runningAgentSummary.progress,
       composerMode: composerState.modeLabel,
@@ -558,7 +552,7 @@ async function main() {
     // Calculate how many rows are consumed by overlays (thinking, permissions, queue, file picker)
     let overlayRows = 0;
     if (orchestrator.isThinking) overlayRows += 2; // spinner + blank
-    if (pendingPermission) overlayRows += PermissionPromptUI.getPromptHeight(pendingPermission);
+    if (pendingPermission) overlayRows += PermissionPromptUI.getPromptHeight(pendingPermission, pendingPermission.hunkState);
     overlayRows += orchestrator.messageQueue.length * 3; // queued messages
     // File picker and model picker overlay rows computed from actual rendered line count below
     // Selection modal overlay rows are computed from actual rendered line count below
@@ -584,6 +578,8 @@ async function main() {
       const partialToolPreview = showPreview ? sessionSnapshot.streamToolPreview : undefined;
       // Elapsed from turn start (stream or tool execution), used for the thinking indicator timer.
       const turnElapsedMs = streamMetrics.startTime > 0 ? Date.now() - streamMetrics.startTime : undefined;
+      // Suppressed while a tool executes — its ticking timer is the honest indicator then.
+      const stallInfo = UIFactory.computeRenderStallInfo(streamMetrics, Date.now());
       const thinking = UIFactory.createThinkingFragment(
         conversationWidth,
         orchestrator.getSpinner(),
@@ -594,6 +590,7 @@ async function main() {
         orchestrator.streamingOutputTokens > 0 ? orchestrator.streamingOutputTokens : undefined,
         turnElapsedMs,
         streamMetrics.ttftMs,
+        stallInfo,
       );
       viewport.push(...thinking);
       // Live tool timer: render the currently executing tool row with ticking elapsed.
@@ -604,7 +601,7 @@ async function main() {
     }
 
     if (pendingPermission) {
-      viewport.push(...PermissionPromptUI.createPromptLines(conversationWidth, pendingPermission));
+      viewport.push(...PermissionPromptUI.createPromptLines(conversationWidth, pendingPermission, pendingPermission.hunkState));
     }
 
     orchestrator.messageQueue.forEach(msg => {
@@ -655,6 +652,7 @@ async function main() {
   const terminalOutputGuard = installTuiTerminalOutputGuard({ stdout, stderr: process.stderr, notify: (message) => { systemMessageRouter.low(message); render(); } });
 
   setRenderRequest(renderNow); // bootstrap's 16ms coalescer calls the composite directly
+  setPanelFrameRequester(render); // live panels repaint when idle (Wave-6 replay: fleet sat stale until keypress)
   orchestratorRefs.requestRender = render;
   commandContext.renderRequest = render;
   wireShellUiOpeners({
@@ -670,6 +668,7 @@ async function main() {
     subscriptionManager,
     secretsManager,
     serviceRegistry: ctx.services.serviceRegistry,
+    memoryEmbeddingRegistry: ctx.services.memoryEmbeddingRegistry,
     workingDirectory: workingDir,
     homeDirectory,
     getConfiguredProviderIds: ctx._getConfiguredProviderIds,
@@ -692,15 +691,14 @@ async function main() {
     gitStatusProvider,
     lastGitInfoRef,
     buildSessionContinuityHints,
-    render, webhookNotifier: ctx.services.webhookNotifier,
+    render, webhookNotifier: ctx.services.webhookNotifier, focusTracker: ctx.services.focusTracker,
   });
   unsubs.push(...turnUnsubs);
 
   // Stable turn context for failover retry — set in submitInput, read by retryTurn.
   let retryCtx: { count: number; text: string; content?: ContentPart[]; opts?: Parameters<typeof orchestrator.handleUserInput>[2] } | null = null;
-  // One-key retry affordance: active immediately after a user-visible TURN_ERROR.
-  // While active, 'r' re-submits on the current provider, 'm' opens the model
-  // picker. Any other character clears the affordance and routes normally.
+  // One-key retry affordance, active right after a user-visible TURN_ERROR: 'r' re-submits on the
+  // current provider, 'm' opens the model picker, any other character clears it and routes normally.
   let errorAffordanceActive = false;
   const retryTurn = (): void => {
     if (!retryCtx) return;
@@ -724,9 +722,8 @@ async function main() {
     }
   });
 
-  // Register terminal-restoring crash/termination handlers BEFORE entering raw mode so a
-  // throw during terminal setup or the initial render still restores the terminal; the
-  // 'exit' listener is the final safety net for any process.exit path.
+  // Register terminal-restoring crash/termination handlers BEFORE entering raw mode so a throw
+  // during setup or the initial render still restores the terminal; 'exit' is the final safety net.
   process.on('uncaughtException', uncaughtExceptionHandler);
   process.on('SIGTERM', terminationSignalHandler);
   process.on('SIGHUP', terminationSignalHandler);
@@ -736,7 +733,7 @@ async function main() {
   stdin.setRawMode(true);
   stdin.resume();
   stdin.setEncoding('utf8');
-  allowTerminalWrite(() => stdout.write((cli.flags.noAltScreen ? '' : ALT_SCREEN_ENTER) + CLEAR_SCREEN + CURSOR_HIDE + MOUSE_ENABLE + KEYBOARD_EXT_ENABLE + PASTE_ENABLE));
+  allowTerminalWrite(() => stdout.write((cli.flags.noAltScreen ? '' : ALT_SCREEN_ENTER) + CLEAR_SCREEN + CURSOR_HIDE + MOUSE_ENABLE + KEYBOARD_EXT_ENABLE + PASTE_ENABLE + FOCUS_ENABLE));
 
   applyInitialTuiCliState({ cli, input, commandRegistry, commandContext, shellPaths: ctx.services.shellPaths, render });