@pellux/goodvibes-tui 1.1.0 → 1.7.0

package/src/runtime/bootstrap-command-context.ts

@@ -16,6 +16,7 @@ import type { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
 import type { ForensicsRegistry } from '@/runtime/index.ts';
 import type { PolicyRuntimeState } from '@/runtime/index.ts';
 import type { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
+import type { WorkspaceCheckpointManager } from '@pellux/goodvibes-sdk/platform/workspace';
 import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
 import type { MemoryRegistry } from '@pellux/goodvibes-sdk/platform/state';
 import type { IntegrationHelperService } from '@/runtime/index.ts';
@@ -61,6 +62,10 @@ export type CreateBootstrapCommandContextOptions = {
   mcpRegistry: McpRegistry;
   voiceProviderRegistry?: VoiceProviderRegistry;
   voiceService?: VoiceService;
+  /** B31: direct-command consumers (`/search`, `/image`) of already-constructed RuntimeServices. */
+  webSearchService?: import('@pellux/goodvibes-sdk/platform/web-search').WebSearchService;
+  mediaProviders?: import('@pellux/goodvibes-sdk/platform/media').MediaProviderRegistry;
+  artifactStore?: import('@pellux/goodvibes-sdk/platform/artifacts').ArtifactStore;
   forensicsRegistry: ForensicsRegistry;
   policyRuntimeState: PolicyRuntimeState;
   readModels: UiReadModels;
@@ -68,6 +73,7 @@ export type CreateBootstrapCommandContextOptions = {
   remoteRuntime?: RemoteCommandService;
   planRuntime?: PlanRuntimeService;
   fileUndoManager: FileUndoManager;
+  workspaceCheckpointManager?: WorkspaceCheckpointManager;
   memoryRegistry?: MemoryRegistry;
   integrationHelpers?: IntegrationHelperService;
   automationManager?: ShellAutomationManagerRuntimeService;
@@ -115,6 +121,9 @@ export type CreateBootstrapCommandContextOptions = {
   wrfcController?: import('@pellux/goodvibes-sdk/platform/agents').WrfcController;
   componentHealthMonitor: import('@/runtime/index.ts').ComponentHealthMonitor;
   hydrateSessionUsage?: () => void;
+  workstreamEngine?: import('./workstream-services.ts').WorkstreamCommandService;
+  codeIndexStore?: import('@pellux/goodvibes-sdk/platform/state').CodeIndexStore;
+  getMainSessionTurnInjections?: () => readonly import('../renderer/turn-injection.ts').TurnInjectionEntry[];
 };
 
 export function createBootstrapCommandContext(
@@ -132,6 +141,9 @@ export function createBootstrapCommandContext(
     mcpRegistry,
     voiceProviderRegistry,
     voiceService,
+    webSearchService,
+    mediaProviders,
+    artifactStore,
     forensicsRegistry,
     policyRuntimeState,
     readModels,
@@ -139,6 +151,7 @@ export function createBootstrapCommandContext(
     remoteRuntime,
     planRuntime,
     fileUndoManager,
+    workspaceCheckpointManager,
     memoryRegistry,
     integrationHelpers,
     automationManager,
@@ -169,6 +182,9 @@ export function createBootstrapCommandContext(
     wrfcController,
     changeTracker,
     hydrateSessionUsage,
+    workstreamEngine,
+    codeIndexStore,
+    getMainSessionTurnInjections,
     planManager,
     adaptivePlanner,
     sessionOrchestration,
@@ -226,6 +242,9 @@ export function createBootstrapCommandContext(
     wrfcController,
     changeTracker,
     hydrateSessionUsage,
+    workstreamEngine,
+    codeIndexStore,
+    getMainSessionTurnInjections,
   });
   const provider = createBootstrapCommandProviderSection({
     providerRegistry,
@@ -236,6 +255,7 @@ export function createBootstrapCommandContext(
   const workspace = createBootstrapCommandWorkspaceSection({
     keybindingsManager,
     fileUndoManager,
+    workspaceCheckpointManager,
     panelManager,
     profileManager,
     bookmarkManager,
@@ -243,7 +263,7 @@ export function createBootstrapCommandContext(
     projectPlanningProjectId,
     workPlanStore,
   }, shellServices);
-  const platform = createBootstrapCommandPlatformSection({ configManager, voiceProviderRegistry, voiceService }, shellServices);
+  const platform = createBootstrapCommandPlatformSection({ configManager, voiceProviderRegistry, voiceService, webSearchService, mediaProviders, artifactStore }, shellServices);
   const extensions = createBootstrapCommandExtensionsSection({
     toolRegistry,
     mcpRegistry,

package/src/runtime/bootstrap-command-parts.ts

@@ -16,7 +16,8 @@ import type { PermissionRequestHandler } from '@pellux/goodvibes-sdk/platform/pe
 import type { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
 import type { ForensicsRegistry } from '@/runtime/index.ts';
 import type { PolicyRuntimeState } from '@/runtime/index.ts';
-import type { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
+import type { CodeIndexStore, FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
+import type { WorkspaceCheckpointManager } from '@pellux/goodvibes-sdk/platform/workspace';
 import type { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
 import type { MemoryRegistry } from '@pellux/goodvibes-sdk/platform/state';
 import type { IntegrationHelperService } from '@/runtime/index.ts';
@@ -79,11 +80,16 @@ export interface BootstrapCommandSectionOptions {
   readonly mcpRegistry: McpRegistry;
   readonly voiceProviderRegistry?: VoiceProviderRegistry;
   readonly voiceService?: VoiceService;
+  /** B31: direct-command consumers (`/search`, `/image`) of already-constructed RuntimeServices. */
+  readonly webSearchService?: import('@pellux/goodvibes-sdk/platform/web-search').WebSearchService;
+  readonly mediaProviders?: import('@pellux/goodvibes-sdk/platform/media').MediaProviderRegistry;
+  readonly artifactStore?: import('@pellux/goodvibes-sdk/platform/artifacts').ArtifactStore;
   readonly forensicsRegistry: ForensicsRegistry;
   readonly policyRuntimeState: PolicyRuntimeState;
   readonly readModels: UiReadModels;
   readonly shellPaths: ShellPathService;
   readonly fileUndoManager: FileUndoManager;
+  readonly workspaceCheckpointManager?: WorkspaceCheckpointManager;
   readonly memoryRegistry?: MemoryRegistry;
   readonly integrationHelpers?: IntegrationHelperService;
   readonly knowledgeService?: KnowledgeService;
@@ -110,6 +116,9 @@ export interface BootstrapCommandSectionOptions {
   readonly wrfcController?: import('@pellux/goodvibes-sdk/platform/agents').WrfcController;
   readonly changeTracker?: import('@pellux/goodvibes-sdk/platform/sessions').SessionChangeTracker;
   readonly hydrateSessionUsage?: () => void;
+  readonly workstreamEngine?: import('./workstream-services.ts').WorkstreamCommandService;
+  readonly codeIndexStore?: CodeIndexStore;
+  readonly getMainSessionTurnInjections?: () => readonly import('../renderer/turn-injection.ts').TurnInjectionEntry[];
   readonly agentManager?: ShellAgentManagerService;
   readonly modeManager?: ShellModeManagerService;
   readonly automationManager?: ShellAutomationManagerRuntimeService;
@@ -182,8 +191,15 @@ export function createBootstrapCommandActions(
   } = options;
 
   const showPanel = (panelId: string, pane?: 'top' | 'bottom') => {
+    // W6.1 (the purge): a MIGRATE-TO-MODAL id resolves to a modal, not a panel.
+    // panelManager.open() fires the injected openModal callback and returns a
+    // no-op sentinel — so skip panelManager.show() (which would reveal an empty
+    // panel workspace behind the modal) when this id redirects. Keeps every
+    // showPanel-based front-door (openHooksPanel/openSecurityPanel/… and the
+    // migrated command runtimes) opening the modal cleanly.
+    const redirected = panelManager.getModalRedirect(panelId) !== undefined;
     panelManager.open(panelId, pane);
-    panelManager.show();
+    if (!redirected) panelManager.show();
     requestRender();
   };
 
@@ -279,11 +295,15 @@ export function createBootstrapCommandActions(
     openMemoryPanel: () => {
       showPanel('memory');
     },
+    // W6.1: remote/subscription migrated to config-modal surfaces. open() hits
+    // the modal redirect and invokes the openModal callback — do NOT go through
+    // showPanel here, which would additionally reveal + focus an (empty) panel
+    // workspace behind the fullscreen modal.
     openRemotePanel: () => {
-      showPanel('remote');
+      panelManager.open('remote');
     },
     openSubscriptionPanel: () => {
-      showPanel('subscription');
+      panelManager.open('subscription');
     },
     openLocalAuthMaskedEntry: (kind, username) => {
       showPanel('local-auth');
@@ -301,7 +321,7 @@ export function createBootstrapCommandActions(
 export function createBootstrapCommandSessionSection(
   options: Pick<
     BootstrapCommandSectionOptions,
-    'conversation' | 'runtime' | 'sessionManager' | 'sessionMemoryStore' | 'sessionLineageTracker' | 'wrfcController' | 'changeTracker' | 'hydrateSessionUsage'
+    'conversation' | 'runtime' | 'sessionManager' | 'sessionMemoryStore' | 'sessionLineageTracker' | 'wrfcController' | 'changeTracker' | 'hydrateSessionUsage' | 'workstreamEngine' | 'codeIndexStore' | 'getMainSessionTurnInjections'
   >,
 ): BootstrapCommandSessionSection {
   return {
@@ -313,6 +333,9 @@ export function createBootstrapCommandSessionSection(
     wrfcController: options.wrfcController,
     changeTracker: options.changeTracker,
     hydrateSessionUsage: options.hydrateSessionUsage,
+    workstreamEngine: options.workstreamEngine,
+    codeIndexStore: options.codeIndexStore,
+    getMainSessionTurnInjections: options.getMainSessionTurnInjections,
   };
 }
 
@@ -333,7 +356,7 @@ export function createBootstrapCommandProviderSection(
 export function createBootstrapCommandWorkspaceSection(
   options: Pick<
     BootstrapCommandSectionOptions,
-    'keybindingsManager' | 'fileUndoManager' | 'panelManager' | 'profileManager' | 'bookmarkManager'
+    'keybindingsManager' | 'fileUndoManager' | 'workspaceCheckpointManager' | 'panelManager' | 'profileManager' | 'bookmarkManager'
     | 'projectPlanningService' | 'projectPlanningProjectId' | 'workPlanStore'
   >,
   shellServices: BootstrapCommandShellServices,
@@ -341,6 +364,7 @@ export function createBootstrapCommandWorkspaceSection(
   return {
     keybindingsManager: options.keybindingsManager,
     fileUndoManager: options.fileUndoManager,
+    workspaceCheckpointManager: options.workspaceCheckpointManager,
     panelManager: options.panelManager,
     profileManager: options.profileManager,
     bookmarkManager: options.bookmarkManager,
@@ -354,7 +378,7 @@ export function createBootstrapCommandWorkspaceSection(
 export function createBootstrapCommandPlatformSection(
   options: Pick<
     BootstrapCommandSectionOptions,
-    'configManager' | 'voiceProviderRegistry' | 'voiceService'
+    'configManager' | 'voiceProviderRegistry' | 'voiceService' | 'webSearchService' | 'mediaProviders' | 'artifactStore'
   >,
   shellServices: BootstrapCommandShellServices,
 ): BootstrapCommandPlatformSection {
@@ -363,6 +387,9 @@ export function createBootstrapCommandPlatformSection(
     configManager: options.configManager,
     voiceProviderRegistry: options.voiceProviderRegistry,
     voiceService: options.voiceService,
+    webSearchService: options.webSearchService,
+    mediaProviders: options.mediaProviders,
+    artifactStore: options.artifactStore,
     ...shellServices.platform,
   };
 }

package/src/runtime/bootstrap-core.ts

@@ -7,7 +7,6 @@ import { ToolRegistry } from '@pellux/goodvibes-sdk/platform/tools';
 import { registerAllTools } from '@pellux/goodvibes-sdk/platform/tools';
 import { PermissionManager, createPermissionConfigReader } from '@pellux/goodvibes-sdk/platform/permissions';
 import { Notifier } from '@pellux/goodvibes-sdk/platform/integrations';
-import { WebhookNotifier } from '@pellux/goodvibes-sdk/platform/integrations';
 import { Compositor } from '../renderer/compositor.ts';
 import type { PermissionRequestHandler } from '@pellux/goodvibes-sdk/platform/permissions';
 import type { SystemMessageRouter } from '../core/system-message-router.ts';
@@ -33,7 +32,7 @@ import { createUiRuntimeServices, type UiRuntimeServices } from './ui-services.t
 import { join } from 'node:path';
 import { installWrfcAgentToolGuard } from '../tools/wrfc-agent-guard.ts';
 import { createWrfcPersistence, type WrfcPersistence } from './wrfc-persistence.ts';
-import type { SystemMessagePriority } from '../panels/system-messages-panel.ts';
+import type { SystemMessagePriority } from '../core/system-message-router.ts';
 
 // ---------------------------------------------------------------------------
 // Pre-router buffer
@@ -637,10 +636,20 @@ export async function initializeBootstrapCore(
 
   providerRegistry.startWatching(runtimeBus);
 
+  // W2.3: attach the SAME WebhookNotifier instance that `/notify add|remove|clear`
+  // (notify-runtime.ts) keeps live via ctx.services.webhookNotifier, rather than
+  // constructing a second, boot-time-only instance here. Before this fix, a
+  // webhook URL added mid-session reached long-task notifications (which read
+  // ctx.services.webhookNotifier directly) but never reached this instance's
+  // AGENT_FAILED/WORKFLOW_CHAIN_FAILED/WORKFLOW_CHAIN_PASSED runtime-bus
+  // listeners until restart — and if the session started with zero URLs
+  // configured, attachToRuntimeBus was never even called, so those listeners
+  // never existed at all for the rest of the session. Always attaching
+  // (regardless of initial URL count) and seeding the shared instance fixes
+  // both: `send()` is already a safe no-op with zero URLs configured.
   const webhookUrls = (configManager.getCategory('notifications') as { webhookUrls?: string[] }).webhookUrls ?? [];
   if (webhookUrls.length > 0) {
-    const webhookNotifier = WebhookNotifier.fromConfig(webhookUrls);
-    webhookNotifier.attachToRuntimeBus(runtimeBus);
+    services.webhookNotifier.setUrls(webhookUrls);
     domainDispatch.syncIntegration({
       id: 'webhooks',
       displayName: 'Webhooks',
@@ -652,6 +661,7 @@ export async function initializeBootstrapCore(
       meta: { urlCount: webhookUrls.length },
     }, 'bootstrap.webhooks');
   }
+  services.webhookNotifier.attachToRuntimeBus(runtimeBus);
 
   const notifier = await Notifier.fromConfig(services.serviceRegistry);
   const queueStatuses = notifier.getQueueStatus();

package/src/runtime/bootstrap-shell.ts

@@ -1,4 +1,5 @@
 import { join } from 'node:path';
+import { readBudgetAlertUsd, BUDGET_ALERT_USD_DEFAULT } from '../export/cost-utils.ts';
 import { sumConversationUsage, type ConversationManager } from '../core/conversation';
 import type { Orchestrator } from '../core/orchestrator';
 import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
@@ -15,7 +16,6 @@ import { GitStatusProvider } from '../renderer/git-status.ts';
 import type { GitHeaderInfo } from '../renderer/git-status.ts';
 import type { PermissionRequestHandler } from '@pellux/goodvibes-sdk/platform/permissions';
 import { registerBuiltinPanels } from '../panels/builtin-panels.ts';
-import { SystemMessagesPanel } from '../panels/system-messages-panel.ts';
 import { createSystemMessageRouter, type SystemMessageRouter } from '../core/system-message-router.ts';
 import { getConfigSnapshot } from '../config/index.ts';
 import { createBootstrapCommandContext } from './bootstrap-command-context.ts';
@@ -40,11 +40,6 @@ export interface BootstrapShellState {
   readonly lastGitInfoRef: { value: GitHeaderInfo | undefined };
   readonly inputHistory: InputHistory;
   readonly systemMessageRouter: SystemMessageRouter;
-  /**
-   * Wire the agent detail modal opener after InputHandler is constructed.
-   * Call with `(id) => input.agentDetailModal.open(id)` from main.ts.
-   */
-  readonly setOpenAgentDetail: (fn: (agentId: string) => void) => void;
 }
 
 export interface BootstrapShellOptions {
@@ -92,7 +87,6 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     completeModelSelectionSideEffect,
   } = options;
 
-  const systemMessagesPanel = new SystemMessagesPanel(configManager, services.componentHealthMonitor);
   // W0.9: after any resume seam replays historical messages into `conversation`,
   // the freshly-constructed `orchestrator` still has its zeroed default usage
   // (SDK gap — Orchestrator.usage is never persisted/reseeded). Recompute it
@@ -138,16 +132,22 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     runtimeBus,
   });
 
-  const openAgentDetailRef: { fn: (agentId: string) => void } = { fn: (_agentId: string) => {} };
-
   // WO-139: initial cost-budget alert threshold (USD; 0/unset = disabled).
   // Once the session starts, the real control surface is the CostTrackerPanel
   // itself — the in-panel 'b' key and /cost budget <usd> both call
-  // CostTrackerPanel.setBudgetThreshold() directly on the live panel instance.
+  // CostTrackerPanel.setBudgetThreshold() directly on the live panel instance,
+  // which (W2.3) now writes through to the behavior.budgetAlertUsd config key
+  // so the background budget-breach notifier reads the same value. The env
+  // var remains a first-run convenience only: it seeds the config key when
+  // that key has never been set, so it doesn't silently override a value the
+  // user has already configured in a prior session.
   const parsedBudgetThreshold = Number(process.env.GOODVIBES_COST_BUDGET_USD);
   const initialCostBudgetThreshold = Number.isFinite(parsedBudgetThreshold) && parsedBudgetThreshold > 0
     ? parsedBudgetThreshold
     : 0;
+  if (initialCostBudgetThreshold > 0 && readBudgetAlertUsd((k) => configManager.get(k as Parameters<typeof configManager.get>[0])) === BUDGET_ALERT_USD_DEFAULT) {
+    configManager.set('behavior.budgetAlertUsd' as Parameters<typeof configManager.set>[0], initialCostBudgetThreshold as never);
+  }
 
   let commandContextRef: CommandContext | null = null;
   registerBuiltinPanels(services.panelManager, {
@@ -182,7 +182,6 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     componentHealthMonitor: services.componentHealthMonitor,
     worktreeRegistry: services.worktreeRegistry,
     sandboxSessionRegistry: services.sandboxSessionRegistry,
-    systemMessagesPanel,
     memoryRegistry: services.memoryRegistry,
     uiServices,
     pluginManager: services.pluginManager,
@@ -190,7 +189,6 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     hookActivityTracker: services.hookActivityTracker,
     hookWorkbench: services.hookWorkbench,
     mcpRegistry: services.mcpRegistry,
-    openAgentDetail: (agentId: string) => openAgentDetailRef.fn(agentId),
     daemonHomeDir: join(services.homeDirectory, '.goodvibes', 'daemon'),
     opsApi,
     planRuntime,
@@ -203,7 +201,6 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
 
   const systemMessageRouter = createSystemMessageRouter(
     conversation,
-    systemMessagesPanel,
     (kind) => {
       const ui = getConfigSnapshot(configManager).ui;
       if (kind === 'wrfc') return ui.wrfcMessages;
@@ -233,6 +230,9 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     mcpRegistry: services.mcpRegistry,
     voiceProviderRegistry: services.voiceProviders,
     voiceService: services.voiceService,
+    webSearchService: services.webSearchService,
+    mediaProviders: services.mediaProviders,
+    artifactStore: services.artifactStore,
     forensicsRegistry,
     policyRuntimeState,
     readModels: uiServices.readModels,
@@ -240,6 +240,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     remoteRuntime,
     planRuntime,
     fileUndoManager: services.fileUndoManager,
+    workspaceCheckpointManager: services.workspaceCheckpointManager,
     memoryRegistry: services.memoryRegistry,
     integrationHelpers: services.integrationHelpers,
     automationManager: services.automationManager,
@@ -268,6 +269,11 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     sessionMemoryStore: services.sessionMemoryStore,
     sessionLineageTracker: services.sessionLineageTracker,
     wrfcController: services.wrfcController,
+    workstreamEngine: services.workstreamCommands,
+    codeIndexStore: services.codeIndexStore,
+    // Wave 5 (wo805): expose the MAIN session's per-turn passive-injection ring
+    // so `/recall injections` (no agent id) renders it — see recall-review.ts.
+    getMainSessionTurnInjections: () => orchestrator.getTurnInjections(),
     changeTracker: services.sessionChangeTracker,
     planManager: services.planManager,
     adaptivePlanner: services.adaptivePlanner,
@@ -302,6 +308,16 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     lastGitInfoRef.value = info;
     requestRender();
   }).catch(() => { /* non-fatal */ });
+  // W1.6 FIX 2: the header's git segment otherwise only refreshes on
+  // TURN_COMPLETED/TOOL_SUCCEEDED/TOOL_FAILED (see turn-event-wiring.ts's
+  // refreshGit()) — if the user runs `git init` externally and never submits
+  // another turn, the header stays stuck on the startup-time fallback
+  // indefinitely. Poll at the same 5s cadence GitPanel already uses for its
+  // own self-poll (git-panel.ts) so the two mechanisms are cadence-consistent.
+  gitStatusProvider.startPolling(5_000, (info) => {
+    lastGitInfoRef.value = info;
+    requestRender();
+  });
 
   const saveHistory = configManager.get('behavior.saveHistory') as boolean;
   const inputHistory = new InputHistory({
@@ -316,8 +332,5 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     lastGitInfoRef,
     inputHistory,
     systemMessageRouter,
-    setOpenAgentDetail: (fn: (agentId: string) => void) => {
-      openAgentDetailRef.fn = fn;
-    },
   };
 }

package/src/runtime/bootstrap.ts

@@ -42,6 +42,7 @@ import type { UiRuntimeServices } from './ui-services.ts';
 import { createDeferredStartupCoordinator } from '@/runtime/index.ts';
 import { initializeBootstrapCore } from './bootstrap-core.ts';
 import { createBootstrapShell } from './bootstrap-shell.ts';
+import { buildSharedOrchestratorCoreServices } from './orchestrator-core-services.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { DaemonServer } from '@pellux/goodvibes-sdk/platform/daemon';
 import { HttpListener } from '@pellux/goodvibes-sdk/platform/daemon';
@@ -110,19 +111,15 @@ export type BootstrapContext = RuntimeContext & {
   /** Command registry used by InputHandler. main.ts needs this to wire input. */
   commandRegistry: import('../input/command-registry.ts').CommandRegistry;
   /**
-   * System message router instantiated at startup, wired to conversation and panel manager.
+   * System message router instantiated at startup, wired to conversation.
    *
    * @remarks
    * Route operational messages through this rather than calling
-   * conversation.addSystemMessage() directly so that low-priority messages
-   * stay out of the main conversation and go to the SystemMessagesPanel instead.
+   * conversation.addSystemMessage() directly so routing-target config
+   * (panel/conversation/both) and the forced-inline critical prefixes stay
+   * centralized in one place.
    */
   systemMessageRouter: SystemMessageRouter;
-  /**
-   * Wire the agent detail modal opener after InputHandler is constructed in main.ts.
-   * Call with `(id) => input.agentDetailModal.open(id)` once the InputHandler is ready.
-   */
-  setOpenAgentDetail: (fn: (agentId: string) => void) => void;
 };
 
 // ── Bootstrap function ────────────────────────────────────────────────────
@@ -235,15 +232,11 @@ export async function bootstrapRuntime(
       logger.debug('companion handleUserInput safety catch', { error: String(err) });
     });
   };
+  // Shared payload (single source of truth, includes wo805's memoryRegistry —
+  // see orchestrator-core-services.ts) plus this site's cacheHitTracker.
   orchestrator.setCoreServices({
-    configManager,
-    providerRegistry,
+    ...buildSharedOrchestratorCoreServices({ services, configManager, providerRegistry }),
     cacheHitTracker: services.cacheHitTracker,
-    planManager: services.planManager,
-    adaptivePlanner: services.adaptivePlanner,
-    sessionMemoryStore: services.sessionMemoryStore,
-    sessionLineageTracker: services.sessionLineageTracker,
-    idempotencyStore: services.idempotencyStore,
   });
   conversation.setSessionLineageTracker(services.sessionLineageTracker);
 
@@ -297,7 +290,9 @@ export async function bootstrapRuntime(
   const gitStatusProvider = shell.gitStatusProvider;
   const inputHistory = shell.inputHistory;
   const lastGitInfoRef = shell.lastGitInfoRef;
-  const setOpenAgentDetail = shell.setOpenAgentDetail;
+  // W1.6 FIX 2: dispose the header's live-repo-state poll (git-status.ts
+  // startPolling) on shutdown, same pattern as acpTaskSyncInterval above.
+  bootstrapUnsubs.push(() => gitStatusProvider.stopPolling());
   const pluginCommandRegistry = {
     register(command: {
       readonly name: string;
@@ -628,7 +623,6 @@ export async function bootstrapRuntime(
     _getConfiguredProviderIds: () => services.providerRegistry.getConfiguredProviderIds(),
     commandRegistry,
     systemMessageRouter,
-    setOpenAgentDetail,
     shutdown: async (sessionData) => {
       // Clear bootstrap-owned subscriptions
       bootstrapUnsubs.forEach(fn => fn());

package/src/runtime/code-index-services.ts

@@ -0,0 +1,112 @@
+// ---------------------------------------------------------------------------
+// code-index-services.ts — Wave 5 (wo804, W5.3 Stage A TUI wiring)
+//
+// Constructs the TUI's repo source-tree code index: CodeIndexStore
+// (@pellux/goodvibes-sdk/platform/state, landed on SDK main as wo802/W5.3
+// Stage A). Extracted into its own module rather than built inline in
+// services.ts: services.ts sits at the architecture check's 800-line cap
+// (scripts/check-architecture.ts), so any new service gets its own
+// construction module and a single wiring call there (mirrors
+// createWorkstreamServices's one-function-bundle shape).
+//
+// Schema-initialized eagerly (mirrors memoryStore: construction + init()
+// happen unconditionally so the store is queryable — /codebase status, the
+// fleet node — even before any build has ever run). The actual walk/chunk/
+// embed build is NEVER auto-triggered by default: the hundreds of existing
+// test fixtures (and every headless invocation) construct RuntimeServices
+// without asking for a full source-tree walk, and init() alone never runs
+// one (mirrors the SDK's own RuntimeServices wiring in
+// platform/runtime/services.ts, which gates its equivalent scheduleBuild()
+// call behind an explicit autoStartCodeIndex option).
+//
+// REALITY-WINS DIVERGENCE from the SDK's own shape: the SDK's
+// RuntimeServicesOptions exposes autoStartCodeIndex as a constructor-time
+// boolean because that call site is a library entrypoint threaded by each
+// embedder. This TUI's createRuntimeServices has no such per-call knob —
+// auto-start is decided from a TUI-local config key instead
+// (CODE_INDEX_ENABLED_CONFIG_KEY, default OFF), so every construction path
+// (interactive main.ts, the daemon, and every test fixture) shares one
+// honest, user-visible on/off switch rather than needing to thread a new
+// boolean through every call site. With it off (the default), `/codebase
+// build` is the explicit, visible trigger — exactly the shape wo804's brief
+// asks for.
+//
+// Shares memoryEmbeddingRegistry with MemoryStore (constructed in
+// services.ts) so code + memory retrieval use one embedding provider and one
+// dimensionality, per the SDK design doc (code-index-store.ts's constructor
+// takes the SAME MemoryEmbeddingProviderRegistry instance memory uses).
+// ---------------------------------------------------------------------------
+
+import { join } from 'node:path';
+import { CodeIndexStore } from '@pellux/goodvibes-sdk/platform/state';
+import type { MemoryEmbeddingProviderRegistry } from '@pellux/goodvibes-sdk/platform/state';
+import type { ConfigKey, ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import { readBooleanConfig } from '../core/alert-gating.ts';
+
+/**
+ * TUI-local synthetic config key (not yet in the SDK's ConfigKey union) that
+ * gates the code index's auto-build on construction. Default OFF — see this
+ * module's header doc. Surfaced in /config via a synthetic entry
+ * (settings-modal-data.ts) exactly like behavior.notifyAfterSeconds.
+ */
+export const CODE_INDEX_ENABLED_CONFIG_KEY = 'storage.codeIndexEnabled';
+
+/**
+ * Honest, generous bounds passed EXPLICITLY to CodeIndexStore (values equal
+ * to its own internal defaults) so /codebase status and the settings
+ * description can state them in one place without reaching into store
+ * internals or duplicating magic numbers.
+ */
+export const CODE_INDEX_MAX_FILES = 5000;
+export const CODE_INDEX_MAX_FILE_BYTES = 512 * 1024;
+export const CODE_INDEX_MAX_TOTAL_BYTES = 256 * 1024 * 1024;
+
+export interface CodeIndexServicesDeps {
+  readonly workingDirectory: string;
+  readonly configManager: Pick<ConfigManager, 'get'>;
+  readonly memoryEmbeddingRegistry: MemoryEmbeddingProviderRegistry;
+}
+
+export interface CodeIndexServices {
+  readonly codeIndexStore: CodeIndexStore;
+}
+
+/** Absolute path to the TUI's code-index sqlite file, sibling to memory.sqlite under .goodvibes/tui/. */
+export function codeIndexDbPath(workingDirectory: string): string {
+  return join(workingDirectory, '.goodvibes', 'tui', 'code-index.sqlite');
+}
+
+/**
+ * Whether the code index's initial build should auto-start on construction.
+ * Exported so /codebase status and the settings modal read the exact same
+ * config key + default this module decides auto-start from.
+ */
+export function isCodeIndexAutoStartEnabled(configManager: Pick<ConfigManager, 'get'>): boolean {
+  return readBooleanConfig(
+    (key) => configManager.get(key as ConfigKey),
+    CODE_INDEX_ENABLED_CONFIG_KEY,
+    false,
+  );
+}
+
+/**
+ * Constructs the TUI's CodeIndexStore. Schema-init runs unconditionally
+ * (init() never throws — it degrades to an honest `available: false` +
+ * recorded error on failure, mirrored by CodeIndexStats/describeDegradation);
+ * the initial full build only fires when isCodeIndexAutoStartEnabled() is
+ * true, via the SAME fire-and-forget scheduleBuild() an explicit
+ * `/codebase build` invocation uses.
+ */
+export function createCodeIndexServices(deps: CodeIndexServicesDeps): CodeIndexServices {
+  const codeIndexStore = new CodeIndexStore(
+    deps.workingDirectory,
+    codeIndexDbPath(deps.workingDirectory),
+    deps.memoryEmbeddingRegistry,
+    { maxFiles: CODE_INDEX_MAX_FILES, maxFileBytes: CODE_INDEX_MAX_FILE_BYTES, maxTotalBytes: CODE_INDEX_MAX_TOTAL_BYTES },
+  );
+  codeIndexStore.init();
+  if (isCodeIndexAutoStartEnabled(deps.configManager)) {
+    codeIndexStore.scheduleBuild();
+  }
+  return { codeIndexStore };
+}

package/src/runtime/orchestrator-core-services.ts

@@ -0,0 +1,49 @@
+import type { OrchestratorCoreServices } from '@pellux/goodvibes-sdk/platform/core';
+import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
+import type { RuntimeServices } from './services.ts';
+
+/** The slice of the runtime services bag the shared orchestrator payload draws from. */
+export type OrchestratorCoreServicesSource = Pick<
+  RuntimeServices,
+  | 'planManager'
+  | 'adaptivePlanner'
+  | 'sessionMemoryStore'
+  | 'sessionLineageTracker'
+  | 'idempotencyStore'
+  | 'memoryRegistry'
+>;
+
+/**
+ * The single source of truth for the `Orchestrator.setCoreServices()` payload
+ * fields shared by BOTH call sites (runtime/bootstrap.ts and main.ts). Each
+ * site spreads this and adds its own site-specific extras (bootstrap:
+ * cacheHitTracker; main: favoritesStore) — setCoreServices() merges, so the
+ * later main.ts call only overlays, never erases.
+ *
+ * Wave-5 (wo805) BLOCKER regression guard: `memoryRegistry` here is what turns
+ * on per-turn passive knowledge injection for the MAIN interactive session —
+ * the SDK turn loop hard-gates on `coreServices.memoryRegistry` (undefined is
+ * a silent no-op: Orchestrator.getTurnInjections() stays empty forever and
+ * `/recall injections` renders a misleading empty state). Both call sites once
+ * omitted it independently; routing them through this one function (with
+ * src/test/runtime/orchestrator-core-services.test.ts pinning the field) is
+ * what keeps that from regressing.
+ */
+export function buildSharedOrchestratorCoreServices(input: {
+  readonly services: OrchestratorCoreServicesSource;
+  readonly configManager: ConfigManager;
+  readonly providerRegistry: ProviderRegistry;
+}): OrchestratorCoreServices {
+  const { services, configManager, providerRegistry } = input;
+  return {
+    configManager,
+    providerRegistry,
+    planManager: services.planManager,
+    adaptivePlanner: services.adaptivePlanner,
+    sessionMemoryStore: services.sessionMemoryStore,
+    sessionLineageTracker: services.sessionLineageTracker,
+    idempotencyStore: services.idempotencyStore,
+    memoryRegistry: services.memoryRegistry,
+  };
+}

package/src/runtime/process-lifecycle.ts

@@ -34,6 +34,8 @@ export interface ProcessLifecycleAnsi {
   readonly KEYBOARD_EXT_DISABLE: string;
   readonly MOUSE_DISABLE: string;
   readonly CURSOR_SHOW: string;
+  /** Disables terminal focus-event reporting (DECSET ?1004l) — see main.ts FOCUS_ENABLE. */
+  readonly FOCUS_DISABLE: string;
 }
 
 export interface ProcessLifecycleDeps {
@@ -128,7 +130,7 @@ export function installProcessLifecycle(deps: ProcessLifecycleDeps): ProcessLife
     if (terminalRestored) return;
     terminalRestored = true;
     const exitScreen = noAltScreen ? ansi.CLEAR_SCREEN : ansi.CLEAR_SCREEN + ansi.ALT_SCREEN_EXIT;
-    allowTerminalWrite(() => stdout.write(ansi.PASTE_DISABLE + ansi.KEYBOARD_EXT_DISABLE + ansi.MOUSE_DISABLE + ansi.CURSOR_SHOW + exitScreen));
+    allowTerminalWrite(() => stdout.write(ansi.PASTE_DISABLE + ansi.KEYBOARD_EXT_DISABLE + ansi.MOUSE_DISABLE + ansi.FOCUS_DISABLE + ansi.CURSOR_SHOW + exitScreen));
     getTerminalOutputGuard().dispose();
     try { stdin.setRawMode(false); } catch { /* stdin may not be a TTY */ }
   };