@wrongstack/cli 0.257.0 → 0.260.0

package/dist/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import * as fsp5 from 'fs/promises';
-import * as path38 from 'path';
+import * as path39 from 'path';
 import { join } from 'path';
-import { color, writeErr, loadPlugins, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, expectDefined, DefaultTaskStore, TaskTracker, renderTaskGraph, withFileLock, DefaultSecretScrubber, resolveProjectDir, GlobalMailbox, TOKENS, ToolRegistry, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, attachDepWatcherBridge, SessionMemoryConsolidator, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, createTieredBrainArbiter, DefaultBrainArbiter, BrainMonitor, mailboxSessionTag, createDelegateTool, FLEET_ROSTER, createMcpControlTool, startTechStackConsumer, startPackageOutdatedWatcher, recordFileAction, createAutonomyBrain, DefaultPluginAPI, SpecVersioning, wstackGlobalRoot, DEFAULT_CONTEXT_WINDOW_MODE_ID, recentTextTurns, enhanceUserPrompt, projectSlug, DefaultSystemPromptBuilder, mutateTasks, loadTasks, resolveContextWindowPolicy, repairToolUseAdjacency, mutatePlan, setPlanItemStatus, getPlanTemplate, loadPlan, emptyPlan, addPlanItem, savePlan, DefaultLogger, DefaultModelsRegistry, isStdinTTY, DefaultPathResolver, EventBus, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, mergeCustomModelDefs, makeAutonomyPromptContributor, createContextManagerTool, makeMailboxTool, makeMailSendTool, makeMailInboxTool, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, DEFAULT_SESSION_PRUNE_DAYS, RecoveryLock, DefaultAttachmentStore, QueueStore, Context, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, createDefaultPipelines, resolveAuditLevel, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, DEFAULT_SUBAGENT_BASELINE, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, writeOut, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, CHIMERA_REVIEW_PROMPT, noOpVault, decryptConfigSecrets, encryptConfigSecrets, atomicWrite, setQueuedMessagesSnapshot, DefaultSessionRewinder, bootConfig as bootConfig$1, setOutputLineGuard, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionStore as DefaultSessionStore$1, ProviderRegistry, StreamHangError, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, getContextWindowMode, AGENT_CATALOG, dispatchAgent, formatTodosList, formatTaskList, formatTaskProgress, formatPlan, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, formatGoal, emptyGoal, buildGoalPreamble, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, matrixKeyKind, phaseForRole, onResize, ERROR_CODES, FsError, ConfigError, InputBuilder, truncate, estimateMessageTokens, AGENTS_BY_PHASE, validateAgainstSchema, resolveMailboxIdentity, isSecretField as isSecretField$1 } from '@wrongstack/core';
+import { color, writeErr, loadPlugins, renderProgress, SpecStore, TaskGraphStore, analyzeCriticalPath, getTemplate, listTemplates, templateToMarkdown, SpecParser, renderSpecAnalysis, AISpecBuilder, expectDefined, DefaultTaskStore, TaskTracker, renderTaskGraph, withFileLock, DefaultSecretScrubber, resolveProjectDir, GlobalMailbox, TOKENS, ToolRegistry, resolveSessionLoggingConfig, createSessionEventBridge, HookRegistry, HookRunner, SlashCommandRegistry, attachDepWatcherBridge, SessionMemoryConsolidator, BrainDecisionQueue, ObservableBrainArbiter, HumanEscalatingBrainArbiter, createTieredBrainArbiter, DefaultBrainArbiter, BrainMonitor, mailboxSessionTag, createDelegateTool, FLEET_ROSTER, createMcpControlTool, startTechStackConsumer, startPackageOutdatedWatcher, recordFileAction, createAutonomyBrain, DefaultPluginAPI, SpecVersioning, wstackGlobalRoot, DEFAULT_CONTEXT_WINDOW_MODE_ID, recentTextTurns, enhanceUserPrompt, projectSlug, DefaultSystemPromptBuilder, mutateTasks, loadTasks, resolveContextWindowPolicy, repairToolUseAdjacency, mutatePlan, setPlanItemStatus, getPlanTemplate, loadPlan, emptyPlan, addPlanItem, savePlan, DefaultLogger, DefaultModelsRegistry, isStdinTTY, DefaultPathResolver, EventBus, runProviderWithRetry, ReplayLogStore, ReplayProviderRunner, mergeCustomModelDefs, makeAutonomyPromptContributor, createContextManagerTool, makeMailboxTool, makeMailSendTool, makeMailInboxTool, InMemoryMetricsSink, wireMetricsToEvents, DefaultHealthRegistry, startMetricsServer, DEFAULT_SESSION_PRUNE_DAYS, RecoveryLock, DefaultAttachmentStore, Context, QueueStore, loadTodosCheckpoint, attachTodosCheckpoint, loadDirectorState, createDefaultPipelines, resolveAuditLevel, AutoCompactionMiddleware, estimateRequestTokensCalibrated, Agent, FleetManager, makeDirectorSessionFactory, Director, makeFleetEmitTool, makeFleetStatusTool, resolveModelMatrix, DEFAULT_SUBAGENT_BASELINE, AutoApprovePermissionPolicy, PhaseStore, AutoPhasePlanner, PhaseGraphBuilder, WorktreeManager, PhaseOrchestrator, makeLLMClassifier, writeOut, ParallelEternalEngine, EternalAutonomyEngine, allServers as allServers$1, CHIMERA_REVIEW_PROMPT, noOpVault, decryptConfigSecrets, encryptConfigSecrets, atomicWrite, setQueuedMessagesSnapshot, DefaultSessionRewinder, bootConfig as bootConfig$1, setOutputLineGuard, setRawMode, DefaultSessionReader, resolveWstackPaths, ToolAuditLog, DefaultSessionStore as DefaultSessionStore$1, ProviderRegistry, StreamHangError, ProviderError, makeAgentSubagentRunner, NULL_FLEET_BUS, buildChildEnv, formatContextWindowModeList, getContextWindowMode, AGENT_CATALOG, dispatchAgent, formatTodosList, formatTaskList, formatTaskProgress, formatPlan, SessionRecovery, loadGoal, goalFilePath, summarizeUsage, saveGoal, formatGoal, emptyGoal, buildGoalPreamble, pendingBtwCount, setBtwNote, MATRIX_PHASE_KEYS, matrixKeyKind, phaseForRole, onResize, ERROR_CODES, FsError, ConfigError, InputBuilder, truncate, estimateMessageTokens, AGENTS_BY_PHASE, validateAgainstSchema, resolveMailboxIdentity, isSecretField as isSecretField$1 } from '@wrongstack/core';
 import { DefaultSecretVault, encryptConfigSecrets as encryptConfigSecrets$1, decryptConfigSecrets as decryptConfigSecrets$1, isSecretField } from '@wrongstack/core/security';
 import * as crypto3 from 'crypto';
-import { createHash, randomUUID } from 'crypto';
+import { createHash, randomBytes, randomUUID } from 'crypto';
 import { createRequire } from 'module';
 import * as os from 'os';
 import os__default from 'os';
@@ -25,6 +25,7 @@ import { parseNextSteps } from '@wrongstack/tui';
 import { ACP_AGENT_COMMANDS, makeACPSubagentRunner, makeACPSubagentRunnerWithStop } from '@wrongstack/acp';
 import { WrongStackACPServer } from '@wrongstack/acp/agent';
 import { ACP_AGENTS, SubagentBudget } from '@wrongstack/core/coordination';
+import { loadBenchConfig, reportHeaderLine, readSummary, renderMarkdownReport, createPolyglotSuite, createSwebenchSuite, runBenchmark, writeJsonArtifacts, collectCellPredictions, writePredictionsJsonl, gradePolyglot, gradeSwebench } from '@wrongstack/bench';
 import { allServers } from '@wrongstack/core/infrastructure';
 import { ToolExecutor } from '@wrongstack/core/execution';
 import { createToolVisionAdapters } from '@wrongstack/runtime/vision';
@@ -70,10 +71,10 @@ async function detectPackageManager2(root, declared) {
     const name = declared.split("@")[0];
     if (name) return name;
   }
