@pellux/goodvibes-tui 1.9.1 → 1.9.2

package/src/renderer/theme.ts

@@ -7,7 +7,7 @@
  *
  * Dark mode values are the historically used colours.
  * Light mode values are defined now for correctness parity; they are consumed
- * when background-detection (F5 / terminal-bg-probe) lands and passes the
+ * when background-detection (terminal-bg-probe) lands and passes the
  * resolved mode down. Callers that do not yet have mode detection MUST call
  * resolveTheme('dark') as the safe default.
  *
@@ -242,7 +242,7 @@ export function resolveUiTones(mode: ThemeMode): Readonly<UiToneTokens> {
 }
 
 // ===========================================================================
-// Active-mode runtime (DEBT-2 / F5 terminal-bg-probe landing).
+// Active-mode runtime (DEBT-2 terminal-bg-probe landing).
 //
 // The mode is decided ONCE at startup — from appearance config (display.themeMode
 // forced dark/light) or the terminal-background probe (auto) — and is then stable

package/src/renderer/turn-injection.ts

@@ -1,5 +1,5 @@
 /**
- * Per-turn knowledge injection record rendering (Wave-5 W5.2, wo803).
+ * Per-turn knowledge injection record rendering.
  *
  * The SDK's passive per-turn retrieval engine (wo801, W5.1 —
  * packages/sdk/src/platform/agents/turn-knowledge-injection.ts) stores one
@@ -13,7 +13,7 @@
  * the entry type here is DERIVED from `AgentRecord` rather than imported by
  * name — this needs no SDK export change.
  *
- * Reality check (updated wo805): as of Wave-5 wo805 the TUI's main interactive
+ * Reality check (since updated): the TUI's main interactive
  * session DOES route through this engine. The SDK `Orchestrator` runs per-turn
  * passive injection on the evolving primary conversation and records each turn
  * on its own bounded ring, exposed via `Orchestrator.getTurnInjections()` — the
@@ -68,7 +68,7 @@ export function formatTurnInjectionEntry(entry: TurnInjectionEntry): string {
     : '';
   // The retrieval query is part of the record's honesty contract — without it
   // an injected line can't be traced back to WHY those ids were retrieved
-  // (Wave-5 replay flagged the omission). Truncated to keep the line scannable.
+  // (a replay finding flagged the omission). Truncated to keep the line scannable.
   const queryStr = entry.query ? ` for ${JSON.stringify(truncateQuery(entry.query))}` : '';
   return (
     `  turn ${entry.turn}: injected ${labelInjectedIds(entry)}${queryStr} ` +

package/src/renderer/ui-factory.ts

@@ -195,7 +195,7 @@ export class UIFactory {
     composerFlags?: readonly string[],
     composerPendingRisk?: 'none' | 'approval-wait' | 'shell' | 'command' | 'remote',
     compact: boolean = false,
-    // S3d: honest cross-surface spine posture. Defined ONLY in adopted-daemon
+    // Honest cross-surface spine posture. Defined ONLY in adopted-daemon
     // mode (undefined in embedded/local), so the segment is absent otherwise.
     sessionSpineStatus?: 'online' | 'offline',
   ): Line[] {
@@ -442,7 +442,7 @@ export class UIFactory {
       if (model) {
         ctxParts.push({ text: model + (provider ? ` (${provider})` : ''), priority: 0 });
       }
-      // S3d: cross-surface spine posture — plain words, no blame. Adopted mode only.
+      // Cross-surface spine posture — plain words, no blame. Adopted mode only.
       if (sessionSpineStatus) ctxParts.push({ text: `spine:${sessionSpineStatus}`, priority: 1 });
       if (toolCount) ctxParts.push({ text: `${toolCount} tools`, priority: 2 });
       // Labeled "notify" (not "hitl") — /mode (aliased /hitl) governs UX
@@ -484,11 +484,11 @@ export class UIFactory {
     return lines;
   }
 
-  // W6-P1: the rotating "thinking" phrase pool and the honest waiting-state
+  // The rotating "thinking" phrase pool and the honest waiting-state
   // wording (approval/reconnecting/pre-first-token/stalled/thinking) are no
   // longer minted here. They come from the SDK presentation contract's
-  // waitingPhrase() (@pellux/goodvibes-sdk/platform/presentation, landed by
-  // W4-S1, already adopted by the agent in W4-R4) — see createThinkingFragment
+  // waitingPhrase() (@pellux/goodvibes-sdk/platform/presentation, already
+  // adopted by the agent) — see createThinkingFragment
   // below. This renderer still decides WHICH state applies from its own
   // stall/reconnect/approval signals (computeStallInfo/computeRenderStallInfo
   // stay renderer-local per the extraction decision record); only the exact
@@ -544,8 +544,8 @@ export class UIFactory {
     // long enough to be misleading (THINKING_STALL_FREEZE_MS). Decide WHICH
     // honest waiting state applies (renderer-local — this signal computation
     // stays here per the extraction decision record), then defer the exact
-    // wording to the SDK presentation contract's waitingPhrase() (W6-P1;
-    // mirrors the agent's W4-R4 adoption). Precedence matches the contract:
+    // wording to the SDK presentation contract's waitingPhrase() (which
+    // mirrors the agent's adoption). Precedence matches the contract:
     // approval > reconnecting > pre-first-token > stalled > thinking.
     const isStalled = stallInfo !== undefined && stallInfo.msSinceLastDelta >= THINKING_STALL_FREEZE_MS;
     let state: WaitingState;

package/src/renderer/ui-primitives.ts

@@ -1,10 +1,10 @@
 // ---------------------------------------------------------------------------
 // ui-primitives.ts — glyph registry + tone-token table.
 //
-// W6-P1: these four tables (GLYPHS, UI_TONES, DIFF_TONES, SPINNER_FRAMES) are
+// These four tables (GLYPHS, UI_TONES, DIFF_TONES, SPINNER_FRAMES) are
 // no longer minted locally. They are the SDK presentation contract
-// (@pellux/goodvibes-sdk/platform/presentation, landed by W4-S1 and already
-// adopted by the agent in W4-R4), consumed here so the TUI and the agent
+// (@pellux/goodvibes-sdk/platform/presentation, already
+// adopted by the agent), consumed here so the TUI and the agent
 // share ONE source (Mike's move-to-SDK ruling — machinery needed by 2+
 // surfaces => SDK). The TUI was the reference these values were lifted from
 // verbatim, so this swap is byte-identical. See

package/src/runtime/bootstrap-core.ts

@@ -119,7 +119,7 @@ export interface BootstrapCoreState {
   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. */
