@pellux/goodvibes-tui 1.16.1 → 1.18.0

package/src/main.ts

@@ -13,6 +13,7 @@ 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, buildPendingPermissionExtras } from './permissions/prompt.ts';
+import { handleBrokerApprovalChange, buildFixSessionAffordance, buildFixSessionErrorNotice, handleFixSessionAttachKey, refreshFixSessionsFromApprovals } from './permissions/broker-approval-card.ts';
 import { CommandRegistry } from './input/command-registry.ts';
 import type { CommandContext } from './input/command-registry.ts';
 import { renderProcessIndicator } from './renderer/process-indicator.ts';
@@ -32,18 +33,20 @@ 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 { selfUpdateAtLaunch } from './cli/launch-auto-update.ts';
 import { buildSharedOrchestratorCoreServices, refreshMemoryRecallSnapshot } from './runtime/orchestrator-core-services.ts';
-import type { HITLMode } from '@pellux/goodvibes-sdk/platform/state';
+import { createSessionContinuityHintsBuilder } from './runtime/session-continuity-hints.ts';
+import { resolveWebSurfaceUrl } from '@pellux/goodvibes-sdk/platform/runtime/feature-announcements';
 import { readLastSessionPointer, writeRecoveryFile } from '@/runtime/index.ts';
 import { handleBlockingShellInput, type PendingPermissionState } from './shell/blocking-input.ts';
-import { createPersistRecoverySnapshot, createRecoveryFileOps, createReopenRecoveryPanels, handleErrorAffordanceKey, resolveStartupRecoveryInfo } from './shell/recovery-input-helpers.ts';
+import { autoRestoreRecoverySession, createPersistRecoverySnapshot, createReopenRecoveryPanels, handleErrorAffordanceKey } from './shell/recovery-input-helpers.ts';
 import { wireShellUiOpeners } from './shell/ui-openers.ts';
 import { deriveComposerState } from './core/composer-state.ts';
