@wrongstack/core 0.77.0 → 0.84.1

package/dist/index.js

@@ -419,6 +419,13 @@ var Container = class {
   has(token) {
     return this.entries.has(token);
   }
+  /**
+   * Resolve a token if it is bound, otherwise return undefined.
+   * Unlike resolve(), this does not throw if the token is unbound.
+   */
+  safeResolve(token) {
+    return this.has(token) ? this.resolve(token) : void 0;
+  }
   ownerOf(token) {
     return this.entries.get(token)?.owner;
   }
@@ -1166,20 +1173,20 @@ var DefaultSecretVault = class {
     return key;
   }
 };
-function decryptConfigSecrets(cfg, vault) {
+function decryptConfigSecrets(cfg, vault, opts) {
+  const warn = opts?.warn ?? ((msg) => console.warn(msg));
   return walk(cfg, vault, (v, key) => {
     try {
       return vault.decrypt(v);
     } catch (err) {
-      console.warn(
-        `[secret-vault] Failed to decrypt "${key}":`,
-        err instanceof Error ? err.message : err
+      warn(
+        `[secret-vault] Failed to decrypt "${key}": ${err instanceof Error ? err.message : err}`
       );
       return "";
     }
   });
 }
-function encryptConfigSecrets(cfg, vault) {
+function encryptConfigSecrets(cfg, vault, _opts) {
   return walk(cfg, vault, (v) => vault.encrypt(v));
 }
 function walk(node, vault, transform) {
@@ -1240,7 +1247,8 @@ async function migratePlaintextSecrets(configPath, vault) {
   await restrictFilePermissions(configPath);
   return { migrated: counter.n, file: configPath };
 }
-async function restrictFilePermissions(filePath) {
+async function restrictFilePermissions(filePath, opts) {
+  const warn = ((msg) => console.warn(msg));
   if (process.platform === "win32") {
     try {
       const { execFile: execFile2 } = await import('child_process');
@@ -1248,7 +1256,7 @@ async function restrictFilePermissions(filePath) {
       const execFileAsync = promisify2(execFile2);
       await execFileAsync("icacls", [filePath, "/inheritance:r", "/grant:r", `${process.env.USERNAME}:(F)`]);
     } catch {
-      console.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 {
@@ -1338,9 +1346,20 @@ function setRawMode(input, mode) {
   input.setRawMode(mode);
   return true;
 }
+var activeOutputGuard = null;
+function setOutputLineGuard(guard) {
+  activeOutputGuard = guard;
+}
 function writeTo(s, stream) {
   if (!stream || typeof stream.write !== "function") return false;
+  const guard = activeOutputGuard;
+  if (!guard) {
+    stream.write(s);
+    return true;
+  }
+  guard.suspend();
   stream.write(s);
+  guard.resume();
   return true;
 }
 function writeOut(s, stream = process.stdout) {
@@ -1515,7 +1534,7 @@ var DefaultTokenCounter = class {
     } else if (this.registry && this.providerId && model) {
       if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
         const keys = [...this.priceCache.keys()];
-        this.priceCache.delete(keys[0]);
+        this.priceCache.delete(keys[0] ?? "");
       }
       void this.registry.getModel(this.providerId, model).then((m) => {
         if (m) {
@@ -1540,7 +1559,7 @@ var DefaultTokenCounter = class {
     const price = priceFromModel(resolved);
     if (this.priceCache.size >= PRICE_CACHE_MAX_SIZE) {
       const keys = [...this.priceCache.keys()];
-      this.priceCache.delete(keys[0]);
+      this.priceCache.delete(keys[0] ?? "");
     }
     this.priceCache.set(resolved.modelId, price);
     this.applyPrice(usage, price);
@@ -1608,6 +1627,12 @@ function round4(n) {
 }
 
 // src/utils/token-estimate.ts
+function expectDefined(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var RoughTokenEstimate = (text, charsPerToken = 3.5) => Math.max(1, Math.ceil(text.length / charsPerToken));
 var _cal = {
   ratio: 1,
@@ -1628,7 +1653,7 @@ function getCachedEstimate(key, compute) {
   if (ESTIMATE_CACHE.size >= ESTIMATE_CACHE_MAX_SIZE) {
     const keys = [...ESTIMATE_CACHE.keys()];
     for (let i = 0; i < Math.floor(ESTIMATE_CACHE_MAX_SIZE / 4); i++) {
-      ESTIMATE_CACHE.delete(keys[i]);
+      ESTIMATE_CACHE.delete(expectDefined(keys[i]));
     }
   }
   const estimate = compute();
@@ -1741,6 +1766,12 @@ function resetCalibration() {
 }
 
 // src/utils/message-invariants.ts
+function expectDefined2(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function repairToolUseAdjacency(messages) {
   const removedToolUses = [];
   const removedToolResults = [];
@@ -1748,7 +1779,7 @@ function repairToolUseAdjacency(messages) {
   let changed = false;
   const out = [];
   for (let i = 0; i < messages.length; i++) {
-    const original = messages[i];
+    const original = expectDefined2(messages[i]);
     let msg = original;
     if (hasToolUse(msg)) {
       const nextIds = toolResultIds(messages[i + 1]);
@@ -2906,6 +2937,12 @@ Remember: your job is to make the user a better developer, not just to complete
 ];
 
 // src/types/context-window.ts
+function expectDefined3(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DEFAULT_CONTEXT_WINDOW_MODE_ID = "balanced";
 var CONTEXT_WINDOW_MODES = Object.freeze([
   {
@@ -2962,7 +2999,7 @@ function isContextWindowModeId(id) {
 }
 function resolveContextWindowPolicy(config = {}, overrideMode) {
   const requested = overrideMode ?? config.mode ?? DEFAULT_CONTEXT_WINDOW_MODE_ID;
-  const mode = getContextWindowMode(requested) ?? getContextWindowMode(DEFAULT_CONTEXT_WINDOW_MODE_ID);
+  const mode = getContextWindowMode(requested) ?? expectDefined3(getContextWindowMode(DEFAULT_CONTEXT_WINDOW_MODE_ID));
   if (mode.id !== DEFAULT_CONTEXT_WINDOW_MODE_ID) {
     return mode;
   }
@@ -3013,7 +3050,7 @@ var InMemoryBridgeTransport = class {
   }
   subscribe(agentId, handler) {
     if (!this.subs.has(agentId)) this.subs.set(agentId, /* @__PURE__ */ new Set());
-    this.subs.get(agentId).add(handler);
+    this.subs.get(agentId)?.add(handler);
     return () => this.subs.get(agentId)?.delete(handler);
   }
   close(agentId) {
@@ -3442,6 +3479,12 @@ function sizeSignals(toolName, content) {
 }
 
 // src/execution/tool-executor.ts
+function expectDefined4(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var ToolExecutor = class {
   constructor(registry, opts) {
     this.registry = registry;
@@ -3730,6 +3773,9 @@ ${post.additionalContext}` };
   async runStreamedTool(tool, input, ctx, signal, toolUseId) {
     let finalOutput;
     let sawFinal = false;
+    if (!tool.executeStream) {
+      throw new Error(`Tool "${tool.name}" does not support streaming execution`);
+    }
     const stream = tool.executeStream(input, ctx, { signal });
     for await (const ev of stream) {
       if (ev.type === "final") {
@@ -3834,7 +3880,7 @@ function hasMalformedArguments(input) {
 function extractMalformedRaw(input) {
   if (!hasMalformedArguments(input)) return void 0;
   const obj = input;
-  const value = obj[Object.keys(obj)[0]];
+  const value = obj[expectDefined4(Object.keys(obj)[0])];
   if (value === void 0 || value === null) return void 0;
   if (typeof value === "string") return value;
   try {
@@ -3881,6 +3927,12 @@ function compileUserRegex(pattern, flags) {
 }
 
 // src/storage/session-reader.ts
+function expectDefined5(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DefaultSessionReader = class {
   store;
   constructor(opts) {
@@ -3942,7 +3994,7 @@ var DefaultSessionReader = class {
         continue;
       }
       for (let i = 0; i < data.events.length; i++) {
-        const ev = data.events[i];
+        const ev = expectDefined5(data.events[i]);
         if (allowedTypes && !allowedTypes.has(ev.type)) continue;
         const text = eventText(ev);
         if (text === null) continue;
@@ -4210,7 +4262,7 @@ function escapeControlCharsInStrings(s) {
   let inString = false;
   let out = "";
   for (let i = 0; i < s.length; i++) {
-    const c = s[i];
+    const c = s.charAt(i);
     if (c === '"' && (i === 0 || s[i - 1] !== "\\")) {
       inString = !inString;
       out += c;
@@ -4248,12 +4300,12 @@ function stripSingleLineComments(s) {
   const chars = [];
   let i = 0;
   while (i < s.length) {
-    const c = s[i];
-    if (c === '"' && (i === 0 || s[i - 1] !== "\\")) {
+    const c = s.charAt(i);
+    if (c === '"' && (i === 0 || s.charAt(i - 1) !== "\\")) {
       inString = !inString;
       chars.push(c);
-    } else if (c === "/" && s[i + 1] === "/" && !inString) {
-      while (i < s.length && s[i] !== "\n") i++;
+    } else if (c === "/" && s.charAt(i + 1) === "/" && !inString) {
+      while (i < s.length && s.charAt(i) !== "\n") i++;
     } else {
       chars.push(c);
     }
@@ -4310,6 +4362,12 @@ function formatTodosList(todos) {
 }
 
 // src/utils/glob-match.ts
+function expectDefined6(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function escapeRegex(s) {
   return s.replace(/[.+^${}()|\\]/g, "\\$&");
 }
@@ -4321,7 +4379,7 @@ function getCachedGlob(pattern) {
   if (COMPILED_GLOB_CACHE.size >= CACHE_MAX_SIZE) {
     const keys = [...COMPILED_GLOB_CACHE.keys()];
     for (let i = 0; i < Math.floor(CACHE_MAX_SIZE / 4); i++) {
-      COMPILED_GLOB_CACHE.delete(keys[i]);
+      COMPILED_GLOB_CACHE.delete(expectDefined6(keys[i]));
     }
   }
   const re = compileGlob(pattern);
@@ -4676,6 +4734,25 @@ function buildChildEnv(optsOrSessionId) {
   if (opts.sessionId) out["WRONGSTACK_SESSION_ID"] = opts.sessionId;
   return out;
 }
+
+// src/utils/sleep.ts
+function sleep(ms) {
+  return new Promise((resolve13) => setTimeout(resolve13, ms));
+}
+
+// src/utils/expect-defined.ts
+function expectDefined7(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
+function expectDefined8(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var GLOB_CHARS = /* @__PURE__ */ new Set(["*", "?", "["]);
 var IS_WINDOWS = process.platform === "win32";
 var SEP = IS_WINDOWS ? "\\" : "/";
@@ -4689,7 +4766,7 @@ function globToRegex(pat) {
   let i = 0;
   let re = "^";
   while (i < pat.length) {
-    const c = pat[i];
+    const c = expectDefined8(pat[i]);
     if (c === "*") {
       if (pat[i + 1] === "*") {
         re += ".*";
@@ -4728,7 +4805,7 @@ function globToRegex(pat) {
 }
 function baseDir(pat) {
   let i = pat.length - 1;
-  while (i >= 0 && !GLOB_CHARS.has(pat[i]) && pat[i] !== SEP && pat[i] !== "/") i--;
+  while (i >= 0 && !GLOB_CHARS.has(expectDefined8(pat[i])) && pat[i] !== SEP && pat[i] !== "/") i--;
   const cut = i >= 0 ? pat.lastIndexOf(SEP, i) : pat.lastIndexOf("/", i);
   return cut < 0 ? "." : pat.slice(0, cut);
 }
@@ -4793,6 +4870,12 @@ async function expandGlob(pattern) {
 }
 
 // src/utils/json-repair.ts
+function expectDefined9(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function completePartialObject(s) {
   if (!s.trim().startsWith("{")) return s;
   if (tryParse(s).ok) return s;
@@ -4804,7 +4887,7 @@ function completePartialObject(s) {
   let contentEnd = 0;
   let stringBraceDepth = 0;
   for (let i = 0; i < s.length; i++) {
-    const ch = s[i];
+    const ch = expectDefined9(s[i]);
     if (inString) {
       contentEnd = i + 1;
       if (escaped) {
@@ -4900,6 +4983,12 @@ function mergeCustomModelDefs(providerCustomModels, configModels) {
 
 // src/storage/session-store.ts
 init_atomic_write();
+function expectDefined10(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function sanitizeModel(model) {
   return model.replace(/[^a-zA-Z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
 }
@@ -4910,7 +4999,7 @@ function generateSessionId(startedAt, model) {
   const modelPart = model ? `_${sanitizeModel(model)}` : "";
   return `${date}/${time}Z${modelPart}_${suffix}`;
 }
-var DefaultSessionStore = class {
+var DefaultSessionStore = class _DefaultSessionStore {
   dir;
   events;
   secretScrubber;
@@ -4919,6 +5008,10 @@ var DefaultSessionStore = class {
     this.events = opts.events;
     this.secretScrubber = opts.secretScrubber;
   }
+  /** Absolute path to the session index file. */
+  get indexFile() {
+    return path6.join(this.dir, "_index.jsonl");
+  }
   /** Join session ID to its absolute path within the store directory. */
   sessionPath(id, ext) {
     return path6.join(this.dir, `${id}${ext}`);
@@ -4951,7 +5044,8 @@ var DefaultSessionStore = class {
       return new FileSessionWriter(id, handle, startedAt, meta, this.events, {
         dir: shardDir,
         filePath: file,
-        secretScrubber: this.secretScrubber
+        secretScrubber: this.secretScrubber,
+        onClose: (s) => this.appendToIndex(s)
       });
     } catch (err) {
       await handle.close().catch(() => {
@@ -4982,7 +5076,7 @@ var DefaultSessionStore = class {
           provider: data.metadata.provider
         },
         this.events,
-        { resumed: true, dir: this.dir, filePath: file, secretScrubber: this.secretScrubber }
+        { resumed: true, dir: this.dir, filePath: file, secretScrubber: this.secretScrubber, onClose: (s) => this.appendToIndex(s) }
       );
       return { writer, data };
     } catch (err) {
@@ -5012,6 +5106,15 @@ var DefaultSessionStore = class {
   async list(limit = 20) {
     try {
       await ensureDir(this.dir);
+      const indexed = await this.readIndex();
+      if (indexed.length > 0) {
+        indexed.sort((a, b) => {
+          if (a.startedAt < b.startedAt) return 1;
+          if (a.startedAt > b.startedAt) return -1;
+          return a.id.localeCompare(b.id);
+        });
+        return indexed.slice(0, limit);
+      }
       const ids = await this.collectSessionIds(this.dir);
       const sessions = await Promise.all(ids.map((id) => this.summaryFor(id).catch(() => null)));
       const out = sessions.filter((s) => s !== null);
@@ -5025,16 +5128,121 @@ var DefaultSessionStore = class {
       return [];
     }
   }
-  /** Recursively collect all session IDs from shard subdirectories. */
-  async collectSessionIds(dir) {
+  // ── Session index (_index.jsonl) ─────────────────────────────────────────
+  //
+  // One JSON line per closed session, appended atomically on close().
+  // When a session is deleted, a tombstone {action:"delete",id:"..."} is
+  // appended. On read, tombstones filter out matching session entries.
+  // This keeps listing O(lines-in-index) instead of O(files-on-disk).
+  //
+  // The index auto-compacts every N appends to prevent unbounded growth
+  // from tombstones and duplicate entries (resume cycles).
+  indexAppendCount = 0;
+  static COMPACT_EVERY = 30;
+  /** Append a session summary to the index. */
+  async appendToIndex(summary) {
+    try {
+      await ensureDir(this.dir);
+      const line = JSON.stringify(summary) + "\n";
+      await fsp3.appendFile(this.indexFile, line, "utf8");
+      this.indexAppendCount++;
+      if (this.indexAppendCount >= _DefaultSessionStore.COMPACT_EVERY) {
+        await this.compactIndex();
+        this.indexAppendCount = 0;
+      }
+    } catch {
+    }
+  }
+  /** Append a tombstone entry for a deleted session. */
+  async writeTombstone(id) {
+    try {
+      await ensureDir(this.dir);
+      const line = JSON.stringify({ action: "delete", id }) + "\n";
+      await fsp3.appendFile(this.indexFile, line, "utf8");
+      this.indexAppendCount++;
+    } catch {
+    }
+  }
+  /**
+   * Compact the index: read all entries, drop tombstones, deduplicate
+   * (keep latest per session), and rewrite. Atomic via temp+rename.
+   */
+  async compactIndex() {
+    const entries = await this.readIndex();
+    if (entries.length === 0) return;
+    const tmp = `${this.indexFile}.compact.tmp`;
+    const lines = entries.map((s) => JSON.stringify(s)).join("\n") + "\n";
+    await fsp3.writeFile(tmp, lines, "utf8");
+    await fsp3.rename(tmp, this.indexFile);
+  }
+  /**
+   * Read the index file and return deduplicated session summaries.
+   * Entries with a matching tombstone are filtered out.
+   * Returns empty array when the index doesn't exist or is corrupt.
+   */
+  async readIndex() {
+    let raw;
+    try {
+      raw = await fsp3.readFile(this.indexFile, "utf8");
+    } catch {
+      return [];
+    }
+    const deleted = /* @__PURE__ */ new Set();
+    const seen = /* @__PURE__ */ new Map();
+    for (const line of raw.split("\n")) {
+      if (!line.trim()) continue;
+      try {
+        const entry = JSON.parse(line);
+        if (entry.action === "delete" && entry.id) {
+          deleted.add(entry.id);
+          seen.delete(entry.id);
+          continue;
+        }
+        if (entry.id && !deleted.has(entry.id)) {
+          seen.set(entry.id, entry);
+        }
+      } catch {
+      }
+    }
+    return Array.from(seen.values());
+  }
+  /**
+   * Rebuild the index from disk by scanning all sessions and writing a
+   * fresh _index.jsonl. Useful after manual cleanup or index corruption.
+   */
+  async rebuildIndex() {
+    const ids = await this.collectSessionIds(this.dir);
+    const summaries = await Promise.all(ids.map((id) => this.summaryFor(id).catch(() => null)));
+    const valid = summaries.filter((s) => s !== null);
+    const tmp = `${this.indexFile}.tmp`;
+    const lines = valid.map((s) => JSON.stringify(s)).join("\n") + "\n";
+    await fsp3.writeFile(tmp, lines, "utf8");
+    await fsp3.rename(tmp, this.indexFile);
+    return valid.length;
+  }
+  /** Recursively collect session IDs from date-shard subdirectories.
+   *  IDs include the date-prefix path (e.g. "2026-06-06/17-46-57Z_…").
+   *  Skips `.jsonl`/`.summary.json` root files, dot-files, and
+   *  sub-directories that belong to fleet/subagent sessions. */
+  async collectSessionIds(dir, prefix = "", depth = 0) {
     const ids = [];
-    const entries = await fsp3.readdir(dir, { withFileTypes: true });
+    let entries;
+    try {
+      entries = await fsp3.readdir(dir, { withFileTypes: true });
+    } catch {
+      return ids;
+    }
     for (const entry of entries) {
-      const full = path6.join(dir, entry.name);
+      if (entry.name.startsWith(".") && entry.name !== ".wrongstack") continue;
+      if (entry.name === "shared" || entry.name === "subagents" || entry.name === "attachments")
+        continue;
       if (entry.isDirectory()) {
-        ids.push(...await this.collectSessionIds(full));
+        const childPrefix = depth === 0 ? entry.name : `${prefix}/${entry.name}`;
+        ids.push(...await this.collectSessionIds(path6.join(dir, entry.name), childPrefix, depth + 1));
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
-        ids.push(entry.name.replace(/\.jsonl$/, ""));
+        if (entry.name === "_index.jsonl") continue;
+        const base = entry.name.replace(/\.jsonl$/, "");
+        ids.push(prefix ? `${prefix}/${base}` : base);
       }
     }
     return ids;
@@ -5057,9 +5265,70 @@ var DefaultSessionStore = class {
       return summary;
     }
   }
-  async delete(id) {
-    await fsp3.unlink(this.sessionPath(id, ".jsonl"));
+  /**
+   * Delete a session and all associated files: JSONL, summary, plan/todos
+   * sidecars, and the session directory (fleet.json, shared/, subagents/).
+   */
+  async deleteSession(id) {
+    await fsp3.unlink(this.sessionPath(id, ".jsonl")).catch(() => void 0);
     await fsp3.unlink(this.sessionPath(id, ".summary.json")).catch(() => void 0);
+    const shardDir = path6.dirname(path6.join(this.dir, id));
+    const base = path6.basename(id);
+    for (const ext of [".plan.json", ".todos.json"]) {
+      await fsp3.unlink(path6.join(shardDir, `${base}${ext}`)).catch(() => void 0);
+    }
+    const sessDir = path6.join(shardDir, base);
+    await fsp3.rm(sessDir, { recursive: true, force: true }).catch(() => void 0);
+    await this.writeTombstone(id);
+  }
+  async delete(id) {
+    await this.deleteSession(id);
+  }
+  async prune(maxAgeDays = 30) {
+    const cutoff = Date.now() - maxAgeDays * 864e5;
+    let deleted = 0;
+    let activeSessionId = null;
+    try {
+      const raw = await fsp3.readFile(path6.join(this.dir, "active.json"), "utf8");
+      const active = JSON.parse(raw);
+      activeSessionId = active.sessionId ?? null;
+    } catch {
+    }
+    const entries = await fsp3.readdir(this.dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const dateDir = path6.join(this.dir, entry.name);
+      const files = await fsp3.readdir(dateDir, { withFileTypes: true }).catch(() => []);
+      for (const file of files) {
+        if (!file.isFile() || !file.name.endsWith(".jsonl")) continue;
+        const jsonlPath = path6.join(dateDir, file.name);
+        try {
+          const stat10 = await fsp3.stat(jsonlPath);
+          if (stat10.mtimeMs >= cutoff) continue;
+        } catch {
+          continue;
+        }
+        const id = `${entry.name}/${file.name.replace(/\.jsonl$/, "")}`;
+        if (activeSessionId && id === activeSessionId) continue;
+        await this.deleteSession(id);
+        deleted++;
+      }
+    }
+    if (deleted > 0) {
+      await this.compactIndex().catch(() => void 0);
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const dateDir = path6.join(this.dir, entry.name);
+      try {
+        const remaining = await fsp3.readdir(dateDir);
+        if (remaining.length === 0) {
+          await fsp3.rmdir(dateDir).catch(() => void 0);
+        }
+      } catch {
+      }
+    }
+    return deleted;
   }
   async clearHistory(id) {
     await this.ensureShardDir(id);
@@ -5081,13 +5350,42 @@ var DefaultSessionStore = class {
       const data = await this.load(id);
       const firstUser = data.events.find((e) => e.type === "user_input");
       const title = firstUser && firstUser.type === "user_input" ? userInputTitle(firstUser.content) : "(empty session)";
+      let iterationCount = 0;
+      let toolCallCount = 0;
+      let toolErrorCount = 0;
+      let fileChangeCount = 0;
+      const toolBreakdown = {};
+      let outcome = void 0;
+      const lastEvent = data.events[data.events.length - 1];
+      for (const e of data.events) {
+        if (e.type === "in_flight_start") iterationCount++;
+        else if (e.type === "tool_call_start") {
+          toolCallCount++;
+          toolBreakdown[e.name] = (toolBreakdown[e.name] ?? 0) + 1;
+        } else if (e.type === "tool_result" && e.isError) toolErrorCount++;
+        else if (e.type === "file_snapshot") fileChangeCount += e.files.length;
+      }
+      if (lastEvent?.type === "session_end") {
+        outcome = "completed";
+      } else if (lastEvent?.type === "in_flight_start") {
+        outcome = "aborted";
+      } else if (data.events.some((e) => e.type === "error")) {
+        outcome = "error";
+      }
       return {
         id,
         title,
         startedAt: data.metadata.startedAt,
+        endedAt: data.metadata.endedAt,
         model: data.metadata.model ?? "unknown",
         provider: data.metadata.provider ?? "unknown",
-        tokenTotal: data.usage.input + data.usage.output
+        tokenTotal: data.usage.input + data.usage.output,
+        iterationCount: iterationCount > 0 ? iterationCount : void 0,
+        toolCallCount: toolCallCount > 0 ? toolCallCount : void 0,
+        toolErrorCount: toolErrorCount > 0 ? toolErrorCount : void 0,
+        fileChangeCount: fileChangeCount > 0 ? fileChangeCount : void 0,
+        toolBreakdown: Object.keys(toolBreakdown).length > 0 ? toolBreakdown : {},
+        outcome
       };
     } catch {
       return {
@@ -5186,9 +5484,10 @@ var FileSessionWriter = class {
     this.meta = meta;
     this.events = events;
     this.resumed = opts.resumed ?? false;
-    this.manifestFile = opts.dir ? path6.join(opts.dir, `${id}.summary.json`) : "";
+    this.manifestFile = opts.dir ? path6.join(opts.dir, `${path6.basename(id)}.summary.json`) : "";
     this.filePath = opts.filePath ?? "";
     this.secretScrubber = opts.secretScrubber;
+    this.onCloseCb = opts.onClose;
     this.summary = {
       id,
       title: "(empty session)",
@@ -5218,6 +5517,15 @@ var FileSessionWriter = class {
   appendFailCount = 0;
   lastAppendWarnAt = 0;
   secretScrubber;
+  onCloseCb;
+  // ── Enriched summary tracking ──────────────────────────────────────────
+  iterationCount = 0;
+  toolCallCount = 0;
+  toolErrorCount = 0;
+  toolBreakdown = {};
+  fileChangeCount = 0;
+  compactionCount = 0;
+  outcome = void 0;
   /**
    * Scrub secrets out of conversation-turn events before they are observed
    * for the summary, written to the JSONL log, or surfaced on resume. Only
@@ -5295,8 +5603,22 @@ var FileSessionWriter = class {
   observeForSummary(event) {
     if (event.type === "tool_use") {
       this.openToolUses.add(event.id);
+    } else if (event.type === "tool_call_start") {
+      this.toolCallCount++;
+      this.toolBreakdown[event.name] = (this.toolBreakdown[event.name] ?? 0) + 1;
     } else if (event.type === "tool_result") {
       this.openToolUses.delete(event.id);
+      if (event.isError) {
+        this.toolErrorCount++;
+        this.outcome = "error";
+      }
+    } else if (event.type === "file_snapshot") {
+      this.fileChangeCount += event.files.length;
+    } else if (event.type === "compaction") {
+      this.compactionCount++;
+    }
+    if (event.type === "error" || event.type === "provider_error") {
+      this.outcome = "error";
     }
     if (event.type === "user_input" && this.summary.title === "(empty session)") {
       this.summary = { ...this.summary, title: userInputTitle(event.content) };
@@ -5307,18 +5629,35 @@ var FileSessionWriter = class {
     } else if (event.type === "session_end") {
       const total = event.usage.input + event.usage.output;
       if (total > 0) this.summary = { ...this.summary, tokenTotal: total };
+    } else if (event.type === "in_flight_start") {
+      this.iterationCount++;
     }
   }
   async close() {
     if (this.closing) return;
     this.closing = true;
     this.closed = true;
+    this.summary = {
+      ...this.summary,
+      endedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      iterationCount: this.iterationCount,
+      toolCallCount: this.toolCallCount,
+      toolErrorCount: this.toolErrorCount,
+      fileChangeCount: this.fileChangeCount,
+      compactionCount: this.compactionCount > 0 ? this.compactionCount : void 0,
+      toolBreakdown: { ...this.toolBreakdown },
+      outcome: this.outcome ?? "completed"
+    };
     if (this.manifestFile) {
       try {
         await atomicWrite(this.manifestFile, JSON.stringify(this.summary), { mode: 384 });
       } catch {
       }
     }
+    try {
+      await this.onCloseCb?.(this.summary);
+    } catch {
+    }
     try {
       await this.handle.close();
     } catch {
@@ -5360,7 +5699,7 @@ var FileSessionWriter = class {
     let targetCheckpointLine = -1;
     let afterTarget = false;
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
+      const line = expectDefined10(lines[i]);
       if (!line.trim()) continue;
       let event;
       try {
@@ -6497,8 +6836,11 @@ var SessionAnalyzer = class {
   }
   calcDuration(events) {
     if (events.length < 2) return 0;
-    const first = new Date(events[0].ts).getTime();
-    const last = new Date(events[events.length - 1].ts).getTime();
+    const firstEvent = events[0];
+    const lastEvent = events[events.length - 1];
+    if (!firstEvent || !lastEvent) return 0;
+    const first = new Date(firstEvent.ts).getTime();
+    const last = new Date(lastEvent.ts).getTime();
     return last - first;
   }
 };
@@ -7607,13 +7949,11 @@ function parseDescription(raw) {
   const scope = [];
   const coversMatch = /(?:covers|for|including)\s+([^.]+)/i.exec(desc);
   if (coversMatch) {
-    const items = coversMatch[1].replace(/[·•]/g, ",").split(",").map((s) => s.trim()).filter(Boolean);
+    const items = coversMatch[1] ?? "".replace(/[·•]/g, ",").split(",").map((s) => s.trim()).filter(Boolean);
     scope.push(...items);
   }
   return { trigger, scope };
 }
-
-// src/core/streaming-response-builder.ts
 function buildResponse(state) {
   const content = [];
   for (const b of state.blockOrder) {
@@ -7672,7 +8012,7 @@ function handleContentBlockStart(state, ev) {
     state.textBuffers.push("");
     state.blockOrder.push({ kind: "text", idx: state.currentTextIndex });
   } else if (kind === "tool_use") {
-    const id = ev.id ?? crypto.randomUUID();
+    const id = ev.id ?? randomUUID();
     state.tools.set(id, { name: ev.name ?? "unknown", partial: "" });
     state.blockOrder.push({ kind: "tool", id });
     state.currentTextIndex = -1;
@@ -8062,7 +8402,7 @@ var IntelligentCompactor = class {
       maxTokens: 1024
     };
     const ac = ctx.signal ? void 0 : new AbortController();
-    const signal = ctx.signal ?? ac.signal;
+    const signal = ctx.signal ?? ac?.signal;
     const res = await this.provider.complete(req, { signal });
     const textBlocks = res.content.filter(isTextBlock);
     return textBlocks.map((b) => b.text).join("\n").trim() || "(empty summary)";
@@ -8165,6 +8505,12 @@ var IntelligentCompactor = class {
 };
 
 // src/models/llm-selector.ts
+function expectDefined11(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DEFAULT_SYSTEM_PROMPT = `You are a context pruning assistant. Given a conversation history and a token budget, decide which message ranges are worth keeping verbatim and which should be collapsed into summaries.
 
 Output a JSON object with this structure:
@@ -8205,7 +8551,7 @@ function formatMessages(messages, maxChars = 8e3) {
   const lines = [];
   let used = 0;
   for (let i = 0; i < messages.length; i++) {
-    const m = messages[i];
+    const m = expectDefined11(messages[i]);
     const role = m.role.padEnd(10, " ");
     let text;
     if (typeof m.content === "string") {
@@ -8270,7 +8616,7 @@ IMPORTANT: Total conversation (${totalTokens} tokens) exceeds budget (${effectiv
     let tokenCount = 0;
     let startIdx = 0;
     for (let i = messages.length - 1; i >= 0; i--) {
-      const m = messages[i];
+      const m = expectDefined11(messages[i]);
       const cost = typeof m.content === "string" ? Math.ceil(m.content.length / 4) : m.content.reduce(
         (acc, b) => acc + (b.type === "text" ? Math.ceil(b.text.length / 4) : Math.ceil(JSON.stringify(b).length / 4)),
         0
@@ -8481,6 +8827,7 @@ Summarize the following message range:`;
     let boundary = preserveIdx;
     for (let i = preserveIdx; i < messages.length && i < preserveIdx + 6; i++) {
       const m = messages[i];
+      if (!m) continue;
       if (m.role === "user" && this.hasTextContent(m)) {
         boundary = i;
         break;
@@ -9579,9 +9926,6 @@ ${recentJournal}` : "No prior iterations.",
     await saveGoal(this.goalPath, { ...current, engineState: state });
   }
 };
-function sleep(ms) {
-  return new Promise((resolve13) => setTimeout(resolve13, ms));
-}
 
 // src/coordination/subagent-budget.ts
 var BudgetExceededError = class extends Error {
@@ -9745,16 +10089,16 @@ var SubagentBudget = class _SubagentBudget {
     }
     if (exceeded.length === 0) return [];
     if (!this._onThreshold) {
-      const first2 = exceeded[0];
+      const first2 = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       throw new BudgetExceededError(first2.kind, first2.limit, first2.used);
     }
     if (this._mode === "sync") {
-      const first2 = exceeded[0];
+      const first2 = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       throw new BudgetExceededError(first2.kind, first2.limit, first2.used);
     }
     const bus = this._events;
     if (!bus || !bus.hasListenerFor("budget.threshold_reached")) {
-      const first2 = exceeded[0];
+      const first2 = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       throw new BudgetExceededError(first2.kind, first2.limit, first2.used);
     }
     for (const entry of exceeded) {
@@ -9762,8 +10106,9 @@ var SubagentBudget = class _SubagentBudget {
       const decision2 = this._negotiateExtension(entry.kind, exceeded);
       this._pendingNegotiations.set(entry.kind, decision2);
     }
-    const first = exceeded[0];
+    const first = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
     const decision = this._pendingNegotiations.get(first.kind);
+    if (!decision) throw new Error(`No pending negotiation for ${first.kind}`);
     throw new BudgetThresholdSignal(first.kind, first.limit, first.used, decision);
   }
   /**
@@ -9785,8 +10130,11 @@ var SubagentBudget = class _SubagentBudget {
    * a fresh signal.
    */
   async _negotiateExtension(kind, exceeded) {
+    if (!this._onThreshold) {
+      return "stop";
+    }
     try {
-      const first = exceeded[0];
+      const first = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       const result = this._onThreshold({
         kind: first.kind,
         used: first.used,
@@ -12269,6 +12617,11 @@ function getAgentDefinition(role) {
 
 // src/coordination/dispatcher.ts
 var DEFAULT_DISPATCH_ROLE = "executor";
+var FALLBACK_DEFINITION = {
+  config: { role: "unknown", name: "Unknown Agent" },
+  budget: {},
+  capability: { phase: "meta", summary: "", keywords: [] }
+};
 function normalize2(text) {
   return ` ${text.toLowerCase().replace(/[^a-z0-9]+/g, " ").trim()} `;
 }
@@ -12296,7 +12649,7 @@ function scoreAgents(task, catalog = AGENT_CATALOG) {
 }
 function heuristicConfidence(candidates) {
   if (candidates.length === 0) return 0;
-  const top = candidates[0].score;
+  const top = candidates[0]?.score ?? 0;
   const second = candidates[1]?.score ?? 0;
   const strength = Math.min(1, top / 3);
   const margin = (top - second + 1) / (top + 1);
@@ -12312,7 +12665,7 @@ async function dispatchAgent(task, opts = {}) {
   if (top && confidence >= threshold) {
     return {
       role: top.role,
-      definition: catalog[top.role],
+      definition: catalog[top.role] ?? FALLBACK_DEFINITION,
       confidence,
       method: "heuristic",
       reason: `Matched keywords: ${top.matched.slice(0, 4).join(", ")}`,
@@ -12320,7 +12673,7 @@ async function dispatchAgent(task, opts = {}) {
     };
   }
   if (opts.classifier) {
-    const pool = (candidates.length > 0 ? candidates.slice(0, maxCandidates).map((c) => catalog[c.role]) : ALL_AGENT_DEFINITIONS).map((d) => ({
+    const pool = (candidates.length > 0 ? candidates.slice(0, maxCandidates).map((c) => catalog[c.role] ?? FALLBACK_DEFINITION) : ALL_AGENT_DEFINITIONS).map((d) => ({
       role: d.config.role,
       name: d.config.name,
       summary: d.capability.summary
@@ -12330,7 +12683,7 @@ async function dispatchAgent(task, opts = {}) {
       if (choice && catalog[choice.role]) {
         return {
           role: choice.role,
-          definition: catalog[choice.role],
+          definition: catalog[choice.role] ?? FALLBACK_DEFINITION,
           confidence: 1,
           method: "llm",
           reason: choice.reason ?? "Selected by LLM classifier",
@@ -12343,17 +12696,17 @@ async function dispatchAgent(task, opts = {}) {
   if (top) {
     return {
       role: top.role,
-      definition: catalog[top.role],
+      definition: catalog[top.role] ?? FALLBACK_DEFINITION,
       confidence,
       method: "heuristic",
       reason: `Weak match (${top.matched.slice(0, 3).join(", ") || "low signal"})`,
       alternatives: candidates.slice(1, maxCandidates)
     };
   }
-  const fallbackRole = catalog[DEFAULT_DISPATCH_ROLE] ? DEFAULT_DISPATCH_ROLE : Object.keys(catalog)[0];
+  const fallbackRole = catalog[DEFAULT_DISPATCH_ROLE] ? DEFAULT_DISPATCH_ROLE : Object.keys(catalog)[0] ?? DEFAULT_DISPATCH_ROLE;
   return {
     role: fallbackRole,
-    definition: catalog[fallbackRole],
+    definition: catalog[fallbackRole] ?? FALLBACK_DEFINITION,
     confidence: 0,
     method: "fallback",
     reason: "No keyword signal; defaulting to the generalist Executor",
@@ -13166,6 +13519,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
   takeNextDispatchableTask() {
     for (let i = 0; i < this.pendingTasks.length; i++) {
       const task = this.pendingTasks[i];
+      if (!task) continue;
       const subagentId = task.subagentId ? this.isIdleSubagent(task.subagentId) ? task.subagentId : null : this.findIdleSubagent();
       if (!subagentId) continue;
       this.pendingTasks.splice(i, 1);
@@ -13357,14 +13711,14 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
         const idleExceeded = idleLimit !== void 0 && budget.idleMs() >= idleLimit;
         if (idleExceeded && !wallExceeded) {
           this.subagents.get(ctx.subagentId)?.abortController.abort();
-          reject(new BudgetExceededError("timeout", idleLimit, budget.idleMs()));
+          reject(new BudgetExceededError("timeout", idleLimit ?? 0, budget.idleMs()));
           return;
         }
         if (!wallExceeded) {
           scheduleNext();
           return;
         }
-        const limit = wallLimit;
+        const limit = wallLimit ?? 0;
         if (!budget.onThreshold) {
           this.subagents.get(ctx.subagentId)?.abortController.abort();
           reject(new BudgetExceededError("timeout", limit, elapsed));
@@ -13523,8 +13877,11 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
 };
 
 // src/execution/parallel-eternal-engine.ts
-function sleep2(ms) {
-  return new Promise((resolve13) => setTimeout(resolve13, ms));
+function expectDefined12(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
 }
 var GOAL_COMPLETE_MARKER2 = /^\s*\[goal[_\s-]?complete\]\s*$/im;
 var ParallelEternalEngine = class {
@@ -13600,7 +13957,7 @@ var ParallelEternalEngine = class {
           );
         }
         if (this.stopRequested) break;
-        await sleep2(2e3);
+        await sleep(2e3);
       }
     } finally {
       this.state = "stopped";
@@ -13681,7 +14038,7 @@ var ParallelEternalEngine = class {
   // Fan-out
   // -------------------------------------------------------------------------
   async fanOut(goal, tasks) {
-    const coordinator = this.coordinator;
+    const coordinator = expectDefined12(this.coordinator);
     const slotCount = Math.min(this.slots, tasks.length);
     const routes = this.dispatchEnabled ? await Promise.all(
       tasks.slice(0, slotCount).map(
@@ -13713,7 +14070,7 @@ ${recentJournal}` : "No prior iterations.",
     const routeInfo = [];
     const spawnPromises = [];
     for (let i = 0; i < slotCount; i++) {
-      const task = tasks[i];
+      const task = expectDefined12(tasks[i]);
       const route = routes[i] ?? null;
       const subagentId = `parallel-${this.iterations}-${i}`;
       const taskId = randomUUID();
@@ -14216,7 +14573,7 @@ var CollabSession = class extends EventEmitter {
       this.emit("session.error", error);
       throw error;
     }
-    for (const result of results.flat()) {
+    for (const result of results?.flat() ?? []) {
       await this.parseAndEmit(result);
     }
     const report = this.assembleReport();
@@ -14277,7 +14634,7 @@ var CollabSession = class extends EventEmitter {
   }
   budgetForRole(role) {
     if (this.options.budgetOverrides?.[role]) {
-      return this.options.budgetOverrides[role];
+      return this.options.budgetOverrides[role] ?? { maxIterations: 0, maxToolCalls: 0, timeoutMs: 0 };
     }
     const defaults = {
       "bug-hunter": { maxIterations: 2e3, maxToolCalls: 5e3, timeoutMs: 10 * 60 * 1e3 },
@@ -14730,7 +15087,7 @@ function makeSpawnTool(director, roster) {
         });
         const dispatchRole = dispatchResult.role;
         if (roster?.[dispatchRole]) {
-          cfg = instantiateRosterConfig(dispatchRole, roster[dispatchRole]);
+          cfg = instantiateRosterConfig(dispatchRole, roster[dispatchRole] ?? {});
         } else {
           const def = dispatchResult.definition;
           cfg = {
@@ -17039,7 +17396,10 @@ function attachAutoExtend(events, policy = {}) {
       if (kind === "timeout" || kind === "idle_timeout") {
         if (progress > lastTimeoutProgress) {
           lastTimeoutProgress = progress;
-          const next2 = Math.min(Math.ceil(limit * (1 + factor)), ceiling.timeoutMs);
+          const next2 = Math.min(
+            Math.ceil(limit * (1 + factor)),
+            ceiling.timeoutMs ?? DEFAULT_CEILING.timeoutMs
+          );
           extend({ timeoutMs: next2 });
         } else {
           deny();
@@ -17053,7 +17413,7 @@ function attachAutoExtend(events, policy = {}) {
       }
       extendCounts.set(kind, count + 1);
       const field = FIELD_BY_KIND[kind];
-      const cap = ceiling[field];
+      const cap = ceiling[field] ?? DEFAULT_CEILING[field];
       const next = Math.min(Math.ceil(limit * (1 + factor)), cap);
       extend({ [field]: next });
     })
@@ -17698,7 +18058,7 @@ var TaskTracker = class {
         if (filter.type?.length && !filter.type.includes(n.type)) return false;
         if (filter.assignee?.length && n.assignee && !filter.assignee.includes(n.assignee))
           return false;
-        if (filter.tags?.length && n.tags && !n.tags.some((t2) => filter.tags.includes(t2)))
+        if (filter.tags?.length && n.tags && !n.tags.some((t2) => filter.tags?.includes(t2)))
           return false;
         if (filter.specRequirementId && n.specRequirementId !== filter.specRequirementId)
           return false;
@@ -18212,6 +18572,12 @@ var TaskGraphStore = class {
 };
 
 // src/sdd/spec-builder.ts
+function expectDefined13(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function buildQuestioningPrompt(session, min, max) {
   const answered = session.answers.length;
   const remaining = Math.max(0, min - answered);
@@ -18257,7 +18623,7 @@ function buildQuestioningPrompt(session, min, max) {
   if (answered > 0) {
     lines.push("", "**Conversation so far:**");
     for (let i = 0; i < answered; i++) {
-      const a = session.answers[i];
+      const a = expectDefined13(session.answers[i]);
       lines.push(``, `Q${i + 1}: ${a.question}`, `A${i + 1}: ${a.answer}`);
     }
   }
@@ -18999,6 +19365,12 @@ function truncate2(str, maxLen) {
 }
 
 // src/sdd/critical-path.ts
+function expectDefined14(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function analyzeCriticalPath(graph) {
   const nodes = Array.from(graph.nodes.values());
   const topoOrder = topologicalSort(graph);
@@ -19007,9 +19379,9 @@ function analyzeCriticalPath(graph) {
   for (const edge of graph.edges) {
     if (edge.type === "depends_on") {
       if (!blockedByMap.has(edge.from)) blockedByMap.set(edge.from, /* @__PURE__ */ new Set());
-      blockedByMap.get(edge.from).add(edge.to);
+      blockedByMap.get(edge.from)?.add(edge.to);
       if (!blocksMap.has(edge.to)) blocksMap.set(edge.to, /* @__PURE__ */ new Set());
-      blocksMap.get(edge.to).add(edge.from);
+      blocksMap.get(edge.to)?.add(edge.from);
     }
   }
   const readyTasks = [];
@@ -19074,7 +19446,7 @@ function getTransitiveBlocked(_graph, taskId, blocksMap) {
   const visited = /* @__PURE__ */ new Set();
   const queue = [taskId];
   while (queue.length > 0) {
-    const current = queue.shift();
+    const current = expectDefined14(queue.shift());
     const blocked = blocksMap.get(current);
     if (!blocked) continue;
     for (const id of blocked) {
@@ -19099,7 +19471,7 @@ function computeCriticalPath(graph, _topoOrder, blockedByMap) {
   for (const [taskId, blockers] of blockedByMap) {
     for (const blockerId of blockers) {
       if (!blocksMap.has(blockerId)) blocksMap.set(blockerId, /* @__PURE__ */ new Set());
-      blocksMap.get(blockerId).add(taskId);
+      blocksMap.get(blockerId)?.add(taskId);
     }
   }
   const n = allIds.length;
@@ -19120,7 +19492,7 @@ function computeCriticalPath(graph, _topoOrder, blockedByMap) {
     if (!changed) break;
   }
   let maxDist = 0;
-  let maxId = allIds[0];
+  let maxId = expectDefined14(allIds[0]);
   for (const id of allIds) {
     const d = dist.get(id) ?? 0;
     if (d > maxDist) {
@@ -19589,6 +19961,12 @@ var SddTaskDecomposer = class {
     return nodes.some((n) => n.status === "blocked");
   }
 };
+function expectDefined15(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var SddParallelRun = class {
   constructor(opts) {
     this.opts = opts;
@@ -19689,8 +20067,10 @@ var SddParallelRun = class {
       "\u2022 Do not ask before routine in-project tool use; if a permission gate appears, wait for that flow.",
       "\u2022 Keep output concise \u2014 summarize changes, do not transcribe files."
     ].join("\n");
+    if (!this.coordinator) throw new Error("SDD parallel runner requires a coordinator");
+    const coordinator = this.coordinator;
     const spawns = subagentIds.map(
-      (subagentId) => this.coordinator.spawn({
+      (subagentId) => coordinator.spawn({
         id: subagentId,
         name: subagentId,
         role: "executor",
@@ -19698,12 +20078,12 @@ var SddParallelRun = class {
       })
     );
     const spawnResults = await Promise.all(spawns);
-    if (!spawnResults.every((r) => r.subagentId)) {
+    if (!spawnResults.every((r) => Boolean(r.subagentId))) {
       throw new Error("One or more subagent spawns failed");
     }
     const assignPromises = tasks.map((task, i) => {
       const spec = {
-        id: taskIds[i],
+        id: taskIds[i] ?? task.id,
         description: [
           directivePreamble,
           "",
@@ -19712,15 +20092,15 @@ var SddParallelRun = class {
           "",
           task.description
         ].join("\n"),
-        subagentId: subagentIds[i],
+        subagentId: subagentIds[i] ?? spawnResults[i]?.subagentId ?? task.id,
         timeoutMs: this.timeoutMs
       };
-      return this.coordinator.assign(spec);
+      return this.coordinator?.assign(spec);
     });
     await Promise.all(assignPromises);
     let results;
     try {
-      results = await this.coordinator.awaitTasks(taskIds);
+      results = await coordinator.awaitTasks(taskIds);
     } catch (err) {
       results = taskIds.map((id) => ({
         subagentId: "",
@@ -19735,8 +20115,8 @@ var SddParallelRun = class {
     const successCount = results.filter((r) => r.status === "success").length;
     const failCount = results.length - successCount;
     for (let i = 0; i < results.length; i++) {
-      const result = results[i];
-      const taskId = taskIds[i];
+      const result = expectDefined15(results[i]);
+      const taskId = expectDefined15(taskIds[i]);
       if (result.status === "success") {
         this.opts.tracker.updateNodeStatus(taskId, "completed");
       } else {
@@ -20843,6 +21223,12 @@ var allServers = () => ({
   "zai-vision": { ...zaiVisionServer(), enabled: false },
   "minimax-vision": { ...miniMaxVisionServer(), enabled: false }
 });
+function expectDefined16(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function parseSkillRef(input) {
   const trimmed = input.trim().replace(/^https?:\/\/github\.com\//, "").replace(/\.git$/, "");
   const atIdx = trimmed.indexOf("@");
@@ -20859,7 +21245,7 @@ function parseSkillRef(input) {
   if (parts.length < 2) {
     throw new Error(`Invalid skill reference "${input}". Expected format: user/repo or user/repo@ref`);
   }
-  return { owner: parts[0], repo: parts[1], ref };
+  return { owner: expectDefined16(parts[0]), repo: expectDefined16(parts[1]), ref };
 }
 var MAX_TARBALL_SIZE = 50 * 1024 * 1024;
 async function downloadGitHubTarball(parsed) {
@@ -21028,6 +21414,12 @@ var SkillManifestStore = class {
 };
 
 // src/skills/skill-installer.ts
+function expectDefined17(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var MAX_SKILL_FILE_SIZE = 100 * 1024;
 var SkillInstaller = class {
   opts;
@@ -21149,10 +21541,10 @@ var SkillInstaller = class {
     for (const entry of targets) {
       const key = `${entry.source}@${entry.ref}`;
       if (!bySource.has(key)) bySource.set(key, []);
-      bySource.get(key).push(entry);
+      bySource.get(key)?.push(entry);
     }
     for (const [, entries] of bySource) {
-      const first = entries[0];
+      const first = expectDefined17(entries[0]);
       const scope = first.scope;
       const isGlobal = scope === "user";
       try {
@@ -21322,6 +21714,12 @@ async function collectFiles(dir, baseDir2) {
 
 // src/storage/annotations-store.ts
 init_atomic_write();
+function expectDefined18(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var FILE_VERSION = 1;
 var MAX_TEXT_LENGTH = 2e3;
 var MAX_ANNOTATIONS = 1e3;
@@ -21413,7 +21811,7 @@ var AnnotationsStore = class {
         return;
       }
       const next = {
-        ...all[idx],
+        ...expectDefined18(all[idx]),
         resolved: true,
         resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
         resolvedBy: input.resolvedBy
@@ -21649,6 +22047,12 @@ var ReplayLogStore = class {
     return next;
   }
 };
+function expectDefined19(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var SessionRecovery = class {
   constructor(dir) {
     this.dir = dir;
@@ -21689,7 +22093,7 @@ var SessionRecovery = class {
       const lines = raw.split("\n").filter((l) => l.trim());
       for (let i = lines.length - 1; i >= 0; i--) {
         try {
-          const ev = JSON.parse(lines[i]);
+          const ev = JSON.parse(expectDefined19(lines[i]));
           if (ev.type === "in_flight_start") {
             return {
               sessionId,
@@ -21741,13 +22145,13 @@ var SessionRecovery = class {
     let lastCheckpoint = null;
     let lastCheckpointIdx = -1;
     for (let i = 0; i < events.length; i++) {
-      if (events[i].type === "checkpoint") {
-        lastCheckpoint = events[i];
+      if (events[i]?.type === "checkpoint") {
+        lastCheckpoint = expectDefined19(events[i]);
         lastCheckpointIdx = i;
       }
     }
     const pendingEvents = lastCheckpointIdx >= 0 ? events.slice(lastCheckpointIdx + 1) : events;
-    const lastEv = events[events.length - 1];
+    const lastEv = expectDefined19(events[events.length - 1]);
     const inFlightStart = lastEv.type === "in_flight_start" ? lastEv : null;
     const context = inFlightStart && inFlightStart.type === "in_flight_start" ? inFlightStart.context : null;
     return {
@@ -21790,6 +22194,12 @@ var SessionRecovery = class {
     return path6.join(this.dir, `${sessionId}.jsonl`);
   }
 };
+function expectDefined20(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var GENESIS_PREV = "0".repeat(64);
 var DEFAULT_FSYNC_EVERY = 100;
 var ToolAuditLog = class {
@@ -21856,7 +22266,7 @@ var ToolAuditLog = class {
   async verify(sessionId) {
     const entries = await this.readAll(sessionId);
     if (entries.length === 0) return { ok: true, entries: 0 };
-    if (entries[0].prevHash !== GENESIS_PREV) {
+    if (entries[0]?.prevHash !== GENESIS_PREV) {
       return {
         ok: false,
         brokenAt: 0,
@@ -21865,7 +22275,7 @@ var ToolAuditLog = class {
     }
     let prevHash = GENESIS_PREV;
     for (let i = 0; i < entries.length; i++) {
-      const e = entries[i];
+      const e = expectDefined20(entries[i]);
       if (e.prevHash !== prevHash) {
         return {
           ok: false,
@@ -21984,6 +22394,12 @@ function sortKeys2(value) {
 
 // src/storage/session-rewinder.ts
 init_atomic_write();
+function expectDefined21(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DefaultSessionRewinder = class {
   constructor(sessionsDir, projectRoot) {
     this.sessionsDir = sessionsDir;
@@ -22022,7 +22438,7 @@ var DefaultSessionRewinder = class {
     const events = parseEvents(raw);
     let targetIdx = -1;
     for (let i = 0; i < events.length; i++) {
-      const event = events[i];
+      const event = expectDefined21(events[i]);
       if (event.type === "checkpoint") {
         const checkpointEvent = event;
         if (checkpointEvent.promptIndex === checkpointIndex) {
@@ -22036,7 +22452,7 @@ var DefaultSessionRewinder = class {
     }
     const snapshotsToRevert = [];
     for (let i = targetIdx + 1; i < events.length; i++) {
-      const event = events[i];
+      const event = expectDefined21(events[i]);
       if (event.type === "checkpoint") {
         break;
       }
@@ -22218,6 +22634,12 @@ var DefaultPromptStore = class {
     };
   }
 };
+function expectDefined22(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var ALL_SYNC_CATEGORIES = ["settings", "skills", "prompts", "memory", "history"];
 var CloudSync = class {
   constructor(paths, getConfig, setConfig) {
@@ -22260,8 +22682,8 @@ var CloudSync = class {
     const cfg = this.getConfig();
     if (!cfg?.enabled) return { ok: false, action: "push", categories: [], message: "Not enabled." };
     const parts = cfg.repo.split("/");
-    const owner = parts[0];
-    const repoName = parts[1];
+    const owner = expectDefined22(parts[0]);
+    const repoName = expectDefined22(parts[1]);
     const branch = "main";
     const baseTreeSha = this.state?.sha;
     const { treeEntries, rev } = await this.buildLocalTree(cfg.categories);
@@ -22313,8 +22735,8 @@ var CloudSync = class {
     const cfg = this.getConfig();
     if (!cfg?.enabled) return { ok: false, action: "pull", categories: [], message: "Not enabled." };
     const pullParts = cfg.repo.split("/");
-    const owner = pullParts[0];
-    const repoName = pullParts[1];
+    const owner = expectDefined22(pullParts[0]);
+    const repoName = expectDefined22(pullParts[1]);
     const branchData = await this.getRef(token, owner, repoName, "main");
     const currentSha = branchData.object.sha;
     const commitData = await this.getCommit(token, owner, repoName, currentSha);
@@ -22369,7 +22791,7 @@ var CloudSync = class {
   // ── GitHub API helpers ──────────────────────────────────────────────
   async githubFetch(token, owner, repo, method, pathSegment, body) {
     const url = `https://api.github.com/repos/${owner}/${repo}${pathSegment}`;
-    const res = await fetch(url, {
+    const init = {
       signal: AbortSignal.timeout(15e3),
       method,
       headers: {
@@ -22377,9 +22799,10 @@ var CloudSync = class {
         Accept: "application/vnd.github+json",
         "X-GitHub-Api-Version": "2022-11-28",
         "Content-Type": "application/json"
-      },
-      body: body !== void 0 ? JSON.stringify(body) : void 0
-    });
+      }
+    };
+    if (body !== void 0) init.body = JSON.stringify(body);
+    const res = await fetch(url, init);
     if (!res.ok) {
       const errText = await res.text();
       throw new Error(`GitHub API ${method} ${pathSegment} failed (${res.status}): ${errText}`);
@@ -23514,7 +23937,7 @@ var ReportGenerator = class {
       if (groups[finding.category] === void 0) {
         groups[finding.category] = [];
       }
-      groups[finding.category].push(finding);
+      groups[finding.category]?.push(finding);
     }
     return groups;
   }
@@ -23659,6 +24082,12 @@ var defaultGitignoreUpdater = new GitignoreUpdater();
 
 // src/security-scanner/orchestrator.ts
 init_atomic_write();
+function expectDefined23(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var SecurityScannerOrchestrator = class {
   constructor(retryPolicy, errorHandler) {
     this.retryPolicy = retryPolicy;
@@ -23708,7 +24137,7 @@ var SecurityScannerOrchestrator = class {
     if (detectionResult.detectedStacks.length === 0) {
       throw new Error(`No supported tech stack detected in ${projectRoot}`);
     }
-    const techStack = detectionResult.detectedStacks[0];
+    const techStack = expectDefined23(detectionResult.detectedStacks[0]);
     const generatedSkill = await this.generateSkillLLM(provider, model, projectRoot, techStack);
     const scanResult = await this.scanWithLLM(provider, model, projectRoot, generatedSkill, techStack, options);
     const synthesizedReport = await this.synthesizeReportLLM(provider, model, projectRoot, techStack, scanResult);
@@ -23789,7 +24218,7 @@ Return ONLY the JSON object, no markdown, no explanation.`;
       const text = response.content.filter((b) => b.type === "text").map((b) => b.text).join("");
       const jsonMatch = text.match(/\{[\s\S]*\}/);
       if (jsonMatch) {
-        const sanitized = sanitizeJsonString(jsonMatch[0]) || jsonMatch[0];
+        const sanitized = sanitizeJsonString(expectDefined23(jsonMatch[0])) || expectDefined23(jsonMatch[0]);
         const skillData = JSON.parse(sanitized);
         return {
           name: skillData.name || `security-scanner-${techStack.stack}`,
@@ -23909,7 +24338,7 @@ Return ONLY the JSON array. If no issues found, return [].`;
       const text = response.content.filter((b) => b.type === "text").map((b) => b.text).join("");
       const jsonMatch = text.match(/\[[\s\S]*\]/);
       if (jsonMatch) {
-        const sanitized = sanitizeJsonString(jsonMatch[0]) || jsonMatch[0];
+        const sanitized = sanitizeJsonString(expectDefined23(jsonMatch[0])) || expectDefined23(jsonMatch[0]);
         const parsed = JSON.parse(sanitized);
         return parsed.map((item, idx) => ({
           id: `llm-finding-${idx}-${Date.now()}`,
@@ -24149,7 +24578,7 @@ ${dirs.join(", ")}`);
     if (detectionResult.detectedStacks.length === 0) {
       throw new Error(`No supported tech stack detected in ${projectRoot}`);
     }
-    const techStack = detectionResult.detectedStacks[0];
+    const techStack = expectDefined23(detectionResult.detectedStacks[0]);
     return {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       projectRoot,
@@ -24757,6 +25186,12 @@ var FleetManager = class {
     this.usage.dispose();
   }
 };
+function expectDefined24(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function createMcpControlTool(opts) {
   const { getConfig, configPath, registry } = opts;
   const inputSchema = {
@@ -24802,11 +25237,11 @@ async function mcpControlDispatch(input, deps) {
     case "search":
       return renderSearch(query ?? "", deps);
     case "enable":
-      return runEnable(server, deps);
+      return server ? runEnable(server, deps) : "`server` is required for enable.";
     case "disable":
-      return runDisable(server, deps);
+      return server ? runDisable(server, deps) : "`server` is required for disable.";
     case "restart":
-      return runRestart(server, deps);
+      return server ? runRestart(server, deps) : "`server` is required for restart.";
     default:
       return `Unknown action "${action}". Use one of: list, search, enable, disable, restart.`;
   }
@@ -24908,7 +25343,7 @@ async function runDisable(name, deps) {
   const mcpServers = {
     ...full.mcpServers ?? {}
   };
-  const existing = mcpServers[name];
+  const existing = expectDefined24(mcpServers[name]);
   mcpServers[name] = { ...existing, enabled: false };
   full.mcpServers = mcpServers;
   await writeConfig(deps.configPath, full);
@@ -24979,6 +25414,12 @@ function badge(state) {
 }
 
 // src/extension/registry.ts
+function expectDefined25(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var ExtensionRegistry = class {
   extensions = [];
   promptContributors = [];
@@ -25144,11 +25585,12 @@ var ExtensionRegistry = class {
    * default runner, each subsequent wrapper wraps the previous.
    */
   wrapProviderRunner(inner) {
-    const wrappers = this.extensions.filter((e) => e.wrapProviderRunner).map((e) => ({ name: e.name, wrap: e.wrapProviderRunner }));
+    const wrappers = this.extensions.filter((e) => e.wrapProviderRunner).map((e) => ({ name: e.name, wrap: expectDefined25(e.wrapProviderRunner) }));
     if (wrappers.length === 0) return inner;
     let composed = inner;
     for (let i = wrappers.length - 1; i >= 0; i--) {
       const wrapper = wrappers[i];
+      if (!wrapper) continue;
       const next = composed;
       composed = async (ctx, req) => {
         try {
@@ -25247,7 +25689,7 @@ function createAgentToolHandler(a) {
     const useById = new Map(selectedToolUses.map((u) => [u.id, u]));
     const resultsForMessage = [];
     for (const { result, tool, durationMs } of outputs) {
-      if (result.type === "tool_confirm_pending") {
+      if (result.type === "tool_confirm_pending" && tool) {
         const decision = await waitForConfirm({
           tool,
           input: result.input,
@@ -25309,6 +25751,7 @@ function createAgentToolHandler(a) {
         resultsForMessage.push(reRunResult.result);
         continue;
       }
+      if (result.type !== "tool_result") continue;
       resultsForMessage.push(result);
       const use = useById.get(result.tool_use_id);
       if (!use) continue;
@@ -25608,7 +26051,7 @@ function createAgentLoopHandler(a, handlers) {
           return { status: "aborted", iterations };
         }
         await a.ctx.session.writeInFlightMarker(`iteration ${i} / max ${a.maxIterations}`).catch((err) => {
-          a.logger.debug?.(
+          (a.logger.debug ?? a.logger.warn)?.(
             `in-flight marker write failed: ${err instanceof Error ? err.message : String(err)}`
           );
         });
@@ -25739,7 +26182,7 @@ function createAgentLoopHandler(a, handlers) {
       offSubagentDone();
       const reason = controller.signal.aborted ? "aborted" : "clean";
       await a.ctx.session.clearInFlightMarker(reason).catch((err) => {
-        a.logger.debug?.(
+        (a.logger.debug ?? a.logger.warn)?.(
           `in-flight marker clear failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -25824,13 +26267,12 @@ var Agent = class {
     return this.container.resolve(TOKENS.PermissionPolicy);
   }
   get renderer() {
-    return this.container.has(TOKENS.Renderer) ? this.container.resolve(TOKENS.Renderer) : void 0;
+    return this.container.safeResolve(TOKENS.Renderer);
   }
   disableInteractiveConfirmation() {
     this.toolExecutor.clearConfirmAwaiter();
-    const policy = this.permission;
-    if (typeof policy.setPromptDelegate === "function") {
-      policy.setPromptDelegate(void 0);
+    if (typeof this.permission.setPromptDelegate === "function") {
+      this.permission.setPromptDelegate(void 0);
     }
   }
   register(tool) {
@@ -25860,6 +26302,7 @@ var Agent = class {
     const signal = controller.signal;
     this.ctx.signal = signal;
     controller.onAbort(() => this.ctx.drainAbortHooks());
+    this.ctx.tools = this.tools.list();
     const span = this.tracer?.startSpan("agent.run", {
       "agent.model": opts.model ?? this.ctx.model,
       "agent.executionStrategy": opts.executionStrategy ?? this.executionStrategy
@@ -25876,7 +26319,8 @@ var Agent = class {
       return result;
     } catch (err) {
       const wse = err instanceof AgentError ? err : toWrongStackError(err);
-      this.events.emit("error", { err: err instanceof Error ? err : new Error(String(err)), phase: "agent" });
+      const safeError = err instanceof Error ? new Error(err.message) : new Error(String(err));
+      this.events.emit("error", { err: safeError, phase: "agent", _original: err instanceof Error ? err : void 0 });
       if (err instanceof Error) span?.recordError(err);
       span?.setAttribute("agent.status", "failed");
       const result = {
@@ -27907,7 +28351,7 @@ function buildRefinerInput(text, history) {
 }
 async function enhanceUserPrompt(opts) {
   const { provider, model, text } = opts;
-  const timeoutMs = opts.timeoutMs ?? 25e3;
+  const timeoutMs = opts.timeoutMs ?? 9e4;
   const maxTokens = opts.maxTokens ?? 2048;
   const req = {
     model,
@@ -27972,7 +28416,7 @@ var PhaseGraphBuilder = class _PhaseGraphBuilder {
     const phases = /* @__PURE__ */ new Map();
     const phaseIds = [];
     for (let i = 0; i < this.opts.phases.length; i++) {
-      const tmpl = this.opts.phases[i];
+      const tmpl = this.opts.phases[i] ?? { name: "", description: "", taskTemplates: [], parallelizable: false, priority: "medium", estimateHours: 0 };
       const phaseId = crypto.randomUUID();
       phaseIds.push(phaseId);
       const store = this.opts.externalTaskStore ?? new DefaultTaskStore();
@@ -27997,8 +28441,8 @@ var PhaseGraphBuilder = class _PhaseGraphBuilder {
         description: tmpl.description,
         status: "pending",
         taskGraph,
-        dependsOn: i > 0 ? [phaseIds[i - 1]] : [],
-        nextPhases: i < this.opts.phases.length - 1 ? [phaseIds[i + 1]] : [],
+        dependsOn: i > 0 ? [phaseIds[i - 1] ?? ""] : [],
+        nextPhases: i < this.opts.phases.length - 1 ? [phaseIds[i + 1] ?? ""] : [],
         parallelizable: tmpl.parallelizable,
         priority: tmpl.priority,
         estimateHours: tmpl.estimateHours,
@@ -28011,15 +28455,16 @@ var PhaseGraphBuilder = class _PhaseGraphBuilder {
     const phaseArray = Array.from(phases.values());
     for (let i = 0; i < phaseArray.length; i++) {
       const phase = phaseArray[i];
-      phase.nextPhases = i < phaseArray.length - 1 ? [phaseArray[i + 1].id] : [];
-      phase.dependsOn = i > 0 ? [phaseArray[i - 1].id] : [];
+      if (!phase) continue;
+      phase.nextPhases = i < phaseArray.length - 1 ? [phaseArray[i + 1]?.id ?? ""] : [];
+      phase.dependsOn = i > 0 ? [phaseArray[i - 1]?.id ?? ""] : [];
     }
     const graph = {
       id: graphId,
       title: this.opts.title,
       description: this.opts.description ?? "",
       phases,
-      rootPhaseIds: phaseIds.length > 0 ? [phaseIds[0]] : [],
+      rootPhaseIds: phaseIds.length > 0 ? [phaseIds[0] ?? ""] : [],
       activePhaseIds: [],
       completedPhaseIds: [],
       failedPhaseIds: [],
@@ -28201,7 +28646,7 @@ var PhaseOrchestrator = class {
       return;
     }
     if (this.opts.stopOnFailure && this.graph.failedPhaseIds.length > 0) {
-      const failedPhase = this.graph.phases.get(this.graph.failedPhaseIds[0]);
+      const failedPhase = this.graph.phases.get(this.graph.failedPhaseIds[0] ?? "");
       if (failedPhase) {
         this.onGraphFailed(failedPhase);
       }
@@ -28377,9 +28822,14 @@ var PhaseOrchestrator = class {
           name: phase.name,
           files: info.conflictFiles
         });
-        return this.ctx.resolveConflict(phase, info);
+        const resolved = await this.ctx.resolveConflict?.(phase, info);
+        return resolved ?? false;
       } : void 0;
-      const result = await this.worktrees.merge(handle, { squash: true, resolve: resolve13 });
+      const mergeOpts = {
+        squash: true
+      };
+      if (resolve13 !== void 0) mergeOpts.resolve = resolve13;
+      const result = await this.worktrees.merge(handle, mergeOpts);
       if (result.resolved) {
         this.emit("phase.conflictResolved", { phaseId: phase.id, name: phase.name });
       }
@@ -28773,9 +29223,6 @@ var AutoPhaseRunner = class {
     this.graph = await builder.build();
     const ctx = {
       executeTask: this.opts.executeTask,
-      verifyPhase: this.opts.verifyPhase,
-      repairPhase: this.opts.repairPhase,
-      resolveConflict: this.opts.resolveConflict,
       brain: this.opts.brain,
       onPhaseComplete: (phase) => {
         this.opts.onPhaseComplete?.(phase);
@@ -28787,6 +29234,9 @@ var AutoPhaseRunner = class {
         this.opts.onTick?.(tickCtx);
       }
     };
+    if (this.opts.verifyPhase !== void 0) ctx.verifyPhase = this.opts.verifyPhase;
+    if (this.opts.repairPhase !== void 0) ctx.repairPhase = this.opts.repairPhase;
+    if (this.opts.resolveConflict !== void 0) ctx.resolveConflict = this.opts.resolveConflict;
     this.orchestrator = new PhaseOrchestrator({
       graph: this.graph,
       ctx,
@@ -28802,8 +29252,8 @@ var AutoPhaseRunner = class {
     });
     if (this.opts.onProgress) {
       this.progressInterval = setInterval(() => {
-        const progress = this.orchestrator.getProgress();
-        this.opts.onProgress(progress);
+        const progress = this.orchestrator?.getProgress();
+        if (progress) this.opts.onProgress?.(progress);
       }, 2e3);
     }
     if (this.opts.events) {
@@ -29023,7 +29473,7 @@ function firstBalancedArray(text) {
   let inString = false;
   let escaped = false;
   for (let i = start; i < text.length; i++) {
-    const ch = text[i];
+    const ch = text[i] ?? "";
     if (inString) {
       if (escaped) {
         escaped = false;
@@ -29533,7 +29983,7 @@ ${merged.stderr}`);
   async tryResolveConflict(handle, conflictFiles, opts) {
     let resolved = false;
     try {
-      resolved = await opts.resolve({ conflictFiles, cwd: this.projectRoot });
+      resolved = opts.resolve ? await opts.resolve({ conflictFiles, cwd: this.projectRoot }) : false;
     } catch {
       resolved = false;
     }
@@ -30056,6 +30506,12 @@ var ReplayProviderRunner = class {
 };
 
 // src/plugins/prompts-plugin.ts
+function expectDefined26(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function createPromptsPlugin(opts) {
   let store = null;
   return {
@@ -30109,7 +30565,7 @@ ${lines.join("\n")}
           if (!restJoined) return { message: "Usage: /prompts view <title>" };
           const matches = await store.find(restJoined);
           if (matches.length === 0) return { message: `No prompt matching "${restJoined}".` };
-          const entry = matches.find((m) => m.title.toLowerCase() === restJoined.toLowerCase()) ?? matches[0];
+          const entry = matches.find((m) => m.title.toLowerCase() === restJoined.toLowerCase()) ?? expectDefined26(matches[0]);
           const tags = entry.tags.length > 0 ? ` [${entry.tags.join(", ")}]` : "";
           return {
             message: `# ${entry.title}${tags}
@@ -30132,7 +30588,7 @@ ${dim2(`id: ${entry.id} | created: ${entry.createdAt}`)}`
           if (!restJoined) return { message: "Usage: /prompts delete <title>" };
           const matches = await store.find(restJoined);
           if (matches.length === 0) return { message: `No prompt matching "${restJoined}".` };
-          const exact = matches.find((m) => m.title.toLowerCase() === restJoined.toLowerCase()) ?? matches[0];
+          const exact = matches.find((m) => m.title.toLowerCase() === restJoined.toLowerCase()) ?? expectDefined26(matches[0]);
           const deleted = await store.delete(exact.id);
           return { message: deleted ? `Deleted "${exact.title}".` : "Delete failed." };
         }
@@ -30142,7 +30598,7 @@ ${dim2(`id: ${entry.id} | created: ${entry.createdAt}`)}`
           if (!parsed.title) return { message: 'Usage: /prompts edit "title" "new content"' };
           const matches = await store.find(parsed.title);
           if (matches.length === 0) return { message: `No prompt matching "${parsed.title}".` };
-          const exact = matches.find((m) => m.title.toLowerCase() === parsed.title.toLowerCase()) ?? matches[0];
+          const exact = matches.find((m) => m.title.toLowerCase() === parsed.title?.toLowerCase()) ?? expectDefined26(matches[0]);
           exact.content = parsed.content;
           exact.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
           await store.save(exact);
@@ -30154,7 +30610,7 @@ ${dim2(`id: ${entry.id} | created: ${entry.createdAt}`)}`
           if (!parsed.title) return { message: 'Usage: /prompts extend "title" <instructions>' };
           const matches = await store.find(parsed.title);
           if (matches.length === 0) return { message: `No prompt matching "${parsed.title}".` };
-          const exact = matches.find((m) => m.title.toLowerCase() === parsed.title.toLowerCase()) ?? matches[0];
+          const exact = matches.find((m) => m.title.toLowerCase() === parsed.title?.toLowerCase()) ?? expectDefined26(matches[0]);
           const prov = ctx.provider;
           if (!prov?.complete) return { message: "LLM not available. Configure a provider first." };
           const enhanced = await prov.complete(ctx.model, [
@@ -30189,9 +30645,9 @@ function parseTitleContent(args) {
   const trimmed = args.trim();
   if (!trimmed) return { title: "", content: "" };
   const doubleMatch = /^"([^"]+)"\s+"([^"]+)"$/.exec(trimmed) || /^'([^']+)'\s+'([^']+)'$/.exec(trimmed);
-  if (doubleMatch) return { title: doubleMatch[1], content: doubleMatch[2] };
+  if (doubleMatch) return { title: expectDefined26(doubleMatch[1]), content: expectDefined26(doubleMatch[2]) };
   const singleMatch = /^'([^']+)'\s+(.+)$/.exec(trimmed);
-  if (singleMatch) return { title: singleMatch[1], content: singleMatch[2] };
+  if (singleMatch) return { title: expectDefined26(singleMatch[1]), content: expectDefined26(singleMatch[2]) };
   const firstSpace = trimmed.indexOf(" ");
   if (firstSpace === -1) return { title: trimmed, content: "" };
   return { title: trimmed.slice(0, firstSpace), content: trimmed.slice(firstSpace + 1) };
@@ -30202,6 +30658,12 @@ function dim2(s) {
 
 // src/plugins/sync-plugin.ts
 init_atomic_write();
+function expectDefined27(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function createSyncPlugin(opts) {
   let cloud = null;
   let configStore;
@@ -30227,11 +30689,11 @@ function createSyncPlugin(opts) {
       cloud = new CloudSync(
         paths,
         () => {
-          const cfg = configStore.get();
+          const cfg = configStore?.get();
           return cfg.sync;
         },
         async (cfg) => {
-          configStore.update({ sync: cfg });
+          configStore?.update({ sync: cfg });
         }
       );
       void cloud.loadState();
@@ -30275,7 +30737,7 @@ function buildSyncCommand(cloud, configStore, vault, syncConfigPath) {
           if (!repo || !repo.includes("/")) {
             return { message: 'Invalid repo format. Expected "owner/repo".' };
           }
-          const storedToken = vault ? vault.encrypt(token) : token;
+          const storedToken = vault ? vault.encrypt(expectDefined27(token)) : expectDefined27(token);
           const syncConfig = {
             enabled: true,
             repo,
@@ -30515,7 +30977,7 @@ async function generateCommitMessageHeuristics(cwd) {
   const commitType = detectCommitType(statsResult.stdout);
   let scope = "";
   if (files.length > 0) {
-    const primary = files[0].split("/")[0];
+    const primary = files[0]?.split("/")[0];
     if (primary && primary !== "packages" && primary !== "apps" && primary !== "node_modules") {
       scope = `(${primary})`;
     }
@@ -31112,6 +31574,6 @@ ${formatPlan(updated)}`
   };
 }
 
-export { ACP_AGENTS, AGENTS_BY_PHASE, AGENT_CATALOG, AISpecBuilder, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, ALL_SYNC_CATEGORIES, AUDIT_LOG_AGENT, Agent, AgentError, AnnotationsStore, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutoExecutor, AutoPhasePlanner, AutoPhaseRunner, AutonomousRunner, BUG_HUNTER_AGENT, BrainDecisionQueue, BudgetExceededError, CONTEXT_WINDOW_MODES, CORE_RECONSTRUCT_EVENTS, CheckpointManager, CloudSync, CollaborationBus, ConfigError, ConfigMigrationError, Container, Context, ConversationState, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_MAX_ITERATIONS, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SPEC_TEMPLATE, DEFAULT_SUBAGENT_BASELINE, DEFAULT_TOOLS_CONFIG, DefaultAttachmentStore, DefaultBrainArbiter, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPathResolver, DefaultPermissionPolicy, DefaultPluginAPI, DefaultPromptStore, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultTaskStore, DefaultTokenCounter, Director, DirectorStateCheckpoint, DoneConditionChecker, ENHANCER_SYSTEM_PROMPT, ERROR_CODES, EternalAutonomyEngine, EventBus, ExtensionRegistry, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FLEET_ROSTER_WITHACP, FleetBus, FleetCostCapError, FleetManager, FleetSpawnBudgetError, FleetUsageAggregator, FsError, GitignoreUpdater, HookRegistry, HookRunner, HumanEscalatingBrainArbiter, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, InputBuilder, IntelligentCompactor, KERNEL_API_VERSION, LAYER_1_IDENTITY, LLMSelector, MATRIX_PHASE_KEYS, MAX_JOURNAL_ENTRIES, NULL_FLEET_BUS, NoopMetricsSink, NoopTracer, OTelTracer, ObservableBrainArbiter, PROMETHEUS_CONTENT_TYPE, ParallelEternalEngine, PhaseGraphBuilder, PhaseOrchestrator, PhaseStore, Pipeline, PluginError, ProviderError, ProviderRegistry, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, ReplayLogStore, ReplayProviderRunner, ReportGenerator, RunController, SECURITY_SCANNER_AGENT, SPEC_TEMPLATES, STANDARD_AUDIT_EVENTS, ScopedEventBus, SddParallelRun, SddTaskDecomposer, SecurityScanner, SecurityScannerOrchestrator, SelectiveCompactor, SessionAnalyzer, SessionError, SessionRecovery, SkillGenerator, SkillInstaller, SkillManifestStore, SlashCommandRegistry, SpecDrivenDev, SpecParser, SpecStore, SpecVersioning, SubagentBudget, TOKENS, TaskFlow, TaskGenerator, TaskGraphStore, TaskTracker, TechStackDetector, ToolAuditLog, ToolError, ToolExecutor, ToolRegistry, WorktreeManager, WrongStackError, addPlanItem, allServers, analyzeCriticalPath, appendJournal, applyRosterBudget, asBlocks, asText, assertSafePath, atomicWrite, attachAutoExtend, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, bootConfig, braveSearchServer, buildBtwBlock, buildChildEnv, buildGoalPreamble, buildOtlpMetricsRequest, buildOtlpTracesRequest, buildRecoveryStrategies, classifyFamily, clearPlan, collabInjectMiddleware, collabPauseMiddleware, color, compileGlob, compileUserRegex, completePartialObject, composeDirectorPrompt, composeSubagentPrompt, computeTaskProgress, consumeBtwNotes, context7Server, contextManagerTool, createAutoExecutor, createAutoPhaseFromTaskGraph, createContextManagerTool, createDefaultPipelines, createDelegateTool, createGitPlugin, createMcpControlTool, createMessage, createObservabilityPlugin, createPlanPlugin, createPromptsPlugin, createSecurityPlugin, createSecuritySlashCommand, createSessionEventBridge, createSkillsPlugin, createSyncPlugin, createToolOutputSerializer, decryptConfigSecrets, defaultGitignoreUpdater, defaultOrchestrator, defaultReportGenerator, defaultSecurityScanner, defaultSkillGenerator, defaultTechStackDetector, deriveTodosFromPlanItem, detectNewlineStyle, dispatchAgent, downloadGitHubTarball, emptyGoal, emptyPlan, encryptConfigSecrets, enhanceUserPrompt, ensureDir, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, everArtServer, expandGlob, extractRunEnv, filesystemServer, findCriticalPath, flagsToConfigPatch, formatContextWindowModeList, formatGoal, formatHumanPrompt, formatPlan, formatPlanTemplates, formatTodosList, getAgentDefinition, getCalibrationState, getContextWindowMode, getPlanTemplate, getTemplate, getTermSize, githubServer, goalFilePath, googleMapsServer, hashRequest, hookMatcherMatches, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isInteractive, isPluginError, isSessionError, isStdinTTY, isStdoutTTY, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isValidMatrixKey, isWrongStackError, listContextWindowModes, listPlanTemplates, listTemplates, loadDirectorState, loadGoal, loadPlan, loadPlugins, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeAskTool, makeAssignTool, makeAutonomyPromptContributor, makeAwaitTasksTool, makeCollabDebugTool, makeContinueToNextIterationTool, makeDirectorSessionFactory, makeFleetEmitTool, makeFleetHealthTool, makeFleetSessionTool, makeFleetStatusTool, makeFleetUsageTool, makeLLMClassifier, makeRollUpTool, makeSpawnTool, makeTerminateTool, matchAny, matchGlob, matrixKeyKind, mergeCustomModelDefs, mergeModelsPayload, migratePlaintextSecrets, miniMaxVisionServer, normalizeToLf, normalizedEqual, onResize, parseContinueDirective, parseSkillRef, pendingBtwCount, phaseForRole, projectHash, projectSlug, recentTextTurns, recordActualUsage, removePlanItem, renderProgress, renderPrometheus, renderSpecAnalysis, renderTaskGraph, renderTaskList, repairToolUseAdjacency, resetCalibration, resolveAuditLevel, resolveContextWindowPolicy, resolveModelMatrix, resolveSessionLoggingConfig, resolveWstackPaths, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, runProviderWithRetry, runShellHook, safeParse, safeStringify, sanitizeJsonString, saveGoal, savePlan, saveTodosCheckpoint, scoreAgents, securitySlashCommand, sentinelServer, setBtwNote, setPlanItemStatus, setRawMode, shouldEnhance, slackServer, stableStringify, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, stripAnsi, summarizeUsage, templateToMarkdown, toStyle, toWrongStackError, topologicalSort, unifiedDiff, unloadPlugins, validateAgainstSchema, wireMetricsToEvents, wrapAsState, writeErr, writeOut, zaiVisionServer };
+export { ACP_AGENTS, AGENTS_BY_PHASE, AGENT_CATALOG, AISpecBuilder, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, ALL_SYNC_CATEGORIES, AUDIT_LOG_AGENT, Agent, AgentError, AnnotationsStore, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutoExecutor, AutoPhasePlanner, AutoPhaseRunner, AutonomousRunner, BUG_HUNTER_AGENT, BrainDecisionQueue, BudgetExceededError, CONTEXT_WINDOW_MODES, CORE_RECONSTRUCT_EVENTS, CheckpointManager, CloudSync, CollaborationBus, ConfigError, ConfigMigrationError, Container, Context, ConversationState, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_CONFIG, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_MAX_ITERATIONS, DEFAULT_MODES, DEFAULT_RECOVERY_STRATEGIES, DEFAULT_SESSION_LOGGING_CONFIG, DEFAULT_SPEC_TEMPLATE, DEFAULT_SUBAGENT_BASELINE, DEFAULT_TOOLS_CONFIG, DefaultAttachmentStore, DefaultBrainArbiter, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPathResolver, DefaultPermissionPolicy, DefaultPluginAPI, DefaultPromptStore, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionRewinder, DefaultSessionStore, DefaultSkillLoader, DefaultSystemPromptBuilder, DefaultTaskStore, DefaultTokenCounter, Director, DirectorStateCheckpoint, DoneConditionChecker, ENHANCER_SYSTEM_PROMPT, ERROR_CODES, EternalAutonomyEngine, EventBus, ExtensionRegistry, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FLEET_ROSTER_WITHACP, FleetBus, FleetCostCapError, FleetManager, FleetSpawnBudgetError, FleetUsageAggregator, FsError, GitignoreUpdater, HookRegistry, HookRunner, HumanEscalatingBrainArbiter, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, InputBuilder, IntelligentCompactor, KERNEL_API_VERSION, LAYER_1_IDENTITY, LLMSelector, MATRIX_PHASE_KEYS, MAX_JOURNAL_ENTRIES, NULL_FLEET_BUS, NoopMetricsSink, NoopTracer, OTelTracer, ObservableBrainArbiter, PROMETHEUS_CONTENT_TYPE, ParallelEternalEngine, PhaseGraphBuilder, PhaseOrchestrator, PhaseStore, Pipeline, PluginError, ProviderError, ProviderRegistry, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, ReplayLogStore, ReplayProviderRunner, ReportGenerator, RunController, SECURITY_SCANNER_AGENT, SPEC_TEMPLATES, STANDARD_AUDIT_EVENTS, ScopedEventBus, SddParallelRun, SddTaskDecomposer, SecurityScanner, SecurityScannerOrchestrator, SelectiveCompactor, SessionAnalyzer, SessionError, SessionRecovery, SkillGenerator, SkillInstaller, SkillManifestStore, SlashCommandRegistry, SpecDrivenDev, SpecParser, SpecStore, SpecVersioning, SubagentBudget, TOKENS, TaskFlow, TaskGenerator, TaskGraphStore, TaskTracker, TechStackDetector, ToolAuditLog, ToolError, ToolExecutor, ToolRegistry, WorktreeManager, WrongStackError, addPlanItem, allServers, analyzeCriticalPath, appendJournal, applyRosterBudget, asBlocks, asText, assertSafePath, atomicWrite, attachAutoExtend, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, bootConfig, braveSearchServer, buildBtwBlock, buildChildEnv, buildGoalPreamble, buildOtlpMetricsRequest, buildOtlpTracesRequest, buildRecoveryStrategies, classifyFamily, clearPlan, collabInjectMiddleware, collabPauseMiddleware, color, compileGlob, compileUserRegex, completePartialObject, composeDirectorPrompt, composeSubagentPrompt, computeTaskProgress, consumeBtwNotes, context7Server, contextManagerTool, createAutoExecutor, createAutoPhaseFromTaskGraph, createContextManagerTool, createDefaultPipelines, createDelegateTool, createGitPlugin, createMcpControlTool, createMessage, createObservabilityPlugin, createPlanPlugin, createPromptsPlugin, createSecurityPlugin, createSecuritySlashCommand, createSessionEventBridge, createSkillsPlugin, createSyncPlugin, createToolOutputSerializer, decryptConfigSecrets, defaultGitignoreUpdater, defaultOrchestrator, defaultReportGenerator, defaultSecurityScanner, defaultSkillGenerator, defaultTechStackDetector, deriveTodosFromPlanItem, detectNewlineStyle, dispatchAgent, downloadGitHubTarball, emptyGoal, emptyPlan, encryptConfigSecrets, enhanceUserPrompt, ensureDir, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, everArtServer, expandGlob, expectDefined7 as expectDefined, extractRunEnv, filesystemServer, findCriticalPath, flagsToConfigPatch, formatContextWindowModeList, formatGoal, formatHumanPrompt, formatPlan, formatPlanTemplates, formatTodosList, getAgentDefinition, getCalibrationState, getContextWindowMode, getPlanTemplate, getTemplate, getTermSize, githubServer, goalFilePath, googleMapsServer, hashRequest, hookMatcherMatches, isAgentError, isConfigError, isContextWindowModeId, isFsError, isImageBlock, isInteractive, isPluginError, isSessionError, isStdinTTY, isStdoutTTY, isTextBlock, isThinkingBlock, isToolError, isToolResultBlock, isToolUseBlock, isValidMatrixKey, isWrongStackError, listContextWindowModes, listPlanTemplates, listTemplates, loadDirectorState, loadGoal, loadPlan, loadPlugins, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeAskTool, makeAssignTool, makeAutonomyPromptContributor, makeAwaitTasksTool, makeCollabDebugTool, makeContinueToNextIterationTool, makeDirectorSessionFactory, makeFleetEmitTool, makeFleetHealthTool, makeFleetSessionTool, makeFleetStatusTool, makeFleetUsageTool, makeLLMClassifier, makeRollUpTool, makeSpawnTool, makeTerminateTool, matchAny, matchGlob, matrixKeyKind, mergeCustomModelDefs, mergeModelsPayload, migratePlaintextSecrets, miniMaxVisionServer, normalizeToLf, normalizedEqual, onResize, parseContinueDirective, parseSkillRef, pendingBtwCount, phaseForRole, projectHash, projectSlug, recentTextTurns, recordActualUsage, removePlanItem, renderProgress, renderPrometheus, renderSpecAnalysis, renderTaskGraph, renderTaskList, repairToolUseAdjacency, resetCalibration, resolveAuditLevel, resolveContextWindowPolicy, resolveModelMatrix, resolveSessionLoggingConfig, resolveWstackPaths, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, runProviderWithRetry, runShellHook, safeParse, safeStringify, sanitizeJsonString, saveGoal, savePlan, saveTodosCheckpoint, scoreAgents, securitySlashCommand, sentinelServer, setBtwNote, setOutputLineGuard, setPlanItemStatus, setRawMode, shouldEnhance, slackServer, sleep, stableStringify, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, stripAnsi, summarizeUsage, templateToMarkdown, toStyle, toWrongStackError, topologicalSort, unifiedDiff, unloadPlugins, validateAgainstSchema, wireMetricsToEvents, wrapAsState, writeErr, writeOut, zaiVisionServer };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map