+  /** 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;
@@ -408,7 +408,7 @@ export async function initializeBootstrapCore(
     void memoryStore.save();
     memoryStore.close();
   });
-  // W6-C2 (E6): fold this project's legacy per-project TUI memory into the home-scoped canonical store, ONCE, AFTER init(). Idempotent and non-fatal.
+  // Fold this project's legacy per-project TUI memory into the home-scoped canonical store, ONCE, AFTER init(). Idempotent and non-fatal.
   await runBootMemoryFold(memoryStore, services.memoryEmbeddingRegistry, workingDir, logger);
 
   const renderRequestRef = { value: (): void => {} };
@@ -644,7 +644,7 @@ export async function initializeBootstrapCore(
     },
   ));
 
-  // D3: inbound steer delivery — see createBootstrapInboundInputPoller's doc comment.
+  // Inbound steer delivery — see createBootstrapInboundInputPoller's doc comment.
   const sessionInboundInputs = createBootstrapInboundInputPoller({
     runtimeSessionIdRef, routeOrBuffer, orchestratorHandleUserInputRef, conversation, requestRender,
   });

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

@@ -23,7 +23,7 @@ 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
+  /** 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;
@@ -80,7 +80,7 @@ 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).
+      // 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[] = [];

package/src/runtime/bootstrap-shell.ts

@@ -48,7 +48,7 @@ export interface BootstrapShellOptions {
   readonly runtimeBus: RuntimeEventBus;
   readonly runtimeStore: RuntimeStore;
   readonly services: RuntimeServices;
-  /** S3c: dormant until bootstrap.ts activates it for an adopted 'external' daemon. */
+  /** Dormant until bootstrap.ts activates it for an adopted 'external' daemon. */
   readonly sessionSpine: SessionSpineClient;
   readonly conversation: ConversationManager;
   readonly runtime: MutableRuntimeState;
