@wrongstack/core 0.109.1 → 0.141.0

package/dist/defaults/index.js

@@ -1,9 +1,9 @@
 import * as crypto2 from 'crypto';
-import { randomBytes, randomUUID, createCipheriv, createDecipheriv, createHash } from 'crypto';
+import { randomBytes, createCipheriv, createDecipheriv, randomUUID, createHash } from 'crypto';
 import * as fsp from 'fs/promises';
 import * as path11 from 'path';
 import { isAbsolute, resolve } from 'path';
-import * as fs5 from 'fs';
+import * as fs4 from 'fs';
 import * as os from 'os';
 import { hostname } from 'os';
 import { execFile } from 'child_process';
@@ -218,7 +218,7 @@ var DefaultLogger = class _DefaultLogger {
     this.stderr = opts.stderr !== false;
     if (this.file) {
       try {
-        fs5.mkdirSync(path11.dirname(this.file), { recursive: true });
+        fs4.mkdirSync(path11.dirname(this.file), { recursive: true });
       } catch {
       }
     }
@@ -258,7 +258,7 @@ var DefaultLogger = class _DefaultLogger {
     }
     if (this.file) {
       try {
-        fs5.appendFileSync(this.file, `${JSON.stringify(entry)}
+        fs4.appendFileSync(this.file, `${JSON.stringify(entry)}
 `);
       } catch {
       }
@@ -452,8 +452,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         onClose: (s) => this.appendToIndex(s)
       });
     } catch (err) {
-      await handle.close().catch(() => {
-      });
+      await handle.close().catch((e) => console.warn(`[session-store] handle.close() failed: ${e}`));
       throw err;
     }
   }
@@ -484,8 +483,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
       );
       return { writer, data };
     } catch (err) {
-      await handle.close().catch(() => {
-      });
+      await handle.close().catch((e) => console.warn(`[session-store] handle.close() failed: ${e}`));
       throw err;
     }
   }
@@ -674,15 +672,15 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * sidecars, and the session directory (fleet.json, shared/, subagents/).
    */
   async deleteSession(id) {
-    await fsp.unlink(this.sessionPath(id, ".jsonl")).catch(() => void 0);
-    await fsp.unlink(this.sessionPath(id, ".summary.json")).catch(() => void 0);
+    await fsp.unlink(this.sessionPath(id, ".jsonl")).catch((err) => console.warn(`[session-store] delete .jsonl failed: ${err}`));
+    await fsp.unlink(this.sessionPath(id, ".summary.json")).catch((err) => console.warn(`[session-store] delete .summary.json failed: ${err}`));
     const shardDir = path11.dirname(path11.join(this.dir, id));
     const base = path11.basename(id);
     for (const ext of [".plan.json", ".todos.json"]) {
-      await fsp.unlink(path11.join(shardDir, `${base}${ext}`)).catch(() => void 0);
+      await fsp.unlink(path11.join(shardDir, `${base}${ext}`)).catch((err) => console.warn(`[session-store] delete ${ext} failed: ${err}`));
     }
     const sessDir = path11.join(shardDir, base);
-    await fsp.rm(sessDir, { recursive: true, force: true }).catch(() => void 0);
+    await fsp.rm(sessDir, { recursive: true, force: true }).catch((err) => console.warn(`[session-store] delete session dir failed: ${err}`));
     await this.writeTombstone(id);
   }
   async delete(id) {
@@ -1510,39 +1508,41 @@ ${line}`;
   }
   async forget(scope, query, filePath) {
     const file = this.resolveFile(filePath, scope);
-    let existing;
-    try {
-      existing = await fsp.readFile(file, "utf8");
-    } catch {
-      return 0;
-    }
-    const needle = query.toLowerCase();
-    const idMatcher = /mem_\d+_\w+/;
-    let removed = 0;
-    const lines = existing.split("\n").filter((line) => {
-      const trimmed = line.trim();
-      if (!trimmed.startsWith("- ")) return true;
-      if (idMatcher.test(query)) {
-        const entryIdMatch = /mem_\d+_\w+/.exec(trimmed);
-        if (entryIdMatch && entryIdMatch[0] === query) {
+    return withFileLock(file, async () => {
+      let existing;
+      try {
+        existing = await fsp.readFile(file, "utf8");
+      } catch {
+        return 0;
+      }
+      const needle = query.toLowerCase();
+      const idMatcher = /mem_\d+_\w+/;
+      let removed = 0;
+      const lines = existing.split("\n").filter((line) => {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("- ")) return true;
+        if (idMatcher.test(query)) {
+          const entryIdMatch = /mem_\d+_\w+/.exec(trimmed);
+          if (entryIdMatch && entryIdMatch[0] === query) {
+            removed++;
+            return false;
+          }
+        }
+        if (trimmed.toLowerCase().includes(needle)) {
           removed++;
           return false;
         }
+        return true;
+      });
+      if (removed > 0) {
+        if (lines.length === 0 || lines.length === 1 && !lines[0]?.trim()) {
+          await atomicWrite(file, "");
+        } else {
+          await atomicWrite(file, lines.join("\n"));
+        }
       }
-      if (trimmed.toLowerCase().includes(needle)) {
-        removed++;
-        return false;
-      }
-      return true;
+      return removed;
     });
-    if (removed > 0) {
-      if (lines.length === 0 || lines.length === 1 && !lines[0]?.trim()) {
-        await atomicWrite(file, "");
-      } else {
-        await atomicWrite(file, lines.join("\n"));
-      }
-    }
-    return removed;
   }
   async readAll(scope, filePath) {
     const file = this.resolveFile(filePath, scope);
@@ -1983,20 +1983,101 @@ function deepFreeze(obj) {
   return Object.freeze(obj);
 }
 
-// src/security/config-secrets.ts
-function decryptConfigSecrets(cfg, vault) {
+// src/types/secret-vault.ts
+var ENCRYPTED_PREFIX = "enc:v1:";
+
+// src/security/secret-vault.ts
+init_atomic_write();
+var KEY_BYTES = 32;
+var IV_BYTES = 12;
+var TAG_BYTES = 16;
+var ALGO = "aes-256-gcm";
+var DefaultSecretVault = class {
+  keyFile;
+  key;
+  constructor(opts) {
+    this.keyFile = opts.keyFile;
+  }
+  isEncrypted(value) {
+    return typeof value === "string" && value.startsWith(ENCRYPTED_PREFIX);
+  }
+  encrypt(plaintext) {
+    if (this.isEncrypted(plaintext)) return plaintext;
+    const key = this.loadOrCreateKey();
+    const iv = randomBytes(IV_BYTES);
+    const cipher = createCipheriv(ALGO, key, iv);
+    const ct = Buffer.concat([cipher.update(plaintext, "utf8"), cipher.final()]);
+    const tag = cipher.getAuthTag();
+    return `${ENCRYPTED_PREFIX}${iv.toString("base64")}:${tag.toString("base64")}:${ct.toString("base64")}`;
+  }
+  decrypt(value) {
+    if (!this.isEncrypted(value)) return value;
+    const rest = value.slice(ENCRYPTED_PREFIX.length);
+    const parts = rest.split(":");
+    if (parts.length !== 3) {
+      throw new Error("SecretVault: malformed encrypted value");
+    }
+    const [ivB64, tagB64, ctB64] = parts;
+    const iv = Buffer.from(ivB64, "base64");
+    const tag = Buffer.from(tagB64, "base64");
+    const ct = Buffer.from(ctB64, "base64");
+    if (iv.length !== IV_BYTES) throw new Error("SecretVault: bad IV length");
+    if (tag.length !== TAG_BYTES) throw new Error("SecretVault: bad tag length");
+    const key = this.loadOrCreateKey();
+    const decipher = createDecipheriv(ALGO, key, iv);
+    decipher.setAuthTag(tag);
+    const pt = Buffer.concat([decipher.update(ct), decipher.final()]);
+    return pt.toString("utf8");
+  }
+  loadOrCreateKey() {
+    if (this.key) return this.key;
+    try {
+      const buf = fs4.readFileSync(this.keyFile);
+      if (buf.length !== KEY_BYTES) {
+        throw new Error(
+          `SecretVault: key file ${this.keyFile} is ${buf.length} bytes (expected ${KEY_BYTES}). Remove it manually to generate a new key.`
+        );
+      }
+      this.key = buf;
+      return this.key;
+    } catch (err) {
+      if (err.code !== "ENOENT") throw err;
+    }
+    fs4.mkdirSync(path11.dirname(this.keyFile), { recursive: true });
+    const key = randomBytes(KEY_BYTES);
+    try {
+      fs4.writeFileSync(this.keyFile, key, { mode: 384, flag: "wx" });
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
+      const buf = fs4.readFileSync(this.keyFile);
+      if (buf.length !== KEY_BYTES) {
+        throw new Error(
+          `SecretVault: key file ${this.keyFile} is ${buf.length} bytes (expected ${KEY_BYTES}). Remove it manually to generate a new key.`
+        );
+      }
+      this.key = buf;
+      return this.key;
+    }
+    this.key = key;
+    return key;
+  }
+};
+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, _opts) {
+  return walk(cfg, vault, (v) => vault.encrypt(v));
+}
 function walk(node, vault, transform) {
   if (node === null || node === void 0) return node;
   if (typeof node !== "object") return node;
@@ -2022,6 +2103,114 @@ function isSecretField(name) {
   if (NON_SECRET_OVERRIDES.has(lc)) return false;
   return SECRET_KEY_PATTERN.test(lc);
 }
+async function rewriteConfigEncrypted(configPath, vault, patch) {
+  let current = {};
+  try {
+    const raw = await fsp.readFile(configPath, "utf8");
+    current = JSON.parse(raw);
+  } catch {
+  }
+  const merged = deepMerge(current, patch ?? {});
+  const encrypted = encryptConfigSecrets(merged, vault);
+  await fsp.mkdir(path11.dirname(configPath), { recursive: true });
+  await atomicWrite(configPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
+  await restrictFilePermissions(configPath);
+}
+async function migratePlaintextSecrets(configPath, vault) {
+  let raw;
+  try {
+    raw = await fsp.readFile(configPath, "utf8");
+  } catch {
+    return { migrated: 0, file: configPath };
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return { migrated: 0, file: configPath };
+  }
+  const counter = { n: 0 };
+  const migrated = walkCount(parsed, vault, counter);
+  if (counter.n === 0) return { migrated: 0, file: configPath };
+  await atomicWrite(configPath, JSON.stringify(migrated, null, 2), { mode: 384 });
+  await restrictFilePermissions(configPath);
+  return { migrated: counter.n, file: configPath };
+}
+async function restrictFilePermissions(filePath, opts) {
+  const warn = ((msg) => console.warn(msg));
+  if (process.platform === "win32") {
+    try {
+      const { execFile: execFile2 } = await import('child_process');
+      const { promisify: promisify2 } = await import('util');
+      const execFileAsync = promisify2(execFile2);
+      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.`
+      );
+    }
+  } else {
+    try {
+      await fsp.chmod(filePath, 384);
+    } catch {
+    }
+  }
+}
+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;
+  if (Array.isArray(node)) {
+    return node.map((item) => walkCount(item, vault, counter));
+  }
+  const out = /* @__PURE__ */ Object.create(null);
+  for (const [k, v] of Object.entries(node)) {
+    if (typeof v === "string" && isSecretField(k) && !vault.isEncrypted(v) && v.length > 0) {
+      out[k] = vault.encrypt(v);
+      counter.n++;
+    } else if (typeof v === "object" && v !== null) {
+      out[k] = walkCount(v, vault, counter);
+    } else {
+      out[k] = v;
+    }
+  }
+  return out;
+}
+var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
+  "__proto__",
+  "constructor",
+  "prototype",
+  "__defineGetter__",
+  "__defineSetter__",
+  "__lookupGetter__",
+  "__lookupSetter__"
+]);
+function deepMerge(a, b) {
+  const out = { ...a };
+  for (const [k, v] of Object.entries(b)) {
+    if (FORBIDDEN_PROTO_KEYS.has(k)) continue;
+    const existing = out[k];
+    if (v !== null && typeof v === "object" && !Array.isArray(v) && existing !== null && typeof existing === "object" && !Array.isArray(existing)) {
+      out[k] = deepMerge(existing, v);
+    } else {
+      out[k] = v;
+    }
+  }
+  return out;
+}
 
 // src/storage/config-loader.ts
 init_atomic_write();
@@ -2207,7 +2396,7 @@ var defaultIndexing = {
 function isPrimitiveArray(a) {
   return a.every((v) => v === null || typeof v !== "object");
 }
-var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
+var FORBIDDEN_PROTO_KEYS2 = /* @__PURE__ */ new Set([
   "__proto__",
   "constructor",
   "prototype",
@@ -2216,12 +2405,12 @@ var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
   "__lookupGetter__",
   "__lookupSetter__"
 ]);
-function deepMerge(base, patch) {
+function deepMerge2(base, patch) {
   if (typeof base !== "object" || base === null) return patch ?? base;
   if (typeof patch !== "object" || patch === null) return base;
   const out = { ...base };
   for (const [k, v] of Object.entries(patch)) {
-    if (FORBIDDEN_PROTO_KEYS.has(k)) continue;
+    if (FORBIDDEN_PROTO_KEYS2.has(k)) continue;
     const existing = out[k];
     if (Array.isArray(v)) {
       if (Array.isArray(existing) && isPrimitiveArray(v) && isPrimitiveArray(existing)) {
@@ -2235,7 +2424,7 @@ function deepMerge(base, patch) {
         }
       }
     } else if (typeof v === "object" && v !== null && typeof existing === "object" && existing !== null) {
-      out[k] = deepMerge(existing, v);
+      out[k] = deepMerge2(existing, v);
     } else if (v !== void 0) {
       out[k] = v;
     }
@@ -2255,12 +2444,14 @@ var DefaultConfigLoader = class {
   }
   async load(opts = {}) {
     let cfg = { ...BEHAVIOR_DEFAULTS };
-    const [global, local] = await Promise.all([
+    const [global, local, inProject] = await Promise.all([
       this.readJson(this.paths.globalConfig),
-      this.readJson(this.paths.projectLocalConfig)
+      this.readJson(this.paths.projectLocalConfig),
+      this.readJson(this.paths.inProjectConfig)
     ]);
-    cfg = deepMerge(cfg, global);
-    cfg = deepMerge(cfg, local);
+    cfg = deepMerge2(cfg, global);
+    cfg = deepMerge2(cfg, local);
+    cfg = deepMerge2(cfg, inProject);
     for (const [key, fn] of Object.entries(ENV_MAP)) {
       const v = process.env[key];
       if (v) fn(cfg, v);
@@ -2274,14 +2465,14 @@ var DefaultConfigLoader = class {
       try {
         const patch = await src.read();
         if (patch && Object.keys(patch).length > 0) {
-          cfg = deepMerge(cfg, patch);
+          cfg = deepMerge2(cfg, patch);
         }
       } catch (err) {
         console.warn(`Config source "${src.name}" failed`, err);
       }
     }
     if (opts.cliFlags) {
-      cfg = deepMerge(cfg, opts.cliFlags);
+      cfg = deepMerge2(cfg, opts.cliFlags);
     }
     if (this.vault) {
       cfg = decryptConfigSecrets(cfg, this.vault);
@@ -3693,239 +3884,12 @@ var DefaultSecretScrubber = class {
   }
 };
 
-// src/types/secret-vault.ts
-var ENCRYPTED_PREFIX = "enc:v1:";
-
-// src/security/secret-vault.ts
-init_atomic_write();
-var KEY_BYTES = 32;
-var IV_BYTES = 12;
-var TAG_BYTES = 16;
-var ALGO = "aes-256-gcm";
-var DefaultSecretVault = class {
-  keyFile;
-  key;
-  constructor(opts) {
-    this.keyFile = opts.keyFile;
-  }
-  isEncrypted(value) {
-    return typeof value === "string" && value.startsWith(ENCRYPTED_PREFIX);
-  }
-  encrypt(plaintext) {
-    if (this.isEncrypted(plaintext)) return plaintext;
-    const key = this.loadOrCreateKey();
-    const iv = randomBytes(IV_BYTES);
-    const cipher = createCipheriv(ALGO, key, iv);
-    const ct = Buffer.concat([cipher.update(plaintext, "utf8"), cipher.final()]);
-    const tag = cipher.getAuthTag();
-    return `${ENCRYPTED_PREFIX}${iv.toString("base64")}:${tag.toString("base64")}:${ct.toString("base64")}`;
-  }
-  decrypt(value) {
-    if (!this.isEncrypted(value)) return value;
-    const rest = value.slice(ENCRYPTED_PREFIX.length);
-    const parts = rest.split(":");
-    if (parts.length !== 3) {
-      throw new Error("SecretVault: malformed encrypted value");
-    }
-    const [ivB64, tagB64, ctB64] = parts;
-    const iv = Buffer.from(ivB64, "base64");
-    const tag = Buffer.from(tagB64, "base64");
-    const ct = Buffer.from(ctB64, "base64");
-    if (iv.length !== IV_BYTES) throw new Error("SecretVault: bad IV length");
-    if (tag.length !== TAG_BYTES) throw new Error("SecretVault: bad tag length");
-    const key = this.loadOrCreateKey();
-    const decipher = createDecipheriv(ALGO, key, iv);
-    decipher.setAuthTag(tag);
-    const pt = Buffer.concat([decipher.update(ct), decipher.final()]);
-    return pt.toString("utf8");
-  }
-  loadOrCreateKey() {
-    if (this.key) return this.key;
-    try {
-      const buf = fs5.readFileSync(this.keyFile);
-      if (buf.length !== KEY_BYTES) {
-        throw new Error(
-          `SecretVault: key file ${this.keyFile} is ${buf.length} bytes (expected ${KEY_BYTES}). Remove it manually to generate a new key.`
-        );
-      }
-      this.key = buf;
-      return this.key;
-    } catch (err) {
-      if (err.code !== "ENOENT") throw err;
-    }
-    fs5.mkdirSync(path11.dirname(this.keyFile), { recursive: true });
-    const key = randomBytes(KEY_BYTES);
-    try {
-      fs5.writeFileSync(this.keyFile, key, { mode: 384, flag: "wx" });
-    } catch (err) {
-      if (err.code !== "EEXIST") throw err;
-      const buf = fs5.readFileSync(this.keyFile);
-      if (buf.length !== KEY_BYTES) {
-        throw new Error(
-          `SecretVault: key file ${this.keyFile} is ${buf.length} bytes (expected ${KEY_BYTES}). Remove it manually to generate a new key.`
-        );
-      }
-      this.key = buf;
-      return this.key;
-    }
-    this.key = key;
-    return key;
-  }
-};
-function decryptConfigSecrets2(cfg, vault, opts) {
-  const warn = opts?.warn ?? ((msg) => console.warn(msg));
-  return walk2(cfg, vault, (v, key) => {
-    try {
-      return vault.decrypt(v);
-    } catch (err) {
-      warn(
-        `[secret-vault] Failed to decrypt "${key}": ${err instanceof Error ? err.message : err}`
-      );
-      return "";
-    }
-  });
-}
-function encryptConfigSecrets(cfg, vault, _opts) {
-  return walk2(cfg, vault, (v) => vault.encrypt(v));
-}
-function walk2(node, vault, transform) {
-  if (node === null || node === void 0) return node;
-  if (typeof node !== "object") return node;
-  if (Array.isArray(node)) {
-    return node.map((item) => walk2(item, vault, transform));
-  }
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const [k, v] of Object.entries(node)) {
-    if (typeof v === "string" && isSecretField2(k)) {
-      out[k] = transform(v, k);
-    } else if (typeof v === "object" && v !== null) {
-      out[k] = walk2(v, vault, transform);
-    } else {
-      out[k] = v;
-    }
-  }
-  return out;
-}
-var SECRET_KEY_PATTERN2 = /(?:apikey|api_key|authtoken|auth_token|bearer|secret|password|passwd|pwd|refreshtoken|refresh_token|sessionkey|session_key|access[_-]?token|private[_-]?key)/i;
-var NON_SECRET_OVERRIDES2 = /* @__PURE__ */ new Set(["publickey", "public_key"]);
-function isSecretField2(name) {
-  const lc = name.toLowerCase();
-  if (NON_SECRET_OVERRIDES2.has(lc)) return false;
-  return SECRET_KEY_PATTERN2.test(lc);
-}
-async function rewriteConfigEncrypted(configPath, vault, patch) {
-  let current = {};
-  try {
-    const raw = await fsp.readFile(configPath, "utf8");
-    current = JSON.parse(raw);
-  } catch {
-  }
-  const merged = deepMerge2(current, patch ?? {});
-  const encrypted = encryptConfigSecrets(merged, vault);
-  await fsp.mkdir(path11.dirname(configPath), { recursive: true });
-  await atomicWrite(configPath, JSON.stringify(encrypted, null, 2), { mode: 384 });
-  await restrictFilePermissions(configPath);
-}
-async function migratePlaintextSecrets(configPath, vault) {
-  let raw;
-  try {
-    raw = await fsp.readFile(configPath, "utf8");
-  } catch {
-    return { migrated: 0, file: configPath };
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return { migrated: 0, file: configPath };
-  }
-  const counter = { n: 0 };
-  const migrated = walkCount(parsed, vault, counter);
-  if (counter.n === 0) return { migrated: 0, file: configPath };
-  await atomicWrite(configPath, JSON.stringify(migrated, null, 2), { mode: 384 });
-  await restrictFilePermissions(configPath);
-  return { migrated: counter.n, file: configPath };
-}
-async function restrictFilePermissions(filePath, opts) {
-  const warn = ((msg) => console.warn(msg));
-  if (process.platform === "win32") {
-    try {
-      const { execFile: execFile2 } = await import('child_process');
-      const { promisify: promisify2 } = await import('util');
-      const execFileAsync = promisify2(execFile2);
-      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.`
-      );
-    }
-  } else {
-    try {
-      await fsp.chmod(filePath, 384);
-    } catch {
-    }
-  }
-}
-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;
-  if (Array.isArray(node)) {
-    return node.map((item) => walkCount(item, vault, counter));
-  }
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const [k, v] of Object.entries(node)) {
-    if (typeof v === "string" && isSecretField2(k) && !vault.isEncrypted(v) && v.length > 0) {
-      out[k] = vault.encrypt(v);
-      counter.n++;
-    } else if (typeof v === "object" && v !== null) {
-      out[k] = walkCount(v, vault, counter);
-    } else {
-      out[k] = v;
-    }
-  }
-  return out;
-}
-var FORBIDDEN_PROTO_KEYS2 = /* @__PURE__ */ new Set([
-  "__proto__",
-  "constructor",
-  "prototype",
-  "__defineGetter__",
-  "__defineSetter__",
-  "__lookupGetter__",
-  "__lookupSetter__"
-]);
-function deepMerge2(a, b) {
-  const out = { ...a };
-  for (const [k, v] of Object.entries(b)) {
-    if (FORBIDDEN_PROTO_KEYS2.has(k)) continue;
-    const existing = out[k];
-    if (v !== null && typeof v === "object" && !Array.isArray(v) && existing !== null && typeof existing === "object" && !Array.isArray(existing)) {
-      out[k] = deepMerge2(existing, v);
-    } else {
-      out[k] = v;
-    }
-  }
-  return out;
-}
-
 // src/security/capabilities.ts
 var ToolCapabilities = {
   /** Can execute arbitrary commands in the user's shell (the `bash` tool). */
   SHELL_ARBITRARY: "shell.arbitrary",
+  /** Can execute a restricted set of commands (the `exec` tool). */
+  SHELL_RESTRICTED: "shell.restricted",
   /** Can write / modify / delete files inside the project. */
   FS_WRITE: "fs.write",
   /** Can write files outside the current project root (very high risk). */
@@ -3941,6 +3905,7 @@ var ToolCapabilities = {
 };
 var DANGEROUS_FOR_SUBAGENTS = [
   ToolCapabilities.SHELL_ARBITRARY,
+  ToolCapabilities.SHELL_RESTRICTED,
   ToolCapabilities.FS_WRITE,
   ToolCapabilities.FS_WRITE_OUTSIDE_PROJECT,
   ToolCapabilities.MCP_PROXY,
@@ -4384,38 +4349,15 @@ var DefaultPermissionPolicy = class {
   }
 };
 var AutoApprovePermissionPolicy = class _AutoApprovePermissionPolicy {
-  /**
-   * Legacy name-based denylist.
-   * @deprecated Prefer declaring `capabilities` on the Tool and using capability-based checks.
-   */
-  static LEGACY_NAME_DENY = /* @__PURE__ */ new Set([
-    "bash",
-    "write",
-    "edit",
-    "replace",
-    "scaffold",
-    "patch",
-    "install",
-    "exec"
-  ]);
-  // Note: hasDangerousCapabilityForSubagents is now the shared helper from capabilities.ts
-  // The old private method was removed in favor of the centralized utility.
-  /**
-   * Tools from MCP servers (`mcp__<server>__<tool>`) are external code of
-   * unknown capability — they may wrap a shell or filesystem. They are
-   * fail-closed here: not auto-approved for subagents by default, so the
-   * leader must allow them explicitly per-spawn.
-   */
   static isMcpTool(name) {
     return name.startsWith("mcp__");
   }
   async evaluate(tool) {
     const hasDangerousCap = hasDangerousCapabilityForSubagents(tool);
-    const legacyNameBlock = _AutoApprovePermissionPolicy.LEGACY_NAME_DENY.has(tool.name);
     const isMcp = _AutoApprovePermissionPolicy.isMcpTool(tool.name);
-    const blocked = tool.permission === "deny" || hasDangerousCap || legacyNameBlock || isMcp;
+    const blocked = tool.permission === "deny" || hasDangerousCap || isMcp;
     if (blocked) {
-      const reason = hasDangerousCap ? `tool declares dangerous capability (${tool.capabilities?.join(", ")}) \u2014 not auto-approved for subagents` : legacyNameBlock || isMcp ? `tool ${tool.name} is not auto-approved for subagents \u2014 ask the leader to allow it explicitly` : "tool default deny";
+      const reason = hasDangerousCap ? `tool declares dangerous capability (${tool.capabilities?.join(", ")}) \u2014 not auto-approved for subagents` : isMcp ? `MCP tool ${tool.name} is not auto-approved for subagents \u2014 ask the leader to allow it explicitly` : "tool default deny";
       return {
         permission: "deny",
         source: "subagent_guard",
@@ -4612,6 +4554,7 @@ var DefaultRetryPolicy = class {
     if (err instanceof ProviderError) {
       if (err.status === 429) return 5;
       if (err.status === 529) return 3;
+      if (err.status === 599) return 5;
       if (err.status >= 500) return 3;
       return 0;
     }
@@ -5083,53 +5026,63 @@ async function streamProviderToResponse(provider, req, signal, ctx, events) {
       const next = await iter.next();
       if (next.done) break;
       const ev = next.value;
-      switch (ev.type) {
-        case "message_start":
-          handleMessageStart(state, ev.model);
-          break;
-        case "content_block_start":
-          handleContentBlockStart(state, ev);
-          break;
-        case "content_block_stop":
-          handleContentBlockStop(state, ev);
-          break;
-        case "text_delta":
-          handleTextDelta(state, ev.text);
-          events.emit("provider.text_delta", { ctx, text: ev.text });
-          break;
-        case "tool_use_start": {
-          const idVal = ev.id;
-          const nameVal = ev.name;
-          handleToolUseStart(state, { id: idVal, name: nameVal });
-          const emittedPayload = { ctx, id: idVal ?? "unknown", name: nameVal ?? "unknown" };
-          events.emit("provider.tool_use_start", emittedPayload);
-          break;
-        }
-        case "tool_use_input_delta":
-          handleToolUseInputDelta(state, ev);
-          break;
-        case "tool_use_stop": {
-          const stoppedName = state.tools.get(ev.id)?.name ?? "unknown";
-          handleToolUseStop(state, ev);
-          events.emit("provider.tool_use_stop", { ctx, id: ev.id, name: stoppedName });
-          break;
+      try {
+        switch (ev.type) {
+          case "message_start":
+            handleMessageStart(state, ev.model);
+            break;
+          case "content_block_start":
+            handleContentBlockStart(state, ev);
+            break;
+          case "content_block_stop":
+            handleContentBlockStop(state, ev);
+            break;
+          case "text_delta":
+            handleTextDelta(state, ev.text);
+            events.emit("provider.text_delta", { ctx, text: ev.text });
+            break;
+          case "tool_use_start": {
+            const idVal = ev.id;
+            const nameVal = ev.name;
+            handleToolUseStart(state, { id: idVal, name: nameVal });
+            const emittedPayload = { ctx, id: idVal ?? "unknown", name: nameVal ?? "unknown" };
+            events.emit("provider.tool_use_start", emittedPayload);
+            break;
+          }
+          case "tool_use_input_delta":
+            handleToolUseInputDelta(state, ev);
+            break;
+          case "tool_use_stop": {
+            const stoppedName = state.tools.get(ev.id)?.name ?? "unknown";
+            handleToolUseStop(state, ev);
+            events.emit("provider.tool_use_stop", { ctx, id: ev.id, name: stoppedName });
+            break;
+          }
+          case "thinking_start":
+            handleThinkingStart(state, ev);
+            break;
+          case "thinking_delta":
+            handleThinkingDelta(state, ev.text);
+            events.emit("provider.thinking_delta", { ctx, text: ev.text });
+            break;
+          case "thinking_signature":
+            handleThinkingSignature(state, ev.signature);
+            break;
+          case "thinking_stop":
+            handleThinkingStop(state);
+            break;
+          case "message_stop":
+            handleMessageStop(state, ev);
+            break;
+          default:
+            break;
         }
-        case "thinking_start":
-          handleThinkingStart(state, ev);
-          break;
-        case "thinking_delta":
-          handleThinkingDelta(state, ev.text);
-          events.emit("provider.thinking_delta", { ctx, text: ev.text });
-          break;
-        case "thinking_signature":
-          handleThinkingSignature(state, ev.signature);
-          break;
-        case "thinking_stop":
-          handleThinkingStop(state);
-          break;
-        case "message_stop":
-          handleMessageStop(state, ev);
-          break;
+      } catch (handlerErr) {
+        events.emit("provider.stream_error", {
+          ctx,
+          eventType: ev.type,
+          msg: handlerErr instanceof Error ? handlerErr.message : String(handlerErr)
+        });
       }
     }
   } catch (err) {
@@ -5142,8 +5095,10 @@ async function streamProviderToResponse(provider, req, signal, ctx, events) {
     try {
       let drainTimer = null;
       try {
+        const drainPromise = Promise.resolve(iter.return?.()).catch(() => {
+        });
         await Promise.race([
-          Promise.resolve(iter.return?.()),
+          drainPromise,
           new Promise((resolve5) => {
             drainTimer = setTimeout(resolve5, STREAM_DRAIN_TIMEOUT_MS);
           })
@@ -5241,6 +5196,17 @@ var DefaultProviderRunner = class {
 
 // src/utils/token-estimate.ts
 var RoughTokenEstimate = (text, charsPerToken = 3.5) => Math.max(1, Math.ceil(text.length / charsPerToken));
+var CALIBRATION_GLOBAL_KEY = "__global__";
+var _cals = /* @__PURE__ */ new Map();
+function calState(key) {
+  let state = _cals.get(key);
+  if (!state) {
+    state = { ratio: 1, count: 0, prevEst: 0 };
+    _cals.set(key, state);
+  }
+  return state;
+}
+var MIN_SAMPLES_FOR_CALIBRATION = 3;
 var ESTIMATE_CACHE = /* @__PURE__ */ new Map();
 var ESTIMATE_CACHE_MAX_SIZE = 1e4;
 function getCachedEstimate(key, compute) {
@@ -5272,10 +5238,25 @@ function estimateToolResultTokens(content) {
 function estimateTextTokens(text) {
   return RoughTokenEstimate(text);
 }
+function estimateMessageTokens(messages) {
+  let total = 0;
+  for (const m of messages) {
+    if (typeof m.content === "string") {
+      total += estimateTextTokens(m.content);
+    } else {
+      for (const b of m.content) {
+        if (b.type === "text") total += estimateTextTokens(b.text);
+        else if (b.type === "tool_use") total += estimateToolInputTokens(b.input);
+        else if (b.type === "tool_result") total += estimateToolResultTokens(b.content);
+      }
+    }
+  }
+  return total;
+}
 function estimateToolDefTokens(tool) {
   return RoughTokenEstimate(tool.name) + RoughTokenEstimate(tool.description ?? "") + RoughTokenEstimate(JSON.stringify(tool.inputSchema));
 }
-function estimateRequestTokens(messages, systemPrompt, tools) {
+function estimateRequestTokens(messages, systemPrompt, tools, calibrationKey = CALIBRATION_GLOBAL_KEY) {
   let messagesTokens = 0;
   if (typeof messages === "string") {
     messagesTokens = RoughTokenEstimate(messages);
@@ -5314,6 +5295,7 @@ function estimateRequestTokens(messages, systemPrompt, tools) {
     toolsTokens += estimateToolDefTokens(t);
   }
   const total = messagesTokens + systemTokens + toolsTokens;
+  calState(calibrationKey).prevEst = total;
   return {
     messages: messagesTokens,
     systemPrompt: systemTokens,
@@ -5321,39 +5303,164 @@ function estimateRequestTokens(messages, systemPrompt, tools) {
     total
   };
 }
-function estimateRequestTokensCalibrated(messages, systemPrompt, tools) {
-  const result = estimateRequestTokens(messages, systemPrompt, tools);
+function estimateRequestTokensCalibrated(messages, systemPrompt, tools, calibrationKey = CALIBRATION_GLOBAL_KEY) {
+  const result = estimateRequestTokens(messages, systemPrompt, tools, calibrationKey);
+  const cal = calState(calibrationKey);
+  if (cal.count >= MIN_SAMPLES_FOR_CALIBRATION) {
+    const safeRatio = Math.min(1.5, Math.max(0.5, cal.ratio));
+    return {
+      messages: Math.round(result.messages * safeRatio),
+      systemPrompt: Math.round(result.systemPrompt * safeRatio),
+      tools: Math.round(result.tools * safeRatio),
+      total: Math.round(result.total * safeRatio)
+    };
+  }
   return result;
 }
 
+// src/types/blocks.ts
+function isTextBlock(b) {
+  return b.type === "text";
+}
+
+// src/execution/compaction-core.ts
+var estimateMessages = estimateMessageTokens;
+function hasTextContent(m) {
+  if (typeof m.content === "string") return m.content.trim().length > 0;
+  return m.content.some((b) => b.type === "text" && b.text.trim().length > 0);
+}
+function findPreserveStart(messages, preserveK) {
+  let pairCount = 0;
+  let preserveStart = messages.length;
+  for (let i = messages.length - 1; i >= 0 && pairCount < preserveK; i--) {
+    const m = messages[i];
+    if (!m) continue;
+    if (m.role === "user" || m.role === "assistant") {
+      pairCount++;
+      preserveStart = i;
+    }
+  }
+  for (let i = preserveStart; i < messages.length; i++) {
+    const m = messages[i];
+    if (!m || typeof m.content === "string" || !Array.isArray(m.content)) continue;
+    const hasToolUse2 = m.content.some((b) => b.type === "tool_use");
+    if (hasToolUse2 && i + 1 < messages.length) {
+      const next = messages[i + 1];
+      if (next && next.role === "user" && typeof next.content !== "string" && Array.isArray(next.content) && next.content.some((b) => b.type === "tool_result")) {
+        preserveStart = i + 1;
+      }
+    }
+  }
+  return preserveStart;
+}
+function eliseOldToolResults(messages, opts) {
+  const preserveStart = findPreserveStart(messages, opts.preserveK);
+  let saved = 0;
+  let changed = false;
+  const next = new Array(messages.length);
+  for (let i = 0; i < messages.length; i++) {
+    const msg = messages[i];
+    if (i >= preserveStart || !msg || !Array.isArray(msg.content)) {
+      next[i] = msg;
+      continue;
+    }
+    const original = msg.content;
+    const newContent = original.map((b) => {
+      if (b.type !== "tool_result") return b;
+      const tokens = estimateToolResultTokens(b.content);
+      if (tokens < opts.eliseThreshold) return b;
+      saved += tokens;
+      const elided = {
+        type: "tool_result",
+        tool_use_id: b.tool_use_id,
+        content: `[elided: ~${tokens} tokens]`,
+        is_error: b.is_error
+      };
+      return elided;
+    });
+    if (newContent.every((b, idx) => b === original[idx])) {
+      next[i] = msg;
+    } else {
+      next[i] = { ...msg, content: newContent };
+      changed = true;
+    }
+  }
+  return { messages: changed ? next : messages, saved, changed };
+}
+function buildLosslessDigest(messages) {
+  const lines = [];
+  for (const m of messages) {
+    let text;
+    let omitted = 0;
+    if (typeof m.content === "string") {
+      text = m.content;
+    } else {
+      const parts = [];
+      for (const b of m.content) {
+        if (isTextBlock(b)) parts.push(b.text);
+        else if (b.type === "tool_use" || b.type === "tool_result") omitted++;
+      }
+      text = parts.join(" ");
+    }
+    if (text.trim().length === 0 && omitted === 0) continue;
+    const marker = omitted > 0 ? ` [${omitted} tool call(s) omitted \u2014 see session log]` : "";
+    lines.push(`[${m.role}]: ${text}${marker}`);
+  }
+  return lines.join("\n");
+}
+function findSafeBoundary(messages, from, to) {
+  for (let i = to; i >= from; i--) {
+    const m = messages[i];
+    if (!m) continue;
+    if (m.role === "user" && hasTextContent(m)) {
+      return findExchangeStart(messages, i);
+    }
+  }
+  return -1;
+}
+function findExchangeStart(messages, userIndex) {
+  for (let i = userIndex - 1; i >= 0; i--) {
+    const m = messages[i];
+    if (!m) continue;
+    if (m.role === "assistant") {
+      const hasToolUse2 = Array.isArray(m.content) ? m.content.some((b) => b.type === "tool_use") : false;
+      if (!hasToolUse2) return i + 1;
+    } else if (m.role === "user") {
+      return i;
+    }
+  }
+  return 0;
+}
+
 // src/execution/compactor.ts
 var HybridCompactor = class {
   preserveK;
   eliseThreshold;
-  estimator;
   constructor(opts = {}) {
     this.preserveK = opts.preserveK ?? 5;
     this.eliseThreshold = opts.eliseThreshold ?? 2e3;
-    this.estimator = opts.estimator ?? estimateTextTokens;
   }
   async compact(ctx, opts = {}) {
-    const beforeTokens = this.estimateMessages(ctx.messages);
+    const beforeTokens = estimateMessages(ctx.messages);
     const beforeFull = this.estimateFullRequest(ctx);
     const reductions = [];
     const policy = readContextWindowPolicy(ctx);
     const preserveK = policy?.preserveK ?? this.preserveK;
     const eliseThreshold = policy?.eliseThreshold ?? this.eliseThreshold;
-    const phase1Saved = this.eliseOldToolResults(ctx, preserveK, eliseThreshold);
-    if (phase1Saved > 0) reductions.push({ phase: "elision", saved: phase1Saved });
+    const elide = eliseOldToolResults(ctx.messages, { preserveK, eliseThreshold });
+    if (elide.changed) ctx.state.replaceMessages(elide.messages);
+    if (elide.saved > 0) reductions.push({ phase: "elision", saved: elide.saved });
+    let collapsedDigest;
     if (opts.aggressive) {
-      const phase2Saved = this.collapseAncientTurns(ctx, preserveK);
-      if (phase2Saved > 0) reductions.push({ phase: "summary", saved: phase2Saved });
+      const phase2 = this.collapseAncientTurns(ctx, preserveK);
+      if (phase2.saved > 0) reductions.push({ phase: "summary", saved: phase2.saved });
+      collapsedDigest = phase2.digest;
     }
     const repaired = repairToolUseAdjacency(ctx.messages);
     if (repaired.report.changed) {
       ctx.state.replaceMessages(repaired.messages);
     }
-    const afterTokens = this.estimateMessages(ctx.messages);
+    const afterTokens = estimateMessages(ctx.messages);
     const afterFull = this.estimateFullRequest(ctx);
     return {
       before: beforeTokens,
@@ -5361,6 +5468,7 @@ var HybridCompactor = class {
       fullRequestTokensBefore: beforeFull,
       fullRequestTokensAfter: afterFull,
       reductions,
+      collapsedDigest,
       repaired: repaired.report.changed ? {
         removedToolUses: repaired.report.removedToolUses,
         removedToolResults: repaired.report.removedToolResults,
@@ -5373,72 +5481,23 @@ var HybridCompactor = class {
    * This is the accurate figure for context-window pressure monitoring.
    */
   estimateFullRequest(ctx) {
-    const breakdown = estimateRequestTokens(ctx.messages, ctx.systemPrompt, ctx.tools ?? []);
-    return breakdown.total;
-  }
-  eliseOldToolResults(ctx, preserveK = this.preserveK, eliseThreshold = this.eliseThreshold) {
-    const messages = ctx.messages;
-    let pairCount = 0;
-    let preserveStart = messages.length;
-    for (let i = messages.length - 1; i >= 0 && pairCount < preserveK; i--) {
-      const m = messages[i];
-      if (!m) continue;
-      if (m.role === "user" || m.role === "assistant") {
-        pairCount++;
-        preserveStart = i;
-      }
-    }
-    for (let i = preserveStart; i < messages.length; i++) {
-      const m = messages[i];
-      if (!m || typeof m.content === "string" || !Array.isArray(m.content)) continue;
-      const hasToolUse2 = m.content.some((b) => b.type === "tool_use");
-      if (hasToolUse2 && i + 1 < messages.length) {
-        const next = messages[i + 1];
-        if (next && next.role === "user" && typeof next.content !== "string" && Array.isArray(next.content) && next.content.some((b) => b.type === "tool_result")) {
-          preserveStart = i + 1;
-        }
-      }
-    }
-    let saved = 0;
-    let changed = false;
-    const nextMessages = new Array(messages.length);
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (i >= preserveStart) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      if (!msg || !Array.isArray(msg.content)) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      const newContent = msg.content.map((b) => {
-        if (b.type !== "tool_result") return b;
-        const tokens = estimateToolResultTokens(b.content);
-        if (tokens < eliseThreshold) return b;
-        saved += tokens;
-        const elided = {
-          type: "tool_result",
-          tool_use_id: b.tool_use_id,
-          content: `[elided: ~${tokens} tokens]`,
-          is_error: b.is_error
-        };
-        return elided;
-      });
-      if (newContent.length === msg.content.length && newContent.every((b, idx) => b === msg.content[idx])) {
-        nextMessages[i] = msg;
-      } else {
-        nextMessages[i] = { ...msg, content: newContent };
-        changed = true;
-      }
-    }
-    if (changed) ctx.state.replaceMessages(nextMessages);
-    return saved;
+    return estimateRequestTokens(ctx.messages, ctx.systemPrompt, ctx.tools ?? []).total;
   }
+  /**
+   * Lossless rule-based collapse of ancient turns into a single digest message.
+   *
+   * Preserves ALL textual content of the collapsed range — user instructions,
+   * assistant decisions/conclusions, and any prior digests (chained forward so
+   * the digest stays lossless across repeated compactions). Only `tool_use` /
+   * `tool_result` protocol blocks are dropped and replaced with a count marker;
+   * their full payload already lives in the session log. No sub-LLM call.
+   *
+   * Returns the token savings and the digest text (for audit logging).
+   */
   collapseAncientTurns(ctx, preserveK = this.preserveK) {
     const messages = ctx.messages;
     const cutTarget = Math.max(0, messages.length - preserveK * 2);
-    if (cutTarget <= 0) return 0;
+    if (cutTarget <= 0) return { saved: 0 };
     let boundary = -1;
     for (let i = cutTarget; i < messages.length; i++) {
       const m = messages[i];
@@ -5448,34 +5507,20 @@ var HybridCompactor = class {
         break;
       }
     }
-    if (boundary <= 0) return 0;
+    if (boundary <= 0) return { saved: 0 };
     const removed = messages.slice(0, boundary);
-    const removedTokens = this.estimateMessages(removed);
-    const summary = [
-      {
-        role: "user",
-        content: `[previous_session_summary: ${removed.length} earlier turns compacted. Todo state preserved in context.]`
-      },
-      { role: "assistant", content: "Continuing from compacted context." }
-    ];
+    const removedTokens = estimateMessages(removed);
+    const digest = buildLosslessDigest(removed) || `${removed.length} earlier turns (no textual content; tool I/O omitted \u2014 see session log)`;
+    const summaryMsg = {
+      role: "system",
+      content: `[prior_turns_digest: ${digest}]`
+    };
     const tail = ctx.messages.slice(boundary);
-    ctx.state.replaceMessages([...summary, ...tail]);
-    return Math.max(0, removedTokens - this.estimateMessages(summary));
-  }
-  estimateMessages(messages) {
-    let total = 0;
-    for (const m of messages) {
-      if (typeof m.content === "string") {
-        total += this.estimator(m.content);
-      } else {
-        for (const b of m.content) {
-          if (b.type === "text") total += this.estimator(b.text);
-          else if (b.type === "tool_use") total += estimateToolInputTokens(b.input);
-          else if (b.type === "tool_result") total += estimateToolResultTokens(b.content);
-        }
-      }
-    }
-    return total;
+    ctx.state.replaceMessages([summaryMsg, ...tail]);
+    return {
+      saved: Math.max(0, removedTokens - estimateMessages([summaryMsg])),
+      digest
+    };
   }
 };
 function readContextWindowPolicy(ctx) {
@@ -5487,15 +5532,6 @@ function readContextWindowPolicy(ctx) {
   }
   return candidate;
 }
-function hasTextContent(m) {
-  if (typeof m.content === "string") return m.content.trim().length > 0;
-  return m.content.some((b) => b.type === "text" && b.text.trim().length > 0);
-}
-
-// src/types/blocks.ts
-function isTextBlock(b) {
-  return b.type === "text";
-}
 
 // src/execution/intelligent-compactor.ts
 var IntelligentCompactor = class {
@@ -5520,23 +5556,25 @@ var IntelligentCompactor = class {
     this.summarizerModel = opts.summarizerModel;
   }
   async compact(ctx, opts = {}) {
-    const beforeTokens = this.estimateTokens(ctx.messages);
+    const beforeTokens = estimateMessages(ctx.messages);
     const beforeFull = this.estimateFullRequest(ctx);
     const reductions = [];
     const load = beforeFull / this.maxContext;
     const aggressive = load >= this.hardThreshold ? true : opts.aggressive ?? load >= this.softThreshold;
-    const saved1 = this.eliseOldToolResults(ctx);
+    const saved1 = this.elide(ctx);
     if (saved1 > 0) reductions.push({ phase: "elision", saved: saved1 });
+    let collapsedDigest;
     if (aggressive) {
-      const saved2 = await this.summarizeAncientTurns(ctx);
-      if (saved2 > 0) reductions.push({ phase: "summary", saved: saved2 });
+      const phase2 = await this.summarizeAncientTurns(ctx);
+      if (phase2.saved > 0) reductions.push({ phase: "summary", saved: phase2.saved });
+      collapsedDigest = phase2.digest;
     } else if (load >= this.warnThreshold) {
-      const saved2 = this.lightweightCompact(ctx);
+      const saved2 = this.elide(ctx);
       if (saved2 > 0) reductions.push({ phase: "elision", saved: saved2 });
     }
     const repaired = repairToolUseAdjacency(ctx.messages);
     if (repaired.report.changed) ctx.state.replaceMessages(repaired.messages);
-    const afterTokens = this.estimateTokens(ctx.messages);
+    const afterTokens = estimateMessages(ctx.messages);
     const afterFull = this.estimateFullRequest(ctx);
     return {
       before: beforeTokens,
@@ -5544,6 +5582,7 @@ var IntelligentCompactor = class {
       fullRequestTokensBefore: beforeFull,
       fullRequestTokensAfter: afterFull,
       reductions,
+      collapsedDigest,
       repaired: repaired.report.changed ? {
         removedToolUses: repaired.report.removedToolUses,
         removedToolResults: repaired.report.removedToolResults,
@@ -5556,75 +5595,39 @@ var IntelligentCompactor = class {
    * This is the accurate figure for context-window pressure monitoring.
    */
   estimateFullRequest(ctx) {
-    const breakdown = estimateRequestTokens(ctx.messages, ctx.systemPrompt, ctx.tools ?? []);
-    return breakdown.total;
+    return estimateRequestTokens(ctx.messages, ctx.systemPrompt, ctx.tools ?? []).total;
+  }
+  /** Run shared tool-result elision and commit through ConversationState. */
+  elide(ctx) {
+    const result = eliseOldToolResults(ctx.messages, {
+      preserveK: this.preserveK,
+      eliseThreshold: this.eliseThreshold
+    });
+    if (result.changed) ctx.state.replaceMessages(result.messages);
+    return result.saved;
   }
   async summarizeAncientTurns(ctx) {
     const messages = ctx.messages;
     const cutoff = Math.max(0, messages.length - this.preserveK * 2);
-    if (cutoff <= 2) return 0;
-    const boundary = this.findSafeBoundary(messages, 0, cutoff);
-    if (boundary <= 1) return 0;
+    if (cutoff <= 2) return { saved: 0 };
+    const boundary = findSafeBoundary(messages, 0, cutoff);
+    if (boundary <= 1) return { saved: 0 };
     const toSummarize = messages.slice(0, boundary);
-    const removedTokens = this.estimateTokens(toSummarize);
+    const removedTokens = estimateMessages(toSummarize);
     let summaryText;
     try {
       summaryText = await this.callSummarizer(toSummarize, ctx);
     } catch {
-      const preservedMessages = [];
-      for (const m of toSummarize) {
-        if (m.role === "system") continue;
-        if (typeof m.content === "string") {
-          preservedMessages.push(m);
-        } else if (Array.isArray(m.content)) {
-          const textParts = m.content.filter(isTextBlock);
-          const toolParts = m.content.filter((b) => b.type === "tool_use" || b.type === "tool_result");
-          const next = {
-            role: m.role,
-            content: [
-              ...textParts,
-              ...toolParts.length > 0 ? [{ type: "text", text: `[${toolParts.length} tool call(s) omitted]` }] : []
-            ]
-          };
-          preservedMessages.push(next);
-        }
-      }
-      summaryText = preservedMessages.map((m) => `[${m.role}]: ${typeof m.content === "string" ? m.content : m.content.filter(isTextBlock).map((b) => b.text).join(" ")}`).join("\n");
-      if (!summaryText) summaryText = `${toSummarize.length} earlier turns (semantic content preserved)`;
-    }
-    const summaryMsg = {
-      role: "system",
-      content: `[prior_turns_summary: ${summaryText}]`
-    };
-    const summaryTokens = this.estimateTokens([summaryMsg]);
-    const tail = ctx.messages.slice(boundary);
-    ctx.state.replaceMessages([summaryMsg, ...tail]);
-    return Math.max(0, removedTokens - summaryTokens);
-  }
-  findSafeBoundary(messages, from, to) {
-    for (let i = to; i >= from; i--) {
-      const m = messages[i];
-      if (!m) continue;
-      if (m.role === "user" && this.hasTextContent(m)) {
-        return this.findExchangeStart(messages, i);
-      }
-    }
-    return -1;
-  }
-  findExchangeStart(messages, userIndex) {
-    for (let i = userIndex - 1; i >= 0; i--) {
-      const m = messages[i];
-      if (!m) continue;
-      if (m.role === "assistant") {
-        const hasToolUse2 = Array.isArray(m.content) ? m.content.some((b) => b.type === "tool_use") : false;
-        if (!hasToolUse2) {
-          return i + 1;
-        }
-      } else if (m.role !== "user") ; else {
-        return i;
-      }
+      summaryText = buildLosslessDigest(toSummarize) || `${toSummarize.length} earlier turns (semantic content preserved)`;
     }
-    return 0;
+    const summaryMsg = {
+      role: "system",
+      content: `[prior_turns_summary: ${summaryText}]`
+    };
+    const summaryTokens = estimateMessages([summaryMsg]);
+    const tail = ctx.messages.slice(boundary);
+    ctx.state.replaceMessages([summaryMsg, ...tail]);
+    return { saved: Math.max(0, removedTokens - summaryTokens), digest: summaryText };
   }
   async callSummarizer(messages, ctx) {
     const prompt = [
@@ -5659,86 +5662,6 @@ var IntelligentCompactor = class {
     }
     return [{ type: "text", text: lines.join("\n") }];
   }
-  lightweightCompact(ctx) {
-    return this.eliseOldToolResults(ctx);
-  }
-  eliseOldToolResults(ctx) {
-    const messages = ctx.messages;
-    let pairCount = 0;
-    let preserveStart = messages.length;
-    for (let i = messages.length - 1; i >= 0 && pairCount < this.preserveK; i--) {
-      const m = messages[i];
-      if (!m) continue;
-      if (m.role === "user" || m.role === "assistant") {
-        pairCount++;
-        preserveStart = i;
-      }
-    }
-    for (let i = preserveStart; i < messages.length; i++) {
-      const m = messages[i];
-      if (!m || typeof m.content === "string" || !Array.isArray(m.content)) continue;
-      const hasToolUse2 = m.content.some((b) => b.type === "tool_use");
-      if (hasToolUse2 && i + 1 < messages.length) {
-        const next = messages[i + 1];
-        if (next && next.role === "user" && typeof next.content !== "string" && Array.isArray(next.content) && next.content.some((b) => b.type === "tool_result")) {
-          preserveStart = i + 1;
-        }
-      }
-    }
-    let saved = 0;
-    let changed = false;
-    const nextMessages = new Array(messages.length);
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (i >= preserveStart) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      if (!msg || !Array.isArray(msg.content)) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      const newContent = msg.content.map((b) => {
-        if (b.type !== "tool_result") return b;
-        const tokens = estimateToolResultTokens(b.content);
-        if (tokens < this.eliseThreshold) return b;
-        saved += tokens;
-        return {
-          type: "tool_result",
-          tool_use_id: b.tool_use_id,
-          content: `[elided: ~${tokens} tokens]`,
-          is_error: b.is_error
-        };
-      });
-      if (newContent.length === msg.content.length && newContent.every((b, idx) => b === msg.content[idx])) {
-        nextMessages[i] = msg;
-      } else {
-        nextMessages[i] = { ...msg, content: newContent };
-        changed = true;
-      }
-    }
-    if (changed) ctx.state.replaceMessages(nextMessages);
-    return saved;
-  }
-  hasTextContent(m) {
-    if (typeof m.content === "string") return m.content.trim().length > 0;
-    return m.content.some((b) => b.type === "text" && b.text.trim().length > 0);
-  }
-  estimateTokens(messages) {
-    let total = 0;
-    for (const m of messages) {
-      if (typeof m.content === "string") {
-        total += estimateTextTokens(m.content);
-      } else {
-        for (const b of m.content) {
-          if (b.type === "text") total += estimateTextTokens(b.text);
-          else if (b.type === "tool_use") total += estimateToolInputTokens(b.input);
-          else if (b.type === "tool_result") total += estimateToolResultTokens(b.content);
-        }
-      }
-    }
-    return total;
-  }
 };
 
 // src/models/llm-selector.ts
@@ -5764,20 +5687,6 @@ Rules:
 - If unsure, keep rather than collapse (errors are more costly than waste)
 
 Return ONLY the JSON object, no markdown, no explanation outside the JSON.`;
-function estimateTokens(messages) {
-  let total = 0;
-  for (const m of messages) {
-    if (typeof m.content === "string") {
-      total += Math.ceil(m.content.length / 4);
-    } else if (Array.isArray(m.content)) {
-      for (const b of m.content) {
-        if (b.type === "text") total += Math.ceil(b.text.length / 4);
-        else total += Math.ceil(JSON.stringify(b).length / 4);
-      }
-    }
-  }
-  return total;
-}
 function formatMessages(messages, maxChars = 8e3) {
   const lines = [];
   let used = 0;
@@ -5816,7 +5725,7 @@ var LLMSelector = class {
   async select(messages, maxToKeep) {
     const effectiveBudget = Math.min(maxToKeep, this.maxContextTokens);
     const historyText = formatMessages(messages);
-    const totalTokens = estimateTokens(messages);
+    const totalTokens = estimateMessageTokens(messages);
     const systemText = `${this.systemPrompt}
 
 Conversation (${messages.length} messages, ~${totalTokens} tokens, budget: ${effectiveBudget}):
@@ -5848,10 +5757,7 @@ IMPORTANT: Total conversation (${totalTokens} tokens) exceeds budget (${effectiv
     let startIdx = 0;
     for (let i = messages.length - 1; i >= 0; i--) {
       const m = expectDefined(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
-      );
+      const cost = estimateMessageTokens([m]);
       if (tokenCount + cost <= budget) {
         tokenCount += cost;
       } else {
@@ -6084,52 +5990,12 @@ Summarize the following message range:`;
     return Math.floor(this.maxContext * 0.75);
   }
   eliseOldToolResults(ctx) {
-    const messages = ctx.messages;
-    let pairCount = 0;
-    let preserveStart = messages.length;
-    for (let i = messages.length - 1; i >= 0 && pairCount < this.preserveK; i--) {
-      const m = messages[i];
-      if (!m) continue;
-      if (m.role === "user" || m.role === "assistant") {
-        pairCount++;
-        preserveStart = i;
-      }
-    }
-    let saved = 0;
-    let changed = false;
-    const nextMessages = new Array(messages.length);
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (i >= preserveStart) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      if (!msg || !Array.isArray(msg.content)) {
-        nextMessages[i] = msg;
-        continue;
-      }
-      const newContent = msg.content.map((b) => {
-        if (b.type !== "tool_result") return b;
-        const text = typeof b.content === "string" ? b.content : JSON.stringify(b.content);
-        const tokens = this.roughTokenEstimate(text);
-        if (tokens < this.eliseThreshold) return b;
-        saved += tokens;
-        return {
-          type: "tool_result",
-          tool_use_id: b.tool_use_id,
-          content: `[elided: ~${tokens} tokens]`,
-          is_error: b.is_error
-        };
-      });
-      if (newContent.every((b, idx) => b === msg.content[idx])) {
-        nextMessages[i] = msg;
-      } else {
-        nextMessages[i] = { ...msg, content: newContent };
-        changed = true;
-      }
-    }
-    if (changed) ctx.state.replaceMessages(nextMessages);
-    return saved;
+    const result = eliseOldToolResults(ctx.messages, {
+      preserveK: this.preserveK,
+      eliseThreshold: this.eliseThreshold
+    });
+    if (result.changed) ctx.state.replaceMessages(result.messages);
+    return result.saved;
   }
   hasTextContent(m) {
     if (typeof m.content === "string") return m.content.trim().length > 0;
@@ -6159,8 +6025,80 @@ Summarize the following message range:`;
   }
 };
 
+// src/execution/strategy-compactor.ts
+function createStrategyCompactor(opts = {}) {
+  const requested = opts.strategy ?? (opts.llmSelector ? "selective" : "hybrid");
+  const strategy = requested;
+  if (strategy === "intelligent" || strategy === "selective") {
+    return new ProviderBackedCompactor(strategy, opts);
+  }
+  return new HybridCompactor({
+    preserveK: opts.preserveK,
+    eliseThreshold: opts.eliseThreshold
+  });
+}
+var ProviderBackedCompactor = class {
+  constructor(strategy, opts) {
+    this.strategy = strategy;
+    this.opts = opts;
+  }
+  strategy;
+  opts;
+  async compact(ctx, compactOpts = {}) {
+    return this.resolveInner(ctx).compact(ctx, compactOpts);
+  }
+  /**
+   * Construct the concrete compactor for this run. Rebuilt per call (cheap, no
+   * I/O) so a model switch — which changes `ctx.provider.capabilities.maxContext`
+   * — is always reflected. Reads the active ContextWindowPolicy from `ctx.meta`
+   * so the LLM compactors honor the same thresholds/preserveK as the policy.
+   */
+  resolveInner(ctx) {
+    const provider = ctx.provider;
+    if (!provider) {
+      return new HybridCompactor({
+        preserveK: this.opts.preserveK,
+        eliseThreshold: this.opts.eliseThreshold
+      });
+    }
+    const policy = readPolicy(ctx);
+    const maxContext = provider.capabilities?.maxContext || void 0;
+    const thresholds = policy?.thresholds;
+    const common = {
+      provider,
+      maxContext,
+      preserveK: this.opts.preserveK ?? policy?.preserveK,
+      eliseThreshold: this.opts.eliseThreshold ?? policy?.eliseThreshold,
+      ...thresholds ? { warnThreshold: thresholds.warn, softThreshold: thresholds.soft, hardThreshold: thresholds.hard } : {}
+    };
+    if (this.strategy === "selective") {
+      return new SelectiveCompactor({
+        ...common,
+        selectorModel: this.opts.summarizerModel,
+        summarizerModel: this.opts.summarizerModel
+      });
+    }
+    return new IntelligentCompactor({
+      ...common,
+      summarizerModel: this.opts.summarizerModel
+    });
+  }
+};
+function readPolicy(ctx) {
+  const policy = ctx.meta?.["contextWindowPolicy"];
+  if (!policy || typeof policy !== "object") return null;
+  const candidate = policy;
+  if (typeof candidate.preserveK !== "number" || !candidate.thresholds) return null;
+  return candidate;
+}
+
 // src/execution/auto-compaction-middleware.ts
 var LEVEL_RANK2 = { warn: 0, soft: 1, hard: 2 };
+var MAX_DIGEST_LOG_CHARS = 4e3;
+function truncateDigest(digest) {
+  if (digest.length <= MAX_DIGEST_LOG_CHARS) return digest;
+  return `${digest.slice(0, MAX_DIGEST_LOG_CHARS)}\u2026 [+${digest.length - MAX_DIGEST_LOG_CHARS} chars; full turns in session log]`;
+}
 var AutoCompactionMiddleware = class _AutoCompactionMiddleware {
   name = "AutoCompaction";
   compactor;
@@ -6221,7 +6159,12 @@ var AutoCompactionMiddleware = class _AutoCompactionMiddleware {
   }
   handler() {
     return async (ctx, next) => {
-      const tokens = this._estimator ? this._estimator(ctx) : estimateRequestTokensCalibrated(ctx.messages, ctx.systemPrompt, ctx.tools ?? []).total;
+      const tokens = this._estimator ? this._estimator(ctx) : estimateRequestTokensCalibrated(
+        ctx.messages,
+        ctx.systemPrompt,
+        ctx.tools ?? [],
+        `${ctx.provider?.id ?? "unknown"}/${ctx.model}`
+      ).total;
       const load = tokens / this._maxContext;
       const policy = this.policyProvider?.(ctx);
       const thresholds = policy?.thresholds ?? {
@@ -6283,7 +6226,11 @@ var AutoCompactionMiddleware = class _AutoCompactionMiddleware {
         after: report.after,
         level: pressure.level,
         aggressive,
-        reductions: report.reductions?.map((r) => ({ phase: r.phase, saved: r.saved }))
+        reductions: report.reductions?.map((r) => ({ phase: r.phase, saved: r.saved })),
+        // Record what was collapsed so the audit trail shows the preserved
+        // content, not just token counts. Bounded to keep the log line small;
+        // the full original turns are already in the session JSONL.
+        ...report.collapsedDigest ? { digest: truncateDigest(report.collapsedDigest) } : {}
       });
       ctx.clearFileTracking();
     } catch (err) {
@@ -6318,10 +6265,10 @@ var AutoCompactionMiddleware = class _AutoCompactionMiddleware {
 // src/utils/json-schema-validate.ts
 function validateAgainstSchema(value, schema) {
   const errors = [];
-  walk3(value, schema, "", errors);
+  walk2(value, schema, "", errors);
   return { ok: errors.length === 0, errors };
 }
-function walk3(value, schema, path19, errors) {
+function walk2(value, schema, path19, errors) {
   if (schema.enum !== void 0) {
     if (!schema.enum.some((e) => deepEqual(e, value))) {
       errors.push({
@@ -6350,13 +6297,13 @@ function walk3(value, schema, path19, errors) {
     if (schema.properties) {
       for (const [key, subSchema] of Object.entries(schema.properties)) {
         if (key in obj) {
-          walk3(obj[key], subSchema, joinPath(path19, key), errors);
+          walk2(obj[key], subSchema, joinPath(path19, key), errors);
         }
       }
     }
   }
   if (schema.type === "array" && Array.isArray(value) && schema.items) {
-    value.forEach((item, i) => walk3(item, schema.items, `${path19}[${i}]`, errors));
+    value.forEach((item, i) => walk2(item, schema.items, `${path19}[${i}]`, errors));
   }
 }
 function checkType(value, type) {
@@ -6870,6 +6817,13 @@ function extractMalformedRaw(input) {
   }
 }
 
+// src/utils/assert-never.ts
+function assertNever(x, message) {
+  throw new Error(
+    `Unhandled case: ${JSON.stringify(x)}`
+  );
+}
+
 // src/execution/autonomous-runner.ts
 var DoneConditionChecker = class {
   constructor(condition) {
@@ -6923,6 +6877,12 @@ var DoneConditionChecker = class {
           return { done: true, reason: `max tool calls (${this.condition.maxToolCalls}) reached`, ...state };
         }
         break;
+      case "all_tasks_done":
+        break;
+      case "custom":
+        break;
+      default:
+        return assertNever(this.condition.type);
     }
     return { done: false, iterations: state.iterations, toolCalls: state.toolCalls };
   }
@@ -7074,6 +7034,7 @@ function resolveWstackPaths(opts) {
     projectTrust: path11.join(projectDir, "trust.json"),
     projectMeta: path11.join(projectDir, "meta.json"),
     projectLocalConfig: path11.join(projectDir, "config.local.json"),
+    inProjectConfig: path11.join(opts.projectRoot, ".wrongstack", "config.json"),
     inProjectAgentsFile: path11.join(opts.projectRoot, ".wrongstack", "AGENTS.md"),
     inProjectSkills: path11.join(opts.projectRoot, ".wrongstack", "skills"),
     inProjectWorktrees: path11.join(opts.projectRoot, ".wrongstack", "worktrees"),
@@ -7098,16 +7059,20 @@ async function loadGoal(filePath) {
   let raw;
   try {
     raw = await fsp.readFile(filePath, "utf8");
-  } catch {
-    return null;
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") return null;
+    throw err;
   }
   try {
     const parsed = JSON.parse(raw);
     if (parsed?.version !== 1 || typeof parsed.goal !== "string" || !Array.isArray(parsed.journal)) {
+      console.warn(`[goal-store] Corrupt goal.json at ${filePath} \u2014 invalid schema. Consider deleting it and re-creating.`);
       return null;
     }
     return parsed;
   } catch {
+    console.warn(`[goal-store] Corrupt goal.json at ${filePath} \u2014 JSON parse failed. Consider deleting it and re-creating.`);
     return null;
   }
 }
@@ -7140,9 +7105,9 @@ function parseProgressFromText(text) {
   const re = /\[progress:\s*(\d{1,3})%\]\s*(?:[—\-]\s*(.+))?/i;
   const m = text.match(re);
   if (!m) return null;
-  const progress = Math.min(100, Math.max(0, Number.parseInt(m[1], 10)));
+  const progress = Math.min(100, Math.max(0, Number.parseInt(m[1] ?? "0", 10)));
   const note = m[2]?.trim() || void 0;
-  return { progress, note };
+  return note === void 0 ? { progress } : { progress, note };
 }
 function recordProgress(goal, progress, note) {
   const clamped = Math.min(100, Math.max(0, progress));
@@ -7161,7 +7126,7 @@ function computeTrend(history) {
   const recent = history.slice(-5);
   const deltas = [];
   for (let i = 1; i < recent.length; i++) {
-    deltas.push(recent[i].progress - recent[i - 1].progress);
+    deltas.push((recent[i]?.progress ?? 0) - (recent[i - 1]?.progress ?? 0));
   }
   if (deltas.length < 2) return void 0;
   const avgDelta = deltas.reduce((a, b) => a + b, 0) / deltas.length;
@@ -7740,6 +7705,7 @@ ${recentJournal}` : "No prior iterations.",
       note: note.slice(0, 240)
     });
     await saveGoal(this.goalPath, withEntry);
+    this.opts.onEternalStop?.();
   }
   /**
    * Manually clear the goal — equivalent to `/goal clear` typed by the user.
@@ -7753,8 +7719,8 @@ ${recentJournal}` : "No prior iterations.",
       await saveGoal(this.goalPath, abandoned);
     }
     try {
-      const { unlink: unlink9 } = await import('fs/promises');
-      await unlink9(this.goalPath);
+      const { unlink: unlink10 } = await import('fs/promises');
+      await unlink10(this.goalPath);
     } catch {
     }
     this.opts.onEternalStop?.();
@@ -8755,6 +8721,53 @@ Working rules:
         "flaws"
       ]
     }
+  },
+  {
+    config: {
+      id: "refactor-planner",
+      name: "Refactor Planner",
+      role: "refactor-planner",
+      tools: [...PLAN_TOOLS, "diff"],
+      prompt: `You are the Refactor Planner agent. Your job is to analyze code
+structure and produce a concrete, phased refactoring plan with risk
+assessment, dependency ordering, and rollback strategy.
+
+Scope:
+- Map module-level dependencies (import graph)
+- Identify coupling hotspots (high fan-in/out modules)
+- Assess refactoring risk by complexity and test coverage
+- Generate phased plans with checkpoint milestones
+- Produce diff-friendly task lists (one task = one concern)
+
+Input format you accept:
+{ "task": "plan | assess | roadmap", "target": "src/core", "constraint": "no-breaking-changes | minimal-downtime | full-rewrite", "focus": "architecture | performance | maintainability" }
+
+Output: Markdown refactor plan with phases (Low Risk / Medium Risk / High Risk),
+dependency graph, rollback strategy, and exit criteria.
+
+Working rules:
+- Always include rollback strategy \u2014 every refactor can fail
+- Merge tasks that take <1h into a single phase
+- Respect team constraints (reviewer availability, parallelization)
+- Never plan without analyzing the actual code first`
+    },
+    budget: HEAVY_BUDGET,
+    capability: {
+      phase: "planning",
+      summary: "Refactoring planner: analyzes code structure, maps dependencies, produces risk-scored phased plans with rollback strategy.",
+      keywords: [
+        "refactor",
+        "refactoring",
+        "restructure",
+        "debt",
+        "technical debt",
+        "clean up",
+        "modularize",
+        "decouple",
+        "dependency graph",
+        "code structure"
+      ]
+    }
   }
 ];
 
@@ -9294,6 +9307,157 @@ Working rules:
         "robustness"
       ]
     }
+  },
+  {
+    config: {
+      id: "security-scanner",
+      name: "Security Scanner",
+      role: "security-scanner",
+      tools: [...TOOLS.inspect],
+      prompt: `You are the Security Scanner agent. Your job is to scan code,
+configs, and dependencies for security issues from hardcoded secrets to
+supply chain risks.
+
+Scope:
+- Detect hardcoded secrets: API keys, tokens, passwords, private keys
+- Find injection vectors: eval, innerHTML, SQL concat, shell injection
+- Identify insecure patterns: weak crypto, hardcoded IVs, disabled TLS
+- Scan dependencies for known CVEs (via npm/pnpm audit)
+- Flag supply chain risks: postinstall hooks, unverified scripts
+
+Input format you accept:
+{ "task": "scan | audit | secrets | dependencies", "paths": ["src", "config"], "depth": "quick | normal | deep" }
+
+Output: Markdown security report with severity-ranked findings, injection
+vectors, dependency issues, and a remediation checklist.
+
+Working rules:
+- Never scan node_modules \u2014 use npm audit instead
+- Always provide remediation steps, not just findings
+- Verify regex-based secrets before flagging (false positive risk)
+- When in doubt, flag as medium rather than ignoring potential issues`
+    },
+    budget: HEAVY_BUDGET,
+    capability: {
+      phase: "verify",
+      summary: "Security scanner: detects hardcoded secrets, injection vectors, insecure patterns, and supply-chain risks with remediation.",
+      keywords: [
+        "security",
+        "scan",
+        "vulnerability",
+        "secret",
+        "api key",
+        "hardcoded",
+        "injection",
+        "cve",
+        "audit dependencies",
+        "supply chain",
+        "xss",
+        "sqli",
+        "shell injection",
+        "sensitive data",
+        "credential"
+      ]
+    }
+  },
+  {
+    config: {
+      id: "bug-hunter",
+      name: "Bug Hunter",
+      role: "bug-hunter",
+      tools: [...TOOLS.inspect],
+      prompt: `You are the Bug Hunter agent. Your job is to systematically scan
+source code for bugs, anti-patterns, and code smells using pattern matching
+and heuristics. Output a prioritized hit list with file:line references.
+
+Scope:
+- Detect common bug patterns (uncaught errors, resource leaks, race conditions)
+- Identify anti-patterns (callback hell, God objects, circular deps)
+- Find TypeScript-specific issues (unsafe any, missing null checks, branded types)
+- Flag security-sensitive constructs (eval, innerHTML, hardcoded secrets)
+- Rank findings: critical > high > medium > low
+
+Input format you accept:
+{ "task": "scan | hunt | check", "paths": ["src/**/*.ts"], "focus": "bugs | patterns | security | all", "severityThreshold": "medium" }
+
+Output: Markdown bug hunt report with critically/high/medium/low sections.
+Each entry: **[TYPE]** \`file:line\` \u2014 description + suggested fix
+
+Working rules:
+- Never scan node_modules \u2014 it's noise
+- Always include file:line for every finding
+- If >30% of findings are false positives, note the confidence level
+- Ask director for clarification if paths are ambiguous`
+    },
+    budget: HEAVY_BUDGET,
+    capability: {
+      phase: "verify",
+      summary: "Bug hunter: scans source code for bugs, anti-patterns, and code smells, producing a file:line-ranked hit list with fixes.",
+      keywords: [
+        "bug",
+        "hunt",
+        "scan",
+        "code smell",
+        "anti-pattern",
+        "race condition",
+        "memory leak",
+        "null deref",
+        "type safety",
+        "unhandled error",
+        "find bugs",
+        "audit code",
+        "code quality"
+      ]
+    }
+  },
+  {
+    config: {
+      id: "audit-log",
+      name: "Audit Log",
+      role: "audit-log",
+      tools: [...TOOLS.inspect],
+      prompt: `You are the Audit Log agent. Your job is to analyze structured JSONL
+session logs and produce actionable markdown reports.
+
+Scope:
+- Parse session logs (iteration counts, tool calls, errors, usage)
+- Detect repeated failure patterns across multiple runs
+- Identify tool usage anomalies (over-use, failures, unexpected chains)
+- Track token consumption trends
+- Generate structured audit reports with severity ratings
+
+Input format you accept:
+{ "task": "analyze | report | trends", "sessionPath": "<path>", "focus": "errors | tools | usage | all" }
+
+Output: Markdown audit report with Summary, Top Errors, Tool Usage table,
+Anomalies, and Cost Trend sections.
+
+Working rules:
+- Never fabricate numbers \u2014 read the actual logs first
+- Always include file:line references for errors
+- If sessionPath is missing, ask the director to provide it
+- Report confidence level: high (>90% accuracy), medium, low`
+    },
+    budget: MEDIUM_BUDGET,
+    capability: {
+      phase: "verify",
+      summary: "Audit log analyzer: parses session JSONL, detects failure patterns, tool anomalies, and cost trends with structured reports.",
+      keywords: [
+        "audit",
+        "log",
+        "logs",
+        "session",
+        "trace",
+        "analyze logs",
+        "error patterns",
+        "cost analysis",
+        "tool usage",
+        "token usage",
+        "post-mortem",
+        "trend",
+        "anomaly"
+      ]
+    }
   }
 ];
 
@@ -12678,7 +12842,7 @@ async function expandGlob(pattern) {
   const abs = isAbsolute(pattern);
   const base = abs ? baseDir(pattern) : baseDir(pattern);
   const relPat = base === "." ? pattern : pattern.slice(base.length + 1);
-  async function walk4(dir, pat) {
+  async function walk3(dir, pat) {
     let entries;
     try {
       entries = await fsp.readdir(dir);
@@ -12699,12 +12863,12 @@ async function expandGlob(pattern) {
     const before = pat.slice(0, firstGlob);
     const rest = pat.slice(firstGlob);
     if (before.endsWith("**")) {
-      await walk4(dir, rest);
+      await walk3(dir, rest);
       for (const e of entries) {
         const full = `${dir}${SEP}${e}`;
         try {
           const stat6 = await fsp.stat(full);
-          if (stat6.isDirectory()) await walk4(full, rest);
+          if (stat6.isDirectory()) await walk3(full, rest);
         } catch {
         }
       }
@@ -12722,13 +12886,13 @@ async function expandGlob(pattern) {
         const full = `${dir}${SEP}${seg}`;
         try {
           const stat6 = await fsp.stat(full);
-          if (stat6.isDirectory()) await walk4(full, rest);
+          if (stat6.isDirectory()) await walk3(full, rest);
         } catch {
         }
       }
     }
   }
-  await walk4(base === "." ? "." : base, relPat);
+  await walk3(base === "." ? "." : base, relPat);
   return [...results];
 }
 
@@ -14324,7 +14488,10 @@ var Director = class _Director {
   workCompleteFlag = false;
   /** Pending /btw notes stashed by the leader agent (see setLeaderBtwNote). */
   _leaderBtwNotes = [];
-  /** Active collab sessions tracked by sessionId (see spawnCollab). */
+  /** Active collab sessions tracked by sessionId (see spawnCollab).
+   *  The tuple holds the session and its Director-registered listener unsubs.
+   *  Calling the unsubs on cancel/premature-cleanup prevents listener accumulation
+   *  on CollabSession (EventEmitter) across many spawnCollab() calls. */
   _activeCollabSessions = /* @__PURE__ */ new Map();
   /** Prevents large `ask_subagent` answers from bloating the leader's context window. */
   largeAnswerStore;
@@ -14654,11 +14821,13 @@ var Director = class _Director {
    * The CollabDebugReport will reflect 'cancelled' disposition when awaited.
    */
   cancelCollabSession(sessionId, reason = "Director cancelled") {
-    const session = this._activeCollabSessions.get(sessionId);
-    if (!session || session.isCancelled()) return;
-    session.cancel(reason);
-    for (const [_role, subagentId] of session.getSubagentIds()) {
-      this.coordinator.stop(subagentId).catch(() => {
+    const entry = this._activeCollabSessions.get(sessionId);
+    if (!entry || entry.session.isCancelled()) return;
+    for (const unsub of entry.unsubs) unsub();
+    entry.session.cancel(reason);
+    for (const [_role, subagentId] of entry.session.getSubagentIds()) {
+      this.coordinator.stop(subagentId).catch((err) => {
+        console.debug(`[director] stop subagent ${subagentId} failed (may have already completed): ${err}`);
       });
     }
   }
@@ -15306,9 +15475,15 @@ var Director = class _Director {
         return options.onBudgetWarning?.(alert) ?? "ignore";
       }
     });
-    this._activeCollabSessions.set(session.sessionId, session);
-    session.on("session.done", () => this._activeCollabSessions.delete(session.sessionId));
-    session.on("session.error", () => this._activeCollabSessions.delete(session.sessionId));
+    const doneHandler = () => this._activeCollabSessions.delete(session.sessionId);
+    const errorHandler = () => this._activeCollabSessions.delete(session.sessionId);
+    session.on("session.done", doneHandler);
+    session.on("session.error", errorHandler);
+    const unsubs = [
+      () => session.off("session.done", doneHandler),
+      () => session.off("session.error", errorHandler)
+    ];
+    this._activeCollabSessions.set(session.sessionId, { session, unsubs });
     return session.start();
   }
   /**
@@ -18730,6 +18905,8 @@ var SpecVersioning = class {
     switch (type) {
       case "functional":
         return "feature";
+      case "non-functional":
+        return "feature";
       case "security":
         return "feature";
       case "performance":
@@ -18737,7 +18914,7 @@ var SpecVersioning = class {
       case "ux":
         return "feature";
       default:
-        return "feature";
+        return assertNever(type);
     }
   }
 };
@@ -19888,27 +20065,13 @@ function startOtlpTraceExporter(opts) {
 // src/infrastructure/context-manager.ts
 var CONTEXT_MANAGER_TOOL_NAME = "context_manager";
 function roughEstimate(messages) {
-  let total = 0;
-  for (const m of messages) {
-    if (typeof m.content === "string") {
-      total += Math.ceil(m.content.length / 4);
-    } else if (Array.isArray(m.content)) {
-      for (const b of m.content) {
-        if (b.type === "text") total += Math.ceil(b.text.length / 4);
-        else if (b.type === "tool_use" || b.type === "tool_result") {
-          total += Math.ceil(JSON.stringify(b).length / 4);
-        }
-      }
-    }
-  }
-  return total;
+  return estimateMessageTokens(messages);
 }
 function createContextManagerTool(opts = {}) {
   const minCompactThreshold = opts.minCompactThreshold ?? 0;
   const noopRetryDeltaTokens = opts.noopRetryDeltaTokens ?? 2e3;
-  const maxContext = opts.maxContext ?? 128e3;
+  const configuredMaxContext = opts.maxContext;
   const compactThresholdFraction = opts.compactThresholdFraction ?? 0.5;
-  const effectiveThreshold = minCompactThreshold > 0 ? minCompactThreshold : Math.floor(maxContext * compactThresholdFraction);
   let lastNoopTokens = 0;
   return {
     name: CONTEXT_MANAGER_TOOL_NAME,
@@ -20002,6 +20165,8 @@ function createContextManagerTool(opts = {}) {
           }
           const fullEstimate = input.systemPrompt != null && Array.isArray(input.tools) ? estimateRequestTokens(messages, input.systemPrompt, input.tools) : { total: beforeTokens};
           const currentTokens = fullEstimate.total;
+          const runtimeMaxContext = configuredMaxContext ?? ctx.provider?.capabilities?.maxContext ?? 128e3;
+          const runtimeThreshold = minCompactThreshold > 0 ? minCompactThreshold : Math.floor(runtimeMaxContext * compactThresholdFraction);
           if (lastNoopTokens > 0) {
             const delta = currentTokens - lastNoopTokens;
             if (delta < noopRetryDeltaTokens) {
@@ -20014,13 +20179,13 @@ function createContextManagerTool(opts = {}) {
               };
             }
           }
-          if (currentTokens < effectiveThreshold) {
+          if (runtimeThreshold > 0 && currentTokens < runtimeThreshold) {
             return {
               action: "compact",
               beforeTokens,
               afterTokens: beforeTokens,
               messageCount: messages.length,
-              notes: `Context tokens (${currentTokens}) below compact threshold (${effectiveThreshold}). Skipping.`
+              notes: `Context tokens (${currentTokens}) below compact threshold (${runtimeThreshold}, based on provider maxContext ${runtimeMaxContext}). Skipping.`
             };
           }
           const report = await opts.compactor.compact(ctx);
@@ -20273,6 +20438,6 @@ var allServers = () => ({
   "minimax-vision": { ...miniMaxVisionServer(), enabled: false }
 });
 
-export { AGENTS_BY_PHASE, AGENT_CATALOG, AISpecBuilder, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutoExecutor, AutonomousRunner, BUG_HUNTER_AGENT, BudgetExceededError, ConfigMigrationError, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_CONFIG, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_SUBAGENT_BASELINE, DEFAULT_TOOLS_CONFIG, DefaultAttachmentStore, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPermissionPolicy, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionStore, DefaultSkillLoader, DefaultTaskStore, Director, DirectorStateCheckpoint, DoneConditionChecker, EternalAutonomyEngine, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FleetBus, FleetSpawnBudgetError, FleetUsageAggregator, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, IntelligentCompactor, LLMSelector, NULL_FLEET_BUS, NoopMetricsSink, NoopTracer, OTelTracer, PROMETHEUS_CONTENT_TYPE, ParallelEternalEngine, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, SECURITY_SCANNER_AGENT, SPEC_TEMPLATES, SddParallelRun, SddTaskDecomposer, SelectiveCompactor, SessionAnalyzer, SpecDrivenDev, SpecParser, SpecStore, SpecVersioning, SubagentBudget, TaskFlow, TaskGenerator, TaskGraphStore, TaskTracker, ToolExecutor, addPlanItem, allServers, analyzeCriticalPath, applyRosterBudget, attachAutoExtend, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, braveSearchServer, buildGoalPreamble, buildOtlpMetricsRequest, buildOtlpTracesRequest, classifyFamily, clearPlan, composeDirectorPrompt, composeSubagentPrompt, context7Server, contextManagerTool, createAutoExecutor, createContextManagerTool, createDelegateTool, createMessage, createSessionEventBridge, decryptConfigSecrets2 as decryptConfigSecrets, deriveTodosFromPlanItem, dispatchAgent, emptyPlan, encryptConfigSecrets, everArtServer, filesystemServer, formatPlan, formatPlanTemplates, getAgentDefinition, getPlanTemplate, getTemplate, githubServer, googleMapsServer, listPlanTemplates, listTemplates, loadDirectorState, loadPlan, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeAskTool, makeAssignTool, makeAutonomyPromptContributor, makeAwaitTasksTool, makeCollabDebugTool, makeDirectorSessionFactory, makeFleetEmitTool, makeFleetHealthTool, makeFleetSessionTool, makeFleetStatusTool, makeFleetUsageTool, makeLLMClassifier, makeRollUpTool, makeSpawnTool, makeTerminateTool, migratePlaintextSecrets, miniMaxVisionServer, removePlanItem, renderProgress, renderPrometheus, renderSpecAnalysis, renderTaskGraph, renderTaskList, resolveAuditLevel, resolveSessionLoggingConfig, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, savePlan, saveTodosCheckpoint, scoreAgents, sentinelServer, setPlanItemStatus, slackServer, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, templateToMarkdown, wireMetricsToEvents, zaiVisionServer };
+export { AGENTS_BY_PHASE, AGENT_CATALOG, AISpecBuilder, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, AutoApprovePermissionPolicy, AutoCompactionMiddleware, AutoExecutor, AutonomousRunner, BUG_HUNTER_AGENT, BudgetExceededError, ConfigMigrationError, DEFAULT_AUTONOMY_CONFIG, DEFAULT_CONFIG_MIGRATIONS, DEFAULT_CONTEXT_CONFIG, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_SUBAGENT_BASELINE, DEFAULT_TOOLS_CONFIG, DefaultAttachmentStore, DefaultConfigLoader, DefaultConfigStore, DefaultErrorHandler, DefaultHealthRegistry, DefaultLogger, DefaultMemoryStore, DefaultModeStore, DefaultModelsRegistry, DefaultMultiAgentCoordinator, DefaultPermissionPolicy, DefaultProviderRunner, DefaultRetryPolicy, DefaultSecretScrubber, DefaultSecretVault, DefaultSessionReader, DefaultSessionStore, DefaultSkillLoader, DefaultTaskStore, Director, DirectorStateCheckpoint, DoneConditionChecker, EternalAutonomyEngine, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FleetBus, FleetSpawnBudgetError, FleetUsageAggregator, HybridCompactor, InMemoryAgentBridge, InMemoryBridgeTransport, InMemoryMetricsSink, IntelligentCompactor, LLMSelector, NULL_FLEET_BUS, NoopMetricsSink, NoopTracer, OTelTracer, PROMETHEUS_CONTENT_TYPE, ParallelEternalEngine, QueueStore, REFACTOR_PLANNER_AGENT, RecoveryLock, SECURITY_SCANNER_AGENT, SPEC_TEMPLATES, SddParallelRun, SddTaskDecomposer, SelectiveCompactor, SessionAnalyzer, SpecDrivenDev, SpecParser, SpecStore, SpecVersioning, SubagentBudget, TaskFlow, TaskGenerator, TaskGraphStore, TaskTracker, ToolExecutor, addPlanItem, allServers, analyzeCriticalPath, applyRosterBudget, attachAutoExtend, attachPlanCheckpoint, attachTodosCheckpoint, awsServer, blockServer, braveSearchServer, buildGoalPreamble, buildOtlpMetricsRequest, buildOtlpTracesRequest, classifyFamily, clearPlan, composeDirectorPrompt, composeSubagentPrompt, context7Server, contextManagerTool, createAutoExecutor, createContextManagerTool, createDelegateTool, createMessage, createSessionEventBridge, createStrategyCompactor, decryptConfigSecrets, deriveTodosFromPlanItem, dispatchAgent, emptyPlan, encryptConfigSecrets, everArtServer, filesystemServer, formatPlan, formatPlanTemplates, getAgentDefinition, getPlanTemplate, getTemplate, githubServer, googleMapsServer, listPlanTemplates, listTemplates, loadDirectorState, loadPlan, loadProjectModes, loadTodosCheckpoint, loadUserModes, makeAgentSubagentRunner, makeAskTool, makeAssignTool, makeAutonomyPromptContributor, makeAwaitTasksTool, makeCollabDebugTool, makeDirectorSessionFactory, makeFleetEmitTool, makeFleetHealthTool, makeFleetSessionTool, makeFleetStatusTool, makeFleetUsageTool, makeLLMClassifier, makeRollUpTool, makeSpawnTool, makeTerminateTool, migratePlaintextSecrets, miniMaxVisionServer, removePlanItem, renderProgress, renderPrometheus, renderSpecAnalysis, renderTaskGraph, renderTaskList, resolveAuditLevel, resolveSessionLoggingConfig, rewriteConfigEncrypted, rosterSummaryFromConfigs, runConfigMigrations, savePlan, saveTodosCheckpoint, scoreAgents, sentinelServer, setPlanItemStatus, slackServer, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, templateToMarkdown, wireMetricsToEvents, zaiVisionServer };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map