-  if (await pathExists(path38.join(root, "pnpm-lock.yaml"))) return "pnpm";
-  if (await pathExists(path38.join(root, "bun.lockb"))) return "bun";
-  if (await pathExists(path38.join(root, "bun.lock"))) return "bun";
-  if (await pathExists(path38.join(root, "yarn.lock"))) return "yarn";
+  if (await pathExists(path39.join(root, "pnpm-lock.yaml"))) return "pnpm";
+  if (await pathExists(path39.join(root, "bun.lockb"))) return "bun";
+  if (await pathExists(path39.join(root, "bun.lock"))) return "bun";
+  if (await pathExists(path39.join(root, "yarn.lock"))) return "yarn";
   return "npm";
 }
 function hasUsableScript(scripts, name) {
@@ -94,7 +95,7 @@ function parseMakeTargets(makefile) {
 async function detectProjectFacts(root) {
   const facts = { hints: [] };
   try {
-    const pkg = JSON.parse(await fsp5.readFile(path38.join(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(await fsp5.readFile(path39.join(root, "package.json"), "utf8"));
     const scripts = pkg.scripts ?? {};
     const pm = await detectPackageManager2(root, pkg.packageManager);
     if (hasUsableScript(scripts, "build")) facts.build = `${pm} run build`;
@@ -108,14 +109,14 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path38.join(root, "pyproject.toml"))) throw new Error("not python");
+    if (!await pathExists(path39.join(root, "pyproject.toml"))) throw new Error("not python");
     facts.test ??= "pytest";
     facts.lint ??= "ruff check .";
     facts.hints.push("pyproject.toml");
   } catch {
   }
   try {
-    if (!await pathExists(path38.join(root, "go.mod"))) throw new Error("not go");
+    if (!await pathExists(path39.join(root, "go.mod"))) throw new Error("not go");
     facts.build ??= "go build ./...";
     facts.test ??= "go test ./...";
     facts.run ??= "go run .";
@@ -123,7 +124,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    if (!await pathExists(path38.join(root, "Cargo.toml"))) throw new Error("not rust");
+    if (!await pathExists(path39.join(root, "Cargo.toml"))) throw new Error("not rust");
     facts.build ??= "cargo build";
     facts.test ??= "cargo test";
     facts.lint ??= "cargo clippy";
@@ -132,7 +133,7 @@ async function detectProjectFacts(root) {
   } catch {
   }
   try {
-    const makefile = await fsp5.readFile(path38.join(root, "Makefile"), "utf8");
+    const makefile = await fsp5.readFile(path39.join(root, "Makefile"), "utf8");
     const targets = parseMakeTargets(makefile);
     facts.build ??= targets.has("build") ? "make build" : "make";
     if (targets.has("test")) facts.test ??= "make test";
@@ -371,26 +372,26 @@ function fmtDuration(ms) {
   const remMin = m - h * 60;
   return `${h}h${remMin}m`;
 }
-function fmtTaskResultLine(r, color71) {
+function fmtTaskResultLine(r, color72) {
   const stats = `${r.iterations}it ${r.toolCalls}tc ${fmtDuration(r.durationMs)}`;
   const errMsg = typeof r.error === "string" ? r.error : r.error?.message;
   const errKind = typeof r.error === "object" ? r.error?.kind : void 0;
   const errTail = errMsg ? ` \u2014 ${errMsg.replace(/\s+/g, " ").slice(0, 80)}${errMsg.length > 80 ? "\u2026" : ""}` : "";
-  const errKindChip = errKind ? color71.dim(` [${errKind}]`) : "";
-  const errSnip = errMsg || errKind ? `${errKindChip}${color71.dim(errTail)}` : "";
+  const errKindChip = errKind ? color72.dim(` [${errKind}]`) : "";
+  const errSnip = errMsg || errKind ? `${errKindChip}${color72.dim(errTail)}` : "";
   switch (r.status) {
     case "success":
-      return { mark: color71.green("\u2713"), stats, tail: "" };
+      return { mark: color72.green("\u2713"), stats, tail: "" };
     case "timeout":
       return {
-        mark: color71.yellow("\u23F1"),
-        stats: `${color71.yellow("timeout")} ${stats}`,
+        mark: color72.yellow("\u23F1"),
+        stats: `${color72.yellow("timeout")} ${stats}`,
         tail: errSnip
       };
     case "stopped":
-      return { mark: color71.dim("\u2298"), stats: `${color71.dim("stopped")} ${stats}`, tail: errSnip };
+      return { mark: color72.dim("\u2298"), stats: `${color72.dim("stopped")} ${stats}`, tail: errSnip };
     case "failed":
-      return { mark: color71.red("\u2717"), stats: `${color71.red("failed")} ${stats}`, tail: errSnip };
+      return { mark: color72.red("\u2717"), stats: `${color72.red("failed")} ${stats}`, tail: errSnip };
   }
 }
 var init_utils = __esm({
@@ -675,7 +676,7 @@ async function findSpec(store, idOrTitle) {
 async function gatherProjectContext2(projectRoot) {
   const parts = [];
   try {
-    const pkgPath = path38.join(projectRoot, "package.json");
+    const pkgPath = path39.join(projectRoot, "package.json");
     const pkgRaw = await fsp5.readFile(pkgPath, "utf8");
     const pkg = JSON.parse(pkgRaw);
     parts.push(`Project: ${String(pkg.name ?? "unknown")}`);
@@ -693,13 +694,13 @@ async function gatherProjectContext2(projectRoot) {
   } catch {
   }
   try {
-    const tsconfigPath = path38.join(projectRoot, "tsconfig.json");
+    const tsconfigPath = path39.join(projectRoot, "tsconfig.json");
     await fsp5.access(tsconfigPath);
     parts.push("Language: TypeScript");
   } catch {
   }
   try {
-    const srcDir = path38.join(projectRoot, "src");
+    const srcDir = path39.join(projectRoot, "src");
     const entries = await fsp5.readdir(srcDir, { withFileTypes: true });
     const dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name);
     if (dirs.length > 0) parts.push(`Source structure: src/${dirs.join(", src/")}`);
@@ -2124,12 +2125,12 @@ __export(project_utils_exports, {
   touchProjectInManifest: () => touchProjectInManifest
 });
 function projectsJsonPath(globalConfigPath) {
-  const base = globalConfigPath ? path38.dirname(globalConfigPath) : wstackGlobalRoot();
-  return path38.join(base, "projects.json");
+  const base = globalConfigPath ? path39.dirname(globalConfigPath) : wstackGlobalRoot();
+  return path39.join(base, "projects.json");
 }
 function projectsDataDir(globalConfigPath) {
-  const base = globalConfigPath ? path38.dirname(globalConfigPath) : wstackGlobalRoot();
-  return path38.join(base, "projects");
+  const base = globalConfigPath ? path39.dirname(globalConfigPath) : wstackGlobalRoot();
+  return path39.join(base, "projects");
 }
 async function loadManifest(globalConfigPath) {
   const file = projectsJsonPath(globalConfigPath);
@@ -2143,12 +2144,12 @@ async function loadManifest(globalConfigPath) {
 }
 async function saveManifest(manifest, globalConfigPath) {
   const file = projectsJsonPath(globalConfigPath);
-  await fsp5.mkdir(path38.dirname(file), { recursive: true });
+  await fsp5.mkdir(path39.dirname(file), { recursive: true });
   await fsp5.writeFile(file, JSON.stringify(manifest, null, 2), "utf8");
 }
 function generateSlug(root) {
-  const base = path38.basename(root).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "project";
-  const hash = createHash("sha256").update(path38.resolve(root)).digest("hex").slice(0, 6);
+  const base = path39.basename(root).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "project";
+  const hash = createHash("sha256").update(path39.resolve(root)).digest("hex").slice(0, 6);
   return `${base}-${hash}`;
 }
 function findProject(manifest, query) {
@@ -2163,29 +2164,29 @@ function findProject(manifest, query) {
   return found;
 }
 async function ensureProjectDataDir(slug, globalConfigPath) {
-  const dir = path38.join(projectsDataDir(globalConfigPath), slug);
+  const dir = path39.join(projectsDataDir(globalConfigPath), slug);
   await fsp5.mkdir(dir, { recursive: true });
   return dir;
 }
 async function touchProjectInManifest(opts) {
-  const root = path38.resolve(opts.projectRoot);
+  const root = path39.resolve(opts.projectRoot);
   const file = projectsJsonPath(opts.globalConfigPath);
   let entry;
   await withFileLock(file, async () => {
     const manifest = await loadManifest(opts.globalConfigPath);
     const now = (/* @__PURE__ */ new Date()).toISOString();
-    entry = manifest.projects.find((p) => path38.resolve(p.root) === root);
+    entry = manifest.projects.find((p) => path39.resolve(p.root) === root);
     if (entry) {
       entry.lastSeen = now;
-      if (opts.workingDir) entry.lastWorkingDir = path38.resolve(opts.workingDir);
+      if (opts.workingDir) entry.lastWorkingDir = path39.resolve(opts.workingDir);
     } else {
       entry = {
-        name: opts.name ?? path38.basename(root),
+        name: opts.name ?? path39.basename(root),
         root,
         slug: generateSlug(root),
         createdAt: now,
         lastSeen: now,
-        lastWorkingDir: opts.workingDir ? path38.resolve(opts.workingDir) : void 0
+        lastWorkingDir: opts.workingDir ? path39.resolve(opts.workingDir) : void 0
       };
       manifest.projects.push(entry);
     }
@@ -2379,7 +2380,7 @@ async function runProjectPicker(opts) {
   const reservedBottom = 3;
   const headerHeight = reservedTop + reservedBottom;
   const baseVisibleHeight = Math.max(5, terminalHeight() - headerHeight);
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     const wasRaw = stdin.isRaw;
     const wasPaused = stdin.isPaused();
     let filter = "";
@@ -2503,7 +2504,7 @@ async function runProjectPicker(opts) {
           cleanup();
           out.write(CURSOR_SHOW);
           out.write("\n");
-          resolve10(void 0);
+          resolve11(void 0);
           return;
         }
         if (ch === ESC) {
@@ -2516,7 +2517,7 @@ async function runProjectPicker(opts) {
           cleanup();
           out.write(CURSOR_SHOW);
           out.write("\n");
-          resolve10(void 0);
+          resolve11(void 0);
           return;
         }
         if (ch === BS || ch === "\b") {
@@ -2533,22 +2534,22 @@ async function runProjectPicker(opts) {
           out.write(CURSOR_SHOW);
           out.write("\n");
           if (!item || item.key === "__divider__") {
-            resolve10(void 0);
+            resolve11(void 0);
             return;
           }
           if (item.key === "quit") {
-            resolve10(void 0);
+            resolve11(void 0);
             return;
           }
           if (item.key === "new-session") {
-            resolve10({ kind: "action", key: "new-session", action: "new-session" });
+            resolve11({ kind: "action", key: "new-session", action: "new-session" });
             return;
           }
           if (item.key === "prev-sessions") {
-            resolve10({ kind: "action", key: "prev-sessions", action: "prev-sessions" });
+            resolve11({ kind: "action", key: "prev-sessions", action: "prev-sessions" });
             return;
           }
-          resolve10({ kind: "project", key: item.key });
+          resolve11({ kind: "project", key: item.key });
           return;
         }
         if (filter.length === 0) {
@@ -2556,7 +2557,7 @@ async function runProjectPicker(opts) {
             cleanup();
             out.write(CURSOR_SHOW);
             out.write("\n");
-            resolve10(void 0);
+            resolve11(void 0);
             return;
           }
           if (ch === "j") {
@@ -2585,7 +2586,7 @@ async function runProjectPicker(opts) {
     try {
       stdin.setRawMode(true);
     } catch {
-      resolve10(void 0);
+      resolve11(void 0);
       return;
     }
     stdin.resume();
@@ -2596,7 +2597,7 @@ async function runProjectPicker(opts) {
     stdin.once("close", () => {
       cleanup();
       out.write(CURSOR_SHOW);
-      resolve10(void 0);
+      resolve11(void 0);
     });
   });
 }
@@ -2631,7 +2632,7 @@ __export(update_check_exports, {
   getUpdateNotification: () => getUpdateNotification
 });
 function cachePath(homeFn = defaultHomeDir2) {
-  return path38.join(homeFn(), ".wrongstack", "update-cache.json");
+  return path39.join(homeFn(), ".wrongstack", "update-cache.json");
 }
 function currentVersion() {
   const req2 = createRequire(import.meta.url);
@@ -2668,7 +2669,7 @@ async function readCache(homeFn = defaultHomeDir2) {
 }
 async function writeCache(entry, homeFn = defaultHomeDir2) {
   try {
-    const dir = path38.dirname(cachePath(homeFn));
+    const dir = path39.dirname(cachePath(homeFn));
     await fsp5.mkdir(dir, { recursive: true });
     await fsp5.writeFile(cachePath(homeFn), JSON.stringify(entry, null, 2), "utf8");
   } catch {
@@ -2754,7 +2755,7 @@ function registerWebuiInstance(p, deps = {}) {
       wsPort: p.wsPort,
       host: p.host,
       projectRoot: p.projectRoot,
-      projectName: path38.basename(p.projectRoot) || p.projectRoot,
+      projectName: path39.basename(p.projectRoot) || p.projectRoot,
       startedAt: p.startedAt,
       url: `http://${p.host}:${p.httpPort}`
     },
@@ -2818,7 +2819,7 @@ var init_lifecycle = __esm({
   }
 });
 function getVault(globalConfigPath) {
-  const keyFile = path38.join(path38.dirname(globalConfigPath ?? ""), ".key");
+  const keyFile = path39.join(path39.dirname(globalConfigPath ?? ""), ".key");
   return new DefaultSecretVault({ keyFile });
 }
 async function loadSavedProviders(globalConfigPath) {
@@ -2852,7 +2853,7 @@ function resolveDistDir() {
   try {
     const requireFromHere = createRequire(import.meta.url);
     const serverEntry = requireFromHere.resolve("@wrongstack/webui/server");
-    return path38.resolve(path38.dirname(serverEntry), "..");
+    return path39.resolve(path39.dirname(serverEntry), "..");
   } catch {
     return null;
   }
@@ -3124,10 +3125,10 @@ function handlePing(ctx, ws) {
   ctx.send(ws, { type: "pong", payload: {} });
 }
 function handleToolConfirmResult(ctx, id, decision) {
-  const resolve10 = ctx.pendingConfirms.get(id);
-  if (resolve10) {
+  const resolve11 = ctx.pendingConfirms.get(id);
+  if (resolve11) {
     ctx.pendingConfirms.delete(id);
-    resolve10(decision);
+    resolve11(decision);
   }
 }
 var init_connection = __esm({
@@ -3543,8 +3544,8 @@ function sendResult6(ctx, ws, success, message) {
   ctx.send(ws, { type: "key.operation_result", payload: { success, message } });
 }
 async function handleProjectsList(ctx, ws) {
-  const projectsBase = ctx.opts.globalConfigPath ? path38.resolve(path38.dirname(ctx.opts.globalConfigPath)) : wstackGlobalRoot();
-  const manifestPath = path38.join(projectsBase, "projects.json");
+  const projectsBase = ctx.opts.globalConfigPath ? path39.resolve(path39.dirname(ctx.opts.globalConfigPath)) : wstackGlobalRoot();
+  const manifestPath = path39.join(projectsBase, "projects.json");
   try {
     const raw = await fsp5.readFile(manifestPath, "utf8");
     const manifest = JSON.parse(raw);
@@ -3557,22 +3558,22 @@ async function handleProjectsSelect(ctx, ws, payload) {
   const { opts } = ctx;
   const { root, name: projectName } = payload;
   try {
-    const resolved = path38.resolve(root);
+    const resolved = path39.resolve(root);
     const stat7 = await fsp5.stat(resolved).catch(() => null);
     if (!stat7?.isDirectory()) {
       ctx.send(ws, {
         type: "projects.selected",
         payload: {
           root,
-          name: projectName ?? path38.basename(root),
+          name: projectName ?? path39.basename(root),
           message: `Cannot switch: not a directory: ${resolved}`
         }
       });
       return;
     }
     const manifest = await loadManifest(opts.globalConfigPath);
-    const entry = manifest.projects.find((p) => path38.resolve(p.root) === resolved);
-    const displayName = projectName?.trim() || entry?.name || path38.basename(resolved);
+    const entry = manifest.projects.find((p) => path39.resolve(p.root) === resolved);
+    const displayName = projectName?.trim() || entry?.name || path39.basename(resolved);
     if (entry) {
       entry.lastSeen = (/* @__PURE__ */ new Date()).toISOString();
     } else {
@@ -3618,8 +3619,8 @@ async function handleProjectsSelect(ctx, ws, payload) {
       });
     } catch {
     }
-    const globalRoot = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : wstackGlobalRoot();
-    const newSessionsDir = path38.join(resolveProjectDir(resolved, globalRoot), "sessions");
+    const globalRoot = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : wstackGlobalRoot();
+    const newSessionsDir = path39.join(resolveProjectDir(resolved, globalRoot), "sessions");
     await fsp5.mkdir(newSessionsDir, { recursive: true });
     const newStore = new DefaultSessionStore({ dir: newSessionsDir });
     opts.sessionStore = newStore;
@@ -3649,11 +3650,11 @@ async function handleProjectsSelect(ctx, ws, payload) {
 async function handleProjectsAdd(ctx, ws, payload) {
   const { root: addRoot, name: addName } = payload;
   try {
-    const resolved = path38.resolve(addRoot);
+    const resolved = path39.resolve(addRoot);
     const stat7 = await fsp5.stat(resolved).catch(() => null);
     if (!stat7?.isDirectory()) throw new Error(`Not a directory: ${resolved}`);
     const manifest = await loadManifest(ctx.opts.globalConfigPath);
-    const existing = manifest.projects.find((p) => path38.resolve(p.root) === resolved);
+    const existing = manifest.projects.find((p) => path39.resolve(p.root) === resolved);
     if (existing) {
       ctx.send(ws, {
         type: "projects.added",
@@ -3666,7 +3667,7 @@ async function handleProjectsAdd(ctx, ws, payload) {
       });
       return;
     }
-    const name = addName?.trim() || path38.basename(resolved);
+    const name = addName?.trim() || path39.basename(resolved);
     const slug = projectSlug(resolved);
     await ensureProjectDataDir(slug, ctx.opts.globalConfigPath);
     const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -3680,7 +3681,7 @@ async function handleProjectsAdd(ctx, ws, payload) {
     ctx.send(ws, {
       type: "projects.added",
       payload: {
-        name: path38.basename(addRoot),
+        name: path39.basename(addRoot),
         root: addRoot,
         slug: "",
         message: err instanceof Error ? err.message : String(err)
@@ -3691,8 +3692,8 @@ async function handleProjectsAdd(ctx, ws, payload) {
 async function handleWorkingDirSet(ctx, ws, newPath) {
   try {
     const wdRoot = ctx.opts.projectRoot ?? ctx.opts.agent.ctx.projectRoot;
-    const resolved = path38.resolve(wdRoot, newPath);
-    if (!resolved.startsWith(wdRoot + path38.sep) && resolved !== wdRoot) {
+    const resolved = path39.resolve(wdRoot, newPath);
+    if (!resolved.startsWith(wdRoot + path39.sep) && resolved !== wdRoot) {
       sendResult6(ctx, ws, false, `Path must stay inside the project root: ${wdRoot}`);
       return;
     }
@@ -3933,13 +3934,13 @@ function sendResult8(ctx, ws, success, message) {
 }
 function storeFor(opts) {
   return opts.sessionStore ?? new DefaultSessionStore({
-    dir: path38.join(opts.projectRoot ?? opts.agent.ctx.projectRoot, ".wrongstack", "sessions")
+    dir: path39.join(opts.projectRoot ?? opts.agent.ctx.projectRoot, ".wrongstack", "sessions")
   });
 }
 async function handleGoalGet(ctx, _ws) {
   const projectRoot = ctx.opts.projectRoot ?? ctx.opts.agent.ctx.projectRoot;
   try {
-    const goalPath = path38.join(projectRoot, ".wrongstack", "goal.json");
+    const goalPath = path39.join(projectRoot, ".wrongstack", "goal.json");
     const raw = await fsp5.readFile(goalPath, "utf8");
     ctx.broadcast({ type: "goal.updated", payload: JSON.parse(raw) });
   } catch {
@@ -4015,7 +4016,7 @@ async function handleSessionNew(ctx, _ws) {
 function rewinderFor(opts) {
   const projectRoot = opts.projectRoot ?? opts.agent.ctx.projectRoot;
   return new DefaultSessionRewinder(
-    opts.sessionsDir ?? path38.join(projectRoot, ".wrongstack", "sessions"),
+    opts.sessionsDir ?? path39.join(projectRoot, ".wrongstack", "sessions"),
     projectRoot
   );
 }
@@ -4349,14 +4350,14 @@ async function runWebUI(opts) {
   let customModeStoreP = null;
   const getCustomModeStore = () => {
     customModeStoreP ??= (async () => {
-      const dir = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : wstackGlobalRoot();
+      const dir = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : wstackGlobalRoot();
       const store = createCustomModeStore(dir);
       await store.load();
       return store;
     })();
     return customModeStoreP;
   };
-  const autoPhaseStoreDir = opts.projectRoot ? path38.join(opts.projectRoot, ".wrongstack", "autophase") : path38.join(os.tmpdir(), ".wrongstack", "autophase");
+  const autoPhaseStoreDir = opts.projectRoot ? path39.join(opts.projectRoot, ".wrongstack", "autophase") : path39.join(os.tmpdir(), ".wrongstack", "autophase");
   const autoPhaseHandler = new AutoPhaseWebSocketHandler(
     opts.agent,
     opts.agent.ctx,
@@ -4447,7 +4448,7 @@ async function runWebUI(opts) {
         return;
       }
       const vault = new DefaultSecretVault({
-        keyFile: path38.join(path38.dirname(configPath2), ".key")
+        keyFile: path39.join(path39.dirname(configPath2), ".key")
       });
       const decrypted = decryptConfigSecrets$1(parsed, vault);
       const autonomyCfg = decrypted.autonomy ?? {};
@@ -4570,7 +4571,7 @@ async function runWebUI(opts) {
       model: opts.agent.ctx.model,
       provider: opts.agent.ctx.provider.id,
       mode: opts.modeId ?? "default",
-      projectName: opts.projectRoot ? path38.basename(opts.projectRoot) : void 0,
+      projectName: opts.projectRoot ? path39.basename(opts.projectRoot) : void 0,
       // Frontend reads `projectRoot` from session.start (ws-handlers setEnv) —
       // omitting it left the store's projectRoot empty after a project switch.
       projectRoot: opts.projectRoot ?? opts.agent.ctx.projectRoot ?? "",
@@ -4596,7 +4597,7 @@ async function runWebUI(opts) {
       const projectDir = resolveProjectDir(opts.projectRoot, wstackGlobalRoot());
       const mailbox = new GlobalMailbox(projectDir, opts.events);
       webuiClientId = `webui@${crypto3.randomUUID().slice(0, 8)}`;
-      const projectName = opts.projectRoot ? path38.basename(opts.projectRoot) : "unknown";
+      const projectName = opts.projectRoot ? path39.basename(opts.projectRoot) : "unknown";
       await mailbox.registerClient({
         clientId: webuiClientId,
         sessionId: opts.projectRoot,
@@ -4627,7 +4628,7 @@ async function runWebUI(opts) {
     host,
     httpPort,
     wsPort,
-    globalRoot: path38.dirname(opts.globalConfigPath ?? "")
+    globalRoot: path39.dirname(opts.globalConfigPath ?? "")
   });
   if (httpServer) {
     announceWebuiReady({
@@ -4642,7 +4643,7 @@ async function runWebUI(opts) {
       `[WebUI] Frontend not served (run \`pnpm --filter @wrongstack/webui build\`). WS bridge still active on ws://${host}:${wsPort}.`
     );
   }
-  const registryBaseDir = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : void 0;
+  const registryBaseDir = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : void 0;
   if (opts.projectRoot) {
     registerWebuiInstance({
       pid: process.pid,
@@ -4999,12 +5000,12 @@ async function runWebUI(opts) {
     broadcast,
     log: (m) => console.log(m)
   };
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     wss.on("listening", () => {
       console.log(`[WebUI] WebSocket server running on ws://${host}:${port}`);
       setupEvents();
       opts.onListening?.({ httpPort, wsPort, host });
-      const globalRoot = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : void 0;
+      const globalRoot = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : void 0;
       if (globalRoot) {
         const statusInterval = setInterval(async () => {
           try {
@@ -5123,8 +5124,8 @@ async function runWebUI(opts) {
         clients.delete(ws);
         abortControllers.delete(ws);
         if (clients.size === 0 && pendingConfirms.size > 0) {
-          for (const [id, resolve11] of pendingConfirms) {
-            resolve11("no");
+          for (const [id, resolve12] of pendingConfirms) {
+            resolve12("no");
             pendingConfirms.delete(id);
           }
         }
@@ -5163,7 +5164,7 @@ async function runWebUI(opts) {
       wss,
       pid: process.pid,
       registryBaseDir,
-      onStopped: resolve10
+      onStopped: resolve11
     });
     registerWebuiSignalHandlers(signalShutdown);
   });
@@ -5553,7 +5554,7 @@ async function runWebUI(opts) {
       // ── Mailbox operations — project-level inter-agent messaging ────
       case "mailbox.messages": {
         const projectRoot = opts.projectRoot ?? opts.agent.ctx.projectRoot ?? "";
-        const globalRoot = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : "";
+        const globalRoot = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : "";
         if (!projectRoot || !globalRoot) {
           send(ws, {
             type: "mailbox.messages",
@@ -5602,7 +5603,7 @@ async function runWebUI(opts) {
       }
       case "mailbox.agents": {
         const projectRoot = opts.projectRoot ?? opts.agent.ctx.projectRoot ?? "";
-        const globalRoot = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : "";
+        const globalRoot = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : "";
         if (!projectRoot || !globalRoot) {
           send(ws, {
             type: "mailbox.agents",
@@ -5645,7 +5646,7 @@ async function runWebUI(opts) {
       }
       case "mailbox.clear": {
         const projectRoot = opts.projectRoot ?? opts.agent.ctx.projectRoot ?? "";
-        const globalRoot = opts.globalConfigPath ? path38.dirname(opts.globalConfigPath) : "";
+        const globalRoot = opts.globalConfigPath ? path39.dirname(opts.globalConfigPath) : "";
         if (!projectRoot || !globalRoot) {
           send(ws, { type: "mailbox.cleared", payload: { error: "No project root available" } });
           break;
@@ -5715,7 +5716,7 @@ var init_webui_server = __esm({
 var WORKTREE_PHASE_CONCURRENCY = 4;
 var MAX_CMD_OUTPUT = 2e5;
 function gitText(args, cwd) {
-  return new Promise((resolve10, reject) => {
+  return new Promise((resolve11, reject) => {
     let child;
     try {
       child = spawn("git", args, {
@@ -5729,15 +5730,14 @@ function gitText(args, cwd) {
       reject(err);
       return;
     }
-    let out = "";
-    child.stdout?.on("data", (c) => {
-      if (out.length < MAX_CMD_OUTPUT) out += c.toString();
-    });
-    child.stderr?.on("data", (c) => {
-      if (out.length < MAX_CMD_OUTPUT) out += c.toString();
-    });
-    child.on("error", () => resolve10({ code: 1, out }));
-    child.on("close", (code) => resolve10({ code: code ?? 1, out: out.trim() }));
+    const chunks = [];
+    const emit = (c) => {
+      if (chunks.join("").length < MAX_CMD_OUTPUT) chunks.push(c.toString());
+    };
+    child.stdout?.on("data", emit);
+    child.stderr?.on("data", emit);
+    child.on("error", () => resolve11({ code: 1, out: chunks.join("") }));
+    child.on("close", (code) => resolve11({ code: code ?? 1, out: chunks.join("").trim() }));
   });
 }
 async function isGitRepo(cwd) {
@@ -5773,8 +5773,8 @@ function runCmd(cmd, args, cwd, shell = false) {
       });
     }
   }
-  return new Promise((resolve10, reject) => {
-    let out = "";
+  return new Promise((resolve11, reject) => {
+    const chunks = [];
     let child;
     try {
       child = spawn(cmd, args, {
@@ -5792,13 +5792,16 @@ function runCmd(cmd, args, cwd, shell = false) {
       return;
     }
     const append = (c) => {
-      out += c.toString();
-      if (out.length > MAX_CMD_OUTPUT) out = out.slice(-MAX_CMD_OUTPUT);
+      chunks.push(c.toString());
     };
     child.stdout?.on("data", append);
     child.stderr?.on("data", append);
-    child.on("error", (e) => resolve10({ code: 1, out: `${out}${String(e)}` }));
-    child.on("close", (code) => resolve10({ code: code ?? 1, out: out.trim() }));
+    child.on("error", (e) => resolve11({ code: 1, out: `${chunks.join("")}${String(e)}` }));
+    child.on("close", (code) => {
+      let out = chunks.join("");
+      if (out.length > MAX_CMD_OUTPUT) out = out.slice(-MAX_CMD_OUTPUT);
+      resolve11({ code: code ?? 1, out: out.trim() });
+    });
   });
 }
 function detectPackageManager(root) {
@@ -6273,7 +6276,7 @@ var ReadlineInputReader = class {
   history = [];
   pending = false;
   constructor(opts = {}) {
-    this.historyFile = opts.historyFile ?? path38.join(wstackGlobalRoot(), "history");
+    this.historyFile = opts.historyFile ?? path39.join(wstackGlobalRoot(), "history");
   }
   async loadHistory() {
     try {
@@ -6285,7 +6288,7 @@ var ReadlineInputReader = class {
   }
   async saveHistory() {
     try {
-      await fsp5.mkdir(path38.dirname(this.historyFile), { recursive: true });
+      await fsp5.mkdir(path39.dirname(this.historyFile), { recursive: true });
       await fsp5.writeFile(this.historyFile, this.history.slice(-1e3).join("\n"));
     } catch {
     }
@@ -6304,31 +6307,31 @@ var ReadlineInputReader = class {
   async readLine(prompt) {
     if (this.history.length === 0) await this.loadHistory();
     while (this.pending) {
-      await new Promise((resolve10) => setTimeout(resolve10, 50));
+      await new Promise((resolve11) => setTimeout(resolve11, 50));
     }
     this.pending = true;
     try {
       if (this.rl) {
         const old = this.rl;
         this.rl = void 0;
-        await new Promise((resolve10) => {
+        await new Promise((resolve11) => {
           if (old.closed) {
-            resolve10();
+            resolve11();
           } else {
-            old.once("close", resolve10);
+            old.once("close", resolve11);
             old.close();
           }
         });
       }
       const fresh = this.ensure();
       this.installPromptGuard(fresh);
-      return new Promise((resolve10) => {
+      return new Promise((resolve11) => {
         let settled = false;
         const settle = (line) => {
           if (settled) return;
           settled = true;
           setOutputLineGuard(null);
-          resolve10(line);
+          resolve11(line);
         };
         fresh.question(prompt ?? "> ", (line) => {
           if (line.trim()) {
@@ -6381,7 +6384,7 @@ var ReadlineInputReader = class {
   async readKey(prompt, options) {
     setOutputLineGuard(null);
     writeOut(prompt);
-    return new Promise((resolve10) => {
+    return new Promise((resolve11) => {
       const stdin = process.stdin;
       const wasRaw = stdin.isRaw;
       const wasPaused = stdin.isPaused();
@@ -6392,7 +6395,7 @@ var ReadlineInputReader = class {
         if (key === "") {
           cleanup();
           writeOut("\n");
-          resolve10("");
+          resolve11("");
           return;
         }
         const opt = options.find(
@@ -6402,12 +6405,12 @@ var ReadlineInputReader = class {
           cleanup();
           writeOut(`${opt.key}
 `);
-          resolve10(opt.value);
+          resolve11(opt.value);
         }
       };
       const onClose = () => {
         cleanup();
-        resolve10("");
+        resolve11("");
       };
       const cleanup = () => {
         stdin.off("data", onData);
@@ -6436,7 +6439,7 @@ var ReadlineInputReader = class {
     this.rl?.close();
     this.rl = void 0;
     writeOut(prompt);
-    return new Promise((resolve10) => {
+    return new Promise((resolve11) => {
       let buf = "";
       const wasRaw = stdin.isRaw;
       setRawMode(stdin, true);
@@ -6454,7 +6457,7 @@ var ReadlineInputReader = class {
             cleanup();
             writeOut(`  ${dim(`[${buf.length} chars]`)}
 `);
-            resolve10(buf);
+            resolve11(buf);
             return;
           }
           if (ch === "") {
@@ -6617,7 +6620,7 @@ function pickGroupIndex(opts) {
         if (Number.isFinite(parsed)) current = wrap(parsed);
       } catch {
       }
-      fs2.mkdirSync(path38.dirname(opts.cursorFile), { recursive: true });
+      fs2.mkdirSync(path39.dirname(opts.cursorFile), { recursive: true });
       fs2.writeFileSync(opts.cursorFile, String(wrap(current + 1)));
       return current;
     } catch {
@@ -6670,11 +6673,11 @@ function assertSafeToDelete(filename, parentDir) {
     throw new FsError({
       message: `Refusing to delete protected file: ${filename}`,
       code: ERROR_CODES.FS_DELETE_FAILED,
-      path: path38.join(parentDir, filename),
+      path: path39.join(parentDir, filename),
       context: { reason: "protected_basename" }
     });
   }
-  if (filename !== path38.basename(filename)) {
+  if (filename !== path39.basename(filename)) {
     throw new FsError({
       message: `Refusing to delete path with traversal: ${filename}`,
       code: ERROR_CODES.FS_DELETE_FAILED,
@@ -6686,11 +6689,11 @@ function assertSafeToDelete(filename, parentDir) {
     throw new FsError({
       message: `Refusing to delete unknown file: ${filename}`,
       code: ERROR_CODES.FS_DELETE_FAILED,
-      path: path38.join(parentDir, filename),
+      path: path39.join(parentDir, filename),
       context: { reason: "unknown_file_pattern" }
     });
   }
-  const resolvedParent = path38.resolve(parentDir);
+  const resolvedParent = path39.resolve(parentDir);
   if (!resolvedParent.endsWith(".wrongstack")) {
     throw new FsError({
       message: `Unexpected parent directory for bak prune: ${resolvedParent}`,
@@ -6701,8 +6704,8 @@ function assertSafeToDelete(filename, parentDir) {
   }
 }
 async function safeDelete(filePath) {
-  const dir = path38.dirname(filePath);
-  const filename = path38.basename(filePath);
+  const dir = path39.dirname(filePath);
+  const filename = path39.basename(filePath);
   try {
     assertSafeToDelete(filename, dir);
     await fsp5.unlink(filePath);
@@ -6747,16 +6750,16 @@ function diffSummary(oldCfg, newCfg) {
 }
 var defaultHomeDir = () => os__default.homedir();
 function historyDir(homeFn = defaultHomeDir) {
-  return path38.join(homeFn(), ".wrongstack", "config.history", "entries");
+  return path39.join(homeFn(), ".wrongstack", "config.history", "entries");
 }
 function historyIndexPath(homeFn = defaultHomeDir) {
-  return path38.join(homeFn(), ".wrongstack", "config.history", "index.json");
+  return path39.join(homeFn(), ".wrongstack", "config.history", "index.json");
 }
 function configPath(homeFn = defaultHomeDir) {
-  return path38.join(homeFn(), ".wrongstack", "config.json");
+  return path39.join(homeFn(), ".wrongstack", "config.json");
 }
 function backupLastPath(homeFn = defaultHomeDir) {
-  return path38.join(homeFn(), ".wrongstack", "config.json.last");
+  return path39.join(homeFn(), ".wrongstack", "config.json.last");
 }
 function entryId(ts) {
   return ts.replace(/[:.]/g, "-").slice(0, 19);
@@ -6814,7 +6817,7 @@ async function backupCurrent(homeFn = defaultHomeDir) {
   }
   if (content !== void 0) {
     try {
-      const bakPath = path38.join(homeFn(), ".wrongstack", `config.json.${ts}.bak`);
+      const bakPath = path39.join(homeFn(), ".wrongstack", `config.json.${ts}.bak`);
       await atomicWrite(bakPath, content);
     } catch (err) {
       writeErr(
@@ -6823,11 +6826,11 @@ async function backupCurrent(homeFn = defaultHomeDir) {
     }
   }
   try {
-    const dir = path38.join(homeFn(), ".wrongstack");
+    const dir = path39.join(homeFn(), ".wrongstack");
     const files = await fsp5.readdir(dir);
     const baks = files.filter((f) => f.startsWith("config.json.") && f.endsWith(".bak")).sort().reverse();
     for (const f of baks.slice(10)) {
-      await safeDelete(path38.join(dir, f));
+      await safeDelete(path39.join(dir, f));
     }
   } catch (err) {
     writeErr(
@@ -6848,7 +6851,7 @@ async function appendHistory(oldCfg, newCfg, description, homeFn = defaultHomeDi
   };
   try {
     await fsp5.writeFile(
-      path38.join(historyDir(homeFn), `${id}.json`),
+      path39.join(historyDir(homeFn), `${id}.json`),
       JSON.stringify(entry, null, 2),
       "utf8"
     );
@@ -6856,7 +6859,7 @@ async function appendHistory(oldCfg, newCfg, description, homeFn = defaultHomeDi
     throw new FsError({
       message: err instanceof Error ? err.message : String(err),
       code: ERROR_CODES.FS_WRITE_FAILED,
-      path: path38.join(historyDir(homeFn), `${id}.json`),
+      path: path39.join(historyDir(homeFn), `${id}.json`),
       cause: err
     });
   }
@@ -6871,7 +6874,7 @@ async function listHistory(homeFn = defaultHomeDir) {
 }
 async function getHistoryEntry(id, homeFn = defaultHomeDir) {
   try {
-    const raw = await fsp5.readFile(path38.join(historyDir(homeFn), `${id}.json`), "utf8");
+    const raw = await fsp5.readFile(path39.join(historyDir(homeFn), `${id}.json`), "utf8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -6988,10 +6991,10 @@ var theme = { primary: color.amber };
 async function saveToGlobalConfig(configPath2, provider, model, homeFn = () => process.env.HOME ?? os__default.homedir()) {
   try {
     const { atomicWrite: atomicWrite17 } = await import('@wrongstack/core');
-    const fs38 = await import('fs/promises');
+    const fs39 = await import('fs/promises');
     let existing = {};
     try {
-      const raw = await fs38.readFile(configPath2, "utf8");
+      const raw = await fs39.readFile(configPath2, "utf8");
       existing = JSON.parse(raw);
     } catch {
     }
@@ -7484,7 +7487,7 @@ function buildAutonomyCommand(opts) {
         const current = opts.onAutonomy();
         const lines = [`Autonomy mode: ${MODE_LABELS[current] ?? current}`];
         try {
-          const goal = await loadGoal(goalFilePath(opts.projectRoot));
+          const goal = await loadGoal(goalFilePath(opts.projectRoot), opts.events);
           if (goal) {
             const u = summarizeUsage(goal);
             lines.push(
@@ -7530,7 +7533,7 @@ function buildAutonomyCommand(opts) {
         opts.onAutonomy("off");
         let summaryLine = "";
         try {
-          const goal = await loadGoal(goalFilePath(opts.projectRoot));
+          const goal = await loadGoal(goalFilePath(opts.projectRoot), opts.events);
           if (goal) {
             const u = summarizeUsage(goal);
             if (u.iterationsWithUsage > 0) {
@@ -7570,7 +7573,7 @@ function buildAutonomyCommand(opts) {
       if (newMode === "eternal" || newMode === "eternal-parallel") {
         const wantKeep = modifiers.includes("--keep") || modifiers.includes("keep");
         const wantNew = modifiers.includes("--new") || modifiers.includes("new");
-        const goal = await loadGoal(goalFilePath(opts.projectRoot));
+        const goal = await loadGoal(goalFilePath(opts.projectRoot), opts.events);
         if (!goal) {
           const msg3 = `${color.red("Eternal/parallel mode requires a goal.")} Run \`/goal set <mission>\` first.`;
           opts.renderer.writeWarning(msg3);
@@ -7673,7 +7676,7 @@ function formatPhaseList(graph) {
 }
 async function gatherProjectContext(projectRoot) {
   try {
-    const raw = await fsp5.readFile(path38.join(projectRoot, "package.json"), "utf8");
+    const raw = await fsp5.readFile(path39.join(projectRoot, "package.json"), "utf8");
     const pkg = JSON.parse(raw);
     const parts = [
       `Project: ${String(pkg.name ?? "unknown")}`,
@@ -8144,7 +8147,9 @@ async function annotationsCommand(opts, sessionId) {
       )
     };
   }
-  const annotations = new AnnotationsStore({ dir: storeDir });
+  const annotationsOpts = { dir: storeDir, events: opts.events };
+  if (opts.context?.traceId !== void 0) annotationsOpts.traceId = opts.context.traceId;
+  const annotations = new AnnotationsStore(annotationsOpts);
   const open = await annotations.listOpen(sessionId);
   if (open.length === 0) {
     return {
@@ -8651,8 +8656,19 @@ function listRoles() {
 }
 var DEFAULT_TIMEOUT_MS = 6e4;
 var MAX_OUTPUT_LINES = 500;
+var WINDOWS_CMD_METACHARACTERS = /[;&|<>^$,(){}[\]!#%'"\\/`]/;
+function validateCommand(cmd) {
+  if (process.platform !== "win32") return;
+  if (WINDOWS_CMD_METACHARACTERS.test(cmd)) {
+    throw new Error(
+      `Command contains disallowed metacharacters for Windows: ${cmd.match(WINDOWS_CMD_METACHARACTERS)?.[0] ?? "?"}
+The following characters are not allowed: ; & | < > ^ $ , ( ) { } [ ] ! # % ' " \\ / \` * ?`
+    );
+  }
+}
 function runCommand(cmd, cwd, timeout) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
+    validateCommand(cmd);
     const opts = {
       cwd,
       timeout,
@@ -8664,7 +8680,7 @@ function runCommand(cmd, cwd, timeout) {
       shell: process.platform === "win32" ? true : false
     };
     execFile(cmd, [], opts, (error, stdout, stderr) => {
-      resolve10({
+      resolve11({
         stdout,
         stderr,
         exitCode: typeof error?.code === "number" ? error.code : 0,
@@ -8733,6 +8749,7 @@ Examples:
   /dev git diff --stat`
         };
       }
+      validateCommand(cmd);
       const cwd = opts.cwd;
       const startedAt = Date.now();
       opts.renderer.write(color.dim(`$ ${cmd}`));
@@ -9085,17 +9102,17 @@ function diagnoseConfig(cfg, plugins = []) {
 function scanPlaintextSecrets(node, prefix, findings) {
   if (!isPlainObject(node)) return;
   for (const [key, value] of Object.entries(node)) {
-    const path39 = prefix ? `${prefix}.${key}` : key;
+    const path40 = prefix ? `${prefix}.${key}` : key;
     if (typeof value === "string") {
       if (value.length > 0 && isSecretField$1(key) && !value.startsWith(ENC_PREFIX)) {
         findings.push({
-          path: path39,
+          path: path40,
           problem: "looks like a plaintext secret (not vault-encrypted) \u2014 it will be encrypted on next boot",
           severity: "warning"
         });
       }
     } else if (isPlainObject(value)) {
-      scanPlaintextSecrets(value, path39, findings);
+      scanPlaintextSecrets(value, path40, findings);
     }
   }
 }
@@ -9116,7 +9133,7 @@ function resolvePersistPath(deps) {
   return deps.globalConfigPath;
 }
 async function ensureProjectDir(filePath) {
-  const dir = path38.dirname(filePath);
+  const dir = path39.dirname(filePath);
   try {
     await fsp5.mkdir(dir, { recursive: true });
   } catch {
@@ -9320,8 +9337,8 @@ function buildDoctorCommand(opts) {
     return `  ${icon} ${color.cyan(f.path)} \u2014 ${f.problem}${fix}`;
   }
   async function findParsableBackup(file) {
-    const dir = path38.dirname(file);
-    const base = path38.basename(file);
+    const dir = path39.dirname(file);
+    const base = path39.basename(file);
     const candidates = [`${base}.last`];
     try {
       const siblings = await fsp5.readdir(dir);
@@ -9332,7 +9349,7 @@ function buildDoctorCommand(opts) {
     }
     for (const name of candidates) {
       try {
-        const raw = await fsp5.readFile(path38.join(dir, name), "utf8");
+        const raw = await fsp5.readFile(path39.join(dir, name), "utf8");
         JSON.parse(raw);
         return { name, raw };
       } catch {
@@ -9449,7 +9466,7 @@ function buildDoctorCommand(opts) {
           await atomicWrite(target.file, JSON.stringify(report.fixed, null, 2));
           if (!target.isProject) {
             try {
-              const homeFn = () => path38.dirname(path38.dirname(target.file));
+              const homeFn = () => path39.dirname(path39.dirname(target.file));
               await appendHistory(parsed, report.fixed, "config doctor auto-fix", homeFn);
             } catch {
             }
@@ -10430,11 +10447,11 @@ function classifyError(input) {
 }
 function extractCode(s) {
   const ts = /\bTS\d+\b|\bCS\d+\b/.exec(s);
-  if (ts) return ts[0];
+  if (ts !== null) return ts[0];
   const rust = /\bE\d{4,}\b/.exec(s);
-  if (rust) return rust[0];
+  if (rust !== null) return rust[0];
   const c = /\bc\d+\b/i.exec(s);
-  if (c) return c[0];
+  if (c !== null) return c[0];
   return void 0;
 }
 function needsSubagent(c) {
@@ -11310,7 +11327,7 @@ function buildGoalCommand(opts) {
         case "":
         case "show":
         case "status": {
-          const current = await loadGoal(goalPath);
+          const current = await loadGoal(goalPath, opts.events);
           if (!current) {
             const msg2 = "No goal set. Use `/goal set <mission text>` to create one.";
             opts.renderer.write(msg2);
@@ -11335,7 +11352,7 @@ function buildGoalCommand(opts) {
           if (!refined) {
             refined = refineGoalHeuristic(setText);
           }
-          const existing = await loadGoal(goalPath);
+          const existing = await loadGoal(goalPath, opts.events);
           const now = (/* @__PURE__ */ new Date()).toISOString();
           const next = existing ? {
             ...existing,
@@ -11352,7 +11369,7 @@ function buildGoalCommand(opts) {
             refinedGoal: refined.refinedGoal,
             deliverables: refined.deliverables
           };
-          await saveGoal(goalPath, next);
+          await saveGoal(goalPath, next, opts.events);
           const lines = [];
           lines.push(`\u{1F3AF} ${color.green("Goal locked:")} ${color.bold(refined.refinedGoal)}`);
           if (refined.refinedGoal !== setText) {
@@ -11379,7 +11396,7 @@ function buildGoalCommand(opts) {
           };
         }
         case "refine": {
-          const current = await loadGoal(goalPath);
+          const current = await loadGoal(goalPath, opts.events);
           if (!current) {
             const msg2 = "No goal set to refine. Use /goal set <text> first.";
             opts.renderer.writeWarning(msg2);
@@ -11398,7 +11415,7 @@ function buildGoalCommand(opts) {
             refinedGoal: refined.refinedGoal,
             deliverables: refined.deliverables
           };
-          await saveGoal(goalPath, updated);
+          await saveGoal(goalPath, updated, opts.events);
           const msg = `${color.green("\u2713")} Goal re-refined with ${refined.deliverables.length} deliverables.`;
           opts.renderer.write(msg);
           return { message: `${msg}
@@ -11407,14 +11424,14 @@ ${formatGoal(updated)}` };
         }
         case "clear":
         case "reset": {
-          const current = await loadGoal(goalPath);
+          const current = await loadGoal(goalPath, opts.events);
           if (!current) {
             const msg2 = "No goal to clear.";
             opts.renderer.write(msg2);
             return { message: msg2 };
           }
           const abandoned = { ...current, goalState: "abandoned" };
-          await saveGoal(goalPath, abandoned);
+          await saveGoal(goalPath, abandoned, opts.events);
           const { unlink: unlink4 } = await import('fs/promises');
           try {
             await unlink4(goalPath);
@@ -11428,7 +11445,7 @@ ${formatGoal(updated)}` };
         }
         case "journal":
         case "log": {
-          const current = await loadGoal(goalPath);
+          const current = await loadGoal(goalPath, opts.events);
           if (!current) {
             const msg2 = "No goal set.";
             opts.renderer.write(msg2);
@@ -11453,7 +11470,7 @@ ${lines.join("\n")}`;
           return { message: msg };
         }
         case "pause": {
-          const current = await loadGoal(goalPath);
+          const current = await loadGoal(goalPath, opts.events);
           if (!current) {
             const msg2 = "No goal set \u2014 nothing to pause.";
             opts.renderer.writeWarning(msg2);
@@ -11465,13 +11482,13 @@ ${lines.join("\n")}`;
             return { message: msg2 };
           }
           const paused = { ...current, goalState: "paused" };
-          await saveGoal(goalPath, paused);
+          await saveGoal(goalPath, paused, opts.events);
           const msg = `${color.cyan("Goal paused.")} Current iteration will finish, then the loop stops. Use /goal resume to continue.`;
           opts.renderer.write(msg);
           return { message: msg };
         }
         case "resume": {
-          const current = await loadGoal(goalPath);
+          const current = await loadGoal(goalPath, opts.events);
           if (!current) {
             const msg2 = "No goal set \u2014 cannot resume.";
             opts.renderer.writeWarning(msg2);
@@ -11483,7 +11500,7 @@ ${lines.join("\n")}`;
             return { message: msg2 };
           }
           const resumed = { ...current, goalState: "active" };
-          await saveGoal(goalPath, resumed);
+          await saveGoal(goalPath, resumed, opts.events);
           const msg = `${color.green("Goal resumed.")} Loop will continue from the next iteration.`;
           opts.renderer.write(msg);
           return { message: msg };
@@ -11570,8 +11587,8 @@ function buildInitCommand(opts) {
     description: "Create or update .wrongstack/AGENTS.md project context for the system prompt.",
     async run(_args, ctx) {
       const root = ctx?.projectRoot ?? opts.projectRoot ?? process.cwd();
-      const dir = path38.join(root, ".wrongstack");
-      const file = path38.join(dir, "AGENTS.md");
+      const dir = path39.join(root, ".wrongstack");
+      const file = path39.join(dir, "AGENTS.md");
       const isFirstInit = !await fileExists(file);
       const detected = await detectProjectFacts(root);
       const body = renderAgentsTemplate(detected);
@@ -11579,7 +11596,7 @@ function buildInitCommand(opts) {
       await fsp5.writeFile(file, body, "utf8");
       let nodePkg = false;
       try {
-        await fsp5.access(path38.join(root, "package.json"));
+        await fsp5.access(path39.join(root, "package.json"));
         nodePkg = true;
       } catch {
       }
@@ -12160,8 +12177,20 @@ async function runAdd(name, enable, configured, configPath2, mcpRegistry, all) {
 }
 async function runRemove(name, configured, configPath2, mcpRegistry) {
   if (!configured[name]) return `Server "${name}" is not in config.`;
-  await mcpRegistry.stop(name).catch(() => {
-  });
+  try {
+    await mcpRegistry.stop(name);
+  } catch (err) {
+    console.error(
+      JSON.stringify({
+        level: "warn",
+        event: "mcp.stop_failed_on_remove",
+        server: name,
+        message: err instanceof Error ? err.message : String(err),
+        note: "config entry removed but server may still be running",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      })
+    );
+  }
   const full = await readConfig(configPath2);
   const mcpServers = {
     ...full.mcpServers ?? {}
@@ -12200,8 +12229,20 @@ async function runEnable(name, configured, configPath2, mcpRegistry) {
 async function runDisable(name, configured, configPath2, mcpRegistry) {
   const cfg = configured[name];
   if (!cfg) return `Server "${name}" is not in config.`;
-  await mcpRegistry.stop(name).catch(() => {
-  });
+  try {
+    await mcpRegistry.stop(name);
+  } catch (err) {
+    console.error(
+      JSON.stringify({
+        level: "warn",
+        event: "mcp.stop_failed_on_disable",
+        server: name,
+        message: err instanceof Error ? err.message : String(err),
+        note: "config marked disabled but server may still be running",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      })
+    );
+  }
   const full = await readConfig(configPath2);
   const mcpServers = {
     ...full.mcpServers ?? {}
@@ -12239,9 +12280,9 @@ function stateBadge(state) {
       return color.dim(state);
   }
 }
-async function readConfig(path39) {
+async function readConfig(path40) {
   try {
-    return JSON.parse(await fsp5.readFile(path39, "utf8"));
+    return JSON.parse(await fsp5.readFile(path40, "utf8"));
   } catch {
     return {};
   }
@@ -12249,11 +12290,11 @@ async function readConfig(path39) {
 function isMcpServerRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
-async function writeConfig(path39, cfg) {
+async function writeConfig(path40, cfg) {
   const raw = JSON.stringify(cfg, null, 2);
-  const tmp = path39 + ".tmp";
+  const tmp = path40 + ".tmp";
   await fsp5.writeFile(tmp, raw, "utf8");
-  await fsp5.rename(tmp, path39);
+  await fsp5.rename(tmp, path40);
 }
 
 // src/slash-commands/mcp.ts
@@ -14552,7 +14593,7 @@ async function listProjectsCommand(opts, ctx) {
   return { message: lines.join("\n") };
 }
 async function addProjectCommand(opts, ctx, targetPath, displayName) {
-  const resolved = path38.resolve(ctx?.projectRoot ?? ctx?.cwd ?? process.cwd(), targetPath);
+  const resolved = path39.resolve(ctx?.projectRoot ?? ctx?.cwd ?? process.cwd(), targetPath);
   try {
     await fsp5.access(resolved);
   } catch {
@@ -14569,7 +14610,7 @@ async function addProjectCommand(opts, ctx, targetPath, displayName) {
       message: color.yellow(`Project already registered: "${existing.name}" (${existing.slug})`)
     };
   }
-  const name = displayName?.trim() || path38.basename(resolved);
+  const name = displayName?.trim() || path39.basename(resolved);
   const slug = generateSlug(resolved);
   const now = (/* @__PURE__ */ new Date()).toISOString();
   await ensureProjectDataDir(slug, opts.paths?.globalConfig);
@@ -14622,7 +14663,7 @@ async function removeProjectCommand(opts, _ctx, slugOrName) {
   };
 }
 async function switchProjectCommand(opts, ctx, target, displayName) {
-  const resolved = path38.resolve(ctx?.projectRoot ?? ctx?.cwd ?? process.cwd(), target);
+  const resolved = path39.resolve(ctx?.projectRoot ?? ctx?.cwd ?? process.cwd(), target);
   try {
     await fsp5.access(resolved);
   } catch {
@@ -14636,8 +14677,8 @@ async function switchProjectCommand(opts, ctx, target, displayName) {
   try {
     const req2 = createRequire(import.meta.url);
     const pkgPath = req2.resolve("@wrongstack/cli/package.json");
-    const pkgDir = path38.dirname(pkgPath);
-    cliPath = path38.join(pkgDir, "dist", "index.js");
+    const pkgDir = path39.dirname(pkgPath);
+    cliPath = path39.join(pkgDir, "dist", "index.js");
     await fsp5.access(cliPath);
   } catch {
     cliPath = process.argv[1] ?? "";
@@ -14654,13 +14695,13 @@ async function switchProjectCommand(opts, ctx, target, displayName) {
   if (existing) {
     existing.lastSeen = (/* @__PURE__ */ new Date()).toISOString();
   } else {
-    const name = displayName?.trim() || path38.basename(resolved);
+    const name = displayName?.trim() || path39.basename(resolved);
     const slug = generateSlug(resolved);
     manifest.projects.push({ name, root: resolved, slug, lastSeen: (/* @__PURE__ */ new Date()).toISOString() });
     await ensureProjectDataDir(slug, opts.paths?.globalConfig);
   }
   await saveManifest(manifest, opts.paths?.globalConfig);
-  const targetName = displayName?.trim() || path38.basename(resolved);
+  const targetName = displayName?.trim() || path39.basename(resolved);
   const canSwitch = await confirmProjectSwitch(opts, targetName);
   if (!canSwitch) return { message: "" };
   const nodeExe = process.execPath;
@@ -14776,8 +14817,8 @@ async function spawnInProject(opts, _ctx, root, projectName) {
   try {
     const req2 = createRequire(import.meta.url);
     const pkgPath = req2.resolve("@wrongstack/cli/package.json");
-    const pkgDir = path38.dirname(pkgPath);
-    cliPath = path38.join(pkgDir, "dist", "index.js");
+    const pkgDir = path39.dirname(pkgPath);
+    cliPath = path39.join(pkgDir, "dist", "index.js");
     await fsp5.access(cliPath);
   } catch {
     cliPath = process.argv[1] ?? "";
@@ -14794,7 +14835,7 @@ async function spawnInProject(opts, _ctx, root, projectName) {
   if (existing) {
     existing.lastSeen = (/* @__PURE__ */ new Date()).toISOString();
   } else {
-    const name = projectName || path38.basename(root);
+    const name = projectName || path39.basename(root);
     const slug = generateSlug(root);
     manifest.projects.push({ name, root, slug, lastSeen: (/* @__PURE__ */ new Date()).toISOString() });
     await ensureProjectDataDir(slug, opts.paths?.globalConfig);
@@ -14826,8 +14867,8 @@ async function handleNewSession(_opts, _ctx) {
   try {
     const req2 = createRequire(import.meta.url);
     const pkgPath = req2.resolve("@wrongstack/cli/package.json");
-    const pkgDir = path38.dirname(pkgPath);
-    cliPath = path38.join(pkgDir, "dist", "index.js");
+    const pkgDir = path39.dirname(pkgPath);
+    cliPath = path39.join(pkgDir, "dist", "index.js");
     await fsp5.access(cliPath);
   } catch {
     cliPath = process.argv[1] ?? "";
@@ -14885,7 +14926,7 @@ async function handlePrevSessions(opts, _ctx) {
   return { message: lines.join("\n") };
 }
 async function runGit(args, cwd) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     const child = spawn("git", args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
@@ -14896,8 +14937,8 @@ async function runGit(args, cwd) {
     child.stdout?.on("data", (d) => {
       stdout += d;
     });
-    child.on("error", () => resolve10({ stdout, code: 1 }));
-    child.on("close", (code) => resolve10({ stdout, code: code ?? 0 }));
+    child.on("error", () => resolve11({ stdout, code: 1 }));
+    child.on("close", (code) => resolve11({ stdout, code: code ?? 0 }));
   });
 }
 async function getChangedFiles(cwd) {
@@ -14938,7 +14979,7 @@ function buildReviewCommand(opts) {
       for (const f of allChanged) {
         if (f.path.startsWith(".wrongstack/")) continue;
         try {
-          await fsp5.access(path38.join(cwd, f.path));
+          await fsp5.access(path39.join(cwd, f.path));
           existing.push(f);
         } catch {
         }
@@ -14949,7 +14990,7 @@ function buildReviewCommand(opts) {
       const filesWithContent = [];
       for (const f of existing.slice(0, 30)) {
         try {
-          const content = await fsp5.readFile(path38.join(cwd, f.path), "utf8");
+          const content = await fsp5.readFile(path39.join(cwd, f.path), "utf8");
           filesWithContent.push({ ...f, content });
         } catch {
         }
@@ -15322,7 +15363,7 @@ var DEFAULTS = {
   working_dir: true
 };
 function resolveConfigPath() {
-  return process.env[CONFIG_ENV] ?? path38.join(process.env.HOME ?? "", ".wrongstack", "statusline.json");
+  return process.env[CONFIG_ENV] ?? path39.join(process.env.HOME ?? "", ".wrongstack", "statusline.json");
 }
 async function loadStatuslineConfig() {
   const p = resolveConfigPath();
@@ -15336,7 +15377,7 @@ async function loadStatuslineConfig() {
 async function saveStatuslineConfig(cfg) {
   const p = resolveConfigPath();
   try {
-    await fsp5.mkdir(path38.dirname(p), { recursive: true });
+    await fsp5.mkdir(path39.dirname(p), { recursive: true });
     await atomicWrite(p, JSON.stringify(cfg, null, 2));
   } catch (err) {
     throw new FsError({
@@ -15748,13 +15789,13 @@ ${formatTaskProgress(file.tasks)}`;
 }
 async function discoverPackageFiles(projectRoot) {
   const files = [];
-  const rootPkg = path38.join(projectRoot, "package.json");
+  const rootPkg = path39.join(projectRoot, "package.json");
   try {
     await fsp5.access(rootPkg);
     files.push(rootPkg);
   } catch {
   }
-  const workspaceFile = path38.join(projectRoot, "pnpm-workspace.yaml");
+  const workspaceFile = path39.join(projectRoot, "pnpm-workspace.yaml");
   try {
     await fsp5.access(workspaceFile);
     const content = await fsp5.readFile(workspaceFile, "utf8");
@@ -15764,12 +15805,12 @@ async function discoverPackageFiles(projectRoot) {
     const globs = rawGlobs.split(/[\s,]+/).filter(Boolean).map((g) => g.replace(/['"]/g, ""));
     for (const g of globs) {
       const dirPrefix = g.replace(/\/?\*$/, "").replace(/\/\*$/, "");
-      const dir = path38.join(projectRoot, dirPrefix);
+      const dir = path39.join(projectRoot, dirPrefix);
       try {
         const entries = await fsp5.readdir(dir, { withFileTypes: true });
         for (const e of entries) {
           if (!e.isDirectory()) continue;
-          const subPkg = path38.join(dir, e.name, "package.json");
+          const subPkg = path39.join(dir, e.name, "package.json");
           try {
             await fsp5.access(subPkg);
             files.push(subPkg);
@@ -15784,7 +15825,7 @@ async function discoverPackageFiles(projectRoot) {
   return files;
 }
 function buildTechStackTask(opts) {
-  const pkgList = opts.packageFiles.map((f) => `  - ${path38.relative(opts.projectRoot, f)}`).join("\n");
+  const pkgList = opts.packageFiles.map((f) => `  - ${path39.relative(opts.projectRoot, f)}`).join("\n");
   const header = opts.isInit ? [
     "## Tech Stack Audit \u2014 First-Time Project Init",
     "",
@@ -16212,7 +16253,7 @@ function buildWorkingDirCommand(_opts) {
       }
       const trimmed = args.trim();
       if (!trimmed) {
-        const rel2 = path38.relative(ctx.projectRoot, ctx.workingDir) || ".";
+        const rel2 = path39.relative(ctx.projectRoot, ctx.workingDir) || ".";
         return {
           message: [
             `Working directory: ${color.bold(ctx.workingDir)}`,
@@ -16221,10 +16262,10 @@ function buildWorkingDirCommand(_opts) {
           ].join("\n")
         };
       }
-      const resolved = path38.isAbsolute(trimmed) ? path38.resolve(trimmed) : path38.resolve(ctx.projectRoot, trimmed);
-      const root = path38.resolve(ctx.projectRoot);
-      const rel = path38.relative(root, resolved);
-      if (rel.startsWith("..") || path38.isAbsolute(rel)) {
+      const resolved = path39.isAbsolute(trimmed) ? path39.resolve(trimmed) : path39.resolve(ctx.projectRoot, trimmed);
+      const root = path39.resolve(ctx.projectRoot);
+      const rel = path39.relative(root, resolved);
+      if (rel.startsWith("..") || path39.isAbsolute(rel)) {
         return {
           message: color.red(
             `Directory "${trimmed}" is outside the project root.
@@ -16249,8 +16290,8 @@ function buildWorkingDirCommand(_opts) {
           message: color.red(err instanceof Error ? err.message : String(err))
         };
       }
-      const prevRel = path38.relative(ctx.projectRoot, previous) || ".";
-      const newRel = path38.relative(ctx.projectRoot, resolved) || ".";
+      const prevRel = path39.relative(ctx.projectRoot, previous) || ".";
+      const newRel = path39.relative(ctx.projectRoot, resolved) || ".";
       return {
         message: [
           color.green(`  \u2713 ${prevRel} \u2192 ${color.bold(newRel)}`),
@@ -16450,13 +16491,13 @@ var MANIFESTS = [
 ];
 async function detectProjectKind(projectRoot) {
   try {
-    await fsp5.access(path38.join(projectRoot, ".wrongstack", "AGENTS.md"));
+    await fsp5.access(path39.join(projectRoot, ".wrongstack", "AGENTS.md"));
     return "initialized";
   } catch {
   }
   for (const m of MANIFESTS) {
     try {
-      await fsp5.access(path38.join(projectRoot, m));
+      await fsp5.access(path39.join(projectRoot, m));
       return "project";
     } catch {
     }
@@ -16464,8 +16505,8 @@ async function detectProjectKind(projectRoot) {
   return "empty";
 }
 async function scaffoldAgentsMd(projectRoot) {
-  const dir = path38.join(projectRoot, ".wrongstack");
-  const file = path38.join(dir, "AGENTS.md");
+  const dir = path39.join(projectRoot, ".wrongstack");
+  const file = path39.join(dir, "AGENTS.md");
   const facts = await detectProjectFacts(projectRoot);
   const body = renderAgentsTemplate(facts);
   await fsp5.mkdir(dir, { recursive: true });
@@ -16478,7 +16519,7 @@ async function runProjectCheck(opts) {
   if (kind === "initialized") {
     renderer.write(
       `
-  ${color.green("\u2713")} Project initialized ${color.dim(`(${path38.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
+  ${color.green("\u2713")} Project initialized ${color.dim(`(${path39.join(projectRoot, ".wrongstack", "AGENTS.md")})`)}
 `
     );
     return true;
@@ -16509,7 +16550,7 @@ async function runProjectCheck(opts) {
     }
     return true;
   }
-  const gitDir = path38.join(projectRoot, ".git");
+  const gitDir = path39.join(projectRoot, ".git");
   let hasGit = false;
   try {
     await fsp5.access(gitDir);
@@ -16532,7 +16573,7 @@ async function runProjectCheck(opts) {
     if (answer2 === "y" || answer2 === "yes") {
       try {
         const { spawn: spawn6 } = await import('child_process');
-        await new Promise((resolve10, reject) => {
+        await new Promise((resolve11, reject) => {
           const child = spawn6("git", ["init"], {
             cwd,
             signal: AbortSignal.timeout(1e4),
@@ -16541,7 +16582,7 @@ async function runProjectCheck(opts) {
           child.on("error", reject);
           child.on(
             "close",
-            (code) => code === 0 ? resolve10() : reject(new Error(`git init failed with ${code}`))
+            (code) => code === 0 ? resolve11() : reject(new Error(`git init failed with ${code}`))
           );
         });
         renderer.write(`  ${color.green("\u2713")} Git repository initialized
@@ -16744,11 +16785,11 @@ async function countProjectFiles(projectRoot, threshold) {
     for (const e of entries) {
       if (SKIP_DIRS.has(e.name)) continue;
       if (count >= threshold) return;
-      const full = path38.join(dir, e.name);
+      const full = path39.join(dir, e.name);
       if (e.isDirectory()) {
         await walk(full);
       } else if (e.isFile()) {
-        if (INDEXABLE_EXTS.has(path38.extname(e.name))) {
+        if (INDEXABLE_EXTS.has(path39.extname(e.name))) {
           count++;
         }
       }
@@ -17089,14 +17130,14 @@ function summarize(value, name) {
   if (typeof v === "object" && v !== null) {
     const o = v;
     if (name === "edit") {
-      const path39 = typeof o["path"] === "string" ? o["path"] : "";
+      const path40 = typeof o["path"] === "string" ? o["path"] : "";
       const reps = typeof o["replacements"] === "number" ? o["replacements"] : 0;
-      return `${path39}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
+      return `${path40}  ${reps} replacement${reps === 1 ? "" : "s"}`.trim();
     }
     if (name === "write") {
-      const path39 = typeof o["path"] === "string" ? o["path"] : "";
+      const path40 = typeof o["path"] === "string" ? o["path"] : "";
       const bytes = typeof o["bytes"] === "number" ? o["bytes"] : void 0;
-      return bytes !== void 0 ? `${path39}  ${bytes}B` : path39;
+      return bytes !== void 0 ? `${path40}  ${bytes}B` : path40;
     }
     if (typeof o["count"] === "number") {
       return `${o["count"]} match${o["count"] === 1 ? "" : "es"}`;
@@ -17313,14 +17354,14 @@ var auditCmd = async (args, deps) => {
   return verify.ok ? 0 : 1;
 };
 async function listAudits(log, dir, deps) {
-  const fs38 = await import('fs/promises');
-  const path39 = await import('path');
+  const fs39 = await import('fs/promises');
+  const path40 = await import('path');
   const out = [];
   let foundRoot = true;
   const scan = async (scanDir, prefix, depth) => {
     let entries;
     try {
-      entries = await fs38.readdir(scanDir, { withFileTypes: true });
+      entries = await fs39.readdir(scanDir, { withFileTypes: true });
     } catch {
       if (depth === 0) foundRoot = false;
       return;
@@ -17328,7 +17369,7 @@ async function listAudits(log, dir, deps) {
     for (const entry of entries) {
       if (entry.name.startsWith(".")) continue;
       if (entry.isDirectory()) {
-        if (depth === 0) await scan(path39.join(scanDir, entry.name), entry.name, depth + 1);
+        if (depth === 0) await scan(path40.join(scanDir, entry.name), entry.name, depth + 1);
         continue;
       }
       if (!entry.isFile() || !entry.name.endsWith(".audit.jsonl")) continue;
@@ -18247,7 +18288,200 @@ try {
 } catch {
 }
 
-// src/subcommands/handlers/diag-doctor.ts
+// src/subcommands/handlers/bench.ts
+var benchCmd = async (args, deps) => {
+  const sub = args[0];
+  const rest = args.slice(1);
+  switch (sub) {
+    case "run":
+      return benchRun(rest, deps);
+    case "report":
+      return benchReport(rest, deps);
+    case "list":
+      return benchList(rest, deps);
+    default:
+      printUsage(deps);
+      return sub === void 0 ? 0 : 1;
+  }
+};
+function printUsage(deps) {
+  deps.renderer.write(
+    [
+      color.bold("wstack bench") + " \u2014 model-independent agentic benchmarks",
+      "",
+      "  run     Run a suite across a model matrix and write a report",
+      "  report  Re-render report.md from a finished run directory",
+      "  list    Show available suites and configured model cells",
+      "",
+      color.dim("Examples:"),
+      color.dim(
+        "  wstack bench run --suite polyglot --polyglot-dir ./polyglot --models bench.config.json --limit 5"
+      ),
+      color.dim("  wstack bench report ./bench-results/2026-06-14T10-00-00"),
+      ""
+    ].join("\n") + "\n"
+  );
+}
+function flagStr(deps, name) {
+  const v = deps.flags?.[name];
+  return typeof v === "string" ? v : void 0;
+}
+function flagBool(deps, name) {
+  const v = deps.flags?.[name];
+  return v === true || v === "true";
+}
+async function resolveWstackEntry() {
+  try {
+    const req2 = createRequire(import.meta.url);
+    const pkgPath = req2.resolve("@wrongstack/cli/package.json");
+    const entry = path39.join(path39.dirname(pkgPath), "dist", "index.js");
+    await fsp5.access(entry);
+    return entry;
+  } catch {
+    return process.argv[1] ?? "";
+  }
+}
+async function benchRun(_args, deps) {
+  const suiteId = flagStr(deps, "suite") ?? "polyglot";
+  const modelsPath = flagStr(deps, "models") ?? "bench.config.json";
+  const limitRaw = flagStr(deps, "limit");
+  const limit = limitRaw ? Math.max(1, Number.parseInt(limitRaw, 10)) : void 0;
+  const outBase = flagStr(deps, "out") ?? "bench-results";
+  let config;
+  try {
+    config = await loadBenchConfig(path39.resolve(deps.cwd, modelsPath));
+  } catch (err) {
+    deps.renderer.writeError(err instanceof Error ? err.message : String(err));
+    return 1;
+  }
+  const concurrencyRaw = flagStr(deps, "concurrency");
+  if (concurrencyRaw) {
+    const c = Number.parseInt(concurrencyRaw, 10);
+    if (c > 0) config.concurrency = c;
+  }
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const outDir = path39.resolve(deps.cwd, outBase, stamp);
+  const predictionsDir = path39.join(outDir, "predictions");
+  let suite;
+  let grade;
+  let isSwebench = false;
+  if (suiteId === "polyglot") {
+    const polyglotDir = flagStr(deps, "polyglot-dir");
+    if (!polyglotDir) {
+      deps.renderer.writeError("--polyglot-dir <path> is required for the polyglot suite.");
+      return 1;
+    }
+    const languagesRaw = flagStr(deps, "languages");
+    const languages = languagesRaw ? languagesRaw.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
+    suite = createPolyglotSuite({ polyglotDir: path39.resolve(deps.cwd, polyglotDir), languages });
+    grade = (a) => gradePolyglot(a);
+  } else if (suiteId === "swebench") {
+    isSwebench = true;
+    const datasetDir = flagStr(deps, "dataset-dir");
+    const docker = flagBool(deps, "docker");
+    suite = createSwebenchSuite({
+      datasetDir: datasetDir ? path39.resolve(deps.cwd, datasetDir) : void 0,
+      docker
+    });
+    grade = (a) => gradeSwebench({ ...a, predictionsDir });
+  } else {
+    deps.renderer.writeError(`unknown suite "${suiteId}" (expected: polyglot | swebench)`);
+    return 1;
+  }
+  const toolNames = deps.toolRegistry?.list().map((t) => t.name) ?? [];
+  const wstackEntry = await resolveWstackEntry();
+  deps.renderer.writeInfo(`Running ${suiteId} across ${config.cells.length} model(s)\u2026`);
+  let report;
+  try {
+    report = await runBenchmark({
+      suite,
+      grade,
+      config,
+      cliVersion: CLI_VERSION,
+      toolNames,
+      nodeBin: process.execPath,
+      wstackEntry,
+      limit,
+      onProgress: (msg) => deps.renderer.write(color.dim(msg) + "\n")
+    });
+  } catch (err) {
+    deps.renderer.writeError(err instanceof Error ? err.message : String(err));
+    return 1;
+  }
+  await writeJsonArtifacts(outDir, report);
+  const md = renderMarkdownReport(report);
+  await fsp5.writeFile(path39.join(outDir, "report.md"), md, "utf8");
+  deps.renderer.write("\n" + md + "\n");
+  if (isSwebench) {
+    for (const cell of config.cells) {
+      const preds = await collectCellPredictions(predictionsDir, cell.label);
+      if (preds.length === 0) continue;
+      const file = await writePredictionsJsonl(outDir, cell.label, preds);
+      deps.renderer.writeInfo(`Predictions for "${cell.label}" \u2192 ${file}`);
+    }
+    deps.renderer.writeInfo(
+      "Grade with the official SWE-bench harness: python -m swebench.harness.run_evaluation --predictions_path <file> --run_id <id>"
+    );
+  }
+  deps.renderer.writeInfo(`Report written to ${path39.join(outDir, "report.md")}`);
+  return 0;
+}
+async function benchReport(args, deps) {
+  const dir = args.find((a) => !a.startsWith("-"));
+  if (!dir) {
+    deps.renderer.writeError("Usage: wstack bench report <run-directory>");
+    return 1;
+  }
+  const outDir = path39.resolve(deps.cwd, dir);
+  let summary;
+  try {
+    summary = await readSummary(outDir);
+  } catch (err) {
+    deps.renderer.writeError(
+      `cannot read summary.json in ${outDir}: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return 1;
+  }
+  const md = renderMarkdownReport(summary);
+  await fsp5.writeFile(path39.join(outDir, "report.md"), md, "utf8");
+  deps.renderer.write("\n" + md + "\n");
+  return 0;
+}
+async function benchList(_args, deps) {
+  deps.renderer.write(color.bold("Suites\n"));
+  deps.renderer.write(
+    "  polyglot  " + color.dim("Aider polyglot (edit accuracy) \u2014 Phase 1, Docker-free\n")
+  );
+  deps.renderer.write(
+    "  swebench  " + color.dim("SWE-bench Verified (end-to-end) \u2014 Phase 2, Docker-gated\n")
+  );
+  const modelsPath = flagStr(deps, "models");
+  if (modelsPath) {
+    try {
+      const config = await loadBenchConfig(path39.resolve(deps.cwd, modelsPath));
+      deps.renderer.write("\n" + color.bold("Model cells\n"));
+      for (const cell of config.cells) {
+        deps.renderer.write(
+          `  ${cell.label.padEnd(16)} ${color.dim(`${cell.provider}/${cell.model}`)}
+`
+        );
+      }
+      const fp = reportHeaderLine({
+        cliVersion: CLI_VERSION,
+        toolNames: deps.toolRegistry?.list().map((t) => t.name) ?? [],
+        maxIterations: config.maxIterations,
+        yolo: true,
+        subsetId: "(computed at run time)",
+        hash: "(computed at run time)"
+      });
+      deps.renderer.write("\n" + color.dim(`Harness: ${fp}`) + "\n");
+    } catch (err) {
+      deps.renderer.writeError(err instanceof Error ? err.message : String(err));
+      return 1;
+    }
+  }
+  return 0;
+}
 var diagCmd = async (_args, deps) => {
   const cfg = deps.config;
   const age = await deps.modelsRegistry.ageSeconds();
@@ -18341,7 +18575,7 @@ var doctorCmd = async (_args, deps) => {
   }
   try {
     await fsp5.mkdir(deps.paths.projectSessions, { recursive: true });
-    const probe = path38.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
+    const probe = path39.join(deps.paths.projectSessions, `.probe-${Date.now()}`);
     await fsp5.writeFile(probe, "");
     await fsp5.unlink(probe);
     checks.push({ name: "sessions writable", status: "ok", detail: deps.paths.projectSessions });
@@ -18444,8 +18678,8 @@ var exportCmd = async (args, deps) => {
     return 1;
   }
   if (output) {
-    await fsp5.mkdir(path38.dirname(path38.resolve(deps.cwd, output)), { recursive: true });
-    await fsp5.writeFile(path38.resolve(deps.cwd, output), rendered, "utf8");
+    await fsp5.mkdir(path39.dirname(path39.resolve(deps.cwd, output)), { recursive: true });
+    await fsp5.writeFile(path39.resolve(deps.cwd, output), rendered, "utf8");
     deps.renderer.write(`Wrote ${rendered.length} bytes to ${output}
 `);
   } else {
@@ -18521,8 +18755,8 @@ var initCmd = async (_args, deps) => {
   const vault = new DefaultSecretVault({ keyFile: deps.paths.secretsKey });
   const encrypted = encryptConfigSecrets$1(config, vault);
   await atomicWrite(deps.paths.globalConfig, JSON.stringify(encrypted, null, 2), { mode: 384 });
-  await fsp5.mkdir(path38.join(deps.projectRoot, ".wrongstack"), { recursive: true });
-  const agentsFile = path38.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
+  await fsp5.mkdir(path39.join(deps.projectRoot, ".wrongstack"), { recursive: true });
+  const agentsFile = path39.join(deps.projectRoot, ".wrongstack", "AGENTS.md");
   const projectFacts = await detectProjectFacts(deps.projectRoot);
   await atomicWrite(agentsFile, renderAgentsTemplate(projectFacts));
   deps.renderer.writeInfo(`Wrote ${deps.paths.globalConfig}`);
@@ -18661,8 +18895,8 @@ async function serveMcpStdio(deps) {
     log(
       `wrongstack MCP server ready at ${handle2.url} \u2014 exposing ${allowed.length} tool(s) (${mode})${token ? " [token auth]" : ""}.`
     );
-    await new Promise((resolve10) => {
-      const stop = () => resolve10();
+    await new Promise((resolve11) => {
+      const stop = () => resolve11();
       process.once("SIGINT", stop);
       process.once("SIGTERM", stop);
     });
@@ -19885,7 +20119,7 @@ var usageCmd = async (_args, deps) => {
   return 0;
 };
 var projectsCmd = async (_args, deps) => {
-  const projectsRoot = path38.join(deps.paths.globalRoot, "projects");
+  const projectsRoot = path39.join(deps.paths.globalRoot, "projects");
   try {
     const entries = await fsp5.readdir(projectsRoot);
     if (entries.length === 0) {
@@ -19895,7 +20129,7 @@ var projectsCmd = async (_args, deps) => {
     for (const hash of entries) {
       try {
         const meta = JSON.parse(
-          await fsp5.readFile(path38.join(projectsRoot, hash, "meta.json"), "utf8")
+          await fsp5.readFile(path39.join(projectsRoot, hash, "meta.json"), "utf8")
         );
         deps.renderer.write(
           `  ${color.dim(hash)}  ${color.dim(meta.lastSeen ?? "")}  ${meta.root ?? "?"}
@@ -20344,7 +20578,7 @@ function findSessionId(args) {
 var rewindCmd = async (args, deps) => {
   const flags = parseRewindFlags(args);
   const wpaths = resolveWstackPaths({ projectRoot: deps.projectRoot });
-  const sessionsDir = path38.join(wpaths.globalRoot, "sessions");
+  const sessionsDir = path39.join(wpaths.globalRoot, "sessions");
   const rewind = new DefaultSessionRewinder(sessionsDir, deps.projectRoot);
   let sessionId = findSessionId(args);
   if (!sessionId) {
@@ -20489,7 +20723,7 @@ async function listFleetRuns(deps) {
   }
   const runs = [];
   for (const id of entries) {
-    const runDir = path38.join(deps.paths.projectSessions, id);
+    const runDir = path39.join(deps.paths.projectSessions, id);
     let stat7;
     try {
       stat7 = await fsp5.stat(runDir);
@@ -20502,17 +20736,17 @@ async function listFleetRuns(deps) {
     let subagentCount = 0;
     let subagentsDir;
     try {
-      await fsp5.access(path38.join(runDir, "fleet.json"));
+      await fsp5.access(path39.join(runDir, "fleet.json"));
       manifest = true;
     } catch {
     }
     try {
-      await fsp5.access(path38.join(runDir, "checkpoint.json"));
+      await fsp5.access(path39.join(runDir, "checkpoint.json"));
       checkpoint = true;
     } catch {
     }
     try {
-      subagentsDir = path38.join(runDir, "subagents");
+      subagentsDir = path39.join(runDir, "subagents");
       const files = await fsp5.readdir(subagentsDir);
       subagentCount = files.filter((f) => f.endsWith(".jsonl")).length;
     } catch {
@@ -20539,7 +20773,7 @@ async function listFleetRuns(deps) {
   return 0;
 }
 async function showFleetRun(runId, deps) {
-  const runDir = path38.join(deps.paths.projectSessions, runId);
+  const runDir = path39.join(deps.paths.projectSessions, runId);
   let stat7;
   try {
     stat7 = await fsp5.stat(runDir);
@@ -20556,7 +20790,7 @@ async function showFleetRun(runId, deps) {
   deps.renderer.write(color.bold(`
 Fleet Run: ${runId}
 `) + "\n");
-  const manifestPath = path38.join(runDir, "fleet.json");
+  const manifestPath = path39.join(runDir, "fleet.json");
   let manifestData = null;
   try {
     manifestData = await fsp5.readFile(manifestPath, "utf8");
@@ -20574,7 +20808,7 @@ Fleet Run: ${runId}
     deps.renderer.write(`  ${color.dim("\u25CB")} fleet.json \u2014 not found
 `);
   }
-  const checkpointPath = path38.join(runDir, "checkpoint.json");
+  const checkpointPath = path39.join(runDir, "checkpoint.json");
   let checkpointData = null;
   try {
     checkpointData = await fsp5.readFile(checkpointPath, "utf8");
@@ -20621,7 +20855,7 @@ Fleet Run: ${runId}
     } catch {
     }
   }
-  const subagentsDir = path38.join(runDir, "subagents");
+  const subagentsDir = path39.join(runDir, "subagents");
   let subagentFiles = [];
   try {
     subagentFiles = await fsp5.readdir(subagentsDir);
@@ -20633,7 +20867,7 @@ Fleet Run: ${runId}
   Subagent transcripts (${subagentFiles.length}):
 `);
     for (const f of subagentFiles.sort()) {
-      const filePath = path38.join(subagentsDir, f);
+      const filePath = path39.join(subagentsDir, f);
       let size;
       try {
         const s = await fsp5.stat(filePath);
@@ -20650,7 +20884,7 @@ Fleet Run: ${runId}
   ${color.dim("\u25CB")} No subagent transcripts
 `);
   }
-  const sharedDir = path38.join(runDir, "shared");
+  const sharedDir = path39.join(runDir, "shared");
   try {
     const files = await fsp5.readdir(sharedDir);
     deps.renderer.write(`
@@ -20834,7 +21068,7 @@ var updateCmd = async (args, deps) => {
   deps.renderer.write(`Updating wrongstack from v${info.current} to v${info.latest}...
 `);
   try {
-    const result = await new Promise((resolve10, reject) => {
+    const result = await new Promise((resolve11, reject) => {
       const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm";
       const child = spawn(npmCommand, ["install", "-g", "wrongstack@latest"], {
         cwd,
@@ -20847,7 +21081,7 @@ var updateCmd = async (args, deps) => {
         _stderr += d;
       });
       child.on("error", reject);
-      child.on("close", (code) => resolve10({ code: code ?? 0 }));
+      child.on("close", (code) => resolve11({ code: code ?? 0 }));
     });
     if (result.code === 0) {
       deps.renderer.write(
@@ -20958,7 +21192,8 @@ var subcommands = {
   help: helpCmd,
   projects: projectsCmd,
   modeldiag: modeldiagCmd,
-  quick: quickCmd
+  quick: quickCmd,
+  bench: benchCmd
 };
 
 // src/boot.ts
@@ -20976,7 +21211,7 @@ function resolveBundledSkillsDir() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path38.join(path38.dirname(corePkg), "skills");
+    return path39.join(path39.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -21197,7 +21432,7 @@ async function boot(argv) {
     const created = await registerProjectAtBoot({ projectRoot, cwd, wpaths });
     if (created && isInteractiveTTY) {
       renderer.write(
-        color.dim(`  \u2713 Registered "${path38.basename(projectRoot)}" in projects.json.
+        color.dim(`  \u2713 Registered "${path39.basename(projectRoot)}" in projects.json.
 `)
       );
     }
@@ -21277,7 +21512,7 @@ async function boot(argv) {
     } catch {
     }
     printLaunchHints(renderer, flags, {
-      cursorFile: path38.join(wpaths.cacheDir, "hint-cursor")
+      cursorFile: path39.join(wpaths.cacheDir, "hint-cursor")
     });
   } else {
     const effectiveChoices = config.launch ? {
@@ -21315,7 +21550,7 @@ async function boot(argv) {
 }
 async function checkGitInCwd(opts) {
   const { cwd, renderer, reader } = opts;
-  const cwdGit = path38.join(cwd, ".git");
+  const cwdGit = path39.join(cwd, ".git");
   let hasCwdGit = false;
   try {
     await fsp5.access(cwdGit);
@@ -21332,7 +21567,7 @@ async function checkGitInCwd(opts) {
     if (answer === "y" || answer === "yes") {
       try {
         const { spawn: spawn6 } = await import('child_process');
-        await new Promise((resolve10, reject) => {
+        await new Promise((resolve11, reject) => {
           const child = spawn6("git", ["init"], {
             cwd,
             signal: AbortSignal.timeout(1e4),
@@ -21341,7 +21576,7 @@ async function checkGitInCwd(opts) {
           child.on("error", reject);
           child.on(
             "close",
-            (code) => code === 0 ? resolve10() : reject(new Error(`git init failed with ${code}`))
+            (code) => code === 0 ? resolve11() : reject(new Error(`git init failed with ${code}`))
           );
         });
         renderer.write(`  ${color.green("\u2713")} Git repository initialized
@@ -21355,10 +21590,10 @@ async function checkGitInCwd(opts) {
       }
     }
   }
-  const parentDir = path38.dirname(cwd);
+  const parentDir = path39.dirname(cwd);
   if (parentDir !== cwd) {
     try {
-      await fsp5.access(path38.join(parentDir, ".git"));
+      await fsp5.access(path39.join(parentDir, ".git"));
       renderer.write(
         `  ${color.dim("\u2139")} A ${color.bold(".git")} repo exists in the parent directory: ${color.dim(parentDir)}
 `
@@ -21370,7 +21605,7 @@ async function checkGitInCwd(opts) {
 async function registerProjectAtBoot(opts) {
   const { projectRoot, cwd, wpaths } = opts;
   const manifest = await loadManifest(wpaths.globalConfig);
-  const existed = manifest.projects.some((p) => path38.resolve(p.root) === path38.resolve(projectRoot));
+  const existed = manifest.projects.some((p) => path39.resolve(p.root) === path39.resolve(projectRoot));
   await touchProjectInManifest({
     projectRoot,
     globalConfigPath: wpaths.globalConfig,
@@ -21571,7 +21806,7 @@ function resolveBundledSkillsDir2() {
   try {
     const req2 = createRequire(import.meta.url);
     const corePkg = req2.resolve("@wrongstack/core/package.json");
-    return path38.join(path38.dirname(corePkg), "skills");
+    return path39.join(path39.dirname(corePkg), "skills");
   } catch {
     return void 0;
   }
@@ -21735,22 +21970,22 @@ function renderFleetLine(states, now, columns, version) {
   const visible = line.replace(/\x1b\[[0-9;]*m/g, "");
   if (visible.length > max) {
     let count = 0;
-    let out = "";
+    const out = [];
     let i = 0;
     while (i < line.length && count < max - 1) {
       if (line[i] === "\x1B") {
         const end = line.indexOf("m", i);
         if (end !== -1) {
-          out += line.slice(i, end + 1);
+          out.push(line.slice(i, end + 1));
           i = end + 1;
           continue;
         }
       }
-      out += line[i];
+      if (line[i] !== void 0) out.push(line[i]);
       count++;
       i++;
     }
-    line = out + "\u2026";
+    line = out.join("") + "\u2026";
   }
   return line;
 }
@@ -22059,7 +22294,7 @@ async function runRepl(opts) {
   clientMailbox.registerClient({
     clientId,
     sessionId: replProjectRoot,
-    name: `REPL [${path38.basename(replProjectRoot)}]`,
+    name: `REPL [${path39.basename(replProjectRoot)}]`,
     source: "repl",
     pid: process.pid
   }).then(() => {
@@ -22127,7 +22362,7 @@ async function runRepl(opts) {
               `[eternal] ${err instanceof Error ? err.message : String(err)}`
             );
           }
-          await new Promise((resolve10) => setTimeout(resolve10, 250));
+          await new Promise((resolve11) => setTimeout(resolve11, 250));
           continue;
         }
       } else if (opts.getAutonomy?.() === "eternal-parallel") {
@@ -22203,7 +22438,7 @@ async function runRepl(opts) {
               `[parallel] ${err instanceof Error ? err.message : String(err)}`
             );
           }
-          await new Promise((resolve10) => setTimeout(resolve10, 250));
+          await new Promise((resolve11) => setTimeout(resolve11, 250));
           continue;
         }
       }
@@ -22770,12 +23005,12 @@ ${color.cyan("\u23F3 Auto")}  ${color.dim("(Ctrl+C to cancel)")}
   let interval;
   let lastTickedSecond = sec + 1;
   let onAbort;
-  return new Promise((resolve10) => {
-    onAbort = () => resolve10(false);
+  return new Promise((resolve11) => {
+    onAbort = () => resolve11(false);
     signal.addEventListener("abort", onAbort, { once: true });
     interval = setInterval(() => {
       if (signal.aborted) {
-        resolve10(false);
+        resolve11(false);
         return;
       }
       const elapsed = Date.now() - start;
@@ -22783,7 +23018,7 @@ ${color.cyan("\u23F3 Auto")}  ${color.dim("(Ctrl+C to cancel)")}
       if (remaining <= 0) {
         opts.renderer.write(color.dim(`  \u21B3 ${truncated}
 `));
-        resolve10(true);
+        resolve11(true);
         return;
       }
       if (opts.onCountdownTick && remaining !== lastTickedSecond) {
@@ -22794,7 +23029,7 @@ ${color.cyan("\u23F3 Auto")}  ${color.dim("(Ctrl+C to cancel)")}
             opts.renderer.write(
               color.yellow("  \u21B3 Countdown cancelled \u2014 switching to manual mode\n")
             );
-            resolve10(false);
+            resolve11(false);
             return;
           }
         } catch {
@@ -22940,6 +23175,23 @@ async function execute(deps) {
     restoredToolCalls,
     needsSetup
   } = deps;
+  const rootTraceId = context.traceId;
+  const storageLog = (event, payload) => {
+    const traceId = payload.traceId ?? rootTraceId;
+    console.warn(JSON.stringify({
+      level: "info",
+      event,
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      traceId,
+      ...payload
+    }));
+  };
+  const onStorageRead = (...args) => storageLog("storage.read", args[0]);
+  const onStorageWrite = (...args) => storageLog("storage.write", args[0]);
+  const onStorageError = (...args) => storageLog("storage.error", args[0]);
+  events.on("storage.read", onStorageRead);
+  events.on("storage.write", onStorageWrite);
+  events.on("storage.error", onStorageError);
   let pendingChimeraWork;
   events.onPattern("chimera.review_needed", (_event, payload) => {
     const p = payload;
@@ -23385,7 +23637,7 @@ async function execute(deps) {
                 const toWrite = targetPath === wpaths.globalConfig ? decrypted : filterSafeForProject(decrypted);
                 const encrypted = encryptConfigSecrets(toWrite, noOpVault);
                 if (targetPath !== wpaths.globalConfig) {
-                  await fsp5.mkdir(path38.dirname(targetPath), { recursive: true });
+                  await fsp5.mkdir(path39.dirname(targetPath), { recursive: true });
                 }
                 await atomicWrite(targetPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
                 configStore.update({
@@ -23462,7 +23714,7 @@ async function execute(deps) {
           agentsMonitorController,
           getLiveSessions: async () => {
             const { SessionRegistry } = await import('@wrongstack/core');
-            const globalRoot = path38.dirname(wpaths.globalConfig);
+            const globalRoot = path39.dirname(wpaths.globalConfig);
             const registry = new SessionRegistry(globalRoot);
             const sessions = await registry.list();
             return sessions.filter((s) => s.status !== "stale").map((s) => ({
@@ -23537,31 +23789,35 @@ async function execute(deps) {
             const metaMode = context.meta?.["mode"];
             return typeof metaMode === "string" ? metaMode : modeId ?? "default";
           },
-          registerDebugStreamCallback: (cb) => {
-            void import('@wrongstack/providers').then(({ setDebugStreamCallback }) => setDebugStreamCallback(cb)).catch(
-              (err) => console.error(
+          registerDebugStreamCallback: async (cb) => {
+            try {
+              const { setDebugStreamCallback } = await import('@wrongstack/providers');
+              setDebugStreamCallback(cb);
+            } catch (err) {
+              console.error(
                 JSON.stringify({
                   level: "error",
                   event: "execution.debug_stream_register_failed",
                   message: err instanceof Error ? err.message : String(err),
                   timestamp: (/* @__PURE__ */ new Date()).toISOString()
                 })
-              )
-            );
+              );
+            }
           },
-          restoreDebugStreamCallback: () => {
-            void import('@wrongstack/providers').then(
-              ({ setDebugStreamCallback, defaultDebugStreamCallback }) => setDebugStreamCallback(defaultDebugStreamCallback)
-            ).catch(
-              (err) => console.error(
+          restoreDebugStreamCallback: async () => {
+            try {
+              const { setDebugStreamCallback, defaultDebugStreamCallback } = await import('@wrongstack/providers');
+              setDebugStreamCallback(defaultDebugStreamCallback);
+            } catch (err) {
+              console.error(
                 JSON.stringify({
                   level: "error",
                   event: "execution.debug_stream_restore_failed",
                   message: err instanceof Error ? err.message : String(err),
                   timestamp: (/* @__PURE__ */ new Date()).toISOString()
                 })
-              )
-            );
+              );
+            }
           },
           restoredMessages,
           restoredToolCalls,
@@ -23587,7 +23843,7 @@ async function execute(deps) {
             if (!sessionStore) return null;
             try {
               const { SessionRegistry } = await import('@wrongstack/core');
-              const registry = new SessionRegistry(path38.dirname(wpaths.globalConfig));
+              const registry = new SessionRegistry(path39.dirname(wpaths.globalConfig));
               const live = (await registry.list()).find(
                 (s) => s.sessionId === sessionId && s.status !== "stale" && s.pid !== process.pid
               );
@@ -23616,12 +23872,14 @@ async function execute(deps) {
               if (oldWriter && oldWriter !== resumed.writer) {
                 const endedUsage = tokenCounter.total();
                 void (async () => {
+                  let appendOk = false;
                   try {
                     await oldWriter.append({
                       type: "session_end",
                       ts: (/* @__PURE__ */ new Date()).toISOString(),
                       usage: endedUsage
                     });
+                    appendOk = true;
                   } catch (err) {
                     console.error(
                       JSON.stringify({
@@ -23632,32 +23890,50 @@ async function execute(deps) {
                       })
                     );
                   }
-                  try {
-                    await oldWriter.close();
-                  } catch (err) {
-                    console.error(
-                      JSON.stringify({
-                        level: "error",
-                        event: "execution.session_close_failed",
-                        message: err instanceof Error ? err.message : String(err),
-                        timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                      })
-                    );
+                  if (appendOk) {
+                    try {
+                      await oldWriter.close();
+                    } catch (err) {
+                      console.error(
+                        JSON.stringify({
+                          level: "error",
+                          event: "execution.session_close_failed",
+                          message: err instanceof Error ? err.message : String(err),
+                          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                        })
+                      );
+                    }
                   }
                 })();
               }
               agent.ctx.session = resumed.writer;
               tokenCounter.reset();
-              void recoveryLock.clear().then(() => recoveryLock.write(resumed.writer.id)).catch(
-                (err) => console.error(
-                  JSON.stringify({
-                    level: "error",
-                    event: "execution.recovery_lock_update_failed",
-                    message: err instanceof Error ? err.message : String(err),
-                    timestamp: (/* @__PURE__ */ new Date()).toISOString()
-                  })
-                )
-              );
+              void (async () => {
+                try {
+                  await recoveryLock.clear();
+                } catch (err) {
+                  console.error(
+                    JSON.stringify({
+                      level: "warn",
+                      event: "execution.recovery_lock_clear_failed",
+                      message: err instanceof Error ? err.message : String(err),
+                      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                    })
+                  );
+                }
+                try {
+                  await recoveryLock.write(resumed.writer.id);
+                } catch (err) {
+                  console.error(
+                    JSON.stringify({
+                      level: "error",
+                      event: "execution.recovery_lock_update_failed",
+                      message: err instanceof Error ? err.message : String(err),
+                      timestamp: (/* @__PURE__ */ new Date()).toISOString()
+                    })
+                  );
+                }
+              })();
               const { replaySessionEvents } = await import('@wrongstack/tui');
               const entries = replaySessionEvents(
                 resumed.data.events,
@@ -23705,7 +23981,7 @@ async function execute(deps) {
               if (slug === "new-session") {
                 pendingProjectSwitch = {
                   root: projectRoot,
-                  name: path38.basename(projectRoot) || projectRoot
+                  name: path39.basename(projectRoot) || projectRoot
                 };
               }
               return;
@@ -23766,13 +24042,13 @@ ${parts.join("\n")}
           const { root, name, resumeSessionId } = pendingProjectSwitch;
           process.stdout.write("\x1B[2J\x1B[H");
           const { spawn: spawn6 } = await import('child_process');
-          const { createRequire: createRequire7 } = await import('module');
+          const { createRequire: createRequire8 } = await import('module');
           let cliPath;
           try {
-            const req2 = createRequire7(import.meta.url);
+            const req2 = createRequire8(import.meta.url);
             const pkgPath = req2.resolve("@wrongstack/cli/package.json");
-            const pkgDir = path38.dirname(pkgPath);
-            cliPath = path38.join(pkgDir, "dist", "index.js");
+            const pkgDir = path39.dirname(pkgPath);
+            cliPath = path39.join(pkgDir, "dist", "index.js");
             await fsp5.access(cliPath);
           } catch {
             cliPath = process.argv[1] ?? "";
@@ -23846,12 +24122,12 @@ ${parts.join("\n")}
         )
       );
       renderer.writeInfo(color.dim("  Press Ctrl+C in this terminal to stop the WebUI server.\n"));
-      const webuiExit = new Promise((resolve10) => {
+      const webuiExit = new Promise((resolve11) => {
         const onSigint = () => {
           renderer.setSilent(false);
           renderer.write("\n");
           renderer.writeInfo(color.yellow("  Shutting down WebUI server\u2026"));
-          resolve10(0);
+          resolve11(0);
         };
         process.on("SIGINT", onSigint);
         process.on("SIGTERM", onSigint);
@@ -23859,13 +24135,13 @@ ${parts.join("\n")}
           renderer.setSilent(false);
           process.off("SIGINT", onSigint);
           process.off("SIGTERM", onSigint);
-          resolve10(0);
+          resolve11(0);
         }).catch((err) => {
           renderer.setSilent(false);
           process.off("SIGINT", onSigint);
           process.off("SIGTERM", onSigint);
           console.debug(`[execution] webui error: ${err}`);
-          resolve10(1);
+          resolve11(1);
         });
       });
       code = await webuiExit;
@@ -23880,7 +24156,7 @@ ${parts.join("\n")}
         supportsVision,
         attachments,
         effectiveMaxContext,
-        projectName: path38.basename(projectRoot) || void 0,
+        projectName: path39.basename(projectRoot) || void 0,
         getAutonomy,
         onAutonomy,
         getNextPredict,
@@ -24003,7 +24279,7 @@ function buildRoutingRunner(config, host) {
 }
 
 // src/fleet/host.ts
-var MultiAgentHost = class {
+var MultiAgentHost = class _MultiAgentHost {
   constructor(deps, opts = {}) {
     this.deps = deps;
     this.opts = opts;
@@ -24032,6 +24308,19 @@ var MultiAgentHost = class {
    * actionable error instead of a generic "Director could not be activated".
    */
   promotionBlockReason = null;
+  /** Guards `buildDirector` from overwriting a runner set by `spawnACP`. */
+  directorRunnerSet = false;
+  /** Event-bus off-handles registered in `buildDirector` — cleaned up in `dispose()`. */
+  directorOffHandles = [];
+  /** Coordinator task.assigned listener — cleaned up in `dispose()`. */
+  coordinatorOffHandle = null;
+  /** ACP runner cache — keyed by role/subagentId, reused across tasks to avoid
+   *  creating a new transport process on every ACP task dispatch. Stores the
+   *  pending promise so concurrent calls for the same subagentId share one spawn.
+   *  Bounded to 20 entries with LRU eviction to prevent unbounded memory growth. */
+  acpRunnerCache = /* @__PURE__ */ new Map();
+  acpRunnerAccessOrder = [];
+  static ACP_CACHE_MAX = 20;
   /**
    * Force the lazy build path to run *now* and return the live Director,
    * or null when director mode is off. Used by the CLI to register the
@@ -24080,7 +24369,8 @@ var MultiAgentHost = class {
     if (this.opts.sessionsRoot && !this.sessionFactory) {
       this.sessionFactory = makeDirectorSessionFactory({
         sessionsRoot: this.opts.sessionsRoot,
-        directorRunId: this.opts.directorRunId
+        directorRunId: this.opts.directorRunId,
+        traceId: this.opts.traceId
       });
     }
     const coordinatorConfig = {
@@ -24088,7 +24378,7 @@ var MultiAgentHost = class {
       doneCondition: { type: "all_tasks_done" },
       maxConcurrent: this.opts.maxConcurrent ?? 4
     };
-    const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path38.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
+    const defaultScratchpad = this.opts.sharedScratchpadPath || (this.opts.sessionsRoot && this.opts.directorRunId ? path39.join(this.opts.sessionsRoot, this.opts.directorRunId, "shared") : void 0);
     this.director = new Director({
       config: coordinatorConfig,
       manifestPath: this.opts.manifestPath,
@@ -24113,60 +24403,71 @@ var MultiAgentHost = class {
       this.fleetManager?.removePendingTask(task.id);
       this.emitLifecycleCompleted(task.id, result);
     });
-    this.director.fleet.filter("budget.threshold_reached", (e) => {
-      const payload = e.payload;
-      this.deps.events.emit("subagent.budget_warning", {
-        subagentId: e.subagentId,
-        kind: payload.kind,
-        used: payload.used,
-        limit: payload.limit
-      });
-    });
-    this.director.fleet.filter("budget.extended", (e) => {
-      const payload = e.payload;
-      this.deps.events.emit("subagent.budget_extended", {
-        subagentId: e.subagentId,
-        kind: payload.kind,
-        newLimit: payload.newLimit,
-        totalExtensions: payload.totalExtensions
-      });
-    });
-    this.director.fleet.filter("ctx.pct", (e) => {
-      const payload = e.payload;
-      this.deps.events.emit("subagent.ctx_pct", {
-        subagentId: e.subagentId,
-        load: payload.load,
-        tokens: payload.tokens,
-        maxContext: payload.maxContext
-      });
-    });
-    this.director.fleet.filter("subagent.spawned", (e) => {
-      const payload = e.payload;
-      this.deps.events.emit("subagent.spawned", {
-        subagentId: payload.subagentId,
-        taskId: payload.taskId,
-        name: payload.name,
-        provider: payload.provider,
-        model: payload.model
-      });
-    });
-    this.getCoordinator().on(
-      "task.assigned",
-      ({
-        task,
-        subagentId
-      }) => {
-        this.deps.events.emit("subagent.task_started", {
-          subagentId,
-          taskId: task.id,
-          description: task.description
+    this.directorOffHandles.push(
+      this.director.fleet.filter("budget.threshold_reached", (e) => {
+        const payload = e.payload;
+        this.deps.events.emit("subagent.budget_warning", {
+          subagentId: e.subagentId,
+          kind: payload.kind,
+          used: payload.used,
+          limit: payload.limit
         });
-      }
+      })
+    );
+    this.directorOffHandles.push(
+      this.director.fleet.filter("budget.extended", (e) => {
+        const payload = e.payload;
+        this.deps.events.emit("subagent.budget_extended", {
+          subagentId: e.subagentId,
+          kind: payload.kind,
+          newLimit: payload.newLimit,
+          totalExtensions: payload.totalExtensions
+        });
+      })
+    );
+    this.directorOffHandles.push(
+      this.director.fleet.filter("ctx.pct", (e) => {
+        const payload = e.payload;
+        this.deps.events.emit("subagent.ctx_pct", {
+          subagentId: e.subagentId,
+          load: payload.load,
+          tokens: payload.tokens,
+          maxContext: payload.maxContext
+        });
+      })
+    );
+    this.directorOffHandles.push(
+      this.director.fleet.filter("subagent.spawned", (e) => {
+        const payload = e.payload;
+        this.deps.events.emit("subagent.spawned", {
+          subagentId: payload.subagentId,
+          taskId: payload.taskId,
+          name: payload.name,
+          provider: payload.provider,
+          model: payload.model
+        });
+      })
     );
+    const coordinatorTaskAssignedHandler = ({
+      task,
+      subagentId
+    }) => {
+      this.deps.events.emit("subagent.task_started", {
+        subagentId,
+        taskId: task.id,
+        description: task.description
+      });
+    };
+    const coordinator = this.getCoordinator();
+    coordinator.on("task.assigned", coordinatorTaskAssignedHandler);
+    this.coordinatorOffHandle = () => coordinator.off("task.assigned", coordinatorTaskAssignedHandler);
     this.fleetEmitTool = makeFleetEmitTool(this.director);
     this.fleetStatusTool = makeFleetStatusTool(this.director);
     const runner = await this.buildSubagentRunner(config);
-    this.getCoordinator().setRunner(runner);
+    if (!this.directorRunnerSet) {
+      this.getCoordinator().setRunner(runner);
+      this.directorRunnerSet = true;
+    }
   }
   /**
    * Returns the FleetEmitTool for director-mode subagents, if the director
@@ -24368,9 +24669,23 @@ var MultiAgentHost = class {
     return buildRoutingRunner(config, this);
   }
   async buildACPRunner(subagentId) {
+    const cached = this.acpRunnerCache.get(subagentId);
+    if (cached) {
+      const idx = this.acpRunnerAccessOrder.indexOf(subagentId);
+      if (idx !== -1) this.acpRunnerAccessOrder.splice(idx, 1);
+      this.acpRunnerAccessOrder.push(subagentId);
+      return cached;
+    }
     const cmd = ACP_AGENT_COMMANDS[subagentId];
     if (!cmd) throw new Error(`Unknown ACP agent: ${subagentId}`);
-    return makeACPSubagentRunner(cmd);
+    while (this.acpRunnerAccessOrder.length >= _MultiAgentHost.ACP_CACHE_MAX) {
+      const oldest = this.acpRunnerAccessOrder.shift();
+      if (oldest) this.acpRunnerCache.delete(oldest);
+    }
+    const p = makeACPSubagentRunner(cmd);
+    this.acpRunnerCache.set(subagentId, p);
+    this.acpRunnerAccessOrder.push(subagentId);
+    return p;
   }
   /**
    * Build a Provider for a subagent. When `overrideId` is supplied (from
@@ -24413,6 +24728,7 @@ var MultiAgentHost = class {
     const coordinator = this.getCoordinator();
     const acpRunner = await this.buildACPRunner(subagentId);
     coordinator.setRunner(acpRunner);
+    this.directorRunnerSet = true;
     await coordinator.spawn({
       id: subagentId,
       name: subagentId,
@@ -24482,8 +24798,9 @@ var MultiAgentHost = class {
    */
   async spawnAndWait(description, opts) {
     const { taskId } = await this.spawn(description, opts);
-    if (!this.director) throw new Error("Director is not initialized");
-    const results = await this.director.awaitTasks([taskId]);
+    const director = this.director;
+    if (!director) throw new Error("Director is not initialized");
+    const results = await director.awaitTasks([taskId]);
     const result = results[0];
     if (!result) throw new Error(`Task ${taskId} completed but no result returned`);
     return result;
@@ -24618,16 +24935,16 @@ var MultiAgentHost = class {
     if (this.director) return this.director;
     this.opts.directorMode = true;
     if (this.opts.fleetRoot && !this.opts.manifestPath) {
-      this.opts.manifestPath = path38.join(this.opts.fleetRoot, "fleet.json");
+      this.opts.manifestPath = path39.join(this.opts.fleetRoot, "fleet.json");
     }
     if (this.opts.fleetRoot && !this.opts.sharedScratchpadPath) {
-      this.opts.sharedScratchpadPath = path38.join(this.opts.fleetRoot, "shared");
+      this.opts.sharedScratchpadPath = path39.join(this.opts.fleetRoot, "shared");
     }
     if (this.opts.fleetRoot && !this.opts.sessionsRoot) {
-      this.opts.sessionsRoot = path38.join(this.opts.fleetRoot, "subagents");
+      this.opts.sessionsRoot = path39.join(this.opts.fleetRoot, "subagents");
     }
     if (this.opts.fleetRoot && !this.opts.stateCheckpointPath) {
-      this.opts.stateCheckpointPath = path38.join(this.opts.fleetRoot, "director-state.json");
+      this.opts.stateCheckpointPath = path39.join(this.opts.fleetRoot, "director-state.json");
     }
     await this.ensureDirector();
     return this.director ?? null;
@@ -24697,6 +25014,24 @@ var MultiAgentHost = class {
       this.getCoordinator().setMaxConcurrent(v);
     }
   }
+  /**
+   * Clean up all listeners and resources held by the host.
+   * Unregisters all EventBus/FleetBus listeners registered in `buildDirector`
+   * and stops the Director and its coordinator.
+   *
+   * Safe to call multiple times — subsequent calls are no-ops.
+   */
+  async dispose() {
+    for (const off of this.directorOffHandles) {
+      off();
+    }
+    this.directorOffHandles.length = 0;
+    this.coordinatorOffHandle?.();
+    this.coordinatorOffHandle = null;
+    if (this.director) {
+      await this.director.shutdown();
+    }
+  }
 };
 
 // src/session-stats.ts
@@ -24738,11 +25073,11 @@ var SessionStats = class {
       if (tool.name === "bash") this.bashCommands++;
       else if (tool.name === "fetch") this.fetches++;
       if (!tool.ok) return;
-      const path39 = typeof input?.path === "string" ? input.path : void 0;
-      if (tool.name === "read" && path39) this.readPaths.add(path39);
-      else if (tool.name === "edit" && path39) this.editedPaths.add(path39);
-      else if (tool.name === "write" && path39) {
-        this.writtenPaths.add(path39);
+      const path40 = typeof input?.path === "string" ? input.path : void 0;
+      if (tool.name === "read" && path40) this.readPaths.add(path40);
+      else if (tool.name === "edit" && path40) this.editedPaths.add(path40);
+      else if (tool.name === "write" && path40) {
+        this.writtenPaths.add(path40);
         const content = typeof input?.content === "string" ? input.content : "";
         this.bytesWritten += Buffer.byteLength(content, "utf8");
       }
@@ -25054,7 +25389,7 @@ async function setupCodebaseIndexing(deps) {
           if (tool?.mutating && FILE_EDIT_TOOLS.has(tool.name)) {
             const fp = payload.toolUse.input?.file_path;
             if (typeof fp === "string" && fp.length > 0) {
-              const abs = path38.resolve(payload.ctx.cwd, fp);
+              const abs = path39.resolve(payload.ctx.cwd, fp);
               if (isIndexableFile(abs)) {
                 enqueueReindex({ projectRoot, files: [abs], debounceMs, onError });
               }
@@ -25073,7 +25408,7 @@ async function setupCodebaseIndexing(deps) {
         if (!filename) return;
         const rel = filename.toString();
         if (isIgnored(rel)) return;
-        const abs = path38.resolve(projectRoot, rel);
+        const abs = path39.resolve(projectRoot, rel);
         if (!isIndexableFile(abs)) return;
         enqueueReindex({ projectRoot, files: [abs], debounceMs, onError });
       });
@@ -25127,7 +25462,7 @@ function setupMetrics(params) {
   const dumpMetrics = () => {
     if (!metricsSink) return;
     try {
-      const out = path38.join(wpaths.projectSessions, "metrics.json");
+      const out = path39.join(wpaths.projectSessions, "metrics.json");
       const snap = metricsSink.snapshot();
       writeFileSync(out, JSON.stringify(snap, null, 2));
     } catch {
@@ -25305,7 +25640,9 @@ async function setupSession(params) {
     tokenCounter,
     renderer,
     flags,
-    onRecovery
+    onRecovery,
+    // Optional EventBus for storage observability
+    events: eventsBus
   } = params;
   sessionStore.prune(DEFAULT_SESSION_PRUNE_DAYS).then((count) => {
     if (count > 0) renderer.writeInfo(`Pruned ${count} old session${count === 1 ? "" : "s"}.`);
@@ -25362,10 +25699,10 @@ async function setupSession(params) {
     );
   });
   const attachments = new DefaultAttachmentStore({
-    spoolDir: path38.join(wpaths.projectSessions, session?.id, "attachments")
+    spoolDir: path39.join(wpaths.projectSessions, session?.id, "attachments")
   });
-  const queueStore = new QueueStore({ dir: path38.join(wpaths.projectSessions, session?.id) });
   const ctxSignal = new AbortController().signal;
+  const traceId = randomBytes(16).toString("hex");
   const context = new Context({
     systemPrompt,
     provider,
@@ -25376,17 +25713,27 @@ async function setupSession(params) {
     projectRoot,
     model: config.model,
     agentId: "leader",
-    agentName: "Leader Agent"
+    agentName: "Leader Agent",
+    traceId
   });
   context.meta["packageTrackerOpts"] = {
     storageDir: wpaths.projectDir,
     projectRoot
   };
   if (restoredMessages.length > 0) context.state.replaceMessages(restoredMessages);
-  const todosCheckpointPath = path38.join(wpaths.projectSessions, `${session?.id}.todos.json`);
+  const queueStore = new QueueStore({
+    dir: path39.join(wpaths.projectSessions, session?.id),
+    ...eventsBus ? { events: eventsBus } : {},
+    ...traceId ? { traceId } : {}
+  });
+  const todosCheckpointPath = path39.join(wpaths.projectSessions, `${session?.id}.todos.json`);
   if (resumeId) {
     try {
-      const restoredTodos = await loadTodosCheckpoint(todosCheckpointPath);
+      const restoredTodos = await loadTodosCheckpoint(
+        todosCheckpointPath,
+        eventsBus,
+        traceId
+      );
       if (restoredTodos && restoredTodos.length > 0) {
         context.state.replaceTodos(restoredTodos);
         renderer.writeInfo(
@@ -25399,17 +25746,19 @@ async function setupSession(params) {
   const detachTodosCheckpoint = attachTodosCheckpoint(
     context.state,
     todosCheckpointPath,
-    session?.id
+    session?.id,
+    eventsBus,
+    traceId
   );
-  const planPath = path38.join(wpaths.projectSessions, `${session?.id}.plan.json`);
+  const planPath = path39.join(wpaths.projectSessions, `${session?.id}.plan.json`);
   context.state.setMeta("plan.path", planPath);
-  const taskPath = path38.join(wpaths.projectSessions, `${session?.id}.tasks.json`);
+  const taskPath = path39.join(wpaths.projectSessions, `${session?.id}.tasks.json`);
   context.state.setMeta("task.path", taskPath);
   let dirState;
   if (resumeId) {
     try {
-      const fleetRoot = path38.join(wpaths.projectSessions, session?.id);
-      dirState = await loadDirectorState(path38.join(fleetRoot, "director-state.json"));
+      const fleetRoot = path39.join(wpaths.projectSessions, session?.id);
+      dirState = await loadDirectorState(path39.join(fleetRoot, "director-state.json"));
       if (dirState) {
         const tCounts = {};
         for (const t of dirState.tasks) tCounts[t.status] = (tCounts[t.status] ?? 0) + 1;
@@ -25435,6 +25784,7 @@ async function setupSession(params) {
   return {
     session: expectDefined(session),
     sessionRef,
+    traceId,
     context,
     restoredMessages,
     attachments,
@@ -25655,7 +26005,7 @@ async function main(argv) {
       projectGoal: wpaths.projectGoal,
       projectSessions: wpaths.projectSessions
     },
-    pathJoiner: { join: (a, b) => path38.join(a, b) },
+    pathJoiner: { join: (a, b) => path39.join(a, b) },
     systemPromptBuilderToken: TOKENS.SystemPromptBuilder
   });
   const toolRegistry = new ToolRegistry();
@@ -25775,6 +26125,7 @@ async function main(argv) {
     tokenCounter,
     renderer,
     flags,
+    events,
     onRecovery: (abandoned, autoRecover) => promptRecovery(reader, renderer, abandoned, autoRecover)
   });
   const session = sessResult.session;
@@ -25786,12 +26137,13 @@ async function main(argv) {
   const planPath = sessResult.planPath;
   const detachTodosCheckpoint = sessResult.detachTodosCheckpoint;
   const priorFleetState = sessResult.priorFleetState;
+  memoryStore.withTraceId(sessResult.traceId);
   let tracker;
   try {
     const { getSessionRegistry, AgentStatusTracker } = await import('@wrongstack/core');
     const registry = getSessionRegistry(wpaths.globalRoot);
-    const projectSlug2 = path38.basename(wpaths.projectDir);
-    const projectName = path38.basename(projectRoot);
+    const projectSlug2 = path39.basename(wpaths.projectDir);
+    const projectName = path39.basename(projectRoot);
     let gitBranch;
     try {
       const { execSync } = await import('child_process');
@@ -25890,7 +26242,7 @@ async function main(argv) {
     if (e.ok && (e.name === "write" || e.name === "edit" || e.name === "replace" || e.name === "patch")) {
       const filePath = e.input?.path;
       if (filePath) {
-        const projectDir = path38.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
+        const projectDir = path39.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
         void recordFileAction(
           { storageDir: projectDir, projectRoot },
           {
@@ -26056,7 +26408,7 @@ async function main(argv) {
   let depWatcherDispose;
   if (dwCfg?.["enabled"] === true) {
     try {
-      const projectDir = path38.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
+      const projectDir = path39.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
       const dwMailbox = new GlobalMailbox(projectDir, events);
       depWatcherDispose = attachDepWatcherBridge({
         events,
@@ -26155,12 +26507,12 @@ async function main(argv) {
       }
     }
   };
-  const fleetRoot = directorMode ? path38.join(wpaths.projectSessions, session.id) : void 0;
-  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path38.join(expectDefined(fleetRoot), "fleet.json") : void 0;
-  const sharedScratchpadPath = directorMode ? path38.join(expectDefined(fleetRoot), "shared") : void 0;
-  const subagentSessionsRoot = directorMode ? path38.join(expectDefined(fleetRoot), "subagents") : void 0;
-  const stateCheckpointPath = directorMode ? path38.join(expectDefined(fleetRoot), "director-state.json") : void 0;
-  const fleetRootForPromotion = path38.join(wpaths.projectSessions, session.id);
+  const fleetRoot = directorMode ? path39.join(wpaths.projectSessions, session.id) : void 0;
+  const manifestPath = directorMode ? typeof process.env["WRONGSTACK_FLEET_MANIFEST"] === "string" ? process.env["WRONGSTACK_FLEET_MANIFEST"] : path39.join(expectDefined(fleetRoot), "fleet.json") : void 0;
+  const sharedScratchpadPath = directorMode ? path39.join(expectDefined(fleetRoot), "shared") : void 0;
+  const subagentSessionsRoot = directorMode ? path39.join(expectDefined(fleetRoot), "subagents") : void 0;
+  const stateCheckpointPath = directorMode ? path39.join(expectDefined(fleetRoot), "director-state.json") : void 0;
+  const fleetRootForPromotion = path39.join(wpaths.projectSessions, session.id);
   const brainSettings = {
     maxAutoRisk: "medium"
   };
@@ -26265,7 +26617,8 @@ async function main(argv) {
       sessionWriter: session,
       maxConcurrent,
       getLeaderMaxContext: () => effectiveMaxContext,
-      brain
+      brain,
+      traceId: sessResult.traceId
     }
   );
   toolRegistry.register(
@@ -26302,7 +26655,7 @@ async function main(argv) {
   let techStackConsumerDispose;
   if (dwCfg?.["enabled"] === true) {
     try {
-      const projectDir = path38.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
+      const projectDir = path39.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
       const tsMailbox = new GlobalMailbox(projectDir, events);
       const fileAuthorOpts = {
         storageDir: projectDir,
@@ -26335,7 +26688,7 @@ async function main(argv) {
   let pkgOutdatedDispose;
   if (dwCfg?.["enabled"] === true) {
     try {
-      const projectDir = path38.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
+      const projectDir = path39.join(wpaths.globalRoot, "projects", wpaths.projectSlug);
       const pkgMailbox = new GlobalMailbox(projectDir, events);
       const pkgTrackerOpts = {
         storageDir: projectDir,
@@ -26709,7 +27062,7 @@ ${color.dim("\u2500".repeat(40))}` : "";
       return director.spawn(cfg);
     },
     onFleetLog: async (subagentId, mode) => {
-      const subagentsRoot = path38.join(fleetRootForPromotion, "subagents");
+      const subagentsRoot = path39.join(fleetRootForPromotion, "subagents");
       let runDirs;
       try {
         runDirs = await fsp5.readdir(subagentsRoot);
@@ -26718,7 +27071,7 @@ ${color.dim("\u2500".repeat(40))}` : "";
       }
       const found = [];
       for (const runId of runDirs) {
-        const runDir = path38.join(subagentsRoot, runId);
+        const runDir = path39.join(subagentsRoot, runId);
         let files;
         try {
           files = await fsp5.readdir(runDir);
@@ -26727,7 +27080,7 @@ ${color.dim("\u2500".repeat(40))}` : "";
         }
         for (const f of files) {
           if (!f.endsWith(".jsonl")) continue;
-          const full = path38.join(runDir, f);
+          const full = path39.join(runDir, f);
           try {
             const stat7 = await fsp5.stat(full);
             found.push({
@@ -26828,7 +27181,7 @@ ${color.dim("\u2500".repeat(40))}` : "";
       }
       const dir = await multiAgentHost.ensureDirector();
       if (!dir) return "Director is not available.";
-      const dirStatePath = path38.join(fleetRootForPromotion, "director-state.json");
+      const dirStatePath = path39.join(fleetRootForPromotion, "director-state.json");
       const prior = await loadDirectorState(dirStatePath);
       if (!prior) {
         return "No prior director-state.json found \u2014 nothing to retry.";
@@ -26897,9 +27250,9 @@ ${color.dim("\u2500".repeat(40))}` : "";
       for (const tool of director2.tools(FLEET_ROSTER)) {
         toolRegistry.register(tool);
       }
-      const mp = path38.join(fleetRootForPromotion, "fleet.json");
-      const sp = path38.join(fleetRootForPromotion, "shared");
-      const ss = path38.join(fleetRootForPromotion, "subagents");
+      const mp = path39.join(fleetRootForPromotion, "fleet.json");
+      const sp = path39.join(fleetRootForPromotion, "shared");
+      const ss = path39.join(fleetRootForPromotion, "subagents");
       const lines = [
         `${color.green("\u2713")} Promoted to director mode.`,
         `  Roster: ${Object.keys(FLEET_ROSTER).join(", ")}`,
@@ -27003,7 +27356,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
             // Real per-role factory: each dispatched slot runs as a fresh,
             // isolated agent with the role's filtered tools + persona prompt
             // (instead of sharing the leader agent's Context).
-            subagentFactory: multiAgentHost.makeSubagentFactory(config)
+            subagentFactory: multiAgentHost.makeSubagentFactory(config),
+            events
           };
           parallelEngine = new ParallelEternalEngine(parallelOptions);
         }
@@ -27017,7 +27371,8 @@ Restart WrongStack to load or unload plugin code in this session.`;
             maxContextTokens: effectiveMaxContext > 0 ? effectiveMaxContext : void 0,
             onIteration: broadcastEternalIteration,
             onStage: broadcastAutonomyStage,
-            brain
+            brain,
+            events
           });
         }
         void eternalEngine.prime();
@@ -27033,11 +27388,14 @@ Restart WrongStack to load or unload plugin code in this session.`;
       brainMonitor.stop();
       brainQueue.dispose();
       void mcpRegistry.stopAll();
+      multiAgentHost.dispose().catch(
+        (err) => logger.warn(`multiAgentHost.dispose() failed: ${err instanceof Error ? err.message : String(err)}`)
+      );
     },
     onBeforeExit: async () => {
       const cwd2 = projectRoot;
       const statusResult = await new Promise(
-        (resolve10, reject) => {
+        (resolve11, reject) => {
           const child = spawn("git", ["status", "--porcelain"], {
             cwd: cwd2,
             stdio: ["ignore", "pipe", "pipe"],
@@ -27049,7 +27407,7 @@ Restart WrongStack to load or unload plugin code in this session.`;
             stdout += d;
           });
           child.on("error", reject);
-          child.on("close", (code) => resolve10({ stdout, code: code ?? 0 }));
+          child.on("close", (code) => resolve11({ stdout, code: code ?? 0 }));
         }
       );
       if (statusResult.stdout.trim().length > 0) {
@@ -27314,8 +27672,11 @@ Reply YES to auto-proceed, NO to wait for human input.`
     brain,
     brainSettings,
     getBrainLog: () => brainLog,
-    // Clean up SessionStats event listeners when the REPL exits.
-    onDestroy: () => stats.destroy(events)
+    // Clean up SessionStats event listeners and all EventBus handlers when the REPL exits.
+    onDestroy: () => {
+      teardownHandlers.forEach((fn) => fn());
+      stats.destroy(events);
+    }
   });
 }
 var isMain = import.meta.url === `file://${process.argv[1]?.replace(/\\/g, "/")}` || process.argv[1]?.endsWith("/cli/dist/index.js") || process.argv[1]?.endsWith("\\cli\\dist\\index.js");