@pellux/goodvibes-tui 1.1.0 → 1.9.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,11 @@ 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;
+  codeIndexReindexScheduler?: import('@pellux/goodvibes-sdk/platform/state').CodeIndexReindexScheduler;
+  isPassiveCodeInjectionFlagEnabled?: () => boolean;
+  getMainSessionTurnInjections?: () => readonly import('../renderer/turn-injection.ts').TurnInjectionEntry[];
 };
 
 export function createBootstrapCommandContext(
@@ -132,6 +143,9 @@ export function createBootstrapCommandContext(
     mcpRegistry,
     voiceProviderRegistry,
     voiceService,
+    webSearchService,
+    mediaProviders,
+    artifactStore,
     forensicsRegistry,
     policyRuntimeState,
     readModels,
@@ -139,6 +153,7 @@ export function createBootstrapCommandContext(
     remoteRuntime,
     planRuntime,
     fileUndoManager,
+    workspaceCheckpointManager,
     memoryRegistry,
     integrationHelpers,
     automationManager,
@@ -169,6 +184,11 @@ export function createBootstrapCommandContext(
     wrfcController,
     changeTracker,
     hydrateSessionUsage,
+    workstreamEngine,
+    codeIndexStore,
+    codeIndexReindexScheduler,
+    isPassiveCodeInjectionFlagEnabled,
+    getMainSessionTurnInjections,
     planManager,
     adaptivePlanner,
     sessionOrchestration,
@@ -226,6 +246,11 @@ export function createBootstrapCommandContext(
     wrfcController,
     changeTracker,
     hydrateSessionUsage,
+    workstreamEngine,
+    codeIndexStore,
+    codeIndexReindexScheduler,
+    isPassiveCodeInjectionFlagEnabled,
+    getMainSessionTurnInjections,
   });
   const provider = createBootstrapCommandProviderSection({
     providerRegistry,
@@ -236,6 +261,7 @@ export function createBootstrapCommandContext(
   const workspace = createBootstrapCommandWorkspaceSection({
     keybindingsManager,
     fileUndoManager,
+    workspaceCheckpointManager,
     panelManager,
     profileManager,
     bookmarkManager,
@@ -243,7 +269,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

@@ -5,7 +5,7 @@ import type { ConversationManager } from '../core/conversation';
 import type { KnowledgeApi } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { HookApi } from '@pellux/goodvibes-sdk/platform/hooks';
 import type { McpApi } from '@pellux/goodvibes-sdk/platform/mcp';
-import type { PanelManager } from '../panels/panel-manager.ts';
+import type { PanelManager, PanelDeepLinkTarget } from '../panels/panel-manager.ts';
 import type { ProviderApi } from '@pellux/goodvibes-sdk/platform/providers';
 import type { OpsApi } from '@/runtime/index.ts';
 import type { MutableRuntimeState } from '@/runtime/index.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,11 @@ 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 codeIndexReindexScheduler?: import('@pellux/goodvibes-sdk/platform/state').CodeIndexReindexScheduler;
+  readonly isPassiveCodeInjectionFlagEnabled?: () => boolean;
+  readonly getMainSessionTurnInjections?: () => readonly import('../renderer/turn-injection.ts').TurnInjectionEntry[];
   readonly agentManager?: ShellAgentManagerService;
   readonly modeManager?: ShellModeManagerService;
   readonly automationManager?: ShellAutomationManagerRuntimeService;
@@ -181,9 +192,16 @@ export function createBootstrapCommandActions(
     localUserAuthManager,
   } = options;
 
-  const showPanel = (panelId: string, pane?: 'top' | 'bottom') => {
-    panelManager.open(panelId, pane);
-    panelManager.show();
+  const showPanel = (panelId: string, pane?: 'top' | 'bottom', target?: PanelDeepLinkTarget) => {
+    // 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, target);
+    if (!redirected) panelManager.show();
     requestRender();
   };
 
@@ -279,11 +297,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 +323,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' | 'codeIndexReindexScheduler' | 'isPassiveCodeInjectionFlagEnabled' | 'getMainSessionTurnInjections'
   >,
 ): BootstrapCommandSessionSection {
   return {
@@ -313,6 +335,11 @@ export function createBootstrapCommandSessionSection(
     wrfcController: options.wrfcController,
     changeTracker: options.changeTracker,
     hydrateSessionUsage: options.hydrateSessionUsage,
+    workstreamEngine: options.workstreamEngine,
+    codeIndexStore: options.codeIndexStore,
+    codeIndexReindexScheduler: options.codeIndexReindexScheduler,
+    isPassiveCodeInjectionFlagEnabled: options.isPassiveCodeInjectionFlagEnabled,
+    getMainSessionTurnInjections: options.getMainSessionTurnInjections,
   };
 }
 
@@ -333,7 +360,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 +368,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 +382,7 @@ export function createBootstrapCommandWorkspaceSection(
 export function createBootstrapCommandPlatformSection(
   options: Pick<
     BootstrapCommandSectionOptions,
-    'configManager' | 'voiceProviderRegistry' | 'voiceService'
+    'configManager' | 'voiceProviderRegistry' | 'voiceService' | 'webSearchService' | 'mediaProviders' | 'artifactStore'
   >,
   shellServices: BootstrapCommandShellServices,
 ): BootstrapCommandPlatformSection {
@@ -363,6 +391,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,9 @@ 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';
+import { SessionSpineClient, SessionUnionCache, TUI_SPINE_PARTICIPANT } from '@pellux/goodvibes-sdk/platform/runtime/session-spine';
+import { SessionInboundInputPoller, createBootstrapInboundInputPoller } from './session-inbound-inputs.ts';
 
 // ---------------------------------------------------------------------------
 // Pre-router buffer
@@ -115,6 +116,12 @@ export interface BootstrapCoreState {
   readonly requestRender: () => void;
   readonly setRenderRequest: (fn: () => void) => void;
   readonly runtimeSessionIdRef: { value: string };
+  /** Cross-surface identity mirror; permanently dormant for embedded/local-only (docs/decisions/2026-07-06-session-spine-mode-branch-is-permanent.md), activated by bootstrap.ts only for an adopted 'external' daemon. */
+  readonly sessionSpine: SessionSpineClient;
+  /** D3: inbound steer/follow-up delivery; dormant until bootstrap.ts activates it. */
+  readonly sessionInboundInputs: SessionInboundInputPoller;
+  /** Cache-backed read facade; bootstrap.ts drives its mode (embedded/external/local-only) from the same HostServiceMode as the spine above. */
+  readonly sessionUnionCache: SessionUnionCache;
   /**
    * WRFC chain persistence — call `rehydrate()` once after the SystemMessageRouter
    * is wired so interrupted chains from a previous process are surfaced to the operator.
@@ -128,17 +135,8 @@ export type CompanionMessagePayload = Extract<SessionEvent, { type: 'COMPANION_M
 // Operator narration of inbound channel events
 // ---------------------------------------------------------------------------
 
-/**
- * Narrate an inbound channel event to the operator via the SystemMessageRouter.
- *
- * When an external surface (GitHub, Slack, ntfy, etc.) triggers an agent turn,
- * this function produces a human-readable system message so the operator can
- * observe which event caused the turn. Returns null for internal/companion
- * sources that do not need operator narration.
- *
- * @param event - The normalized inbound event descriptor.
- * @returns A narration string, or null if no narration is appropriate.
- */
+/** Narrate an inbound channel event (GitHub, Slack, ntfy, etc.) that triggered an
+ * agent turn, via the SystemMessageRouter — null for internal/companion sources. */
 export function narrateInboundEvent(event: {
   source: string;
   metadata: Readonly<Record<string, unknown>> | undefined;
@@ -294,6 +292,12 @@ export async function initializeBootstrapCore(
     surfaceRegistry,
     watcherRegistry,
   } = services;
+  // Permanently dormant for embedded/local-only (nothing to mirror to); bootstrap.ts activates it only for an adopted 'external' daemon.
+  const sessionSpine = new SessionSpineClient({ participant: TUI_SPINE_PARTICIPANT, recordKind: 'tui' });
+  // Cache-backed read facade over the local broker (passthrough until bootstrap.ts marks it
+  // embedded, or activates the adopted-daemon wire union for 'external').
+  // selfSessionIds keeps local authoritative for our own wire-mirrored session even when local/wire ids diverge (D-TUI-1).
+  const sessionUnionCache = new SessionUnionCache({ local: sharedSessionBroker, selfSessionIds: () => sessionSpine.mirroredSessionIds });
 
   routeBindings.attachRuntime({ runtimeBus, runtimeStore: store });
   surfaceRegistry.attachRuntime(store);
@@ -325,6 +329,7 @@ export async function initializeBootstrapCore(
   const uiServices = createUiRuntimeServices(services, {
     forensicsRegistry,
     getControlPlaneRecentEvents,
+    sessionUnionCache,
   });
 
   const conversation = new ConversationManager(() => {
@@ -428,6 +433,10 @@ export async function initializeBootstrapCore(
     } catch (err) {
       logger.error('Render threw; next requestRender will reschedule', { error: String(err) });
     }
+    // Debounced spine heartbeat on turn/render activity (no-op while dormant, i.e.
+    // embedded/local-only): a cheap synchronous no-op unless its own internal window has
+    // elapsed (at most one wire call per heartbeatMinIntervalMs) — safe on the hot path.
+    sessionSpine.heartbeat(runtimeSessionIdRef.value);
   };
   const requestRender = (): void => {
     if (renderScheduled) return;
@@ -635,12 +644,27 @@ export async function initializeBootstrapCore(
     },
   ));
 
+  // D3: inbound steer delivery — see createBootstrapInboundInputPoller's doc comment.
+  const sessionInboundInputs = createBootstrapInboundInputPoller({
+    runtimeSessionIdRef, routeOrBuffer, orchestratorHandleUserInputRef, conversation, requestRender,
+  });
+
   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 +676,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();
@@ -714,6 +739,10 @@ export async function initializeBootstrapCore(
       lastSeenAt: Date.now(),
     },
   }).catch((err) => { logger.debug('session broker create session failed at bootstrap', { err }); });
+  // Fire-and-forget spine mirror — a permanent parallel-write posture alongside (never
+  // instead of) the still-authoritative local SharedSessionBroker above. Dormant/queued
+  // until bootstrap.ts's deferred task activates it for an adopted 'external' daemon.
+  sessionSpine.register({ sessionId: runtime.sessionId, project: services.workingDirectory, title: 'Terminal UI session' });
 
   domainDispatch.syncSessionState({
     id: userSessionId,
@@ -764,5 +793,8 @@ export async function initializeBootstrapCore(
     },
     runtimeSessionIdRef,
     wrfcPersistence,
+    sessionSpine,
+    sessionInboundInputs,
+    sessionUnionCache,
   };
 }

package/src/runtime/bootstrap-hook-bridge.ts

@@ -9,6 +9,7 @@ import { HelperModel } from '@pellux/goodvibes-sdk/platform/config';
 import type { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
 import { formatReturnContextForDisplay, getReturnContextMode, maybeAssistReturnContextSummary } from '@/runtime/index.ts';
 import type { SharedSessionBroker } from '@pellux/goodvibes-sdk/platform/control-plane';
+import type { SessionSpineClient } from '@pellux/goodvibes-sdk/platform/runtime/session-spine';
 import type { SessionManager } from '@pellux/goodvibes-sdk/platform/sessions';
 import type { PanelManager } from '../panels/panel-manager.ts';
 import type { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
@@ -22,6 +23,10 @@ export interface ResumeSessionOptions {
   readonly requestRender: () => void;
   readonly onSessionIdChanged?: (sessionId: string) => void;
   readonly sharedSessionBroker: Pick<SharedSessionBroker, 'reopenSession'>;
+  /** S3c: fire-and-forget daemon-spine mirror. Reopen (not register) is the
+   * ONLY resume-time verb — see the SDK session-spine client.ts header doc. */
+  readonly sessionSpine: Pick<SessionSpineClient, 'reopen'>;
+  readonly project: string;
   readonly writeLastSessionPointer: (sessionId: string) => void;
   readonly hookDispatcher: HookDispatcher;
   readonly sessionManager: SessionManager;
@@ -75,6 +80,8 @@ export function createResumeSessionHandler(options: ResumeSessionOptions): (sess
       if (meta?.provider) options.runtime.provider = meta.provider;
       options.writeLastSessionPointer(sessionId);
       void options.sharedSessionBroker.reopenSession(sessionId).catch((err) => { logger.debug('session broker reopen session failed', { err }); });
+      // S3c: fire-and-forget spine mirror (reopen:true — the user resume verb).
+      options.sessionSpine.reopen({ sessionId, project: options.project, title: options.conversation.title || meta.title });
       options.conversation.log(`Resumed session: ${sessionId}`, { fg: '135' });
       const reopenedPanels: string[] = [];
       if (meta.returnContext?.openPanels?.length) {

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';
@@ -32,6 +32,7 @@ import type { PolicyRuntimeState } from '@/runtime/index.ts';
 import type { TaskManager } from '@/runtime/index.ts';
 import type { UiRuntimeServices } from './ui-services.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import type { SessionSpineClient } from '@pellux/goodvibes-sdk/platform/runtime/session-spine';
 
 export interface BootstrapShellState {
   readonly commandRegistry: CommandRegistry;
@@ -40,11 +41,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 {
@@ -52,6 +48,8 @@ export interface BootstrapShellOptions {
   readonly runtimeBus: RuntimeEventBus;
   readonly runtimeStore: RuntimeStore;
   readonly services: RuntimeServices;
+  /** S3c: dormant until bootstrap.ts activates it for an adopted 'external' daemon. */
+  readonly sessionSpine: SessionSpineClient;
   readonly conversation: ConversationManager;
   readonly runtime: MutableRuntimeState;
   readonly orchestrator: Orchestrator;
@@ -75,6 +73,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     runtimeBus,
     runtimeStore,
     services,
+    sessionSpine,
     conversation,
     runtime,
     orchestrator,
@@ -92,7 +91,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
@@ -109,6 +107,8 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     requestRender,
     onSessionIdChanged,
     sharedSessionBroker: services.sessionBroker,
+    sessionSpine,
+    project: services.workingDirectory,
     writeLastSessionPointer,
     hookDispatcher: services.hookDispatcher,
     sessionManager: services.sessionManager,
@@ -138,16 +138,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, {
@@ -175,14 +181,14 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     forensicsRegistry,
     policyRuntimeState,
     approvalBroker: services.approvalBroker,
-    sessionBroker: services.sessionBroker,
+    // S3d: panels read the cross-surface union facade, not the raw local broker.
+    sessionBroker: uiServices.sessions.sessionBroker,
     automationManager: services.automationManager,
     getControlPlaneRecentEvents,
     tokenAuditor: services.tokenAuditor,
     componentHealthMonitor: services.componentHealthMonitor,
     worktreeRegistry: services.worktreeRegistry,
     sandboxSessionRegistry: services.sandboxSessionRegistry,
-    systemMessagesPanel,
     memoryRegistry: services.memoryRegistry,
     uiServices,
     pluginManager: services.pluginManager,
@@ -190,7 +196,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,13 +208,21 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
 
   const systemMessageRouter = createSystemMessageRouter(
     conversation,
-    systemMessagesPanel,
     (kind) => {
       const ui = getConfigSnapshot(configManager).ui;
       if (kind === 'wrfc') return ui.wrfcMessages;
       if (kind === 'operational') return ui.operationalMessages;
       return ui.systemMessages;
     },
+    {
+      // Suppress stale WRFC replay re-notifications for chains that can no
+      // longer act — gone (killed/removed → getChain null) or terminal
+      // (passed/failed). (UX-B item 1c.)
+      isChainTerminal: (chainId) => {
+        const chain = services.wrfcController.getChain(chainId);
+        return chain === null || chain.state === 'passed' || chain.state === 'failed';
+      },
+    },
   );
   orchestrator.setSystemMessageRouter(systemMessageRouter);
 
@@ -233,6 +246,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 +256,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 +285,13 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     sessionMemoryStore: services.sessionMemoryStore,
     sessionLineageTracker: services.sessionLineageTracker,
     wrfcController: services.wrfcController,
+    workstreamEngine: services.workstreamCommands,
+    codeIndexStore: services.codeIndexStore,
+    codeIndexReindexScheduler: services.codeIndexReindexScheduler,
+    isPassiveCodeInjectionFlagEnabled: () => services.featureFlags.isEnabled('agent-passive-code-injection'),
+    // 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 +326,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 +350,5 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     lastGitInfoRef,
     inputHistory,
     systemMessageRouter,
-    setOpenAgentDetail: (fn: (agentId: string) => void) => {
-      openAgentDetailRef.fn = fn;
-    },
   };
 }