@wrongstack/core 0.87.0 → 0.89.1

package/dist/defaults/index.js

@@ -29,7 +29,8 @@ var __export = (target, all) => {
 var atomic_write_exports = {};
 __export(atomic_write_exports, {
   atomicWrite: () => atomicWrite,
-  ensureDir: () => ensureDir
+  ensureDir: () => ensureDir,
+  withFileLock: () => withFileLock
 });
 async function atomicWrite(targetPath, content, opts = {}) {
   const dir = path3.dirname(targetPath);
@@ -52,8 +53,8 @@ async function atomicWrite(targetPath, content, opts = {}) {
     }
     let mode;
     try {
-      const stat5 = await fsp.stat(targetPath);
-      mode = stat5.mode & 511;
+      const stat6 = await fsp.stat(targetPath);
+      mode = stat6.mode & 511;
     } catch {
       mode = opts.mode;
     }
@@ -72,6 +73,49 @@ async function atomicWrite(targetPath, content, opts = {}) {
 async function ensureDir(dir) {
   await fsp.mkdir(dir, { recursive: true });
 }
+async function withFileLock(targetPath, fn, opts = {}) {
+  const dir = path3.dirname(targetPath);
+  await fsp.mkdir(dir, { recursive: true });
+  const lockPath = path3.join(dir, `.${path3.basename(targetPath)}.lock`);
+  const timeoutMs = opts.timeoutMs ?? 5e3;
+  const staleMs = opts.staleMs ?? 3e4;
+  const started = Date.now();
+  let handle;
+  for (; ; ) {
+    try {
+      handle = await fsp.open(lockPath, "wx");
+      await handle.writeFile(`${process.pid}:${Date.now()}`);
+      break;
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
+      try {
+        const stat6 = await fsp.stat(lockPath);
+        if (Date.now() - stat6.mtimeMs > staleMs) {
+          await fsp.unlink(lockPath);
+          continue;
+        }
+      } catch {
+        continue;
+      }
+      if (Date.now() - started >= timeoutMs) {
+        throw new Error(`Timed out waiting for file lock: ${targetPath}`);
+      }
+      await new Promise((resolve5) => setTimeout(resolve5, 25));
+    }
+  }
+  try {
+    return await fn();
+  } finally {
+    try {
+      await handle?.close();
+    } catch {
+    }
+    try {
+      await fsp.unlink(lockPath);
+    } catch {
+    }
+  }
+}
 async function renameWithRetry(from, to) {
   if (process.platform !== "win32") {
     await fsp.rename(from, to);
@@ -119,10 +163,15 @@ function writeErr(s, stream = process.stderr) {
 
 // src/utils/color.ts
 var isColorTty = () => {
-  if (process.env.NO_COLOR) return false;
-  if (process.env.FORCE_COLOR) return true;
+  if (envFlag(process.env.NO_COLOR)) return false;
+  if (envFlag(process.env.FORCE_COLOR)) return true;
   return isStdoutTTY();
 };
+function envFlag(value) {
+  if (value === void 0) return false;
+  if (value.trim() === "") return false;
+  return !/^(0|false|no|off)$/i.test(value.trim());
+}
 var COLOR = isColorTty();
 var wrap = (open3, close) => (s) => COLOR ? `\x1B[${open3}m${s}\x1B[${close}m` : s;
 var color = {
@@ -159,6 +208,7 @@ var COLORS = {
   debug: color.gray,
   trace: color.dim
 };
+var LOG_LEVELS = /* @__PURE__ */ new Set(["error", "warn", "info", "debug", "trace"]);
 var DefaultLogger = class _DefaultLogger {
   level;
   file;
@@ -166,7 +216,7 @@ var DefaultLogger = class _DefaultLogger {
   pretty;
   stderr;
   constructor(opts = {}) {
-    this.level = opts.level ?? process.env.WRONGSTACK_LOG_LEVEL ?? "info";
+    this.level = opts.level ?? parseLogLevel(process.env.WRONGSTACK_LOG_LEVEL);
     this.file = opts.file;
     this.bindings = opts.bindings ?? {};
     this.pretty = opts.pretty ?? true;
@@ -231,6 +281,9 @@ var DefaultLogger = class _DefaultLogger {
     }
   }
 };
+function parseLogLevel(raw) {
+  return raw && LOG_LEVELS.has(raw) ? raw : "info";
+}
 function formatCtx(ctx) {
   if (ctx instanceof Error) return color.dim(ctx.message);
   if (typeof ctx === "string") return color.dim(ctx);
@@ -614,8 +667,8 @@ var DefaultSessionStore = class _DefaultSessionStore {
       return JSON.parse(raw);
     } catch {
       const full = this.sessionPath(id, ".jsonl");
-      const stat5 = await fsp.stat(full);
-      const summary = await this.summarize(id, stat5.mtime.toISOString());
+      const stat6 = await fsp.stat(full);
+      const summary = await this.summarize(id, stat6.mtime.toISOString());
       await atomicWrite(manifest, JSON.stringify(summary), { mode: 384 }).catch((err) => {
         console.warn(
           `[session-store] Failed to write manifest for "${id}":`,
@@ -663,8 +716,8 @@ var DefaultSessionStore = class _DefaultSessionStore {
         if (!file.isFile() || !file.name.endsWith(".jsonl")) continue;
         const jsonlPath = path3.join(dateDir, file.name);
         try {
-          const stat5 = await fsp.stat(jsonlPath);
-          if (stat5.mtimeMs >= cutoff) continue;
+          const stat6 = await fsp.stat(jsonlPath);
+          if (stat6.mtimeMs >= cutoff) continue;
         } catch {
           continue;
         }
@@ -1774,6 +1827,13 @@ var BEHAVIOR_DEFAULTS = {
 function envBool(v) {
   return !/^(0|false|no|off)$/i.test(v.trim());
 }
+function envBoolOptional(v) {
+  return v !== void 0 && envBool(v);
+}
+var LOG_LEVELS2 = /* @__PURE__ */ new Set(["error", "warn", "info", "debug", "trace"]);
+function envLogLevel(v) {
+  return LOG_LEVELS2.has(v) ? v : "info";
+}
 var ENV_MAP = {
   WRONGSTACK_PROVIDER: (c, v) => {
     c.provider = v;
@@ -1797,7 +1857,7 @@ var ENV_MAP = {
   },
   WRONGSTACK_LOG_LEVEL: (c, v) => {
     if (!c.log) c.log = { level: "info" };
-    c.log.level = v;
+    c.log.level = envLogLevel(v);
   },
   WRONGSTACK_INDEX_ON_START: (c, v) => {
     c.indexing = { ...defaultIndexing, ...c.indexing, onSessionStart: envBool(v) };
@@ -1839,7 +1899,7 @@ function deepMerge(base, patch) {
         out[k] = [.../* @__PURE__ */ new Set([...existing, ...v])];
       } else {
         out[k] = v;
-        if (process.env.WRONGSTACK_DEBUG_CONFIG) {
+        if (envBoolOptional(process.env.WRONGSTACK_DEBUG_CONFIG)) {
           console.warn(
             `[config] Non-primitive array for "${k}" replaced (global + local config merge). Global entries: ${existing?.length ?? 0}, local entries: ${v.length}.`
           );
@@ -3467,9 +3527,18 @@ async function restrictFilePermissions(filePath, opts) {
       const { execFile: execFile2 } = await import('child_process');
       const { promisify: promisify2 } = await import('util');
       const execFileAsync = promisify2(execFile2);
-      await execFileAsync("icacls", [filePath, "/inheritance:r", "/grant:r", `${process.env.USERNAME}:(F)`]);
+      const user = windowsAccountName();
+      if (!user) {
+        warn(
+          `[secret-vault] Could not determine the current Windows user for ${filePath}; skipping icacls hardening.`
+        );
+        return;
+      }
+      await execFileAsync("icacls", [filePath, "/inheritance:r", "/grant:r", `${user}:(F)`]);
     } catch {
-      warn(`[secret-vault] Could not restrict permissions on ${filePath} \u2014 config file may be readable by other users on this system.`);
+      warn(
+        `[secret-vault] Could not restrict permissions on ${filePath} \u2014 config file may be readable by other users on this system.`
+      );
     }
   } else {
     try {
@@ -3478,6 +3547,13 @@ async function restrictFilePermissions(filePath, opts) {
     }
   }
 }
+function windowsAccountName() {
+  const username = process.env.USERNAME || process.env.USER;
+  if (!username || username.includes("\0")) return void 0;
+  const domain = process.env.USERDOMAIN;
+  if (domain && !domain.includes("\0")) return `${domain}\\${username}`;
+  return username;
+}
 function walkCount(node, vault, counter) {
   if (node === null || node === void 0) return node;
   if (typeof node !== "object") return node;
@@ -4542,6 +4618,7 @@ function tryParse(s) {
 }
 
 // src/core/streaming-response-builder.ts
+var STREAM_DRAIN_TIMEOUT_MS = 500;
 function buildResponse(state) {
   const content = [];
   for (const b of state.blockOrder) {
@@ -4754,7 +4831,7 @@ async function streamProviderToResponse(provider, req, signal, ctx, events) {
         await Promise.race([
           Promise.resolve(iter.return?.()),
           new Promise((resolve5) => {
-            drainTimer = setTimeout(resolve5, 500);
+            drainTimer = setTimeout(resolve5, STREAM_DRAIN_TIMEOUT_MS);
           })
         ]);
       } finally {
@@ -6086,6 +6163,7 @@ var ToolExecutor = class {
     this.registry = registry;
     this.opts = opts;
     this.iterationTimeoutMs = opts.iterationTimeoutMs ?? 3e5;
+    this.maxToolTimeoutMs = opts.maxToolTimeoutMs ?? 3e5;
     this.serializer = createToolOutputSerializer({
       perIterationOutputCapBytes: opts.perIterationOutputCapBytes ?? 1e5
     });
@@ -6094,6 +6172,7 @@ var ToolExecutor = class {
   opts;
   serializer;
   iterationTimeoutMs;
+  maxToolTimeoutMs;
   /**
    * Clear the interactive confirm awaiter so the executor returns
    * `ToolConfirmPendingResult` instead of blocking on stdin. Used by
@@ -6331,7 +6410,10 @@ ${post.additionalContext}` };
       if (parentSignal.reason instanceof Error) throw parentSignal.reason;
       throw new Error(typeof parentSignal.reason === "string" ? parentSignal.reason : "aborted");
     }
-    const timeoutMs = tool.timeoutMs ?? this.iterationTimeoutMs;
+    const timeoutMs = clampTimeoutMs(
+      tool.timeoutMs ?? this.iterationTimeoutMs,
+      this.maxToolTimeoutMs
+    );
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(new Error("tool timeout")), timeoutMs);
     const combined = AbortSignal.any([parentSignal, ctrl.signal]);
@@ -6466,6 +6548,12 @@ ${excerpt}`;
     return void 0;
   }
 };
+function clampTimeoutMs(timeoutMs, maxTimeoutMs) {
+  const fallback = 3e5;
+  const finiteTimeout = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : fallback;
+  const finiteMax = Number.isFinite(maxTimeoutMs) && maxTimeoutMs > 0 ? maxTimeoutMs : fallback;
+  return Math.max(1, Math.min(finiteTimeout, finiteMax));
+}
 var MALFORMED_ARG_MARKERS = ["__raw", "__raw_arguments", "_raw"];
 function hasMalformedArguments(input) {
   if (!input || typeof input !== "object" || Array.isArray(input)) return false;
@@ -7278,6 +7366,7 @@ ${recentJournal}` : "No prior iterations.",
 };
 
 // src/coordination/subagent-budget.ts
+var TIMEOUT_PREEMPT_FRACTION = 0.85;
 var BudgetExceededError = class extends Error {
   kind;
   limit;
@@ -10079,16 +10168,17 @@ Do not add prose, markdown, or code fences.`;
     const raw = (await complete(prompt)).trim();
     const match = raw.match(/\{[\s\S]*\}/);
     if (!match) return null;
-    try {
-      const parsed = JSON.parse(match[0]);
-      if (typeof parsed.role !== "string") return null;
-      const role = parsed.role.trim();
-      const valid = candidates.some((c) => c.role === role);
-      if (!valid) return null;
-      return { role, reason: typeof parsed.reason === "string" ? parsed.reason : void 0 };
-    } catch {
-      return null;
-    }
+    const parsed = safeParse(
+      match[0]
+    );
+    if (!parsed.ok || !parsed.value || typeof parsed.value.role !== "string") return null;
+    const role = parsed.value.role.trim();
+    const valid = candidates.some((c) => c.role === role);
+    if (!valid) return null;
+    return {
+      role,
+      reason: typeof parsed.value.reason === "string" ? parsed.value.reason : void 0
+    };
   };
 }
 
@@ -11043,15 +11133,38 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
     }
     const start = Date.now();
     let timer = null;
+    let preemptedForLimit = null;
     const timeoutPromise = new Promise((_, reject) => {
       const armFor = (ms) => {
         if (timer) clearTimeout(timer);
         timer = setTimeout(onTick, Math.max(0, ms));
       };
       const scheduleNext = () => {
-        const wallRemaining = initialTimeoutMs === void 0 ? Number.POSITIVE_INFINITY : (budget.limits.timeoutMs ?? initialTimeoutMs) - (Date.now() - start);
+        const wallLimit = budget.limits.timeoutMs ?? initialTimeoutMs;
+        const wallRemaining = initialTimeoutMs === void 0 ? Number.POSITIVE_INFINITY : wallLimit - (Date.now() - start);
         const idleRemaining = idleLimitMs === void 0 ? Number.POSITIVE_INFINITY : (budget.limits.idleTimeoutMs ?? idleLimitMs) - budget.idleMs();
-        armFor(Math.max(25, Math.min(wallRemaining, idleRemaining)));
+        const preemptRemaining = initialTimeoutMs === void 0 || preemptedForLimit === wallLimit ? Number.POSITIVE_INFINITY : wallLimit * TIMEOUT_PREEMPT_FRACTION - (Date.now() - start);
+        armFor(Math.max(25, Math.min(wallRemaining, idleRemaining, preemptRemaining)));
+      };
+      const negotiateTimeout = async (used, limit) => {
+        const handler = budget.onThreshold;
+        if (!handler) return "stop";
+        const result = handler({
+          kind: "timeout",
+          used,
+          limit,
+          requestDecision: () => new Promise((resolveDecision) => {
+            budget._events?.emit("budget.threshold_reached", {
+              kind: "timeout",
+              used,
+              limit,
+              timeoutMs: 6e4,
+              extend: (extra) => resolveDecision({ extend: extra }),
+              deny: () => resolveDecision("stop")
+            });
+          })
+        });
+        return typeof result === "string" ? result : await result;
       };
       const onTick = async () => {
         const elapsed = Date.now() - start;
@@ -11064,6 +11177,21 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
           reject(new BudgetExceededError("timeout", idleLimit ?? 0, budget.idleMs()));
           return;
         }
+        if (wallLimit !== void 0 && !wallExceeded && budget.onThreshold && preemptedForLimit !== wallLimit && elapsed >= wallLimit * TIMEOUT_PREEMPT_FRACTION) {
+          try {
+            const decision = await negotiateTimeout(elapsed, wallLimit);
+            if (typeof decision !== "string" && decision.extend.timeoutMs !== void 0) {
+              budget.limits.timeoutMs = decision.extend.timeoutMs;
+              preemptedForLimit = null;
+            } else {
+              preemptedForLimit = wallLimit;
+            }
+          } catch {
+            preemptedForLimit = wallLimit;
+          }
+          scheduleNext();
+          return;
+        }
         if (!wallExceeded) {
           scheduleNext();
           return;
@@ -11075,28 +11203,15 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
           return;
         }
         try {
-          const result = budget.onThreshold({
-            kind: "timeout",
-            used: elapsed,
-            limit,
-            requestDecision: () => new Promise((resolveDecision) => {
-              budget._events?.emit("budget.threshold_reached", {
-                kind: "timeout",
-                used: elapsed,
-                limit,
-                timeoutMs: 6e4,
-                extend: (extra) => resolveDecision({ extend: extra }),
-                deny: () => resolveDecision("stop")
-              });
-            })
-          });
-          const decision = typeof result === "string" ? result : await result;
+          const decision = await negotiateTimeout(elapsed, limit);
           if (decision === "continue" || decision === "throw" || decision === "stop") {
+            preemptedForLimit = null;
             armFor(Math.max(1e3, limit));
             return;
           }
           if (decision.extend.timeoutMs !== void 0) {
             budget.limits.timeoutMs = decision.extend.timeoutMs;
+            preemptedForLimit = null;
             scheduleNext();
             return;
           }
@@ -12004,8 +12119,8 @@ async function expandGlob(pattern) {
       for (const e of entries) {
         const full = `${dir}${SEP}${e}`;
         try {
-          const stat5 = await fsp.stat(full);
-          if (stat5.isDirectory()) await walk4(full, rest);
+          const stat6 = await fsp.stat(full);
+          if (stat6.isDirectory()) await walk4(full, rest);
         } catch {
         }
       }
@@ -12022,8 +12137,8 @@ async function expandGlob(pattern) {
       if (entries.includes(seg)) {
         const full = `${dir}${SEP}${seg}`;
         try {
-          const stat5 = await fsp.stat(full);
-          if (stat5.isDirectory()) await walk4(full, rest);
+          const stat6 = await fsp.stat(full);
+          if (stat6.isDirectory()) await walk4(full, rest);
         } catch {
         }
       }
@@ -12051,6 +12166,7 @@ var CollabSession = class extends EventEmitter {
   timeoutMs;
   cancelled = false;
   alerts = [];
+  snapshotWarnings = [];
   /** Tracks tool call counts per subagent for progress-based timeout decisions. */
   progressBySubagent = /* @__PURE__ */ new Map();
   /** Last tool call count when a timeout warning was handled. */
@@ -12120,10 +12236,19 @@ var CollabSession = class extends EventEmitter {
     }
     for (const filePath of allFiles) {
       try {
-        const content = await fsp.readFile(filePath, "utf8");
+        const [content, stat6] = await Promise.all([
+          fsp.readFile(filePath, "utf8"),
+          fsp.stat(filePath)
+        ]);
         const ext = filePath.split(".").pop() ?? "";
         const language = ext === "ts" || ext === "tsx" ? "typescript" : ext === "js" || ext === "jsx" ? "javascript" : ext === "md" ? "markdown" : ext === "json" ? "json" : void 0;
-        this.snapshot.files.push({ path: filePath, content, language });
+        this.snapshot.files.push({
+          path: filePath,
+          content,
+          language,
+          snapshotMtimeMs: stat6.mtimeMs,
+          snapshotSizeBytes: stat6.size
+        });
       } catch {
         this.snapshot.files.push({ path: filePath, content: "", language: void 0 });
       }
@@ -12146,7 +12271,11 @@ var CollabSession = class extends EventEmitter {
       subagentId: this.director.id,
       ts: Date.now(),
       type: "director.cancel_collab",
-      payload: { sessionId: this.sessionId, reason, cancelledAt: (/* @__PURE__ */ new Date()).toISOString() }
+      payload: {
+        sessionId: this.sessionId,
+        reason,
+        cancelledAt: (/* @__PURE__ */ new Date()).toISOString()
+      }
     });
     this.fleetBus.emit({
       subagentId: this.director.id,
@@ -12197,6 +12326,7 @@ var CollabSession = class extends EventEmitter {
     for (const result of results?.flat() ?? []) {
       await this.parseAndEmit(result);
     }
+    this.snapshotWarnings = await this.checkSnapshotFreshness();
     const report = this.assembleReport();
     this.cleanup();
     this.emit("session.done", report);
@@ -12260,7 +12390,7 @@ var CollabSession = class extends EventEmitter {
     const defaults = {
       "bug-hunter": { maxIterations: 2e3, maxToolCalls: 5e3, timeoutMs: 10 * 60 * 1e3 },
       "refactor-planner": { maxIterations: 1500, maxToolCalls: 4e3, timeoutMs: 8 * 60 * 1e3 },
-      "critic": { maxIterations: 1e3, maxToolCalls: 3e3, timeoutMs: 6 * 60 * 1e3 }
+      critic: { maxIterations: 1e3, maxToolCalls: 3e3, timeoutMs: 6 * 60 * 1e3 }
     };
     return defaults[role] ?? { maxIterations: 1500, maxToolCalls: 4e3, timeoutMs: 8 * 60 * 1e3 };
   }
@@ -12340,7 +12470,10 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
   }
   wireFleetBus() {
     const dTool = this.fleetBus.filter("tool.executed", (e) => {
-      this.progressBySubagent.set(e.subagentId, (this.progressBySubagent.get(e.subagentId) ?? 0) + 1);
+      this.progressBySubagent.set(
+        e.subagentId,
+        (this.progressBySubagent.get(e.subagentId) ?? 0) + 1
+      );
     });
     this.disposers.push(dTool);
     const dBudget = this.fleetBus.filter("budget.threshold_reached", (e) => {
@@ -12379,7 +12512,10 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
           return;
         }
         this.lastTimeoutProgress.set(e.subagentId, progress);
-        const newLimit = Math.min(Math.ceil((payload.timeoutMs ?? payload.limit) * 2), 24 * 60 * 6e4);
+        const newLimit = Math.min(
+          Math.ceil((payload.timeoutMs ?? payload.limit) * 2),
+          24 * 60 * 6e4
+        );
         setImmediate(() => {
           payload.extend({ timeoutMs: newLimit });
         });
@@ -12489,15 +12625,18 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
       needs_revision: 1,
       reject: 2
     };
-    const overallVerdict = evalList.reduce(
-      (worst, eval_) => {
-        const w = verdictOrder[worst];
-        const c = verdictOrder[eval_.verdict];
-        return c > w ? eval_.verdict : worst;
-      },
-      "approve"
+    const overallVerdict = evalList.reduce((worst, eval_) => {
+      const w = verdictOrder[worst];
+      const c = verdictOrder[eval_.verdict];
+      return c > w ? eval_.verdict : worst;
+    }, "approve");
+    const summary = this.buildMarkdownSummary(
+      bugList,
+      planList,
+      evalList,
+      overallVerdict,
+      disposition
     );
-    const summary = this.buildMarkdownSummary(bugList, planList, evalList, overallVerdict, disposition);
     return {
       sessionId: this.sessionId,
       startedAt: this.snapshot.createdAt,
@@ -12508,10 +12647,28 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
       refactorPlans: planList,
       evaluations: evalList,
       alerts: [...this.alerts],
+      ...this.snapshotWarnings.length > 0 ? { snapshotWarnings: this.snapshotWarnings } : {},
       overallVerdict,
       summary
     };
   }
+  async checkSnapshotFreshness() {
+    const warnings = [];
+    for (const file of this.snapshot.files) {
+      if (file.snapshotMtimeMs === void 0 && file.snapshotSizeBytes === void 0) continue;
+      try {
+        const stat6 = await fsp.stat(file.path);
+        const mtimeChanged = file.snapshotMtimeMs !== void 0 && stat6.mtimeMs > file.snapshotMtimeMs + 1;
+        const sizeChanged = file.snapshotSizeBytes !== void 0 && stat6.size !== file.snapshotSizeBytes;
+        if (mtimeChanged || sizeChanged) {
+          warnings.push(`${file.path} changed after the collab snapshot was captured.`);
+        }
+      } catch {
+        warnings.push(`${file.path} could not be checked after the collab snapshot was captured.`);
+      }
+    }
+    return warnings;
+  }
   buildMarkdownSummary(bugs, plans, evals, overallVerdict, disposition) {
     const lines = [
       `## Collaborative Debugging Report \u2014 ${this.sessionId}`,
@@ -12528,10 +12685,19 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
       }
       lines.push("");
     }
+    if (this.snapshotWarnings.length > 0) {
+      lines.push("### Snapshot Warnings", "");
+      for (const warning of this.snapshotWarnings) {
+        lines.push(`- ${warning}`);
+      }
+      lines.push("");
+    }
     if (bugs.length > 0) {
       lines.push("### Bugs Found", "");
       for (const b of bugs) {
-        lines.push(`- **[${b.severity.toUpperCase()}]** \`${b.location.file}:${b.location.line}\` \u2014 ${b.description}`);
+        lines.push(
+          `- **[${b.severity.toUpperCase()}]** \`${b.location.file}:${b.location.line}\` \u2014 ${b.description}`
+        );
       }
       lines.push("");
     }
@@ -13134,6 +13300,7 @@ var FleetBus = class {
     set.add(handler);
     return () => {
       set.delete(handler);
+      if (set.size === 0) this.byId.delete(subagentId);
     };
   }
   /** Subscribe to one event type across all subagents. */
@@ -13146,6 +13313,7 @@ var FleetBus = class {
     set.add(handler);
     return () => {
       set.delete(handler);
+      if (set.size === 0) this.byType.delete(type);
     };
   }
   /** Subscribe to literally everything. The fleet roll-up uses this. */
@@ -13179,6 +13347,11 @@ var FleetBus = class {
       }
     }
   }
+  clear() {
+    this.byId.clear();
+    this.byType.clear();
+    this.any.clear();
+  }
 };
 var FleetUsageAggregator = class {
   constructor(bus, priceLookup, metaLookup) {
@@ -14411,7 +14584,9 @@ var Director = class _Director {
     let toolUses = 0;
     for (const line of targetLines) {
       try {
-        const ev = JSON.parse(line);
+        const parsed = safeParse(line);
+        if (!parsed.ok || !parsed.value) continue;
+        const ev = parsed.value;
         if (ev.type === "assistant" && typeof ev.text === "string") {
           lastAssistantText = ev.text;
         } else if (ev.type === "stop" && ev.stopReason) {
@@ -14725,7 +14900,7 @@ function createDelegateTool(opts) {
           const offIter = dir.fleet.filter("iteration.started", bump);
           const offProgress = dir.fleet.filter("tool.progress", bump);
           arm();
-          dir.awaitTasks([taskId]).then((r) => finish(r[0] ?? { __timeout: true })).catch(() => finish({ __timeout: true }));
+          dir.awaitTasks([taskId]).then((r) => finish(r[0] ?? { __emptyResult: true })).catch(() => finish({ __timeout: true }));
         });
         if ("__timeout" in result) {
           const partial2 = await readSubagentPartial(opts, subagentId);
@@ -14750,6 +14925,29 @@ function createDelegateTool(opts) {
             partial: partial2
           };
         }
+        if ("__emptyResult" in result) {
+          const partial2 = await readSubagentPartial(opts, subagentId);
+          opts.events?.emit("delegate.completed", {
+            target,
+            task: i.task,
+            ok: false,
+            status: "empty_result",
+            summary: `[${target}] completed without a task result`,
+            durationMs: 0,
+            iterations: partial2?.events ?? 0,
+            toolCalls: partial2?.toolUsesObserved ?? 0,
+            subagentId
+          });
+          return {
+            ok: false,
+            stopReason: "error",
+            error: "Director returned no task result for the delegated task.",
+            hint: "Check fleet state with /fleet status, then retry or reassign the task.",
+            subagentId,
+            taskId,
+            partial: partial2
+          };
+        }
         const baseStopReason = result.status === "success" ? "end_turn" : result.status === "timeout" ? "subagent_timeout" : result.status === "stopped" ? "aborted" : "budget_exhausted";
         const partial = result.status === "success" ? void 0 : await readSubagentPartial(opts, subagentId);
         const errorKind = result.error?.kind;
@@ -14922,7 +15120,9 @@ async function readSubagentPartial(opts, subagentId) {
     let toolUses = 0;
     for (const line of lines) {
       try {
-        const ev = JSON.parse(line);
+        const parsed = safeParse(line);
+        if (!parsed.ok || !parsed.value) continue;
+        const ev = parsed.value;
         if (ev.type === "tool_use") toolUses += 1;
         if (ev.type === "llm_response") {
           if (typeof ev.stopReason === "string") lastStopReason = ev.stopReason;
@@ -15694,8 +15894,8 @@ async function loadProjectModes(modesDir) {
     for (const entry of entries) {
       if (!entry.endsWith(".md") && !entry.endsWith(".txt")) continue;
       const filePath = path3.join(modesDir, entry);
-      const stat5 = await fsp.stat(filePath);
-      if (!stat5.isFile()) continue;
+      const stat6 = await fsp.stat(filePath);
+      if (!stat6.isFile()) continue;
       const content = await fsp.readFile(filePath, "utf8");
       const id = path3.basename(entry, path3.extname(entry));
       modes.push({