-import { buildPersistedSessionContext, formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
+import { buildPersistedSessionContext, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { prepareShellCliRuntime } from './cli/entrypoint.ts';
 import { applyInitialTuiCliState } from './cli/tui-startup.ts';
-import { applyRuntimeConfigDefault, applyRuntimeConfigValue } from './cli/config-overrides.ts';
+import { applyConfiguredHitlMode, applyRuntimeConfigValue, applyTuiRuntimeConfigDefaults } from './cli/config-overrides.ts';
 import { renderToolCallBlock } from './renderer/tool-call.ts';
 import { wireSpokenTurnRuntime } from './audio/spoken-turn-wiring.ts';
 import { attachSpokenTurnModelRouting, createSpokenTurnInputOptions } from './audio/spoken-turn-model-routing.ts';
@@ -54,7 +57,7 @@ import { buildCommandArgsHint } from './input/command-args-hint.ts';
 import { summarizeRunningAgents } from './renderer/process-summary.ts';
 import { footerFleetCost } from './panels/fleet-read-model.ts';
 import { formatUserFacingErrorLine } from './core/format-user-error.ts';
-import { wireStreamEventMetrics, type StreamMetrics, type WireStreamEventMetricsResult } from './core/stream-event-wiring.ts';
+import { wireStreamEventMetrics, createStreamMetrics, type StreamMetrics, type WireStreamEventMetricsResult } from './core/stream-event-wiring.ts';
 import { wireTurnEventHandlers } from './core/turn-event-wiring.ts';
 import { buildContextStatusHint } from './renderer/context-status-hint.ts';
 import { isEffectiveDangerMode } from './config/index.ts';
@@ -64,6 +67,9 @@ import { createSessionAutoTitler } from './core/session-auto-titler.ts';
 import { makeComposerEditorOpener } from './input/composer-editor.ts';
 import { evaluateSessionMaintenance } from '@/runtime/index.ts';
 import { createCancelGeneration } from './core/turn-cancellation.ts';
+import { wireInteractionSeams, createMemoryProvenanceUi } from './runtime/interaction-seams.ts';
+import { createPowerChipSource } from './core/power-chip-source.ts';
+import { fetchDaemonPowerState, installKeepAwakeRemoteForward } from './runtime/power-keepawake-remote.ts';
 import { wrapRequestPermissionWithAlert } from './core/approval-alert.ts';
 import { createTerminalNotifier } from './core/terminal-notifier.ts';
 import { setPanelFrameRequester } from './panels/base-panel.ts';
@@ -79,6 +85,10 @@ async function main() {
     homeDirectory: homedir(),
   }, 'goodvibes');
 
+  // Launch-time self-update, before any bootstrap or terminal mode change; on
+  // an installed update this restarts onto the swapped binary and never returns.
+  const launchUpdateLines = await selfUpdateAtLaunch({ configManager, stdout });
+
   const ctx: BootstrapContext = await bootstrapRuntime(stdout, {
     configManager,
     workingDir: bootstrapWorkingDir,
@@ -102,7 +112,7 @@ async function main() {
     agentStatusIntervalRef,
     orchestratorRefs,
     setRenderRequest,
-    permissionPromptRef,
+    permissionPromptRef, trustPromptRef,
     _writeLastSessionPointer: writeLastSessionPointer,
     systemMessageRouter,
   } = ctx;
@@ -111,7 +121,7 @@ async function main() {
   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 —
+  // Shared payload (single source of truth, includes the memoryRegistry —
   // see orchestrator-core-services.ts) plus this site's favoritesStore.
   orchestrator.setCoreServices({
     ...buildSharedOrchestratorCoreServices({ services: ctx.services, configManager, providerRegistry }),
@@ -120,62 +130,40 @@ async function main() {
   ctx.services.wrfcController.setPlanManager(ctx.services.planManager);
   let activeConversationWidth = stdout.columns || 80;
   conversation.setWidthProvider(() => activeConversationWidth);
-  {
-    const hitlMode = configManager.get('behavior.hitlMode') as HITLMode | undefined;
-    if (hitlMode && (hitlMode === 'quiet' || hitlMode === 'balanced' || hitlMode === 'operator')) {
-      modeManager.setHITLMode(hitlMode);
-    }
-  }
+  // Persisted HITL mode + TUI-side config defaults (doc'd at their definitions).
+  applyConfiguredHitlMode(configManager, modeManager);
+  applyTuiRuntimeConfigDefaults(configManager);
 
-  // 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);
+  // Re-surface pre-TUI launch-update lines in-session (the alt screen wipes stdout).
+  for (const line of launchUpdateLines) systemMessageRouter.high(`[Update] ${line}`);
 
   const panelManager = ctx.services.panelManager;
-  const buildSessionContinuityHints = () => {
-    const sessionSnapshot = uiServices.readModels.session.getSnapshot();
-    const tasksSnapshot = uiServices.readModels.tasks.getSnapshot();
-    const remoteSnapshot = uiServices.readModels.remote.getSnapshot();
-    const worktreeSnapshot = uiServices.readModels.worktrees.getSnapshot();
-    return {
-      pendingApprovals: sessionSnapshot.pendingApproval ? 1 : 0,
-      activeTasks: tasksSnapshot.tasks.filter((task) => task.status === 'running' || task.status === 'queued').length,
-      blockedTasks: tasksSnapshot.tasks.filter((task) => task.status === 'blocked').length,
-      remoteContracts: remoteSnapshot.contracts.length,
-      remoteRunners: remoteSnapshot.contracts.slice(0, 4).map((contract) => contract.runnerId),
-      worktreeCount: worktreeSnapshot.records.length,
-      worktreePaths: worktreeSnapshot.records.slice(0, 3).map((record) => record.path),
-      openPanels: panelManager.getAllOpen().map((panel) => panel.id),
-    };
-  };
+  const buildSessionContinuityHints = createSessionContinuityHintsBuilder({ readModels: uiServices.readModels, panelManager });
 
   let pendingPermission: PendingPermissionState | null = null;
-  approvalBroker.subscribe((approval) => {
-    if (!pendingPermission) return;
-    if (pendingPermission.callId !== approval.callId) return;
-    if (approval.status === 'pending' || approval.status === 'claimed') return;
-    pendingPermission = null;
-    render();
+  // One-key jump/attach to a spawned CI fix-session: the affordance ARMS the id; the next 'j' runs the resume so the user never retypes it.
+  let fixSessionAttachArmed: string | null = null;
+  const attachToFixSession = (fixSessionId: string) => { void commandContext.executeCommand?.('session', ['resume', fixSessionId]); };
+  const onFixSessionStarted = buildFixSessionAffordance({
+    notify: (message) => { systemMessageRouter.high(message); render(); },
+    arm: (fixSessionId) => { fixSessionAttachArmed = fixSessionId; },
   });
+  // A failed fix-session spawn stamps an error instead of a dead id: render it honestly, no jump armed.
+  const onFixSessionError = buildFixSessionErrorNotice((message) => { systemMessageRouter.high(message); render(); });
+  commandContext.armFixSessionAttach = onFixSessionStarted;
+  approvalBroker.subscribe((approval) => handleBrokerApprovalChange({
+    approval, broker: approvalBroker, render, onFixSessionStarted, onFixSessionError,
+    getPending: () => pendingPermission,
+    setPending: (next) => { pendingPermission = next; },
+  }));
+  refreshFixSessionsFromApprovals(() => approvalBroker.listApprovals(), onFixSessionStarted, onFixSessionError); // catch pre-subscription stamps
 
   let scrollTop = 0;
   let scrollLocked = true;
-  // Cached from the overlay-aware clamp the renderer computes (conversation-layout) each
-  // frame so scroll() clamps against exactly what is displayed, not a footer estimate.
+  // Cached from the overlay-aware clamp the renderer computes (conversation-layout) each frame so scroll() clamps against exactly what is displayed, not a footer estimate.
   let lastMaxScroll: number | null = null;
   // Stream and tool-timer state; mutated by wireStreamEventMetrics handlers, read during render.
-  const streamMetrics: StreamMetrics = {
-    startTime: 0,
-    deltaCount: 0,
-    tokenSpeed: 0,
-    ttftMs: undefined,
-    ttftRecorded: false,
-    activeToolStartedAtMs: undefined,
-    activeToolName: undefined,
-    lastDeltaAtMs: undefined, stallEpisode: 0,
-    reconnectAttempt: undefined, reconnectMaxAttempts: undefined,
-  };
+  const streamMetrics: StreamMetrics = createStreamMetrics();
 
   const getPromptContentWidth = () => computePromptContentWidth(stdout.columns);
 
@@ -185,8 +173,7 @@ 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,
-    // else estimateShellFooterHeight's cached-height fast path answers with the wrong mode.
+    // 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);
   };
 
@@ -209,9 +196,13 @@ async function main() {
   const unsubs: Array<() => void> = [];
   let recoveryInterval: ReturnType<typeof setInterval> | null = null;
   let stopSpokenOutputForExit: (() => Promise<void>) | null = null;
-  let recoveryPending = false;
-  // Which file the current recovery prompt should load/delete from (see recovery-input-helpers.ts).
-  let recoverySource: 'live' | 'preserved' = 'live';
+  // The optional "used N memories" provenance chip (default OFF) — see interaction-seams.ts.
+  const memoryProvenanceUi = createMemoryProvenanceUi({ render: () => render(), memorySpine: ctx.services.memorySpine });
+  // Topology-aware keep-awake: the chip renders the DAEMON's state in adopted-external mode (power-chip-source.ts) and every toggle is forwarded to that daemon (power-keepawake-remote.ts) so keep-awake survives the TUI closing in BOTH topologies.
+  const isExternalDaemon = () => uiServices.platform.externalServices?.inspect()?.daemonStatus?.mode === 'external';
+  const powerChipSource = createPowerChipSource({ powerManager: ctx.services.powerManager, render: () => render(), isExternalDaemon,
+    onPowerEvent: (cb) => uiServices.events.ops.on('OPS_POWER_STATE_CHANGED', cb as never), fetchDaemonPowerState: () => fetchDaemonPowerState({ configManager, homeDirectory, isExternalDaemon }) });
+  unsubs.push(powerChipSource.stop, installKeepAwakeRemoteForward({ configManager, homeDirectory, isExternalDaemon }));
 
   const lifecycle = installProcessLifecycle({
     stdin,
@@ -335,6 +326,10 @@ async function main() {
   // Late-patched: bootstrap.ts populates uiServices.platform.externalServices AFTER commandContext is built.
   commandContext.platform.externalServices = uiServices.platform.externalServices;
   commandContext.cancelGeneration = cancelGeneration;
+  wireInteractionSeams(commandContext, {
+    orchestrator, powerManager: ctx.services.powerManager, readPowerSurface: () => powerChipSource.get(), render: () => render(), notify: (m) => systemMessageRouter.high(m),
+    getActiveToolCallId: () => streamMetrics.activeToolCallId, toggleMemoryProvenance: () => memoryProvenanceUi.toggle(),
+  });
   commandContext.isGenerating = () => orchestrator.isThinking;
   commandContext.jumpToBookmark = jumpToBookmark; commandContext.scrollToLine = scrollToLine;
   commandContext.clearScreen = () => {
@@ -379,7 +374,7 @@ async function main() {
         surfaceRegistry: ctx.services.surfaceRegistry,
         subscriptionManager: ctx.services.subscriptionManager,
         secretsManager: ctx.services.secretsManager,
-        tokenAuditor: ctx.services.tokenAuditor,
+        pairingTokens: ctx.services.pairingTokens, tokenAuditor: ctx.services.tokenAuditor,
         replayEngine: ctx.services.replayEngine,
         webhookNotifier: ctx.services.webhookNotifier,
         policyRuntimeState: ctx.services.policyRuntimeState,
@@ -414,7 +409,7 @@ async function main() {
   input.setConversationManager(conversation);
   input.setContentWidth(getPromptContentWidth());
   input.filePicker.setOnUpdate(() => render());
-  // W6.1 retirement: agentDetailModal/processModal setOnRefresh wiring removed —
+  // 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.
@@ -501,6 +496,9 @@ async function main() {
       hitlMode: modeManager.getHITLMode(),
       // Cross-surface spine posture segment (adopted-daemon mode only).
       sessionSpineStatus: (() => { const s = uiServices.platform.externalServices?.inspect(); return s?.sessionSpineActive && s.sessionSpineStatus && s.sessionSpineStatus !== 'unknown' ? s.sessionSpineStatus : undefined; })(), runningAgentCount, runningProcessCount,
+      webSurfaceUrl: configManager.get('web.enabled') ? resolveWebSurfaceUrl(configManager) : undefined,
+      // Always-visible "sleep disabled" chip — topology-aware: the DAEMON's state in adopted-external mode, the in-process manager otherwise (power-chip-source.ts).
+      powerKeepAwake: powerChipSource.get().keepAwake,
       // Composer must not read as focused while the panel/process indicator owns keyboard focus.
       promptFocused: !input.panelFocused && !input.indicatorFocused,
       indicatorFocused: input.indicatorFocused,
@@ -547,7 +545,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, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy);
+    if (pendingPermission) overlayRows += PermissionPromptUI.getPromptHeight(pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy, PermissionPromptUI.promptViewState(pendingPermission, conversationWidth, approvalBroker));
     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
@@ -591,18 +589,17 @@ async function main() {
       viewport.push(...thinking);
       // Live tool timer: render the currently executing tool row with ticking elapsed.
       if (streamMetrics.activeToolName !== undefined && streamMetrics.activeToolStartedAtMs !== undefined) {
-        const liveToolCall = { id: 'live', name: streamMetrics.activeToolName, arguments: {} };
+        const liveToolCall = { id: streamMetrics.activeToolCallId ?? 'live', name: streamMetrics.activeToolName, arguments: {} };
         viewport.push(...renderToolCallBlock(liveToolCall, 'executing', undefined, conversationWidth, undefined, undefined, undefined, streamMetrics.activeToolStartedAtMs));
       }
     }
 
     if (pendingPermission) {
-      viewport.push(...PermissionPromptUI.createPromptLines(conversationWidth, pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy));
+      viewport.push(...PermissionPromptUI.createPromptLines(conversationWidth, pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy, PermissionPromptUI.promptViewState(pendingPermission, conversationWidth, approvalBroker)));
     }
 
-    orchestrator.messageQueue.forEach(msg => {
-      viewport.push(...UIFactory.createQueuedMessageFragment(conversationWidth, msg.text));
-    });
+    viewport.push(...UIFactory.createQueuedMessageList(conversationWidth, orchestrator.listQueuedMessages()));
+    viewport.push(...memoryProvenanceUi.renderChip(conversationWidth, configManager));
 
     viewport = applyConversationOverlays(viewport, {
       input,
@@ -643,8 +640,8 @@ async function main() {
       panelWidth: panelComposite.panelWidth,
     });
   };
-  const renderScheduler = createRenderScheduler(renderNow, undefined, () => lifecycle.isTerminalRestored()); // WO-208 coalescer; no frames after terminal restore
-  const render = (): void => renderScheduler.schedule(); // captured direct writes → activity log + quiet /debug counter, not repeated transcript lines (UX-B 1a)
+  const renderScheduler = createRenderScheduler(renderNow, undefined, () => lifecycle.isTerminalRestored()); // coalescer; no frames after terminal restore
+  const render = (): void => renderScheduler.schedule(); // captured direct writes → activity log + quiet /debug counter, not repeated transcript lines (1a)
   const terminalOutputGuard = installTuiTerminalOutputGuard({ stdout, stderr: process.stderr, onCapture: (total) => { commandContext.session.runtime.terminalWritesIntercepted = total; render(); } });
 
   setRenderRequest(() => renderScheduler.flushNow()); // bootstrap's 16ms coalescer composites via the (restore-gated) scheduler
@@ -669,7 +666,7 @@ async function main() {
     homeDirectory,
     getConfiguredProviderIds: ctx._getConfiguredProviderIds,
     getPinned: ctx._getPinned,
-    render,
+    render, trustPromptRef,
   });
 
   const { refreshGit, unsubs: turnUnsubs } = wireTurnEventHandlers({
@@ -691,6 +688,8 @@ async function main() {
   });
   unsubs.push(...turnUnsubs);
 
+  unsubs.push(uiServices.events.turns.on('TURN_COMPLETED', (evt) => memoryProvenanceUi.onTurnCompleted(evt)));
+
   // 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 right after a user-visible TURN_ERROR: 'r' re-submits on the
@@ -731,7 +730,7 @@ async function main() {
   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 + FOCUS_ENABLE));
-  // DEBT-2: forced dark/light applies before first paint; auto (TTY only) fires the
+  // forced dark/light applies before first paint; auto (TTY only) fires the
   // OSC 11 probe and repaints once if light wins. filterInput strips the reply from stdin.
   const themeProbe = installBackgroundThemeProbe({ configManager, isTTY: Boolean(stdout.isTTY), env: process.env, writeQuery: (b) => allowTerminalWrite(() => stdout.write(b)), requestRepaint: () => { compositor.resetDiff(); render(); } });
 
@@ -740,24 +739,24 @@ async function main() {
   stdin.on('data', (raw: string) => {
     const data = themeProbe.filterInput(raw); if (data.length === 0) return;
     const blocking = handleBlockingShellInput({
-      data, pendingPermission, recoveryPending, conversation, systemMessageRouter, render,
+      data, pendingPermission, render,
       abortTurn: () => orchestrator.abort(),
-      ...createRecoveryFileOps(() => recoverySource, { homeDirectory }),
-      homeDirectory, sessionId: runtime.sessionId,
-      persistSnapshot: createPersistRecoverySnapshot({ sessionManager: ctx.services.sessionManager, runtime, conversation }),
-      reopenPanels: createReopenRecoveryPanels({ panelManager, render }),
     });
     pendingPermission = blocking.pendingPermission;
-    recoveryPending = blocking.recoveryPending;
     if (blocking.handled) {
       return;
     }
-
     // One-key retry affordance: armed after a user-visible TURN_ERROR; any key other than r/m dismisses it and routes normally.
     if (errorAffordanceActive) {
       errorAffordanceActive = false;
       if (handleErrorAffordanceKey(data, { retryArmed: retryCtx !== null, retry: retryTurn, openModelPicker: () => commandContext.openModelPicker?.(), render })) return;
     }
+    // One-key jump to a spawned CI fix-session: 'j' attaches, any other key dismisses and routes normally.
+    if (fixSessionAttachArmed !== null) {
+      const armedFixSessionId = fixSessionAttachArmed;
+      fixSessionAttachArmed = null;
+      if (handleFixSessionAttachKey(data, { armedFixSessionId, attach: attachToFixSession, render })) return;
+    }
 
     input.feed(data);
   });
@@ -765,26 +764,27 @@ async function main() {
   process.on('unhandledRejection', unhandledRejectionHandler);
   stdout.on('resize', resizeHandler);
 
+  // --- Silent crash-recovery restore (no prompt/banner) ---
+  // Restore the newest crash snapshot in place, replay any post-snapshot
+  // journal turns, reopen its panels, and emit a single one-line receipt. The
+  // SDK scopes both the load and the follow-up delete to that snapshot's own
+  // session id, so a concurrent session's snapshot is never touched. Runs
+  // before the initial render so the restored content shows immediately.
+  autoRestoreRecoverySession({
+    workingDirectory: workingDir,
+    homeDirectory,
+    conversation,
+    persistSnapshot: createPersistRecoverySnapshot({ sessionManager: ctx.services.sessionManager, runtime, conversation }),
+    reopenPanels: createReopenRecoveryPanels({ panelManager, render }),
+    systemMessageRouter,
+  });
+
   // Initial render
   conversation.rebuildHistory();
   render();
 
-  // --- Crash recovery check (also checks the preserve-on-dismiss sibling; see recovery-input-helpers.ts) ---
-  const recoveryInfo = resolveStartupRecoveryInfo({ workingDirectory: workingDir, homeDirectory });
-  if (recoveryInfo) {
-    recoverySource = recoveryInfo.source;
-    systemMessageRouter.high(`[Recovery] Found unsaved session from ${new Date(recoveryInfo.timestamp).toLocaleString()}. Title: "${recoveryInfo.title}". Press Ctrl+R to restore, Esc to discard, or start typing to ignore it.`);
-    for (const line of formatReturnContextForDisplay(recoveryInfo.returnContext)) {
-      systemMessageRouter.low(`[Recovery] ${line}`);
-    }
-    render();
-    recoveryPending = true;
-  }
-
   // --- Auto-save to recovery file every 60s ---
   recoveryInterval = setInterval(() => {
-    // Skip while an earlier recovery prompt is unresolved (avoids racing preserve-on-dismiss).
-    if (recoveryPending) return;
     const snapshot = conversation.toJSON() as { messages: Array<import('./core/conversation.ts').ConversationMessageSnapshot> };
     const persisted = buildPersistedSessionContext(snapshot.messages, conversation.getTitleSource(), buildSessionContinuityHints());
     writeRecoveryFile(

package/src/panels/agent-inspector-shared.ts

@@ -8,7 +8,7 @@ export type AgentInspectorEntryKind = 'user' | 'assistant' | 'tool_call' | 'tool
 // ---------------------------------------------------------------------------
 // Shared agent status / stall constants
 // Used by the Fleet panel's agent views and read-model consumers (formerly also
-// AgentDetailModal, which was retired in W6.1).
+// AgentDetailModal, which was retired in).
 // ---------------------------------------------------------------------------
 
 /** Terminal statuses — cancel not offered; stall check skipped. */
@@ -127,7 +127,7 @@ export function agentKindStyle(kind: AgentInspectorEntryKind, colors: Record<str
 }
 
 // ---------------------------------------------------------------------------
-// Inspector filter modes (ported from the merged agent-logs console — WO-110)
+// Inspector filter modes (ported from the merged agent-logs console —)
 // ---------------------------------------------------------------------------
 
 export type AgentInspectorFilterType = 'all' | 'assistant' | 'tool' | 'error';
@@ -188,7 +188,7 @@ interface AgentUsageLike {
 
 /**
  * True when a usage object carries actual reported token data rather than
- * being present-but-empty. W0.9: the SDK's AgentRecord.usage is initialised
+ * being present-but-empty.: the SDK's AgentRecord.usage is initialised
  * to an all-zero object at agent spawn (platform/tools/agent/manager.ts) and
  * — in the currently pinned SDK version — is never updated past that, so a
  * plain truthiness check on `rec.usage` treats every agent, including ones
@@ -256,7 +256,7 @@ export function buildWrfcCostSegments(
 }
 
 // ---------------------------------------------------------------------------
-// Agent lifecycle event subscriptions (ported from agent-logs — WO-110)
+// Agent lifecycle event subscriptions (ported from agent-logs —)
 // ---------------------------------------------------------------------------
 
 export interface AgentActivityHooks {

package/src/panels/base-panel.ts

@@ -227,10 +227,10 @@ export abstract class BasePanel implements Panel {
     return consumed;
   }
 
-  /** R2: Mark this panel dirty — it will be re-rendered on the next compositor frame. */
+  /** Mark this panel dirty — it will be re-rendered on the next compositor frame. */
   public invalidate(): void { this.needsRender = true; }
 
-  /** R2: Called by the compositor after a successful render to clear the dirty flag. */
+  /** Called by the compositor after a successful render to clear the dirty flag. */
   public markRendered(): void { this.needsRender = false; }
 
   protected markDirty(): void {

package/src/panels/builtin/agent.ts

@@ -1,25 +1,25 @@
 import type { PanelManager } from '../panel-manager.ts';
 import type { ResolvedBuiltinPanelDeps } from './shared.ts';
 
-// W6.1 (the purge): thinking, tools, inspector, and wrfc were registered here
+// (the purge): thinking, tools, inspector, and wrfc were registered here
 // before the purge. thinking/tools were DELETE-disposition (no surviving
 // human surface — thinking already renders inline in the transcript, tool
 // results render inline plus per-node in Fleet); inspector/wrfc were
 // RETIRE-INTO-FLEET (their live console is subsumed by the Fleet panel,
 // operations.ts:84). See registerOperationsPanels for the fleet
-// registration and .goodvibes/audit/2026-07-04-wave6-briefs.json (W6.1) for
+// registration and .goodvibes/audit/2026-07-04-wave6-briefs.json for
 // the full disposition map.
 export function registerAgentPanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
   // Compat: '/panel open agent-logs' and 'inspector' (and any saved
   // layout/muscle memory) still resolve — redirected straight to fleet.
-  // Repointed from agent-logs->inspector (WO-110) now that inspector itself
+  // Repointed from agent-logs->inspector now that inspector itself
   // is retired; alias resolution is a single hop (PanelManager._resolveId),
   // so this must point at the real surviving id, not at another alias.
   manager.registerAlias('agent-logs', 'fleet');
   manager.registerAlias('inspector', 'fleet');
   manager.registerAlias('wrfc', 'fleet');
 
-  // W6.1 (the purge) — group B (WO-P): 'work-plan' and 'project-planning'
+  // (the purge) — group B: 'work-plan' and 'project-planning'
   // migrated to the 'work-plan-modal' / 'planning-modal' config-modal surfaces.
   // Their surfaces AND panel→modal redirects are registered centrally in
   // registerBuiltinModals (builtin-modals.ts). Panel registrations retired here.

package/src/panels/builtin/development.ts

@@ -6,14 +6,14 @@ import { CostTrackerPanel } from '../cost-tracker-panel.ts';
 import type { ResolvedBuiltinPanelDeps } from './shared.ts';
 import { requireUiServices, withUnconfiguredFallback } from './shared.ts';
 
-// W6.1 (the purge): plan, intelligence, explorer, preview, and symbols were
+// (the purge): plan, intelligence, explorer, preview, and symbols were
 // registered here before the purge. plan was RETIRE-INTO-FLEET (its
 // execution-plan view is subsumed by Fleet — operations.ts:84); the other
 // four were DELETE-disposition (no surviving human surface — intelligence's
 // read-model still backs the surviving `/intelligence` CLI subcommands, see
 // intelligence-runtime.ts; explorer/preview/symbols had no dedicated
 // read-model to preserve). See .goodvibes/audit/2026-07-04-wave6-briefs.json
-// (W6.1) for the full disposition map.
+// for the full disposition map.
 export function registerDevelopmentPanels(manager: PanelManager, deps: ResolvedBuiltinPanelDeps): void {
   manager.registerType({
     id: 'git',
@@ -56,10 +56,10 @@ export function registerDevelopmentPanels(manager: PanelManager, deps: ResolvedB
     ),
   });
 
-  // WO-110: 'inspector' registration moved to builtin/agent.ts (category
+  // 'inspector' registration moved to builtin/agent.ts (category
   // 'agent') — it now absorbs the merged agent-logs capabilities.
 
-  // WO-152: always registered (was gated behind `if (deps.getOrchestratorUsage)`,
+  // always registered (was gated behind `if (deps.getOrchestratorUsage)`,
   // so `/panel open cost` reported "Unknown panel" on builds without usage
   // tracking wired). Falls back to a "dependency not configured" empty state.
   {

package/src/panels/builtin/knowledge.ts

@@ -1,7 +1,7 @@
 import type { PanelManager } from '../panel-manager.ts';
 import type { ResolvedBuiltinPanelDeps } from './shared.ts';
 
-// W6.1 (the purge) — group B: 'knowledge' and 'memory' migrated to the
+// (the purge) — group B: 'knowledge' and 'memory' migrated to the
 // 'knowledge-modal' / 'memory-modal' config-modal surfaces. Both surfaces and
 // their panel→modal redirects are registered centrally in registerBuiltinModals
 // (src/panels/builtin-modals.ts). This registrar is intentionally empty