@@ -181,7 +181,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     forensicsRegistry,
     policyRuntimeState,
     approvalBroker: services.approvalBroker,
-    // S3d: panels read the cross-surface union facade, not the raw local broker.
+    // Panels read the cross-surface union facade, not the raw local broker.
     sessionBroker: uiServices.sessions.sessionBroker,
     automationManager: services.automationManager,
     getControlPlaneRecentEvents,
@@ -289,7 +289,7 @@ export function createBootstrapShell(options: BootstrapShellOptions): BootstrapS
     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
+    // 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,

package/src/runtime/bootstrap.ts

@@ -199,7 +199,7 @@ export async function bootstrapRuntime(
     pluginManager,
   } = services;
 
-  // D4b: a liveness flip is only PAINTED once something calls requestRender();
+  // A liveness flip is only PAINTED once something calls requestRender();
   // without this, the footer's spine segment sat correct-but-undrawn until
   // incidental activity redrew it (minutes, during an idle stretch).
   sessionUnionCache.setOnTransition(() => requestRender());
@@ -413,7 +413,7 @@ export async function bootstrapRuntime(
       close: (sessionId) => httpTransport.operator.sessions.close(sessionId),
     };
     sessionSpine.activate(createTuiSpineTransport(sessionsClient));
-    // D3: adopt the same daemon's wire for the INBOUND steer path — collect
+    // Adopt the same daemon's wire for the INBOUND steer path — collect
     // steer/follow-up inputs another live surface queued for this session and
     // inject them into the turn machinery (acking delivery on the wire).
     sessionInboundInputs.activate({
@@ -453,7 +453,7 @@ export async function bootstrapRuntime(
       // Honest session-spine posture, independent of daemonRunning —
       // 'external'-adopted-but-currently-unreachable degrades to 'offline' here
       // even though daemonRunning might still read true from a stale handle.
-      // D4: sessionSpine.status() alone is ACTIVITY-gated (only updates on a
+      // sessionSpine.status() alone is ACTIVITY-gated (only updates on a
       // register/heartbeat/close), so after the daemon dies mid-idle it would
       // keep reading 'online'. Derive the footer status from the union cache's
       // 5s liveness probe too — one signal, no new timer — so offline surfaces
@@ -568,7 +568,7 @@ export async function bootstrapRuntime(
       // authenticate against the embedded daemon this surface starts.
       const daemonHomeDir = join(services.homeDirectory, '.goodvibes', 'daemon');
       const companionTokenRecord = resolveDaemonCompanionToken(daemonHomeDir);
-      // F3 resolution (TUI 0.19.20): remove stale pre-0.21.28 workspace-scoped operator
+      // Fix (TUI 0.19.20): remove stale pre-0.21.28 workspace-scoped operator
       // token files so only the canonical <daemonHomeDir>/operator-tokens.json survives.
       // The prune is best-effort — it silently skips missing files, no-ops when tokens
       // already match, and records un-deletable candidates in `failedPaths` for logging.
@@ -741,7 +741,7 @@ export async function bootstrapRuntime(
       // a no-op when the spine was never activated (embedded/local-only topology).
       sessionSpine.close(runtime.sessionId);
       sessionSpine.dispose();
-      sessionInboundInputs.dispose(); // D3: stop the inbound steer poll interval on exit
+      sessionInboundInputs.dispose(); // stop the inbound steer poll interval on exit
       sessionUnionCache.dispose(); // stop the wire-refresh interval on exit
       await deferredStartup.drain(100);
       if (externalServicesPromise) {

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

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-// code-index-services.ts — Wave 5 (wo804, W5.3 Stage A TUI wiring)
+// code-index-services.ts — repo source-tree code index (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
@@ -81,7 +81,7 @@ export function isCodeInjectionSettingEnabled(configManager: Pick<ConfigManager,
 export interface CodeIndexServices {
   readonly codeIndexStore: CodeIndexStore;
   /**
-   * Wave-5 Stage B tool-site incremental reindex scheduler, bound to codeIndexStore and
+   * Tool-site incremental reindex scheduler, bound to codeIndexStore and
    * gated live on storage.codeIndexEnabled. Threaded into both SDK orchestrators (main +
    * agent) so a successful write/edit debounces an incremental reindex, and into the command
    * context so /codebase status can report the last reindex activity honestly.

package/src/runtime/index.ts

@@ -274,9 +274,17 @@ export const reachableFrom = operations.reachableFrom;
 export const evaluateSessionMaintenance = operations.evaluateSessionMaintenance;
 export const formatSessionMaintenanceLines = operations.formatSessionMaintenanceLines;
 export const getGuidanceMode = operations.getGuidanceMode;
-export const DEFAULT_RETENTION_CONFIG = operations.DEFAULT_RETENTION_CONFIG;
-export const RetentionPolicy = operations.RetentionPolicy;
-export const SnapshotPruner = operations.SnapshotPruner;
+// Snapshot-retention symbols (SnapshotPruner, RetentionPolicy,
+// DEFAULT_RETENTION_CONFIG) are intentionally NOT re-exported here. No app code
+// consumes them — only the retention unit test does, and it now imports them
+// straight from the SDK `operations` namespace. Re-exporting them created a
+// second top-level binding named `SnapshotPruner` that collided with the SDK's
+// own `class SnapshotPruner`, forcing the bundler to rename ours to
+// `SnapshotPruner2` and emit a fragile `SnapshotPruner2 = operations.SnapshotPruner`
+// module-init assignment. `bun build --compile` occasionally drops that renamed
+// `var` declaration on the darwin-arm64 target, so the compiled binary died at
+// startup with `ReferenceError: SnapshotPruner2 is not defined`. Dropping the
+// re-export removes the collision (and the same latent hazard for the other two).
 export const buildPersistedSessionContext = operations.buildPersistedSessionContext;
 export const buildLocalReturnContextSummary = operations.buildLocalReturnContextSummary;
 export const formatReturnContextForDisplay = operations.formatReturnContextForDisplay;

package/src/runtime/legacy-daemon-migration.ts

@@ -1,5 +1,5 @@
 /**
- * W4-D1: the legacy `goodvibes-daemon.service` detect/migrate engine, shared
+ * The legacy `goodvibes-daemon.service` detect/migrate engine, shared
  * by the daemon CLI (`src/daemon/service-commands.ts`, the `migrate-service`
  * subcommand) and the interactive TUI's onboarding guided UX
  * (`src/input/handler-onboarding-daemon-adopt.ts`).
@@ -11,8 +11,8 @@
  * depending on CLI/daemon entrypoint concerns), and `src/runtime/**` is the
  * shared, entrypoint-agnostic layer both sides are already allowed to import.
  *
- * Wave 3 (W3 Finding 4) shipped DETECT + DISCLOSE only: a read-only check for
- * the prior D7a-era systemd unit name plus a manual-removal hint, never
+ * An earlier release shipped DETECT + DISCLOSE only: a read-only check for
+ * the prior generation's systemd unit name plus a manual-removal hint, never
  * touching it. This module adds the guided, CONSENTED migration itself.
  * Design constraints, all load-bearing (see also the per-function docs):
  *   - NEVER auto-migrate. Without explicit consent nothing runs except a
@@ -63,7 +63,7 @@ export const MANAGED_SERVICE_NAME = 'goodvibes';
 export const MANAGED_SERVICE_DESCRIPTION = 'GoodVibes daemon (shared session broker + companion host)';
 
 /**
- * F2 follow-up: resolve the unit name the SDK's `PlatformServiceManager`
+ * Follow-up: resolve the unit name the SDK's `PlatformServiceManager`
  * would actually manage, from config alone — for callers that need the
  * honest display name BEFORE any manager/status exists (the onboarding
  * wizard's detection banner resolves this at snapshot-collection time and
@@ -218,7 +218,7 @@ export function detectLegacyUnit(input: DetectLegacyUnitInput): LegacyUnitInfo {
 }
 
 /**
- * F1: the unit name `PlatformServiceManager` is ACTUALLY about to mutate can
+ * The unit name `PlatformServiceManager` is ACTUALLY about to mutate can
  * differ from `MANAGED_SERVICE_NAME` / `definitionOverride.name`. The SDK's
  * internal `resolveServiceName()` — used by `install()`, `uninstall()`, and
  * `status()` alike to compute the unit file PATH — resolves from the
@@ -303,7 +303,7 @@ export interface RunLegacyDaemonMigrationParams {
 }
 
 /**
- * F1 belt-and-braces guard: throws if the resolved unit `status` is the
+ * Belt-and-braces guard: throws if the resolved unit `status` is the
  * legacy unit. Called immediately before the two mutation calls
  * (`manager.install()`, and `manager.uninstall()` on the failed-health
  * rollback path) that would otherwise write to or remove that path. This is
@@ -343,7 +343,7 @@ export async function runLegacyDaemonMigration(
   const { trackedServiceName } = params;
   // Computed once, up front, and reused for every branch below (this is the
   // exact same single call each branch made individually before — see the
-  // F1 fix note on `resolveManagedUnitName` for why the name/path it reports
+  // fix note on `resolveManagedUnitName` for why the name/path it reports
   // can differ from `trackedServiceName`).
   const currentStatus = manager.status();
   const resolvedUnitName = resolveManagedUnitName(currentStatus);
@@ -393,7 +393,7 @@ export async function runLegacyDaemonMigration(
     };
   }
 
-  // F1: before any mutation, confirm the unit PlatformServiceManager is
+  // Before any mutation, confirm the unit PlatformServiceManager is
   // actually about to install/uninstall isn't the legacy unit itself. This
   // happens when the host's `service.serviceName` config key is set to the
   // legacy unit's own name — see `resolveManagedUnitName`'s doc comment for
@@ -440,7 +440,7 @@ export async function runLegacyDaemonMigration(
 
   // Consented: new-up-then-old-down. The legacy unit is not touched until the
   // new unit is verified healthy.
-  // Belt-and-braces (F1): the collision check above already returns before
+  // Belt-and-braces: the collision check above already returns before
   // reaching here whenever the resolved unit is the legacy one — this
   // re-asserts the same invariant right at the mutation site so a future
   // change to the check above can never silently reopen the hole.

package/src/runtime/memory-fold.ts

@@ -9,7 +9,7 @@ import {
 } from '@pellux/goodvibes-sdk/platform/state';
 
 /**
- * W6-C2 (E6): fold the TUI's legacy per-project memory store into the canonical
+ * Fold the TUI's legacy per-project memory store into the canonical
  * cross-surface store. Called once at boot AFTER `memoryStore.init()` so records written
  * before unification survive. Id-keyed and idempotent — a re-run imports nothing new and
  * never deletes the legacy file. Returns the report so boot can log what moved.

package/src/runtime/onboarding/snapshot.ts

@@ -403,12 +403,12 @@ export async function collectOnboardingSnapshot(
       snapshot: authSnapshotResult.value,
     },
     bindSettings: {
-      // danger.daemon (removed Wave 6 — see docs/decisions/2026-07-05-daemon-by-default.md)
-      // used to gate the pre-Wave-2 opt-in daemon posture; this site read it RAW
+      // danger.daemon (since removed — see docs/decisions/2026-07-05-daemon-by-default.md)
+      // used to gate the earlier opt-in daemon posture; this site read it RAW
       // (not through resolveDaemonEnabled) so the wizard's network-mode
       // classification tracked "did the user explicitly request the legacy
       // dangerous posture" rather than "does the daemon run" (which has defaulted
-      // true unconditionally since Wave 2, and would misclassify every default,
+      // true unconditionally since daemon-by-default landed, and would misclassify every default,
       // local-only install as server-mode if read here). Every realistic config
       // already evaluated this to `false` (unset, or an explicit `danger.daemon:
       // false` both did); the alias's removal migration preserves the one case

package/src/runtime/onboarding/types.ts

@@ -126,7 +126,7 @@ export interface OnboardingSurfacesSnapshot {
 }
 
 /**
- * W4-D1 wizard wiring: read-only detection of a legacy `goodvibes-daemon.service`
+ * Wizard wiring: read-only detection of a legacy `goodvibes-daemon.service`
  * systemd unit (see `../legacy-daemon-migration.ts`'s `LegacyUnitInfo`), carried
  * on the snapshot so the Network step can show the guided migration action only
  * when there is actually something to migrate. Never implies anything was
@@ -137,7 +137,7 @@ export interface OnboardingLegacyDaemonSnapshot {
   readonly active: boolean;
   readonly path: string;
   /**
-   * F2 follow-up: the unit name this tool actually manages on this host,
+   * Follow-up: the unit name this tool actually manages on this host,
    * resolved from the `service.serviceName` config key at snapshot-collection
    * time (`resolveConfiguredServiceName`, `../legacy-daemon-migration.ts`) —
    * so the wizard's detection banner names the real unit instead of the

package/src/runtime/operator-token-cleanup.ts

@@ -4,7 +4,7 @@
  * Shared helper that enumerates the legacy workspace-scoped `operator-tokens.json`
  * locations the TUI has written at various pre-0.21.28 versions. Used by both the
  * in-process bootstrap path (`src/runtime/bootstrap.ts`) and the standalone daemon
- * CLI (`src/daemon/cli.ts`) so F3 (stale-token pruning) has a single source of
+ * CLI (`src/daemon/cli.ts`) so stale-token pruning has a single source of
  * truth for where to look.
  *
  * Adding a new legacy location: append to `workspaceOperatorTokenCandidates` and
@@ -32,7 +32,7 @@ export function workspaceOperatorTokenCandidates(workingDirectory: string): read
 }
 
 /**
- * F1 (adopt-an-already-running-external-daemon): resolve the operator/companion
+ * External-daemon adoption: resolve the operator/companion
  * token this TUI process uses to authenticate with its daemon, honoring
  * `GOODVIBES_DAEMON_TOKEN` as a non-interactive override.
  *

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

@@ -24,7 +24,7 @@ export type OrchestratorCoreServicesSource = Pick<
  * 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
+ * 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
@@ -48,7 +48,7 @@ export function buildSharedOrchestratorCoreServices(input: {
     sessionLineageTracker: services.sessionLineageTracker,
     idempotencyStore: services.idempotencyStore,
     memoryRegistry: services.memoryRegistry,
-    // Wave-5 Stage B — main-session code auto-injection + tool-site reindex. Injection is
+    // Main-session code auto-injection + tool-site reindex. Injection is
     // additionally gated by the default-off `agent-passive-code-injection` flag inside the
     // SDK; here we supply the source, the live storage.codeIndexEnabled predicate, and the
     // reindex scheduler.

package/src/runtime/process-lifecycle.ts

@@ -57,7 +57,7 @@ export interface ProcessLifecycleDeps {
   readonly unsubs: ReadonlyArray<() => void>;
   readonly getRecoveryInterval: () => ReturnType<typeof setInterval> | null;
   readonly setRecoveryInterval: (value: ReturnType<typeof setInterval> | null) => void;
-  readonly getStopSpokenOutputForExit: () => (() => void) | null;
+  readonly getStopSpokenOutputForExit: () => (() => void | Promise<void>) | null;
 }
 
 export interface ProcessLifecycleHandlers {
@@ -153,7 +153,16 @@ export function installProcessLifecycle(deps: ProcessLifecycleDeps): ProcessLife
     // must not re-run teardown or double-fire ctx.shutdown.
     if (exiting) return;
     exiting = true;
-    getStopSpokenOutputForExit()?.();
+    // Exit lets the spoken audio the user is already hearing finish inside a
+    // short bounded window (capped inside stopForExit, under the 3s shutdown
+    // budget below) while the rest of teardown proceeds; queued-but-unplayed
+    // speech is dropped. Deliberate interrupts (Ctrl+C, /tts stop) still cut
+    // instantly through controller.stop() before this path is ever reached.
+    let spokenOutputDrain: Promise<void> = Promise.resolve();
+    try {
+      spokenOutputDrain = Promise.resolve(getStopSpokenOutputForExit()?.()).then(() => undefined);
+    } catch { /* non-fatal to exit */ }
+    spokenOutputDrain = spokenOutputDrain.catch(() => undefined);
     unsubs.forEach(fn => fn());
     const interval = getRecoveryInterval();
     if (interval !== null) { clearInterval(interval); setRecoveryInterval(null); }
@@ -169,9 +178,14 @@ export function installProcessLifecycle(deps: ProcessLifecycleDeps): ProcessLife
     try {
       // Race the graceful shutdown against a hard timeout — externalServices.stop() can hang
       // and we must still exit; deferredStartup.drain only budgets 100ms internally.
-      await Promise.race([
-        ctx.shutdown({ ...snapshot, ...buildPersistedSessionContext(snapshot.messages, ctx.conversation.getTitleSource(), buildSessionContinuityHints()) }).then(() => { shutdownOk = true; }),
-        new Promise<void>((resolve) => setTimeout(resolve, 3000)),
+      // The spoken-audio drain runs concurrently and is internally capped below
+      // this budget, so it never extends the exit beyond the hard timeout.
+      await Promise.all([
+        spokenOutputDrain,
+        Promise.race([
+          ctx.shutdown({ ...snapshot, ...buildPersistedSessionContext(snapshot.messages, ctx.conversation.getTitleSource(), buildSessionContinuityHints()) }).then(() => { shutdownOk = true; }),
+          new Promise<void>((resolve) => setTimeout(resolve, 3000)),
+        ]),
       ]);
     } catch (err) {
       logger.debug('ctx.shutdown error during exitApp (non-fatal)', { error: summarizeError(err) });

package/src/runtime/services.ts

@@ -222,12 +222,12 @@ 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. */
+  /** 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. */
+  /** The repo source-tree code index — see runtime/code-index-services.ts. */
   readonly codeIndexStore: CodeIndexStore;
-  readonly codeIndexReindexScheduler: CodeIndexReindexScheduler; // Wave-5 Stage B tool-site reindex
+  readonly codeIndexReindexScheduler: CodeIndexReindexScheduler; // tool-site reindex
   /** 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;
@@ -338,7 +338,7 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     executor: agentOrchestrator,
     configManager,
   });
-  agentOrchestrator.setConversationSink({ // Wave-3 Part C6 bridge (mirrors the SDK's own createRuntimeServices)
+  agentOrchestrator.setConversationSink({ // Conversation-snapshot bridge (mirrors the SDK's own createRuntimeServices)
     register: (agentId, source) => agentManager.registerConversationSource(agentId, source),
     release: (agentId) => agentManager.releaseConversationSource(agentId),
   });
@@ -387,7 +387,7 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
   });
   const artifactStore = new ArtifactStore({ configManager });
   const memoryEmbeddingRegistry = new MemoryEmbeddingProviderRegistry({ configManager });
-  // W6-C2 (E6): open the ONE home-scoped canonical store; legacy per-project TUI memory folds in at boot (foldTuiLegacyMemory).
+  // Open the ONE home-scoped canonical store; legacy per-project TUI memory folds in at boot (foldTuiLegacyMemory).
   const memoryDbPath = resolveCanonicalMemoryDbPath(homeDirectory);
   const memoryStore = new MemoryStore(memoryDbPath, {
     embeddingRegistry: memoryEmbeddingRegistry,
@@ -595,18 +595,18 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     artifactStore,
   });
   const processManager = new ProcessManager();
-  // Wave 4 (wo703): the phase/work-item orchestration engine, constructed
+  // 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
+  // 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, codeIndexReindexScheduler } = createCodeIndexServices({ workingDirectory, configManager, memoryEmbeddingRegistry });
-  const codeInjectionOrchestratorDeps = { codeIndex: codeIndexStore, isCodeInjectionSettingEnabled: () => isCodeInjectionSettingEnabled(configManager), codeIndexReindexScheduler }; // Wave-5 Stage B seam (agent here; main via orchestrator-core-services.ts)
+  const codeInjectionOrchestratorDeps = { codeIndex: codeIndexStore, isCodeInjectionSettingEnabled: () => isCodeInjectionSettingEnabled(configManager), codeIndexReindexScheduler }; // Code-injection seam (agent here; main via orchestrator-core-services.ts)
   // 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
@@ -614,15 +614,15 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
   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
+    orchestrationEngine, // Folds workstream/phase/work-item nodes into the fleet
+    codeIndexService: codeIndexStore, // 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
+    messageBus: agentMessageBus, // Backs steer()/`steerable` (the Fleet steer composer builds on top)
+    automationManager, // 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) => {
@@ -681,7 +681,7 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     remoteRunnerRegistry,
     knowledgeService,
     memoryRegistry,
-    ...codeInjectionOrchestratorDeps, // Wave-5 Stage B: agent-run code injection + tool-site reindex
+    ...codeInjectionOrchestratorDeps, // Agent-run code injection + tool-site reindex
     archetypeLoader,
     configManager,
     providerRegistry,
@@ -790,7 +790,7 @@ export function createRuntimeServices(options: RuntimeServicesOptions): RuntimeS
     workspaceCheckpointManager,
     integrationHelpers,
     async rerootStores(newWorkingDir: string): Promise<void> {
-      // W6-C2 (E6): the memory store is the home-scoped canonical cross-surface store and
+      // The memory store is the home-scoped canonical cross-surface store and
       // deliberately does NOT reroot per-project (that would re-silo memory, the E6
       // regression). Only working-tree-bound stores (code index, project index) reroot.
       await codeIndexStore.reroot(newWorkingDir, codeIndexDbPath(newWorkingDir));

package/src/runtime/session-inbound-inputs.ts

@@ -1,7 +1,7 @@
 /**
  * session-inbound-inputs.ts
  *
- * D3 (One-Platform Wave 2, live-surface steer delivery — the inbound half of the
+ * Live-surface steer delivery (the inbound half of the
  * session spine): the TUI's INBOUND path for steer/follow-up inputs that another
  * live surface (e.g. the webui) queued against THIS TUI's session.
  *

package/src/runtime/session-spine-transport.ts

@@ -1,10 +1,10 @@
 /**
  * session-spine-transport.ts
  *
- * W3-T1 (One-Platform Wave 3, TUI session-spine cutover): the thin typed-client
+ * The TUI session-spine cutover: the thin typed-client
  * adapter that lets the TUI's bootstrap drive the SDK's
  * `@pellux/goodvibes-sdk/platform/runtime/session-spine` `SessionSpineClient`
- * (extracted in W3-S4) via its injected `SpineTransport` seam.
+ * via its injected `SpineTransport` seam.
  *
  * The TUI is SDK-clean here: `SpineSessionsClient` is exactly the narrow wire
  * surface the old TUI-local `session-spine-client.ts` declared (structurally

package/src/runtime/ui-services.ts

@@ -114,7 +114,7 @@ export interface UiRuntimeSharedServices {
     readonly remoteSupervisor: RuntimeServices['remoteSupervisor'] & RemoteSupervisor;
     /** W2.2: the shared live process registry backing the Fleet panel. */
     readonly processRegistry: RuntimeServices['processRegistry'];
-    /** Wave-3 (W3.2): the shared runtime event bus — the Fleet panel subscribes to its 'communication' domain for the honest steer-consumed signal. */
+    /** The shared runtime event bus — the Fleet panel subscribes to its 'communication' domain for the honest steer-consumed signal. */
     readonly runtimeBus: RuntimeServices['runtimeBus'];
   };
 }

package/src/runtime/workstream-services.ts

@@ -1,5 +1,5 @@
 // ---------------------------------------------------------------------------
-// workstream-services.ts — Wave 4 (wo703)
+// workstream-services.ts — phase/work-item orchestration engine
 //
 // Constructs the TUI's OrchestrationEngine instance (@pellux/goodvibes-sdk/
 // platform/orchestration, landed on SDK main as wo701/W4.1) and a thin

package/src/runtime/wrfc-persistence.ts

@@ -19,7 +19,7 @@
  *    additionally exposes the recovered set for inspection.
  *
  *    A chain that looked interrupted (non-terminal) in the old snapshot can be
- *    reaped to terminal IN PLACE by `WrfcController.importChain` (Wave 6, wo-F:
+ *    reaped to terminal IN PLACE by `WrfcController.importChain` (the zombie-reap pass:
  *    no member agent survived the restart — see wrfc-controller.ts). This
  *    module always re-checks `chain.state` AFTER the import call, never the
  *    pre-import classification, so a reaped chain is treated as history, not
@@ -209,7 +209,7 @@ class WrfcPersistenceImpl implements WrfcPersistence {
       // chain. The accessor is optional for read-only test doubles.
       //
       // NOTE: importChain may reap this chain to a terminal state IN PLACE
-      // (Wave 6, wo-F zombie-reap: no member agent survived the restart) —
+      // (zombie reap: no member agent survived the restart) —
       // always read chain.state AFTER this call below, never the pre-import
       // classification captured by candidateInterrupted.
       this.controller.importChain?.(chain);