@pellux/goodvibes-tui 1.0.0 → 1.7.0

package/src/runtime/bootstrap-shell.ts

@@ -1,5 +1,6 @@
 import { join } from 'node:path';
-import type { ConversationManager } from '../core/conversation';
+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';
 import type { RuntimeEventBus } from '@/runtime/index.ts';
@@ -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,15 @@ 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
+  // from the replayed history so the footer doesn't show Input: 0 post-resume.
+  const hydrateSessionUsage = (): void => {
+    const { usage, lastInputTokens } = sumConversationUsage(conversation.getMessageSnapshot());
+    orchestrator.usage = usage;
+    orchestrator.lastInputTokens = lastInputTokens;
+  };
   const resumeSession = createResumeSessionHandler({
     runtimeBus,
     runtime,
@@ -107,6 +110,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     configManager,
     providerRegistry: services.providerRegistry,
     homeDirectory: services.homeDirectory,
+    hydrateSessionUsage,
   });
 
   const foundationClients = createRuntimeFoundationClients({
@@ -128,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, {
@@ -172,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,
@@ -180,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,
@@ -193,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;
@@ -223,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,
@@ -230,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,
@@ -258,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,
@@ -282,6 +298,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     },
     completeModelSelectionSideEffect,
     componentHealthMonitor: services.componentHealthMonitor,
+    hydrateSessionUsage,
   });
   commandContextRef = commandContext;
 
@@ -291,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({
@@ -305,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 */ }
   };

package/src/runtime/services.ts

@@ -1,11 +1,9 @@
 import { join } from 'node:path';
-import { ConfigManager } from '@pellux/goodvibes-sdk/platform/config';
+import { FocusTracker } from '../core/focus-tracker.ts';
+import { ConfigManager, ServiceRegistry, SubscriptionManager, ToolLLM } from '@pellux/goodvibes-sdk/platform/config';
 import { SecretsManager } from '../config/secrets.ts';
-import { ServiceRegistry } from '@pellux/goodvibes-sdk/platform/config';
-import { SubscriptionManager } from '@pellux/goodvibes-sdk/platform/config';
 import { AutomationDeliveryManager, AutomationManager, AutomationRouteStore } from '@pellux/goodvibes-sdk/platform/automation';
-import { ChannelPluginRegistry, ChannelPolicyManager, RouteBindingManager, SurfaceRegistry } from '@pellux/goodvibes-sdk/platform/channels';
-import { ChannelDeliveryRouter } from '@pellux/goodvibes-sdk/platform/channels';
+import { ChannelDeliveryRouter, ChannelPluginRegistry, ChannelPolicyManager, RouteBindingManager, SurfaceRegistry } from '@pellux/goodvibes-sdk/platform/channels';
 import { ApprovalBroker, GatewayMethodCatalog, SharedSessionBroker } from '@pellux/goodvibes-sdk/platform/control-plane';
 import { WatcherRegistry } from '@pellux/goodvibes-sdk/platform/watchers';
 import { ArtifactStore } from '@pellux/goodvibes-sdk/platform/artifacts';
@@ -23,16 +21,10 @@ import {
 } from '@pellux/goodvibes-sdk/platform/knowledge';
 import { MediaProviderRegistry, ensureBuiltinMediaProviders } from '@pellux/goodvibes-sdk/platform/media';
 import { MultimodalService } from '@pellux/goodvibes-sdk/platform/multimodal';
