@pellux/goodvibes-agent 1.5.6 → 1.5.8

package/src/input/agent-workspace-settings.ts

@@ -330,7 +330,7 @@ export function agentWorkspaceSettingSchema(context: CommandContext | null, key:
     ?.getSchema()
     .find((setting) => setting.key === key) ?? null;
   if (fromSchema) return fromSchema;
-  // display.themeMode is a TUI-local synthetic setting (W4-R4) that never
+  // display.themeMode is a TUI-local synthetic setting that never
   // joined the SDK ConfigKey schema — the classic settings-modal injects the
   // same descriptor into its own groups map rather than the schema. Mirror
   // that fallback here so the workspace surface can discover and cycle it too.

package/src/input/agent-workspace-snapshot-builders.ts

@@ -1,5 +1,5 @@
 // Sub-builders extracted out of the single ~516-line `buildAgentWorkspaceRuntimeSnapshot`
-// function in agent-workspace-snapshot.ts (W4-H2, per the W4-H1 design ruling's
+// function in agent-workspace-snapshot.ts (per the design ruling's
 // giant-single-function-assembler verdict: "splitting into cohesive sub-builders...
 // would reduce single-function size without changing behavior"). Each function here
 // is the verbatim body of one of that function's local IIFEs or local variable blocks,
@@ -273,7 +273,7 @@ export function buildAgentWorkspaceCompanionAccessSnapshot(context: CommandConte
 
 /**
  * Honest email-connect status for the inbox connect wizard's entry state
- * (W4-A5) — config validation only, no network I/O. Best-effort: never
+ * — config validation only, no network I/O. Best-effort: never
  * throws, returns null on any read failure.
  */
 export function buildAgentWorkspaceEmailConnectStatus(context: CommandContext): AgentWorkspaceEmailConnectStatus | null {

package/src/input/agent-workspace-snapshot-config.ts

@@ -1,5 +1,5 @@
 // Small config-read helpers shared by agent-workspace-snapshot.ts and
-// agent-workspace-snapshot-builders.ts (W4-H2 split of the runtime-snapshot giant
+// agent-workspace-snapshot-builders.ts (split out of the runtime-snapshot giant
 // assembler). Each never throws: config reads fall back to the given default on any
 // error, matching the original inline behavior exactly.
 import type { CommandContext } from './command-registry.ts';

package/src/input/agent-workspace-snapshot.ts

@@ -36,8 +36,8 @@ import {
 } from './agent-workspace-snapshot-builders.ts';
 import type { AgentWorkspaceLocalLibraryItem, AgentWorkspaceRuntimeSnapshot } from './agent-workspace-types.ts';
 
-// Re-exported so this module's public surface matches the pre-split file (W4-A5
-// added and exported this builder here before the W4-H2 split moved its body to
+// Re-exported so this module's public surface matches the pre-split file (this
+// builder was originally exported here, before a later split moved its body to
 // agent-workspace-snapshot-builders.ts).
 export { buildAgentWorkspaceEmailConnectStatus } from './agent-workspace-snapshot-builders.ts';
 
@@ -65,16 +65,16 @@ export interface AgentWorkspaceLiveMemoryCounters {
  * mid-call) rather than swallowing it — callers that need a best-effort,
  * never-throws default (the full runtime snapshot builder below) should use
  * buildAgentWorkspaceMemorySnapshot instead. The render-path live-counter
- * refresh (AgentWorkspace.syncLiveCountersForRender, W4-A6) calls this
+ * refresh (AgentWorkspace.syncLiveCountersForRender) calls this
  * directly so a genuine read failure can be surfaced as "stale" instead of
  * being silently rewritten to a fabricated 0.
  *
- * NOTE (W4-H1 observability flag): these live process/state counters are
+ * NOTE (observability flag): these live process/state counters are
  * flagged as observability-shaped content whose eventual surface home is the
  * fleet/observability layer, not this admin-console snapshot builder. Nothing
  * moves today (no observability layer exists yet); this function is kept
  * intact and separate rather than folded into the sibling sub-builders in
- * agent-workspace-snapshot-builders.ts extracted alongside it in W4-H2.
+ * agent-workspace-snapshot-builders.ts extracted alongside it.
  */
 export function readLiveAgentMemoryCounters(context: CommandContext): AgentWorkspaceLiveMemoryCounters {
   const memory = context.clients?.agentKnowledgeApi?.memory;
@@ -85,7 +85,7 @@ export function readLiveAgentMemoryCounters(context: CommandContext): AgentWorks
     reviewQueueCount: memory.reviewQueue(100).length,
     promptActiveCount: records.filter(isPromptActiveMemory).length,
     // Each item carries the honest, per-record eligibility reason straight from
-    // describeMemoryPromptEligibility (Wave-4 W4-A1B) — the same wording source
+    // describeMemoryPromptEligibility — the same wording source
     // prompt-context-receipts.ts and agent-harness-prompt-context.ts use for prompt
     // recall. No locally invented "not reviewed"/"outside prompt limit" paraphrase here.
     items: records.map((record) => ({
@@ -120,9 +120,9 @@ export interface AgentWorkspaceLiveRoutineCounters {
  * if the store read fails (e.g. a corrupt/unreadable routines.json —
  * AgentRoutineRegistry.snapshot() itself throws in that case) rather than
  * swallowing it; see readLiveAgentMemoryCounters above for why the
- * render-path live-counter refresh (W4-A6) wants that.
+ * render-path live-counter refresh wants that.
  *
- * NOTE (W4-H1 observability flag): see readLiveAgentMemoryCounters above —
+ * NOTE (observability flag): see readLiveAgentMemoryCounters above —
  * the same flag applies to these routine counters.
  */
 export function readLiveAgentRoutineCounters(context: CommandContext): AgentWorkspaceLiveRoutineCounters {
@@ -150,7 +150,7 @@ export function buildAgentWorkspaceRoutineCounters(context: CommandContext): Age
 
 /**
  * Assembles the full Agent workspace runtime snapshot. Composes the
- * sub-builders in agent-workspace-snapshot-builders.ts (W4-H2 split of what
+ * sub-builders in agent-workspace-snapshot-builders.ts (split out of what
  * was previously one ~516-line function) plus the two live-counter builders
  * above, then maps everything onto the AgentWorkspaceRuntimeSnapshot shape.
  */

package/src/input/agent-workspace-types.ts

@@ -370,7 +370,7 @@ export interface AgentWorkspaceLocalLibraryItem {
   readonly missingRequirementCount?: number;
   readonly missingRequirements?: readonly string[];
   readonly startCount?: number;
-  /** Memory-only (Wave-4 W4-A1B): whether this record currently clears the prompt-injection
+  /** Memory-only: whether this record currently clears the prompt-injection
    *  recall floor, per describeMemoryPromptEligibility. */
   readonly promptEligible?: boolean;
   /** Memory-only: the honest, per-record reason from describeMemoryPromptEligibility —
@@ -640,7 +640,7 @@ export interface AgentWorkspaceCompanionAccessSummary {
   readonly nextStep: string;
 }
 
-/** Honest, no-I/O email-connect status (config validation only) for the inbox connect card/wizard (W4-A5). */
+/** Honest, no-I/O email-connect status (config validation only) for the inbox connect card/wizard. */
 export interface AgentWorkspaceEmailConnectStatus {
   readonly connected: boolean;
   readonly username: string;
@@ -785,7 +785,7 @@ export interface AgentWorkspaceRuntimeSnapshot {
   readonly warnings: readonly string[];
   /**
    * True when the most recent render-path attempt to re-derive the live
-   * counters (memory count, routine counts + start counts — W4-A6) failed
+   * counters (memory count, routine counts + start counts) failed
    * and the previous values below had to be kept. A fresh
    * buildAgentWorkspaceRuntimeSnapshot() call is never stale (it just read
    * everything); this only flips true from
@@ -794,7 +794,7 @@ export interface AgentWorkspaceRuntimeSnapshot {
    * instead of asserting a number the disk might already contradict.
    */
   readonly liveCountersStale: boolean;
-  /** Honest email-connect status for the connect wizard's entry state (W4-A5). Null when unavailable in this runtime. */
+  /** Honest email-connect status for the connect wizard's entry state. Null when unavailable in this runtime. */
   readonly emailConnectStatus: AgentWorkspaceEmailConnectStatus | null;
   readonly calendarOAuthConfigStatus: { readonly google: boolean; readonly microsoft: boolean } | null; // F1c: per-provider client-id-configured state for the advanced cards
 }

package/src/input/agent-workspace.ts

@@ -219,7 +219,7 @@ export class AgentWorkspace {
     this.lastActionResult = { kind: 'refreshed', title: 'Runtime context refreshed', detail: 'Provider, model, session, local memory, runtime endpoint, and Agent knowledge route posture were re-read from the live command context.' };
   }
 
-  /** W4-A6 render-path live counter mirror (see syncAgentWorkspaceLiveCounters). */ syncLiveCountersForRender(): void { syncAgentWorkspaceLiveCounters({ context: this.context, runtimeSnapshot: this.runtimeSnapshot, setRuntimeSnapshot: (snapshot) => { this.runtimeSnapshot = snapshot; }, clampSelection: () => this.clampSelection() }); }
+  /** Render-path live counter mirror (see syncAgentWorkspaceLiveCounters). */ syncLiveCountersForRender(): void { syncAgentWorkspaceLiveCounters({ context: this.context, runtimeSnapshot: this.runtimeSnapshot, setRuntimeSnapshot: (snapshot) => { this.runtimeSnapshot = snapshot; }, clampSelection: () => this.clampSelection() }); }
 
   cancelLocalEditor(): void {
     if (!this.localEditor) return;

package/src/input/commands/calendar-connect-runtime.ts

@@ -1,6 +1,6 @@
 /**
  * calendar-connect-runtime.ts — the /calendar connect|disconnect|accounts subcommands
- * and the provider-event merge for /calendar upcoming (W4-A10).
+ * and the provider-event merge for /calendar upcoming.
  *
  * The OAuth network dance lives here (not in the workspace card) because a command
  * handler can print the authorization URL / device user-code IMMEDIATELY, then await

package/src/input/commands/calendar-subscription-runtime.ts

@@ -11,8 +11,8 @@ import { parseAgentLocalLibraryArgs } from './agent-local-library-args.ts';
 import { requireShellPaths } from './runtime-services.ts';
 
 /**
- * External-calendar SUBSCRIPTION verbs for /calendar — the no-OAuth read path
- * (W4-A9). Subscriptions are iCalendar feeds (Google secret address, Outlook
+ * External-calendar SUBSCRIPTION verbs for /calendar — the no-OAuth read path.
+ * Subscriptions are iCalendar feeds (Google secret address, Outlook
  * published .ics, or any .ics URL). The parse/RRULE/fetch-status engine is the
  * SDK's platform/calendar; this file is the /calendar command surface over the
  * agent-side CalendarSubscriptionRegistry.

package/src/input/commands/operator-actions-runtime.ts

@@ -93,7 +93,7 @@ function automationActionFromParts(scope: string, verb: string): {
   readonly targetField: 'jobId' | 'runId' | 'scheduleId';
 } | null {
   if ((scope === 'job' || scope === 'jobs') && verb === 'run') return { action: 'automation.jobs.run', targetField: 'jobId' };
-  // W6-C3: automation.jobs.pause/resume retired (redundant with
+  // automation.jobs.pause/resume retired (redundant with
   // disable/enable) — the user-facing "pause"/"resume" verb is unchanged,
   // it now maps onto the canonical disable/enable wire actions.
   if ((scope === 'job' || scope === 'jobs') && verb === 'pause') return { action: 'automation.jobs.disable', targetField: 'jobId' };

package/src/input/commands/session-content.ts

@@ -254,7 +254,7 @@ export function registerSessionContentCommands(registry: CommandRegistry): void
     usage: '[resume <id|name>]',
     argsHint: '[resume <id|name>]',
     async handler(_args, ctx) {
-      // Matches the TUI's /sessions (W6-C3, worst-class collision #5): this
+      // Matches the TUI's /sessions (worst-class collision #5): this
       // was `hidden: true` here — invisible in help/autocomplete — even
       // though it is a fully working command identical in behavior to the
       // TUI's visible one. Also forward args to /session (the TUI's fix for

package/src/input/commands/session-workflow.ts

@@ -479,7 +479,7 @@ export async function handleSessionWorkflowCommand(args: string[], ctx: CommandC
   return false;
 }
 
-// NOTE (W6-C3, Wave 6 core-verb pass): this file used to also export
+// NOTE (core-verb pass): this file used to also export
 // registerSessionWorkflowCommands(), a second top-level `/session` (alias
 // `sess`) registration with its own usage text. It was NEVER called from
 // startup — commands.ts only registers `sessionCommand` from ./session.ts —

package/src/input/feed-context-factory.ts

@@ -1,7 +1,7 @@
 /**
  * feed-context-factory.ts — Construction and mutable-field sync for InputFeedContext.
  *
- * Extracted from handler.ts (Wave 4α review, 0.18.23) to keep handler.ts under the
+ * Extracted from handler.ts (0.18.23) to keep handler.ts under the
  * 800-line architecture cap.
  *
  * Two exported functions:
@@ -95,9 +95,9 @@ export interface FeedContextStableRefs {
   selection: SelectionManager;
   pasteRegistry: Map<string, string>;
   imageRegistry: Map<string, { data: string; mediaType: string }>;
-  /** W4-R3 — ported from goodvibes-tui's DEBT-5 item 5; mutated in place, never reallocated. */
+  /** Ported from goodvibes-tui's DEBT-5 item 5; mutated in place, never reallocated. */
   burstGuard: PanelBurstGuardState;
-  /** W4-R3 — OS-level terminal focus tracker, ported from goodvibes-tui's W2.3. */
+  /** OS-level terminal focus tracker, ported from goodvibes-tui's W2.3. */
   focusTracker: FocusTracker;
   projectRoot: string;
   selectionModal: SelectionModal;
@@ -182,7 +182,7 @@ export function buildInitialFeedContext(
     ...mutable,
     // --- requestRender: placeholder, swapped per-feed to buffered version ---
     requestRender: noop,
-    // W4-R3: wiring-layer-only bookkeeping for the paste-flood guard's honest
+    // Wiring-layer-only bookkeeping for the paste-flood guard's honest
     // resolution notice (not part of the ported panel-paste-flood-guard.ts
     // module itself; see handler-feed.ts's feedInputTokens).
     burstSuppressedCount: 0,

package/src/input/handler-feed.ts

@@ -64,13 +64,13 @@ import type { FocusTracker } from '../core/focus-tracker.ts';
  *   - `inputHistory`, `conversationManager` — late-wired service handles; synced at
  *     feed() entry only since no in-feed action rewires them
  *   - `pasteRegistry`, `imageRegistry` — owned Maps, never replaced
- *   - `burstGuard` (W4-R3, ported from goodvibes-tui's DEBT-5 item 5) — the
+ *   - `burstGuard` (ported from goodvibes-tui's DEBT-5 item 5) — the
  *     unbracketed-paste-flood guard's sliding-window state, mutated in place
  *     across tokens by trackPanelPasteFloodGuard (see panel-paste-flood-guard.ts).
  *     Never reallocated. `burstSuppressedCount` is this wiring layer's own
  *     bookkeeping (not part of the ported module) for the honest resolution
  *     notice — see feedInputTokens below.
- *   - `focusTracker` (W4-R3, ported from goodvibes-tui's W2.3) — tracks OS-level
+ *   - `focusTracker` (ported from goodvibes-tui's W2.3) — tracks OS-level
  *     terminal focus from `\x1b[I`/`\x1b[O` tokens (DECSET ?1004h, enabled in
  *     main.ts). Shared instance from RuntimeServices, threaded via
  *     uiServices.platform.focusTracker (mirrors the TUI's own wiring).
@@ -105,11 +105,11 @@ export interface InputFeedContext {
   contentWidth: number;
   readonly pasteRegistry: Map<string, string>;
   readonly imageRegistry: Map<string, { data: string; mediaType: string }>;
-  /** W4-R3 (ported from goodvibes-tui DEBT-5 item 5) — mutated in place, never reallocated. */
+  /** Ported from goodvibes-tui DEBT-5 item 5 — mutated in place, never reallocated. */
   readonly burstGuard: PanelBurstGuardState;
-  /** W4-R3 wiring-layer bookkeeping (not part of the ported module) for the honest suppressed-count notice. */
+  /** Wiring-layer bookkeeping (not part of the ported module) for the honest suppressed-count notice. */
   burstSuppressedCount: number;
-  /** W4-R3 (ported from goodvibes-tui W2.3) — OS-level terminal focus, fed from 'focus' tokens below. */
+  /** Ported from goodvibes-tui W2.3 — OS-level terminal focus, fed from 'focus' tokens below. */
   readonly focusTracker: FocusTracker;
   readonly projectRoot: string;
   readonly selection: SelectionManager;
@@ -176,13 +176,13 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
   const scrollTop = context.getScrollTop();
   const lineCount = history.getLineCount();
   const keybindings = context.keybindingsManager;
-  // W4-R3: one `now` per feed() call (not per token) — a genuine unbracketed-paste
+  // One `now` per feed() call (not per token) — a genuine unbracketed-paste
   // flood delivers many tokens in one drain, and they should all measure as
   // arriving "at once" (mirrors goodvibes-tui's handler-feed.ts DEBT-5 item 5 doc).
   const now = Date.now();
 
   for (const token of tokens) {
-    // W4-R3 (ported from goodvibes-tui W2.3): focus-reporting tokens (CSI ?1004h)
+    // Ported from goodvibes-tui W2.3: focus-reporting tokens (CSI ?1004h)
     // never reach the composer or any modal route — consumed here, first,
     // unconditionally. No render needed.
     if (token.type === 'focus') {
@@ -294,8 +294,8 @@ export function feedInputTokens(context: InputFeedContext, tokens: readonly Inpu
       }
     }
 
-    // W4-R3 (ported from goodvibes-tui's panel-paste-flood-guard.ts, DEBT-5 item
-    // 5): guards command-mode's key-driven dispatch (handleCommandModeToken,
+    // Ported from goodvibes-tui's panel-paste-flood-guard.ts, DEBT-5 item
+    // 5: guards command-mode's key-driven dispatch (handleCommandModeToken,
     // below) from an unbracketed-paste-replay or control-character-injection
     // burst.
     //

package/src/input/handler.ts

@@ -94,7 +94,7 @@ export class InputHandler {
   public pasteRegistry = new Map<string, string>();
   public nextPasteId = 1;
   public lastCtrlCTime = 0;
-  /** W4-R3 (ported from goodvibes-tui DEBT-5 item 5) — unbracketed-paste-flood guard state, mutated in place. */
+  /** Ported from goodvibes-tui DEBT-5 item 5 — unbracketed-paste-flood guard state, mutated in place. */
   public burstGuard: PanelBurstGuardState = { timestamps: [], suspended: false, hintShown: false };
   /** Long-lived feed context — reused across every feed() call to avoid per-keystroke allocation. */
   public feedContext!: import('./handler-feed.ts').InputFeedContext;

package/src/input/panel-paste-flood-guard.ts

@@ -1,13 +1,13 @@
 // ---------------------------------------------------------------------------
 // panel-paste-flood-guard.ts — ported from goodvibes-tui (commit 90eb3a26,
-// DEBT-5 item 5), W4-R3.
+// DEBT-5 item 5).
 //
 // A terminal WITHOUT bracketed paste delivers a pasted block as a burst of
 // discrete 1-char 'text' tokens (isPasteToken stays false for every one of
 // them, since that flag only fires for a single token whose value.length > 1).
 //
-// AGENT ADAPTATION (this repo has no `src/panels/` — see the W4-R1 parity
-// matrix's R3 row): the TUI wires this guard inside handlePanelFocusToken,
+// AGENT ADAPTATION (this repo has no `src/panels/` — see the parity
+// matrix's corresponding row): the TUI wires this guard inside handlePanelFocusToken,
 // where it protects a focused PANEL from having each replayed character
 // dispatched as a real hotkey (K arms kill, etc). This agent has no panel
 // focus concept at all — every token that isn't consumed by a modal route or

package/src/input/settings-modal.ts

@@ -640,7 +640,7 @@ export class SettingsModal {
       if (this.groups.has(cat)) this.groups.get(cat)!.push(entry);
     }
 
-    // W4-R4: inject the synthetic display.themeMode enum (auto|dark|light) —
+    // Inject the synthetic display.themeMode enum (auto|dark|light) —
     // agent-local key stored under the existing `display` section (not in the
     // SDK ConfigKey union; setDynamic/get round-trip it), the TUI's
     // settings-modal-data.ts synthetic-setting pattern. Cycles like any other

package/src/main.ts

@@ -67,7 +67,7 @@ const KEYBOARD_EXT_ENABLE = '\x1b[>4;2m' + '\x1b[?1u', KEYBOARD_EXT_DISABLE = '\
 async function main() {
   const stdout = process.stdout;
   const stdin = process.stdin;
-  installFocusModeExitGuard(stdout); // W4-R3 — see shell/terminal-focus-mode.ts
+  installFocusModeExitGuard(stdout); // see shell/terminal-focus-mode.ts
   const { cli, configManager, bootstrapWorkingDir, bootstrapHomeDirectory } = await prepareShellCliRuntime(process.argv.slice(2), {
     defaultWorkingDirectory: process.env['GOODVIBES_WORKING_DIR'] ?? process.cwd(),
     homeDirectory: process.env['GOODVIBES_AGENT_HOME'] ?? homedir(),
@@ -159,7 +159,7 @@ async function main() {
 
   let streamTokenSpeed = 0;
 
-  const thinkingClock = new ThinkingStallClock(); // W4-R4 thinking-indicator stall clock
+  const thinkingClock = new ThinkingStallClock(); // thinking-indicator stall clock
 
   let scrollTop = 0;
   let scrollLocked = true;
@@ -401,7 +401,7 @@ async function main() {
     sidebarOverride = !(sidebarWidthFor(width) > 0);
     render();
   };
-  const rawRequestPermission: typeof permissionPromptRef.requestPermission = (request) => new Promise((resolve) => { // W4-R3: see shell/terminal-focus-mode.ts
+  const rawRequestPermission: typeof permissionPromptRef.requestPermission = (request) => new Promise((resolve) => { // see shell/terminal-focus-mode.ts
     pendingPermission = { ...request, resolve: (approved: boolean, remember = false) => resolve({ approved, remember }) };
     render();
   });
@@ -692,7 +692,7 @@ async function main() {
   stdin.setEncoding('utf8');
   allowTerminalWrite(() => { markFocusModeEnabled(); return stdout.write((cli.flags.noAltScreen ? '' : ALT_SCREEN_ENTER) + CLEAR_SCREEN + CURSOR_HIDE + MOUSE_ENABLE + KEYBOARD_EXT_ENABLE + PASTE_ENABLE + FOCUS_ENABLE); });
 
-  // W4-R4: forced dark/light before first paint; auto (TTY) probes + repaints once if light.
+  // Forced dark/light before first paint; auto (TTY) probes + repaints once if light.
   const themeProbe = installStartupThemeProbe({
     configManager, stdout, writeAllowed: allowTerminalWrite,
     resetDiff: () => compositor.resetDiff(), render,

package/src/renderer/agent-workspace-context-lines.ts

@@ -28,7 +28,7 @@ function formatMegabytes(bytes: number): string {
   return `${Math.round(bytes / (1024 * 1024))} MB`;
 }
 
-// W4-A6: the memory/routine counts below are re-derived live on every
+// The memory/routine counts below are re-derived live on every
 // repaint (AgentWorkspace.syncLiveCountersForRender). If that live read
 // fails, liveCountersStale flags it so we say so instead of asserting a
 // number the disk might already contradict.

package/src/renderer/startup-theme-probe.ts

@@ -1,5 +1,5 @@
 /**
- * startup-theme-probe.ts (W4-R4) — install the OSC-11 background probe at
+ * startup-theme-probe.ts — install the OSC-11 background probe at
  * startup and wire its resolved mode to the ported theme system.
  *
  * Thin composition seam extracted from main.ts: it binds R2's

package/src/renderer/status-glyphs.ts

@@ -1,8 +1,8 @@
 // ---------------------------------------------------------------------------
 // status-glyphs.ts — canonical glyph map for status states.
 //
-// W4-R4: STATE_GLYPHS is no longer hardcoded here. It is the SDK presentation
-// contract (@pellux/goodvibes-sdk/platform/presentation, landed by W4-S1),
+// STATE_GLYPHS is no longer hardcoded here. It is the SDK presentation
+// contract (@pellux/goodvibes-sdk/platform/presentation),
 // aliased to GLYPHS.status so the four semantic glyphs are spelled out in
 // exactly one place and can never drift from the registry again. Re-exported
 // under the historical names so status-token.ts and polish.ts import unchanged.

package/src/renderer/terminal-bg-probe.ts

@@ -26,7 +26,7 @@
  * is enabled; otherwise the query is swallowed and the timeout fallback (dark)
  * covers it silently.
  *
- * W4-R2 adaptation (agent): the theme-application coupling is INJECTED rather
+ * Adaptation for this agent: the theme-application coupling is INJECTED rather
  * than imported from theme.ts. R2 owns this module; R4 owns the theme system
  * (theme.ts / theme-mode-config.ts) and wires installBackgroundThemeProbe with
  * `applyThemeMode: setActiveThemeMode`. Keeping the coupling injected lets R2

package/src/renderer/terminal-escapes.ts

@@ -5,8 +5,9 @@
  * and the entry file stays within the source-file line-count gate.
  *
  * FOCUS_ENABLE / FOCUS_DISABLE (DECSET ?1004) are the shared home for the OS
- * window-focus reporting mode consumed by the focus-tracker (W4-R3): R3 imports
- * FOCUS_ENABLE from here rather than redefining it.
+ * window-focus reporting mode consumed by the focus-tracker: the focus-mode
+ * module (shell/terminal-focus-mode.ts) imports FOCUS_ENABLE from here rather
+ * than redefining it.
  */
 
 export const ALT_SCREEN_ENTER = '\x1b[?1049h';

package/src/renderer/theme-mode-config.ts

@@ -1,5 +1,5 @@
 /**
- * theme-mode-config — the appearance/theme-mode preference surface (W4-R4).
+ * theme-mode-config — the appearance/theme-mode preference surface.
  *
  * The preference lives at the config key `display.themeMode` (auto | dark |
  * light, default auto). It is stored under the existing SDK `display` section
@@ -8,7 +8,7 @@
  * display.* toggles.
  *
  * DIVERGENCE FROM THE W4 BRIEF (recorded): the brief listed theme-mode-config.ts
- * as the NEW home for the config-read helpers, but W4-R2 landed FIRST and
+ * as the NEW home for the config-read helpers, but the terminal-bg-probe.ts change landed FIRST and
  * inlined resolveConfiguredThemeMode / coerceThemeModeSetting /
  * THEME_MODE_CONFIG_KEY / ThemeModeSetting into terminal-bg-probe.ts (so R2
  * could ship the probe before this file existed). Rather than duplicate those

package/src/renderer/theme.ts

@@ -1,5 +1,5 @@
 /**
- * theme.ts — Semantic colour token layer (W4-R4 port of the TUI theme system).
+ * theme.ts — Semantic colour token layer (port of the TUI theme system).
  *
  * Two token layers, resolved per background mode:
  *
@@ -16,7 +16,7 @@
  *
  * Dark mode values are the historically used colours. Light mode values exist
  * for correctness parity and are consumed once the terminal-bg-probe
- * (terminal-escapes / OSC 11, W4-R2) resolves the mode and setActiveThemeMode
+ * (terminal-escapes / OSC 11) resolves the mode and setActiveThemeMode
  * is called. Callers that do not yet have mode detection get 'dark' — the safe
  * default (activeMode starts dark).
  *
@@ -162,7 +162,7 @@ export const DARK_THEME: Readonly<ThemeTokens> = DARK;
 //
 // The dark table is the SDK's TONE_TOKENS (re-exported here as UI_TONES); the
 // light variant is the SDK's resolveTones('light'). The agent does NOT mint its
-// own light chrome variant — that duplication is exactly what W4-S1 ended.
+// own light chrome variant — that duplication is exactly what the SDK extraction ended.
 // ---------------------------------------------------------------------------
 
 /** The chrome tone-token shape (the SDK ToneTokens contract). */
@@ -189,7 +189,7 @@ export function resolveUiTones(mode: ThemeMode): Readonly<UiToneTokens> {
 //
 // registerThemeRefresh exists for owners that BAKE tone values into
 // module-level constants (which cannot be re-resolved per call). Nothing
-// registers this wave — the agent's opaque panel palettes (polish.ts
+// registers currently — the agent's opaque panel palettes (polish.ts
 // DEFAULT_PANEL_PALETTE and the modal/overlay/fullscreen surfaces built from
 // it) paint OPAQUE dark boxes whose fg/state tokens stay dark in both modes, so
 // they need no rebuild for dark parity (the opaque-surface trio deferral). The

package/src/renderer/thinking.ts

@@ -10,7 +10,7 @@ export function renderThinkingBlock(text: string, width: number): Line[] {
   // light terminal. In dark mode the accent adopts the shared reasoning purple
   // (state.reasoning) and the body adopts chrome.faint (== fg.dim) — a small,
   // deliberate convergence to the reference tokens from the agent's prior local
-  // BORDERS.THINKING.color / COLORS.DIM_TEXT (see the W4-R4 visible-changes note).
+  // BORDERS.THINKING.color / COLORS.DIM_TEXT (see the visible-changes note).
   const t = activeUiTones();
   return renderConversationNotice(
     text,

package/src/renderer/ui-factory.ts

@@ -259,7 +259,7 @@ export class UIFactory {
     if (inp > 0 || out > 0) {
       statusTokens.push({ text: `↑${fmtNum(inp)} ↓${fmtNum(out)}`, fg: '240' });
     }
-    // W4-R4: the disconnected footer 'waiting for your approval' token is retired
+    // The disconnected footer 'waiting for your approval' token is retired
     // here — the approval-wait truth now lives in the unified waiting state of the
     // thinking indicator (createThinkingFragment's approvalPending path) and in the
     // permission prompt itself, so the footer no longer carries a separate,

package/src/renderer/ui-primitives.ts

@@ -1,9 +1,9 @@
 // ---------------------------------------------------------------------------
 // ui-primitives.ts — glyph registry + tone-token table.
 //
-// W4-R4: 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), consumed here
+// (@pellux/goodvibes-sdk/platform/presentation), consumed here
 // so the agent and the TUI share ONE source (Mike's move-to-SDK ruling —
 // machinery needed by 2+ surfaces => SDK). See
 // docs/decisions/2026-07-05-presentation-contract-sdk-extraction.md in the SDK.

package/src/runtime/bootstrap-core.ts

@@ -26,7 +26,10 @@ import {
 } from '@/runtime/index.ts';
 import { loadBootstrapSystemPrompt, syncConfiguredServices } from '@/runtime/index.ts';
 import { registerBootstrapHookBridge } from '@/runtime/index.ts';
-import { createRuntimeServices, type RuntimeServices } from './services.ts';
+import { createRuntimeServices, foldAgentLegacyMemory, type RuntimeServices } from './services.ts';
+import { formatMemoryFoldReport } from '@pellux/goodvibes-sdk/platform/state';
+import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
+import { importVibeFilesIntoMemoryOnce } from '../agent/vibe-file.ts';
 import { createUiRuntimeServices, type UiRuntimeServices } from './ui-services.ts';
 import { installAgentToolPolicyGuard } from '../tools/agent-tool-policy-guard.ts';
 import { registerAgentChannelSendTool } from '../tools/agent-channel-send-tool.ts';
@@ -345,6 +348,34 @@ export async function initializeBootstrapCore(
     memoryStore.close();
   });
 
+  // Fold the agent's legacy per-surface memory into the canonical
+  // cross-surface store (id-keyed, idempotent, never deletes the legacy file) and
+  // SURFACE the fold report — migration honesty requires that what moved is visible,
+  // not silently swallowed. Non-fatal: a fold failure must never block startup.
+  try {
+    const foldReport = await foldAgentLegacyMemory(
+      services.memoryStore,
+      services.memoryEmbeddingRegistry,
+      services.shellPaths,
+    );
+    logger.info('agent legacy memory fold report', { report: formatMemoryFoldReport(foldReport) });
+  } catch (err) {
+    logger.warn('agent legacy memory fold failed (non-fatal)', { error: summarizeError(err) });
+  }
+
+  // ONE-TIME migration of discovered VIBE.md files into persona/constraint
+  // records, guarded by a persisted path→hash marker so it never re-imports the same
+  // file (which would create near-duplicate persona records). After this, the VIBE
+  // prompt is a PROJECTION of those records (buildVibeProjectionPrompt).
+  try {
+    const importedPersona = await importVibeFilesIntoMemoryOnce(services.memoryRegistry, services.shellPaths);
+    if (importedPersona > 0) {
+      logger.info('agent VIBE.md persona migration', { records: importedPersona });
+    }
+  } catch (err) {
+    logger.warn('agent VIBE.md persona migration failed (non-fatal)', { error: summarizeError(err) });
+  }
+
   const renderRequestRef = { value: (): void => {} };
   // R1: Coalescing render scheduler — collapses N same-microtask requestRender() calls into 1.
   // Also enforces a 16ms minimum interval to cap at ~60fps during streaming.

package/src/runtime/bootstrap.ts

@@ -203,10 +203,10 @@ export async function bootstrapRuntime(
     services.shellPaths.resolveUserPath(GOODVIBES_AGENT_SURFACE_ROOT, 'prompt-context-receipts.jsonl'),
   );
   let activePromptTurnId: string | null = null;
-  // The current turn's raw text (Wave-4 W4-A1B): the injection seam
+  // The current turn's raw text: the injection seam
   // (composeRuntimePromptWithReceipt, invoked from getSystemPrompt below) needs the
   // active turn's intent to rank the already-eligible memory set by relevance. This is
-  // the real seam W4-A1 left unthreaded — TURN_SUBMITTED already carries `prompt`, it
+  // the real seam that was left unthreaded — TURN_SUBMITTED already carries `prompt`, it
   // was just never captured. Mirrors activePromptTurnId's lifecycle exactly: set on
   // TURN_SUBMITTED, cleared on every terminal event for that turn.
   let activePromptTurnText: string | null = null;
@@ -551,7 +551,7 @@ export async function bootstrapRuntime(
     shellPaths: services.shellPaths,
     surfaceRoot: GOODVIBES_AGENT_SURFACE_ROOT,
   });
-  // W4-A9: refresh explicitly-subscribed external calendar feeds that are DUE
+  // Refresh explicitly-subscribed external calendar feeds that are DUE
   // per their own bounded interval (conditional 304 requests keep it cheap).
   // Consent was given at subscribe time ("now and on each refresh"); with no
   // subscriptions this touches nothing. Non-blocking — boot never waits on it;

package/src/runtime/calendar-boot-refresh.ts

@@ -1,5 +1,5 @@
 /**
- * Calendar subscription boot refresh (W4-A9 completion).
+ * Calendar subscription boot refresh.
  *
  * Fires once from bootstrap's Phase-8 area (after first render, like the gated
  * LAN scan and MCP discovery), fully async and non-blocking: boot never waits on

package/src/runtime/lan-scan-consent.ts

@@ -1,5 +1,5 @@
 /**
- * LAN-scan consent gate (Wave-4 A7).
+ * LAN-scan consent gate.
  *
  * The SDK's background provider-discovery pass (`startBackgroundProviderDiscovery`
  * in `@pellux/goodvibes-sdk/platform/runtime`) probes every host on this