-import { AgentManager } from '@pellux/goodvibes-sdk/platform/tools';
-import { AgentMessageBus } from '@pellux/goodvibes-sdk/platform/agents';
-import { WrfcController } from '@pellux/goodvibes-sdk/platform/agents';
-import { AgentOrchestrator } from '@pellux/goodvibes-sdk/platform/agents';
-import { ArchetypeLoader } from '@pellux/goodvibes-sdk/platform/agents';
-import { ProcessManager } from '@pellux/goodvibes-sdk/platform/tools';
-import { ModeManager } from '@pellux/goodvibes-sdk/platform/state';
-import { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
-import { MemoryRegistry } from '@pellux/goodvibes-sdk/platform/state';
-import { MemoryStore } from '@pellux/goodvibes-sdk/platform/state';
+import { AgentMessageBus, AgentOrchestrator, ArchetypeLoader, WrfcController } from '@pellux/goodvibes-sdk/platform/agents';
+import { AgentManager, OverflowHandler, ProcessManager, createWorkflowServices, type WorkflowServices } from '@pellux/goodvibes-sdk/platform/tools';
+import { FileStateCache, FileUndoManager, MemoryEmbeddingProviderRegistry, MemoryRegistry, MemoryStore, ModeManager, ProjectIndex, type CodeIndexStore } from '@pellux/goodvibes-sdk/platform/state';
+import { WorkspaceCheckpointManager } from '@pellux/goodvibes-sdk/platform/workspace';
 import type { RuntimeEventBus } from '@/runtime/index.ts';
 import { createDomainDispatch } from './store/index.ts';
 import type { DomainDispatch, RuntimeStore } from './store/index.ts';
@@ -41,40 +33,20 @@ import { RemoteRunnerRegistry, RemoteSupervisor } from '@/runtime/index.ts';
 import { IntegrationHelperService } from '@/runtime/index.ts';
 import { VoiceProviderRegistry, VoiceService, ensureBuiltinVoiceProviders } from '@pellux/goodvibes-sdk/platform/voice';
 import { WebSearchProviderRegistry, WebSearchService } from '@pellux/goodvibes-sdk/platform/web-search';
-import { MemoryEmbeddingProviderRegistry } from '@pellux/goodvibes-sdk/platform/state';
 import { PanelManager } from '../panels/panel-manager.ts';
 import { HookActivityTracker } from '@pellux/goodvibes-sdk/platform/hooks';
 import { HookDispatcher, createHookWorkbench, type HookWorkbench } from '@pellux/goodvibes-sdk/platform/hooks';
 import { PluginManager } from '@pellux/goodvibes-sdk/platform/plugins';
 import { BookmarkManager } from '@pellux/goodvibes-sdk/platform/bookmarks';
 import { ProfileManager } from '@pellux/goodvibes-sdk/platform/profiles';
-import { SessionManager } from '@pellux/goodvibes-sdk/platform/sessions';
-import { CrossSessionTaskRegistry } from '@pellux/goodvibes-sdk/platform/sessions';
-import { ApiTokenAuditor } from '@pellux/goodvibes-sdk/platform/security';
-import { UserAuthManager } from '@pellux/goodvibes-sdk/platform/security';
+import { SessionManager, CrossSessionTaskRegistry, SessionChangeTracker } from '@pellux/goodvibes-sdk/platform/sessions';
+import { ApiTokenAuditor, UserAuthManager } from '@pellux/goodvibes-sdk/platform/security';
 import { WebhookNotifier } from '@pellux/goodvibes-sdk/platform/integrations';
 import { McpRegistry } from '@pellux/goodvibes-sdk/platform/mcp';
-import { DeterministicReplayEngine } from '@pellux/goodvibes-sdk/platform/core';
-import { ProviderOptimizer } from '@pellux/goodvibes-sdk/platform/providers';
-import { ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
-import type { ModelDefinition } from '@pellux/goodvibes-sdk/platform/providers';
-import { ProviderCapabilityRegistry } from '@pellux/goodvibes-sdk/platform/providers';
-import { CacheHitTracker } from '@pellux/goodvibes-sdk/platform/providers';
-import { FavoritesStore } from '@pellux/goodvibes-sdk/platform/providers';
-import { BenchmarkStore } from '@pellux/goodvibes-sdk/platform/providers';
-import { ModelLimitsService } from '@pellux/goodvibes-sdk/platform/providers';
-import { inferFallbackContextWindow } from '@pellux/goodvibes-sdk/platform/providers';
+import { BenchmarkStore, CacheHitTracker, FavoritesStore, inferFallbackContextWindow, type ModelDefinition, ModelLimitsService, ProviderCapabilityRegistry, ProviderOptimizer, ProviderRegistry } from '@pellux/goodvibes-sdk/platform/providers';
 import { KeybindingsManager } from '../input/keybindings.ts';
-import { SessionMemoryStore } from '@pellux/goodvibes-sdk/platform/core';
-import { SessionLineageTracker } from '@pellux/goodvibes-sdk/platform/core';
-import { SessionChangeTracker } from '@pellux/goodvibes-sdk/platform/sessions';
-import { ExecutionPlanManager } from '@pellux/goodvibes-sdk/platform/core';
-import { AdaptivePlanner } from '@pellux/goodvibes-sdk/platform/core';
-import { FileStateCache } from '@pellux/goodvibes-sdk/platform/state';
-import { ProjectIndex } from '@pellux/goodvibes-sdk/platform/state';
+import { AdaptivePlanner, DeterministicReplayEngine, ExecutionPlanManager, SessionLineageTracker, SessionMemoryStore } from '@pellux/goodvibes-sdk/platform/core';
 import { IdempotencyStore } from '@/runtime/index.ts';
-import { OverflowHandler } from '@pellux/goodvibes-sdk/platform/tools';
-import { ToolLLM } from '@pellux/goodvibes-sdk/platform/config';
 import { ComponentHealthMonitor } from '@/runtime/index.ts';
 import { WorktreeRegistry } from '@/runtime/index.ts';
 import { SandboxSessionRegistry } from '@/runtime/index.ts';
@@ -83,10 +55,10 @@ import { isFeatureFlagEnabled } from './surface-feature-flags.ts';
 import type { FeatureFlagManager } from '@/runtime/index.ts';
 import { createFeatureFlagManager } from '@/runtime/index.ts';
 import { PolicyRuntimeState } from '@/runtime/index.ts';
-import {
-  createWorkflowServices,
-  type WorkflowServices,
-} from '@pellux/goodvibes-sdk/platform/tools';
+import { createProcessRegistry, type ProcessRegistry } from '@pellux/goodvibes-sdk/platform/runtime/fleet';
+import { calcSessionCost, isModelPriced } from '../export/cost-utils.ts';
+import { createWorkstreamServices, type OrchestrationEngine, type WorkstreamCommandService } from './workstream-services.ts';
+import { codeIndexDbPath, createCodeIndexServices } from './code-index-services.ts';
 import { WorkPlanStore } from '../work-plans/work-plan-store.ts';
 import {
   registerDaemonHandlers,
@@ -221,6 +193,8 @@ export interface RuntimeServices {
   readonly worktreeRegistry: WorktreeRegistry;
   readonly sandboxSessionRegistry: SandboxSessionRegistry;
   readonly webhookNotifier: WebhookNotifier;
+  /** Terminal focus tracker (W2.3) — fed by input/handler-feed.ts, read by the alert notifiers in core/. */
+  readonly focusTracker: FocusTracker;
   readonly replayEngine: DeterministicReplayEngine;
   readonly providerOptimizer: ProviderOptimizer;
   readonly providerCapabilityRegistry: ProviderCapabilityRegistry;
@@ -248,8 +222,16 @@ export interface RuntimeServices {
   readonly agentOrchestrator: AgentOrchestrator;
   readonly wrfcController: WrfcController;
   readonly processManager: ProcessManager;
+  /** Wave 4 (wo703): the phase/work-item orchestration engine — see runtime/workstream-services.ts. */
+  readonly orchestrationEngine: OrchestrationEngine;
+  readonly workstreamCommands: WorkstreamCommandService;
+  /** Wave 5 (wo804): the repo source-tree code index — see runtime/code-index-services.ts. */
+  readonly codeIndexStore: CodeIndexStore;
+  /** W2.1/W2.2: unified live process registry (agents, WRFC chains, workflows, watchers, background processes) backing the Fleet panel. */
+  readonly processRegistry: ProcessRegistry;
   readonly modeManager: ModeManager;
   readonly fileUndoManager: FileUndoManager;
+  readonly workspaceCheckpointManager: WorkspaceCheckpointManager;
   readonly integrationHelpers: IntegrationHelperService;
   /**
    * Re-root path-bound stores (MemoryStore, ProjectIndex) to a new working directory.
@@ -272,6 +254,9 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
   const runtimeDispatch = createDomainDispatch(options.runtimeStore);
   const gatewayMethods = new GatewayMethodCatalog();
   const panelManager = new PanelManager();
+  // W6.1 (the purge): MIGRATE-TO-MODAL surface + redirect registration moved to
+  // registerBuiltinPanels (builtin-panels.ts), where the panels' resolved deps
+  // are available for the surfaces to close over.
   const keybindingsManager = new KeybindingsManager({
     configPath: shellPaths.resolveUserPath('tui', 'keybindings.json'),
   });
@@ -352,6 +337,10 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     executor: agentOrchestrator,
     configManager,
   });
+  agentOrchestrator.setConversationSink({ // Wave-3 Part C6 bridge (mirrors the SDK's own createRuntimeServices)
+    register: (agentId, source) => agentManager.registerConversationSource(agentId, source),
+    release: (agentId) => agentManager.releaseConversationSource(agentId),
+  });
   agentManager.setRuntimeBus(options.runtimeBus);
   const wrfcController = new WrfcController(options.runtimeBus, agentMessageBus, {
     agentManager,
@@ -580,6 +569,7 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
   const componentHealthMonitor = new ComponentHealthMonitor();
   const worktreeRegistry = new WorktreeRegistry(workingDirectory);
   const webhookNotifier = new WebhookNotifier();
+  const focusTracker = new FocusTracker();
   const replayEngine = new DeterministicReplayEngine(workingDirectory);
   const providerOptimizer = new ProviderOptimizer(
     providerRegistry,
@@ -603,8 +593,57 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     artifactStore,
   });
   const processManager = new ProcessManager();
+  // Wave 4 (wo703): the phase/work-item orchestration engine, constructed
+  // before the process registry so its fleet nodes (workstream/phase/
+  // work-item) can be folded in below via the registry's optional
+  // orchestrationEngine dep.
+  const { orchestrationEngine, workstreamCommands } = createWorkstreamServices({
+    agentManager, configManager, adaptivePlanner, runtimeBus: options.runtimeBus, projectRoot: workingDirectory,
+  });
+  // Wave 5 (wo804): repo source-tree code index, sharing memoryEmbeddingRegistry
+  // with MemoryStore above. Auto-build is config-gated (default off) — see
+  // code-index-services.ts's header doc.
+  const { codeIndexStore } = createCodeIndexServices({ workingDirectory, configManager, memoryEmbeddingRegistry });
+  // W2.1/W2.2: one shared process registry aggregating the managers above —
+  // the Fleet panel (panels/fleet-read-model.ts) is its first consumer.
+  // Constructed once here (not per-consumer) so the coalesced tick and the
+  // agent-activity side-table are shared, not duplicated.
+  const processRegistry = createProcessRegistry({
+    agentManager,
+    wrfcController,
+    orchestrationEngine, // Wave 4 (wo703): folds workstream/phase/work-item nodes into the fleet
+    codeIndexService: codeIndexStore, // Wave 5 (wo804): folds a single 'code-index' node into the fleet
+    processManager,
+    watcherRegistry,
+    workflow,
+    approvalBroker,
+    sessionBroker,
+    messageBus: agentMessageBus, // Wave-3: backs steer()/`steerable` (wo612 builds the composer UI on top)
+    automationManager, // Wave 6 (wo-F item d4): folds /schedule AutomationJobs into the fleet as 'schedule' nodes
+    runtimeBus: options.runtimeBus,
+    // Honest pricing: never fabricate a cost for an unrecognized model.
+    priceUsage: (model, usage) => {
+      const modelId = model ?? 'unknown';
+      if (!isModelPriced(modelId)) return null;
+      return calcSessionCost(usage.inputTokens, usage.outputTokens, usage.cacheReadTokens, usage.cacheWriteTokens, modelId);
+    },
+  });
   const modeManager = new ModeManager();
   const fileUndoManager = new FileUndoManager();
+  const workspaceCheckpointManager = new WorkspaceCheckpointManager({
+    workspaceRoot: workingDirectory,
+    runtimeBus: options.runtimeBus,
+  });
+  // Fire-and-forget: subscriptions go live immediately if init() succeeds.
+  // If it rejects, WorkspaceCheckpointManager caches that rejection on
+  // `initPromise` and never clears it, so every later call (create/list/
+  // diff/restore — each awaits init() first) re-throws the same error
+  // forever: checkpointing becomes entirely unavailable for the rest of the
+  // session, not "degraded to manual-only". The `.catch(() => {})` here only
+  // exists to prevent an unhandled rejection at startup; the checkpoint
+  // commands (checkpoint-runtime.ts) are what actually catch and report the
+  // failure to the user, on first use.
+  void workspaceCheckpointManager.init().catch(() => {});
   const integrationHelpers = new IntegrationHelperService({
     workingDirectory,
     homeDirectory,
@@ -709,6 +748,7 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     worktreeRegistry,
     sandboxSessionRegistry,
     webhookNotifier,
+    focusTracker,
     replayEngine,
     providerOptimizer,
     providerCapabilityRegistry,
@@ -736,12 +776,20 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     agentOrchestrator,
     wrfcController,
     processManager,
+    orchestrationEngine,
+    workstreamCommands,
+    codeIndexStore,
+    processRegistry,
     modeManager,
     fileUndoManager,
+    workspaceCheckpointManager,
     integrationHelpers,
     async rerootStores(newWorkingDir: string): Promise<void> {
       const newMemoryDbPath = join(newWorkingDir, '.goodvibes', 'tui', 'memory.sqlite');
       await memoryStore.reroot(newMemoryDbPath);
+      // Wave 5 (wo804) risk #7: the code index must follow memory to the new
+      // tree, or it keeps pointing at the old working directory.
+      await codeIndexStore.reroot(newWorkingDir, codeIndexDbPath(newWorkingDir));
       await projectIndex.reroot(newWorkingDir);
     },
   };