@wrongstack/core 0.275.1 → 0.276.3

package/dist/coordination/index.js

@@ -1,6 +1,6 @@
 import { randomUUID, randomBytes, createHash } from 'crypto';
 import * as fsp7 from 'fs/promises';
-import * as path8 from 'path';
+import * as path9 from 'path';
 import { isAbsolute, resolve } from 'path';
 import * as os from 'os';
 import { hostname } from 'os';
@@ -19,10 +19,10 @@ var ObservableBrainArbiter = class {
   inner;
   events;
   async decide(request) {
-    this.events.emit("brain.decision_requested", { request, at: Date.now() });
+    this.events.emit("brain.decision_requested", { sessionId: request.sessionId, request, at: Date.now() });
     const decision = await this.inner.decide(request);
     const event = decision.type === "ask_human" ? "brain.decision_ask_human" : decision.type === "deny" ? "brain.decision_denied" : "brain.decision_answered";
-    this.events.emit(event, { request, decision, at: Date.now() });
+    this.events.emit(event, { sessionId: request.sessionId, request, decision, at: Date.now() });
     return decision;
   }
 };
@@ -59,17 +59,17 @@ var BrainDecisionQueue = class {
       options: request.options,
       rationale: "Decision escalated to human authority."
     };
-    const pending = new Promise((resolve5) => {
-      const entry = { request, resolve: resolve5 };
+    const pending = new Promise((resolve6) => {
+      const entry = { request, resolve: resolve6 };
       if (this.opts.timeoutMs && this.opts.timeoutMs > 0) {
         entry.timer = setTimeout(() => {
           this.pending.delete(request.id);
-          resolve5({ type: "deny", reason: "Brain human decision timed out." });
+          resolve6({ type: "deny", reason: "Brain human decision timed out." });
         }, this.opts.timeoutMs);
       }
       this.pending.set(request.id, entry);
     });
-    this.events.emit("brain.decision_ask_human", { request, decision: ask, at: Date.now() });
+    this.events.emit("brain.decision_ask_human", { sessionId: request.sessionId, request, decision: ask, at: Date.now() });
     return pending;
   }
   dispose() {
@@ -155,308 +155,10 @@ function formatHumanPrompt(request) {
   lines.push("", `Risk: ${request.risk}`);
   return lines.join("\n");
 }
-async function atomicWrite(targetPath, content, opts = {}) {
-  const dir = path8.dirname(targetPath);
-  await fsp7.mkdir(dir, { recursive: true });
-  const tmp = path8.join(dir, `.${path8.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
-  try {
-    if (typeof content === "string") {
-      await fsp7.writeFile(tmp, content, { flag: "wx", encoding: opts.encoding ?? "utf8" });
-    } else {
-      await fsp7.writeFile(tmp, content, { flag: "wx" });
-    }
-    try {
-      const fh = await fsp7.open(tmp, "r+");
-      try {
-        await fh.sync();
-      } finally {
-        await fh.close();
-      }
-    } catch {
-    }
-    let mode;
-    try {
-      const stat7 = await fsp7.stat(targetPath);
-      mode = stat7.mode & 511;
-    } catch {
-      mode = opts.mode;
-    }
-    if (mode !== void 0) {
-      await fsp7.chmod(tmp, mode);
-    }
-    await renameWithRetry(tmp, targetPath);
-    if (mode !== void 0 && process.platform === "win32") {
-      try {
-        await fsp7.chmod(targetPath, mode);
-      } catch {
-      }
-    }
-  } catch (err) {
-    try {
-      await fsp7.unlink(tmp);
-    } catch {
-    }
-    throw err;
-  }
-}
-async function ensureDir(dir) {
-  await fsp7.mkdir(dir, { recursive: true });
-}
-async function withFileLock(targetPath, fn, opts = {}) {
-  const dir = path8.dirname(targetPath);
-  await fsp7.mkdir(dir, { recursive: true });
-  const lockPath = path8.join(dir, `.${path8.basename(targetPath)}.lock`);
-  const timeoutMs = opts.timeoutMs ?? 5e3;
-  const staleMs = opts.staleMs ?? 3e4;
-  const started = Date.now();
-  let handle;
-  for (; ; ) {
-    try {
-      handle = await fsp7.open(lockPath, "wx");
-      await handle.writeFile(`${process.pid}:${Date.now()}`);
-      break;
-    } catch (err) {
-      const code = err.code;
-      if (code === "ENOENT") {
-        await fsp7.mkdir(dir, { recursive: true });
-        continue;
-      }
-      if (code !== "EEXIST") throw err;
-      try {
-        const stat7 = await fsp7.stat(lockPath);
-        if (Date.now() - stat7.mtimeMs > staleMs) {
-          await fsp7.unlink(lockPath);
-          continue;
-        }
-      } catch {
-        continue;
-      }
-      if (Date.now() - started >= timeoutMs) {
-        throw new Error(`Timed out waiting for file lock: ${targetPath}`);
-      }
-      await new Promise((resolve5) => setTimeout(resolve5, 25));
-    }
-  }
-  try {
-    return await fn();
-  } finally {
-    try {
-      await handle?.close();
-    } catch {
-    }
-    try {
-      await fsp7.unlink(lockPath);
-    } catch {
-    }
-  }
-}
-var TRANSIENT_RENAME_CODES = /* @__PURE__ */ new Set(["EPERM", "EBUSY", "EACCES", "ENOTEMPTY"]);
-async function renameWithRetry(from, to) {
-  if (process.platform !== "win32") {
-    await fsp7.rename(from, to);
-    return;
-  }
-  const delays = [10, 25, 60, 120, 250];
-  let lastErr;
-  for (let i = 0; i <= delays.length; i++) {
-    try {
-      await fsp7.rename(from, to);
-      return;
-    } catch (err) {
-      lastErr = err;
-      const code = err?.code;
-      if (!code || !TRANSIENT_RENAME_CODES.has(code) || i === delays.length) {
-        throw err;
-      }
-      await new Promise((resolve5) => setTimeout(resolve5, delays[i]));
-    }
-  }
-  throw lastErr;
-}
-
-// src/utils/error.ts
-function toErrorMessage(err) {
-  return err instanceof Error ? err.message : String(err);
-}
-
-// src/storage/director-state.ts
-async function acquireDirectorStateLock(lockPath, processId = process.pid) {
-  let existing;
-  try {
-    existing = await fsp7.readFile(lockPath, "utf8");
-  } catch {
-  }
-  if (existing) {
-    try {
-      const lock2 = JSON.parse(existing);
-      try {
-        process.kill(lock2.pid, 0);
-        return false;
-      } catch {
-      }
-    } catch {
-    }
-  }
-  const lock = {
-    pid: processId,
-    hostname: hostname(),
-    startedAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  await atomicWrite(lockPath, JSON.stringify(lock), { mode: 384 });
-  return true;
-}
-async function releaseDirectorStateLock(lockPath) {
-  try {
-    await fsp7.unlink(lockPath);
-  } catch {
-  }
-}
-var DirectorStateCheckpoint = class {
-  snapshot;
-  filePath;
-  lockPath;
-  timer = null;
-  debounceMs;
-  writing = false;
-  rewriteRequested = false;
-  constructor(filePath, init, debounceMs = 250) {
-    this.filePath = filePath;
-    this.lockPath = `${filePath}.lock`;
-    this.debounceMs = debounceMs;
-    this.snapshot = {
-      version: 1,
-      directorRunId: init.directorRunId,
-      updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      spawnCount: 0,
-      maxSpawns: init.maxSpawns,
-      spawnDepth: init.spawnDepth,
-      maxSpawnDepth: init.maxSpawnDepth,
-      directorBudget: init.directorBudget,
-      subagents: [],
-      tasks: []
-    };
-  }
-  /**
-   * Attempt to acquire the lock for this checkpoint. Call this before
-   * resuming a crashed director run. If it returns false, another
-   * director process is still running this fleet — do not resume.
-   */
-  async acquireLock() {
-    return acquireDirectorStateLock(this.lockPath);
-  }
-  /**
-   * Release the lock on graceful shutdown. Call `flush()` first to ensure
-   * the final checkpoint state is on disk before removing the lock.
-   * Without this, the next resume will see a stale-lock and refuse.
-   */
-  async releaseLock() {
-    return releaseDirectorStateLock(this.lockPath);
-  }
-  /**
-   * Resume from a snapshot previously loaded via `loadDirectorState()`.
-   * Use this when `--resume <runId>` is triggered — the snapshot has
-   * the full fleet state (subagents, tasks) from before the crash; the
-   * checkpoint continues from there.
-   */
-  resume(snapshot) {
-    this.snapshot = snapshot;
-  }
-  current() {
-    return this.snapshot;
-  }
-  recordSpawn(sub, spawnCount) {
-    this.snapshot = {
-      ...this.snapshot,
-      spawnCount,
-      subagents: [...this.snapshot.subagents.filter((s) => s.id !== sub.id), sub]
-    };
-    this.bumpUpdatedAt();
-    this.schedule();
-  }
-  recordTaskAssigned(task) {
-    const exists = this.snapshot.tasks.some((t) => t.taskId === task.taskId);
-    this.snapshot = {
-      ...this.snapshot,
-      tasks: exists ? this.snapshot.tasks.map((t) => t.taskId === task.taskId ? { ...t, ...task } : t) : [...this.snapshot.tasks, task]
-    };
-    this.bumpUpdatedAt();
-    this.schedule();
-  }
-  recordTaskStatus(taskId, patch) {
-    this.snapshot = {
-      ...this.snapshot,
-      tasks: this.snapshot.tasks.map(
-        (t) => t.taskId === taskId ? { ...t, ...patch } : t
-      )
-    };
-    this.bumpUpdatedAt();
-    this.schedule();
-  }
-  setUsage(usage) {
-    this.snapshot = { ...this.snapshot, usage };
-    this.bumpUpdatedAt();
-    this.schedule();
-  }
-  /** Force a synchronous flush — used by Director.shutdown(). */
-  async flush() {
-    if (this.timer) {
-      clearTimeout(this.timer);
-      this.timer = null;
-    }
-    await this.persist();
-    while (this.rewriteRequested) {
-      this.rewriteRequested = false;
-      await this.persist();
-    }
-  }
-  bumpUpdatedAt() {
-    this.snapshot = { ...this.snapshot, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-  }
-  schedule() {
-    if (this.timer) return;
-    this.timer = setTimeout(() => {
-      this.timer = null;
-      void this.persist();
-    }, this.debounceMs);
-  }
-  async persist() {
-    if (this.writing) {
-      this.rewriteRequested = true;
-      return;
-    }
-    this.writing = true;
-    try {
-      await atomicWrite(this.filePath, JSON.stringify(this.snapshot, null, 2), {
-        mode: 384
-      });
-    } catch (err) {
-      console.warn(
-        "[director-state] checkpoint write failed:",
-        toErrorMessage(err)
-      );
-    } finally {
-      this.writing = false;
-      if (this.rewriteRequested) {
-        this.rewriteRequested = false;
-        this.schedule();
-      }
-    }
-  }
-};
 
-// src/utils/safe-json.ts
-function safeParse(input, maxBytes = 5e6) {
-  if (input.length > maxBytes) {
-    return { ok: false, error: `Input exceeds limit (${maxBytes} bytes)` };
-  }
-  try {
-    return { ok: true, value: JSON.parse(input) };
-  } catch (err) {
-    return {
-      ok: false,
-      error: toErrorMessage(err)
-    };
-  }
+// src/utils/error.ts
+function toErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
 }
 
 // src/utils/expect-defined.ts
@@ -676,13 +378,72 @@ function isEmptyMessage(msg) {
   return msg.content.length === 0;
 }
 
+// src/utils/safe-json.ts
+function safeParse(input, maxBytes = 5e6) {
+  if (input.length > maxBytes) {
+    return { ok: false, error: `Input exceeds limit (${maxBytes} bytes)` };
+  }
+  try {
+    return { ok: true, value: JSON.parse(input) };
+  } catch (err) {
+    return {
+      ok: false,
+      error: toErrorMessage(err)
+    };
+  }
+}
+function sessionScopedPath(dir, sessionId, suffix) {
+  if (!sessionId || sessionId.includes("\\") || sessionId.includes("..")) {
+    throw invalid(sessionId);
+  }
+  const resolved = path9.resolve(dir, `${sessionId}${suffix}`);
+  const rel = path9.relative(path9.resolve(dir), resolved);
+  if (rel.startsWith("..") || path9.isAbsolute(rel)) {
+    throw invalid(sessionId);
+  }
+  return resolved;
+}
+function invalid(sessionId) {
+  return new FsError({
+    message: `Invalid sessionId: ${sessionId}`,
+    code: ERROR_CODES.FS_DELETE_FAILED,
+    path: sessionId,
+    context: { reason: "path_traversal" }
+  });
+}
+var ENCODING = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+var ENCODING_LEN = ENCODING.length;
+var TIME_LEN = 10;
+var RANDOM_LEN = 16;
+function encodeTime(now, len) {
+  let mod;
+  let str = "";
+  for (let i = len - 1; i >= 0; i--) {
+    mod = now % ENCODING_LEN;
+    str = ENCODING[mod] + str;
+    now = (now - mod) / ENCODING_LEN;
+  }
+  return str;
+}
+function encodeRandom(len) {
+  const bytes = randomBytes(len);
+  let str = "";
+  for (let i = 0; i < len; i++) {
+    str += ENCODING[bytes[i] % ENCODING_LEN];
+  }
+  return str;
+}
+function ulid(seedTime = Date.now()) {
+  return encodeTime(seedTime, TIME_LEN) + encodeRandom(RANDOM_LEN);
+}
+
 // src/utils/string.ts
 function truncate(s, max) {
   return s.length <= max ? s : `${s.slice(0, max - 1)}\u2026`;
 }
 function projectSlug(absRoot) {
-  const base = slugify(path8.basename(absRoot));
-  const hash = createHash("sha256").update(path8.resolve(absRoot)).digest("hex").slice(0, 6);
+  const base = slugify(path9.basename(absRoot));
+  const hash = createHash("sha256").update(path9.resolve(absRoot)).digest("hex").slice(0, 6);
   return `${base}-${hash}`;
 }
 function slugify(name) {
@@ -690,8 +451,8 @@ function slugify(name) {
 }
 function wstackGlobalRoot() {
   const fromEnv = process.env["WRONGSTACK_HOME"];
-  if (fromEnv && fromEnv.trim().length > 0) return path8.resolve(fromEnv);
-  return path8.join(os.homedir(), ".wrongstack");
+  if (fromEnv && fromEnv.trim().length > 0) return path9.resolve(fromEnv);
+  return path9.join(os.homedir(), ".wrongstack");
 }
 
 // src/types/errors.ts
@@ -706,7 +467,10 @@ var ERROR_CODES = {
   // Agent
   AGENT_ITERATION_LIMIT: "AGENT_ITERATION_LIMIT",
   AGENT_ABORTED: "AGENT_ABORTED",
-  AGENT_RUN_FAILED: "AGENT_RUN_FAILED"};
+  AGENT_RUN_FAILED: "AGENT_RUN_FAILED",
+  // File system
+  FS_READ_FAILED: "FS_READ_FAILED",
+  FS_DELETE_FAILED: "FS_DELETE_FAILED"};
 var WrongStackError = class extends Error {
   code;
   subsystem;
@@ -723,30 +487,336 @@ var WrongStackError = class extends Error {
     this.context = opts.context;
   }
   /**
-   * Render a one-line user-facing description.
-   * Subclasses should override for domain-specific formatting.
+   * Render a one-line user-facing description.
+   * Subclasses should override for domain-specific formatting.
+   */
+  describe() {
+    const ctx = this.context ? ` ${formatContext(this.context)}` : "";
+    return `${this.code}: ${this.message}${ctx}`;
+  }
+};
+function formatContext(ctx) {
+  const parts = Object.entries(ctx).filter(([, v]) => v !== void 0).slice(0, 3).map(([k, v]) => `${k}=${String(v)}`);
+  return parts.length > 0 ? `[${parts.join(" ")}]` : "";
+}
+var AgentError = class extends WrongStackError {
+  constructor(opts) {
+    super({
+      message: opts.message,
+      code: opts.code,
+      subsystem: "agent",
+      severity: opts.code === ERROR_CODES.AGENT_ABORTED ? "warning" : "error",
+      recoverable: opts.recoverable ?? opts.code === ERROR_CODES.AGENT_ITERATION_LIMIT,
+      context: opts.context,
+      cause: opts.cause
+    });
+    this.name = "AgentError";
+  }
+};
+var FsError = class extends WrongStackError {
+  path;
+  constructor(opts) {
+    super({
+      message: opts.message,
+      code: opts.code,
+      subsystem: "fs",
+      severity: "error",
+      recoverable: opts.code !== ERROR_CODES.FS_READ_FAILED,
+      context: { path: opts.path, ...opts.context },
+      cause: opts.cause
+    });
+    this.name = "FsError";
+    this.path = opts.path;
+  }
+};
+
+// src/utils/atomic-write.ts
+async function atomicWrite(targetPath, content, opts = {}) {
+  const dir = path9.dirname(targetPath);
+  await fsp7.mkdir(dir, { recursive: true });
+  const tmp = path9.join(dir, `.${path9.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
+  try {
+    if (typeof content === "string") {
+      await fsp7.writeFile(tmp, content, { flag: "wx", encoding: opts.encoding ?? "utf8" });
+    } else {
+      await fsp7.writeFile(tmp, content, { flag: "wx" });
+    }
+    try {
+      const fh = await fsp7.open(tmp, "r+");
+      try {
+        await fh.sync();
+      } finally {
+        await fh.close();
+      }
+    } catch {
+    }
+    let mode;
+    try {
+      const stat7 = await fsp7.stat(targetPath);
+      mode = stat7.mode & 511;
+    } catch {
+      mode = opts.mode;
+    }
+    if (mode !== void 0) {
+      await fsp7.chmod(tmp, mode);
+    }
+    await renameWithRetry(tmp, targetPath);
+    if (mode !== void 0 && process.platform === "win32") {
+      try {
+        await fsp7.chmod(targetPath, mode);
+      } catch {
+      }
+    }
+  } catch (err) {
+    try {
+      await fsp7.unlink(tmp);
+    } catch {
+    }
+    throw err;
+  }
+}
+async function ensureDir(dir) {
+  await fsp7.mkdir(dir, { recursive: true });
+}
+async function withFileLock(targetPath, fn, opts = {}) {
+  const dir = path9.dirname(targetPath);
+  await fsp7.mkdir(dir, { recursive: true });
+  const lockPath = path9.join(dir, `.${path9.basename(targetPath)}.lock`);
+  const timeoutMs = opts.timeoutMs ?? 5e3;
+  const staleMs = opts.staleMs ?? 3e4;
+  const started = Date.now();
+  let handle;
+  for (; ; ) {
+    try {
+      handle = await fsp7.open(lockPath, "wx");
+      await handle.writeFile(`${process.pid}:${Date.now()}`);
+      break;
+    } catch (err) {
+      const code = err.code;
+      if (code === "ENOENT") {
+        await fsp7.mkdir(dir, { recursive: true });
+        continue;
+      }
+      if (code !== "EEXIST") throw err;
+      try {
+        const stat7 = await fsp7.stat(lockPath);
+        if (Date.now() - stat7.mtimeMs > staleMs) {
+          await fsp7.unlink(lockPath);
+          continue;
+        }
+      } catch {
+        continue;
+      }
+      if (Date.now() - started >= timeoutMs) {
+        throw new FsError({
+          message: `Timed out waiting for file lock: ${targetPath}`,
+          code: "FS_ATOMIC_WRITE_FAILED",
+          path: targetPath,
+          context: { timeoutMs }
+        });
+      }
+      await new Promise((resolve6) => setTimeout(resolve6, 25));
+    }
+  }
+  try {
+    return await fn();
+  } finally {
+    try {
+      await handle?.close();
+    } catch {
+    }
+    try {
+      await fsp7.unlink(lockPath);
+    } catch {
+    }
+  }
+}
+var TRANSIENT_RENAME_CODES = /* @__PURE__ */ new Set(["EPERM", "EBUSY", "EACCES", "ENOTEMPTY"]);
+async function renameWithRetry(from, to) {
+  if (process.platform !== "win32") {
+    await fsp7.rename(from, to);
+    return;
+  }
+  const delays = [10, 25, 60, 120, 250];
+  let lastErr;
+  for (let i = 0; i <= delays.length; i++) {
+    try {
+      await fsp7.rename(from, to);
+      return;
+    } catch (err) {
+      lastErr = err;
+      const code = err?.code;
+      if (!code || !TRANSIENT_RENAME_CODES.has(code) || i === delays.length) {
+        throw err;
+      }
+      await new Promise((resolve6) => setTimeout(resolve6, delays[i]));
+    }
+  }
+  throw lastErr;
+}
+
+// src/storage/director-state.ts
+async function acquireDirectorStateLock(lockPath, processId = process.pid) {
+  let existing;
+  try {
+    existing = await fsp7.readFile(lockPath, "utf8");
+  } catch {
+  }
+  if (existing) {
+    try {
+      const lock2 = JSON.parse(existing);
+      try {
+        process.kill(lock2.pid, 0);
+        return false;
+      } catch {
+      }
+    } catch {
+    }
+  }
+  const lock = {
+    pid: processId,
+    hostname: hostname(),
+    startedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await atomicWrite(lockPath, JSON.stringify(lock), { mode: 384 });
+  return true;
+}
+async function releaseDirectorStateLock(lockPath) {
+  try {
+    await fsp7.unlink(lockPath);
+  } catch {
+  }
+}
+var DirectorStateCheckpoint = class {
+  snapshot;
+  filePath;
+  lockPath;
+  timer = null;
+  debounceMs;
+  writing = false;
+  rewriteRequested = false;
+  constructor(filePath, init, debounceMs = 250) {
+    this.filePath = filePath;
+    this.lockPath = `${filePath}.lock`;
+    this.debounceMs = debounceMs;
+    this.snapshot = {
+      version: 1,
+      directorRunId: init.directorRunId,
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      spawnCount: 0,
+      maxSpawns: init.maxSpawns,
+      spawnDepth: init.spawnDepth,
+      maxSpawnDepth: init.maxSpawnDepth,
+      directorBudget: init.directorBudget,
+      subagents: [],
+      tasks: []
+    };
+  }
+  /**
+   * Attempt to acquire the lock for this checkpoint. Call this before
+   * resuming a crashed director run. If it returns false, another
+   * director process is still running this fleet — do not resume.
+   */
+  async acquireLock() {
+    return acquireDirectorStateLock(this.lockPath);
+  }
+  /**
+   * Release the lock on graceful shutdown. Call `flush()` first to ensure
+   * the final checkpoint state is on disk before removing the lock.
+   * Without this, the next resume will see a stale-lock and refuse.
    */
-  describe() {
-    const ctx = this.context ? ` ${formatContext(this.context)}` : "";
-    return `${this.code}: ${this.message}${ctx}`;
+  async releaseLock() {
+    return releaseDirectorStateLock(this.lockPath);
   }
-};
-function formatContext(ctx) {
-  const parts = Object.entries(ctx).filter(([, v]) => v !== void 0).slice(0, 3).map(([k, v]) => `${k}=${String(v)}`);
-  return parts.length > 0 ? `[${parts.join(" ")}]` : "";
-}
-var AgentError = class extends WrongStackError {
-  constructor(opts) {
-    super({
-      message: opts.message,
-      code: opts.code,
-      subsystem: "agent",
-      severity: opts.code === ERROR_CODES.AGENT_ABORTED ? "warning" : "error",
-      recoverable: opts.recoverable ?? opts.code === ERROR_CODES.AGENT_ITERATION_LIMIT,
-      context: opts.context,
-      cause: opts.cause
-    });
-    this.name = "AgentError";
+  /**
+   * Resume from a snapshot previously loaded via `loadDirectorState()`.
+   * Use this when `--resume <runId>` is triggered — the snapshot has
+   * the full fleet state (subagents, tasks) from before the crash; the
+   * checkpoint continues from there.
+   */
+  resume(snapshot) {
+    this.snapshot = snapshot;
+  }
+  current() {
+    return this.snapshot;
+  }
+  recordSpawn(sub, spawnCount) {
+    this.snapshot = {
+      ...this.snapshot,
+      spawnCount,
+      subagents: [...this.snapshot.subagents.filter((s) => s.id !== sub.id), sub]
+    };
+    this.bumpUpdatedAt();
+    this.schedule();
+  }
+  recordTaskAssigned(task) {
+    const exists = this.snapshot.tasks.some((t) => t.taskId === task.taskId);
+    this.snapshot = {
+      ...this.snapshot,
+      tasks: exists ? this.snapshot.tasks.map((t) => t.taskId === task.taskId ? { ...t, ...task } : t) : [...this.snapshot.tasks, task]
+    };
+    this.bumpUpdatedAt();
+    this.schedule();
+  }
+  recordTaskStatus(taskId, patch) {
+    this.snapshot = {
+      ...this.snapshot,
+      tasks: this.snapshot.tasks.map(
+        (t) => t.taskId === taskId ? { ...t, ...patch } : t
+      )
+    };
+    this.bumpUpdatedAt();
+    this.schedule();
+  }
+  setUsage(usage) {
+    this.snapshot = { ...this.snapshot, usage };
+    this.bumpUpdatedAt();
+    this.schedule();
+  }
+  /** Force a synchronous flush — used by Director.shutdown(). */
+  async flush() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    await this.persist();
+    while (this.rewriteRequested) {
+      this.rewriteRequested = false;
+      await this.persist();
+    }
+  }
+  bumpUpdatedAt() {
+    this.snapshot = { ...this.snapshot, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  }
+  schedule() {
+    if (this.timer) return;
+    this.timer = setTimeout(() => {
+      this.timer = null;
+      void this.persist();
+    }, this.debounceMs);
+  }
+  async persist() {
+    if (this.writing) {
+      this.rewriteRequested = true;
+      return;
+    }
+    this.writing = true;
+    try {
+      await atomicWrite(this.filePath, JSON.stringify(this.snapshot, null, 2), {
+        mode: 384
+      });
+    } catch (err) {
+      console.warn(
+        "[director-state] checkpoint write failed:",
+        toErrorMessage(err)
+      );
+    } finally {
+      this.writing = false;
+      if (this.rewriteRequested) {
+        this.rewriteRequested = false;
+        this.schedule();
+      }
+    }
   }
 };
 
@@ -852,7 +922,7 @@ var InMemoryAgentBridge = class {
       });
     }
     this.inflightGuards.add(correlationId);
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const timer = setTimeout(() => {
         this.inflightGuards.delete(correlationId);
         this.pendingRequests.delete(correlationId);
@@ -871,7 +941,7 @@ var InMemoryAgentBridge = class {
         return;
       }
       this.pendingRequests.set(correlationId, {
-        resolve: resolve5,
+        resolve: resolve6,
         reject,
         timer
       });
@@ -1173,7 +1243,7 @@ var CollabSession = class extends EventEmitter {
       id: `${role}-${this.sessionId}`,
       name: role,
       role,
-      tools: ["fleet_emit", "fleet_status", "read", "grep", "glob", "bash", "write"],
+      tools: ["fleet_emit", "fleet", "read", "grep", "glob", "bash", "write"],
       maxIterations: budget.maxIterations,
       maxToolCalls: budget.maxToolCalls,
       timeoutMs: budget.timeoutMs
@@ -1509,7 +1579,7 @@ Emit each evaluation immediately. Do not wait until you have read all reports.`;
 function readBundledInstructionText(relativePath) {
   for (const root of instructionRootCandidates()) {
     try {
-      return readFileSync(path8.join(root, relativePath), "utf8").trimEnd();
+      return readFileSync(path9.join(root, relativePath), "utf8").trimEnd();
     } catch {
     }
   }
@@ -1522,11 +1592,11 @@ function renderInstructionTemplate(template, values) {
   );
 }
 function instructionRootCandidates() {
-  const here = path8.dirname(fileURLToPath(import.meta.url));
+  const here = path9.dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    path8.resolve(here, "../../instructions"),
-    path8.resolve(here, "../instructions"),
-    path8.resolve(here, "instructions")
+    path9.resolve(here, "../../instructions"),
+    path9.resolve(here, "../instructions"),
+    path9.resolve(here, "instructions")
   ];
   return candidates.sort((a, b) => Number(!isDirectory(a)) - Number(!isDirectory(b)));
 }
@@ -1655,24 +1725,24 @@ function agentPrompt(id) {
   const fileName = `${id}.md`;
   for (const dir of agentPromptDirCandidates()) {
     try {
-      return readFileSync(path8.join(dir, fileName), "utf8").trimEnd();
+      return readFileSync(path9.join(dir, fileName), "utf8").trimEnd();
     } catch {
     }
   }
   return "";
 }
 function agentPromptDirCandidates() {
-  const here = path8.dirname(fileURLToPath(import.meta.url));
+  const here = path9.dirname(fileURLToPath(import.meta.url));
   const explicitDir = process.env["WRONGSTACK_AGENT_INSTRUCTIONS_DIR"];
-  const globalRoot = process.env["WRONGSTACK_HOME"] || path8.join(os.homedir(), ".wrongstack");
+  const globalRoot = process.env["WRONGSTACK_HOME"] || path9.join(os.homedir(), ".wrongstack");
   const candidates = [
-    ...explicitDir ? [path8.resolve(explicitDir)] : [],
-    path8.join(globalRoot, "instructions", "agents"),
-    path8.resolve(here, "../../../../instructions/agents"),
-    path8.resolve(here, "../../../instructions/agents"),
-    path8.resolve(here, "../../instructions/agents"),
-    path8.resolve(here, "../instructions/agents"),
-    path8.resolve(here, "instructions/agents")
+    ...explicitDir ? [path9.resolve(explicitDir)] : [],
+    path9.join(globalRoot, "instructions", "agents"),
+    path9.resolve(here, "../../../../instructions/agents"),
+    path9.resolve(here, "../../../instructions/agents"),
+    path9.resolve(here, "../../instructions/agents"),
+    path9.resolve(here, "../instructions/agents"),
+    path9.resolve(here, "instructions/agents")
   ];
   return candidates.sort((a, b) => Number(!isDirectory2(a)) - Number(!isDirectory2(b)));
 }
@@ -3491,96 +3561,91 @@ function makeTerminateAllTool(director) {
     }
   };
 }
-function makeFleetStatusTool(director) {
-  return {
-    name: "fleet_status",
-    description: "Snapshot of the fleet \u2014 every subagent's current status, coordinator counts (total/running/idle/stopped), pending task descriptions, and usage rollup.",
-    permission: "auto",
-    mutating: false,
-    capabilities: [ToolCapabilities.COORDINATION_FLEET_READ],
-    inputSchema: { type: "object", properties: {}, required: [] },
-    async execute() {
-      const base = director.status();
-      const fm = director.fleetManager;
-      const stats = fm?.getFleetStats();
-      const fleetStatus = fm?.getFleetStatus();
-      return {
-        subagents: base.subagents,
-        coordinatorStats: stats ? { total: stats.total, running: stats.running, idle: stats.idle, stopped: stats.stopped } : void 0,
-        pending: fleetStatus?.pending ?? [],
-        usage: fm?.snapshot()
-      };
-    }
-  };
-}
-function makeFleetUsageTool(director) {
-  return {
-    name: "fleet_usage",
-    description: "Token + cost breakdown across the fleet, per-subagent and totals.",
-    permission: "auto",
-    mutating: false,
-    capabilities: [ToolCapabilities.COORDINATION_FLEET_READ],
-    inputSchema: { type: "object", properties: {}, required: [] },
-    async execute() {
-      return director.snapshot();
-    }
-  };
-}
-function makeFleetSessionTool(director) {
+function makeFleetTool(director) {
   return {
-    name: "fleet_session",
-    description: "Read a subagent's JSONL transcript and extract its last assistant text, stop reason, and tool-use count. Use this to see what a running or timed-out subagent actually produced.",
+    name: "fleet",
+    description: 'Fleet observation tool. Use `action` to select what you need: "status" \u2014 snapshot of all subagents + coordinator counts + pending tasks; "usage" \u2014 token + cost breakdown per subagent and totals; "health" \u2014 per-subagent budget pressure, last activity, and status; "session" \u2014 read a subagent\'s JSONL transcript (requires subagentId).',
+    usageHint: 'action: "status" (default) | "usage" | "health" | "session".\nFor "session", pass subagentId (required) and optional tail (trailing JSONL lines).',
     permission: "auto",
     mutating: false,
     capabilities: [ToolCapabilities.COORDINATION_FLEET_READ],
     inputSchema: {
       type: "object",
       properties: {
-        subagentId: { type: "string", description: "Subagent id to read the transcript of." },
-        tail: { type: "number", description: "Number of trailing JSONL lines to return. Omit for the full transcript." }
-      },
-      required: ["subagentId"]
+        action: {
+          type: "string",
+          enum: ["status", "usage", "health", "session"],
+          description: "Observation to retrieve (default: status)."
+        },
+        subagentId: {
+          type: "string",
+          description: 'Subagent id (required for action: "session").'
+        },
+        tail: {
+          type: "number",
+          description: 'Number of trailing JSONL lines (action: "session" only). Omit for the full transcript.'
+        }
+      }
     },
     async execute(input) {
-      const i = input;
-      const result = await director.readSession(i.subagentId, i.tail);
-      if (!result) {
-        return {
-          error: `fleet_session: transcript unavailable for "${i.subagentId}". Is sessionsRoot configured?`
-        };
-      }
-      return result;
-    }
-  };
-}
-function makeFleetHealthTool(director) {
-  return {
-    name: "fleet_health",
-    description: "Per-subagent health report: budget pressure (pct of limits consumed), last activity timestamp, and current status. Use to decide whether to assign more work to a subagent or spawn a fresh one.",
-    permission: "auto",
-    mutating: false,
-    capabilities: [ToolCapabilities.COORDINATION_FLEET_READ],
-    inputSchema: { type: "object", properties: {}, required: [] },
-    async execute() {
-      const status = director.status();
-      const snapshot = director.snapshot();
-      const subagents = status.subagents ?? [];
-      const perSubagent = snapshot.perSubagent ?? {};
-      return {
-        subagents: subagents.map((s) => {
-          const usage = perSubagent[s.id];
+      const i = input ?? {};
+      const action = i.action ?? "status";
+      switch (action) {
+        case "status": {
+          const base = director.status();
+          const fm = director.fleetManager;
+          const stats = fm?.getFleetStats();
+          const fleetStatus = fm?.getFleetStatus();
           return {
-            id: s.id,
-            status: s.status,
-            lastEventAt: usage?.lastEventAt,
-            budgetPressure: {
-              iterations: usage?.iterations,
-              toolCalls: usage?.toolCalls,
-              costUsd: usage?.cost
-            }
+            action: "status",
+            subagents: base.subagents,
+            coordinatorStats: stats ? { total: stats.total, running: stats.running, idle: stats.idle, stopped: stats.stopped } : void 0,
+            pending: fleetStatus?.pending ?? [],
+            usage: fm?.snapshot()
           };
-        })
-      };
+        }
+        case "usage": {
+          return { action: "usage", ...director.snapshot() };
+        }
+        case "health": {
+          const status = director.status();
+          const snapshot = director.snapshot();
+          const subagents = status.subagents ?? [];
+          const perSubagent = snapshot.perSubagent ?? {};
+          return {
+            action: "health",
+            subagents: subagents.map((s) => {
+              const usage = perSubagent[s.id];
+              return {
+                id: s.id,
+                status: s.status,
+                lastEventAt: usage?.lastEventAt,
+                budgetPressure: {
+                  iterations: usage?.iterations,
+                  toolCalls: usage?.toolCalls,
+                  costUsd: usage?.cost
+                }
+              };
+            })
+          };
+        }
+        case "session": {
+          const subagentId = i.subagentId;
+          if (!subagentId) {
+            return { action: "session", error: 'fleet: subagentId is required for action: "session"' };
+          }
+          const result = await director.readSession(subagentId, i.tail);
+          if (!result) {
+            return {
+              action: "session",
+              error: `fleet: transcript unavailable for "${subagentId}". Is sessionsRoot configured?`
+            };
+          }
+          return { action: "session", ...result };
+        }
+        default:
+          return { error: `fleet: unknown action "${action}". Valid: status, usage, health, session.` };
+      }
     }
   };
 }
@@ -4116,6 +4181,7 @@ var SubagentBudget = class _SubagentBudget {
    */
   lastActivityTime = null;
   _onThreshold;
+  _sessionId;
   /**
    * Hard cap on how long `_negotiateExtension` waits for the coordinator to
    * respond before defaulting to 'stop'. Without this fallback an absent
@@ -4184,10 +4250,15 @@ var SubagentBudget = class _SubagentBudget {
   get mode() {
     return this._mode;
   }
-  constructor(limits = {}, mode = "auto") {
+  constructor(limits = {}, mode = "auto", options = {}) {
     this._mode = mode;
+    this._sessionId = options.sessionId;
     this.limits = { ...limits };
   }
+  currentSessionId() {
+    const value = typeof this._sessionId === "function" ? this._sessionId() : this._sessionId;
+    return typeof value === "string" && value.length > 0 ? value : void 0;
+  }
   start() {
     this.startTime = Date.now();
     this.lastActivityTime = this.startTime;
@@ -4346,16 +4417,18 @@ var SubagentBudget = class _SubagentBudget {
     if (!bus?.hasListenerFor("budget.threshold_reached")) {
       return Promise.resolve("stop");
     }
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       let resolved = false;
       const respond = (d) => {
         if (resolved) return;
         resolved = true;
         clearTimeout(fallback);
-        resolve5(d);
+        resolve6(d);
       };
       const fallback = setTimeout(() => respond("stop"), _SubagentBudget.DECISION_TIMEOUT_MS);
+      const sessionId = this.currentSessionId();
       bus.emit("budget.threshold_reached", {
+        ...sessionId ? { sessionId } : {},
         kind: entry.kind,
         used: entry.used,
         limit: entry.limit,
@@ -4825,6 +4898,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
   coordinatorId;
   config;
   runner;
+  sessionId;
   fleetBus;
   subagents = /* @__PURE__ */ new Map();
   /**
@@ -4859,6 +4933,11 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
     this.coordinatorId = config.coordinatorId;
     this.config = config;
     this.runner = options.runner;
+    this.sessionId = options.sessionId;
+  }
+  currentSessionId() {
+    const value = typeof this.sessionId === "function" ? this.sessionId() : this.sessionId;
+    return typeof value === "string" && value.length > 0 ? value : void 0;
   }
   /**
    * Replace the runner after construction. Used when the runner depends
@@ -5017,11 +5096,16 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
       status: s.status,
       assigned: s.context.parentBridge !== null
     }));
+    const sessionId = this.currentSessionId();
     this.fleetBus?.emit({
       subagentId: this.coordinatorId,
       ts: Date.now(),
       type: "coordinator.stats",
-      payload: { ...stats, subagentStatuses }
+      payload: {
+        ...sessionId ? { sessionId } : {},
+        ...stats,
+        subagentStatuses
+      }
     });
   }
   getStatus() {
@@ -5053,7 +5137,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
       taskIds.map((id) => {
         const cached = this.completedResults.find((r) => r.taskId === id);
         if (cached) return cached;
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           const timeout = setTimeout(() => {
             this.off("task.completed", handler);
             reject(new Error(`awaitTasks timed out waiting for task "${id}"`));
@@ -5062,7 +5146,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
             if (result.taskId === id) {
               clearTimeout(timeout);
               this.off("task.completed", handler);
-              resolve5(result);
+              resolve6(result);
             }
           };
           this.on("task.completed", handler);
@@ -5224,16 +5308,20 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
     const rawTimeoutMs = subagent.config.timeoutMs;
     const rawIdleTimeoutMs = subagent.config.idleTimeoutMs;
     const configWithRosterDefaults = applyRosterBudget(subagent.config);
-    const budget = new SubagentBudget({
-      maxIterations: rawMaxIterations ?? this.config.defaultBudget?.maxIterations ?? configWithRosterDefaults.maxIterations,
-      maxToolCalls: rawMaxToolCalls ?? this.config.defaultBudget?.maxToolCalls ?? configWithRosterDefaults.maxToolCalls,
-      maxTokens: rawMaxTokens ?? this.config.defaultBudget?.maxTokens ?? configWithRosterDefaults.maxTokens,
-      maxCostUsd: rawMaxCostUsd ?? this.config.defaultBudget?.maxCostUsd ?? configWithRosterDefaults.maxCostUsd,
-      // Wall-clock cap is opt-in (explicit config / defaultBudget only); the
-      // roster no longer supplies one. Idle is the default reaper.
-      timeoutMs: rawTimeoutMs ?? this.config.defaultBudget?.timeoutMs ?? configWithRosterDefaults.timeoutMs,
-      idleTimeoutMs: rawIdleTimeoutMs ?? this.config.defaultBudget?.idleTimeoutMs ?? configWithRosterDefaults.idleTimeoutMs
-    });
+    const budget = new SubagentBudget(
+      {
+        maxIterations: rawMaxIterations ?? this.config.defaultBudget?.maxIterations ?? configWithRosterDefaults.maxIterations,
+        maxToolCalls: rawMaxToolCalls ?? this.config.defaultBudget?.maxToolCalls ?? configWithRosterDefaults.maxToolCalls,
+        maxTokens: rawMaxTokens ?? this.config.defaultBudget?.maxTokens ?? configWithRosterDefaults.maxTokens,
+        maxCostUsd: rawMaxCostUsd ?? this.config.defaultBudget?.maxCostUsd ?? configWithRosterDefaults.maxCostUsd,
+        // Wall-clock cap is opt-in (explicit config / defaultBudget only); the
+        // roster no longer supplies one. Idle is the default reaper.
+        timeoutMs: rawTimeoutMs ?? this.config.defaultBudget?.timeoutMs ?? configWithRosterDefaults.timeoutMs,
+        idleTimeoutMs: rawIdleTimeoutMs ?? this.config.defaultBudget?.idleTimeoutMs ?? configWithRosterDefaults.idleTimeoutMs
+      },
+      "auto",
+      { sessionId: () => this.currentSessionId() }
+    );
     subagent.activeBudget = budget;
     if (!this.runner) {
       return;
@@ -5330,13 +5418,15 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
             }
             return new Promise((resolveDecision) => {
               let settled = false;
-              const resolve5 = (d) => {
+              const resolve6 = (d) => {
                 if (settled) return;
                 settled = true;
                 resolveDecision(d);
               };
-              const fallback = setTimeout(() => resolve5("stop"), DECISION_TIMEOUT_MS);
+              const fallback = setTimeout(() => resolve6("stop"), DECISION_TIMEOUT_MS);
+              const sessionId = this.currentSessionId();
               budget._events?.emit("budget.threshold_reached", {
+                ...sessionId ? { sessionId } : {},
                 kind: "timeout",
                 used,
                 limit,
@@ -5351,11 +5441,11 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
                 // disagreeing, resolves as a stop). Async grants still resolve.
                 extend: (extra) => {
                   clearTimeout(fallback);
-                  queueMicrotask(() => resolve5({ extend: extra }));
+                  queueMicrotask(() => resolve6({ extend: extra }));
                 },
                 deny: () => {
                   clearTimeout(fallback);
-                  resolve5("stop");
+                  resolve6("stop");
                 }
               });
             });
@@ -5370,7 +5460,9 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
         const wallExceeded = wallLimit !== void 0 && elapsed >= wallLimit;
         const idleExceeded = idleLimit !== void 0 && budget.idleMs() >= idleLimit;
         if (idleExceeded && !wallExceeded) {
+          const sessionId = this.currentSessionId();
           budget._events?.emit("budget.threshold_reached", {
+            ...sessionId ? { sessionId } : {},
             kind: "idle_timeout",
             used: budget.idleMs(),
             limit: idleLimit ?? 0,
@@ -5661,6 +5753,10 @@ var Director = class _Director {
     const resolved = typeof this.maxContext === "function" ? this.maxContext() : this.maxContext;
     return resolved && resolved > 0 ? resolved : 128e3;
   }
+  currentSessionId() {
+    const value = typeof this.sessionIdSource === "function" ? this.sessionIdSource() : this.sessionIdSource;
+    return typeof value === "string" && value.length > 0 ? value : void 0;
+  }
   /** Optional Brain arbiter for director-level policy decisions. */
   brain;
   /**
@@ -5720,6 +5816,7 @@ var Director = class _Director {
   stateCheckpoint;
   /** Optional session writer for emitting task_* / agent_* lifecycle events. */
   sessionWriter;
+  sessionIdSource;
   /** Debounce timer for periodic manifest writes. */
   manifestTimer = null;
   manifestDebounceMs;
@@ -5727,7 +5824,7 @@ var Director = class _Director {
   maxFleetCostUsd;
   /** Max auto-extensions per subagent per budget kind before denying. */
   maxBudgetExtensions;
-  /** Sessions root for direct subagent JSONL reads (fleet_session tool). */
+  /** Sessions root for direct subagent JSONL reads (fleet tool, action: session). */
   sessionsRoot;
   /** Director run id for JSONL path resolution. */
   directorRunId;
@@ -5803,6 +5900,7 @@ var Director = class _Director {
     this.maxSpawnDepth = opts.maxSpawnDepth ?? 2;
     this.spawnDepth = opts.spawnDepth ?? 0;
     this.sessionWriter = opts.sessionWriter ?? null;
+    this.sessionIdSource = opts.sessionId ?? (() => opts.sessionWriter?.id);
     this.manifestDebounceMs = opts.manifestDebounceMs ?? 2e3;
     this.dispatchClassifier = opts.dispatchClassifier;
     this.maxFleetCostUsd = opts.directorBudget?.maxCostUsd ?? Number.POSITIVE_INFINITY;
@@ -5849,7 +5947,7 @@ var Director = class _Director {
     }
     this.coordinator = new DefaultMultiAgentCoordinator(
       { ...opts.config, coordinatorId: this.id },
-      { runner: opts.runner }
+      { runner: opts.runner, sessionId: () => this.currentSessionId() }
     );
     this.coordinator.setFleetBus(this.fleet);
     this.fleetManager?.setCoordinator(this.coordinator);
@@ -5977,6 +6075,7 @@ var Director = class _Director {
       if (this.brain) {
         void this.brain.decide({
           id: `director-budget-${e.subagentId}-${payload.kind}`,
+          sessionId: this.currentSessionId(),
           source: "director",
           question: `Should the director extend the ${payload.kind} budget for subagent ${e.subagentId}?`,
           context: [
@@ -6426,7 +6525,7 @@ var Director = class _Director {
       })),
       usage: this.usage.snapshot()
     };
-    await fsp7.mkdir(path8.dirname(this.manifestPath), { recursive: true });
+    await fsp7.mkdir(path9.dirname(this.manifestPath), { recursive: true });
     await atomicWrite(this.manifestPath, JSON.stringify(manifest, null, 2), { mode: 384 });
     return this.manifestPath;
   }
@@ -6570,11 +6669,11 @@ var Director = class _Director {
         if (cached) return cached;
         const existing = this.taskWaiters.get(id);
         if (existing) return existing.promise;
-        let resolve5;
+        let resolve6;
         const promise = new Promise((res) => {
-          resolve5 = res;
+          resolve6 = res;
         });
-        this.taskWaiters.set(id, { promise, resolve: resolve5 });
+        this.taskWaiters.set(id, { promise, resolve: resolve6 });
         return promise;
       })
     );
@@ -6657,7 +6756,7 @@ var Director = class _Director {
    */
   async readSession(subagentId, tail) {
     if (!this.sessionsRoot) return null;
-    const filePath = path8.join(this.sessionsRoot, this.directorRunId, `${subagentId}.jsonl`);
+    const filePath = path9.join(this.sessionsRoot, this.directorRunId, `${subagentId}.jsonl`);
     let raw;
     try {
       raw = await fsp7.readFile(filePath, "utf8");
@@ -6773,10 +6872,7 @@ var Director = class _Director {
       makeRollUpTool(this),
       makeTerminateTool(this),
       makeTerminateAllTool(this),
-      makeFleetStatusTool(this),
-      makeFleetUsageTool(this),
-      makeFleetSessionTool(this),
-      makeFleetHealthTool(this),
+      makeFleetTool(this),
       makeCollabDebugTool(this),
       makeFleetEmitTool(this),
       makeWorkCompleteTool(this)
@@ -6897,6 +6993,7 @@ function createDelegateTool(opts) {
     mutating: false,
     inputSchema,
     async execute(input) {
+      const sessionId = opts.directorRunId;
       const i = input ?? {};
       if (typeof i.task !== "string" || !i.task.trim()) {
         return { ok: false, error: "`task` is required." };
@@ -6962,7 +7059,7 @@ function createDelegateTool(opts) {
         if (!cfg.timeoutMs) {
           cfg.timeoutMs = Math.max(3e4, timeoutMs - SUBAGENT_TIMEOUT_BUFFER_MS);
         }
-        opts.events?.emit("delegate.started", { target, task: i.task });
+        opts.events?.emit("delegate.started", { sessionId, target, task: i.task });
         const subagentId = await director.spawn(cfg);
         const taskId = await director.assign({
           id: `${randomUUID()}`,
@@ -6970,7 +7067,7 @@ function createDelegateTool(opts) {
           subagentId
         });
         const dir = director;
-        const result = await new Promise((resolve5) => {
+        const result = await new Promise((resolve6) => {
           let settled = false;
           let timer;
           const finish = (value) => {
@@ -6980,7 +7077,7 @@ function createDelegateTool(opts) {
             offTool();
             offIter();
             offProgress();
-            resolve5(value);
+            resolve6(value);
           };
           const arm = () => {
             if (timer) clearTimeout(timer);
@@ -6998,6 +7095,7 @@ function createDelegateTool(opts) {
         if ("__timeout" in result) {
           const partial2 = await readSubagentPartial(opts, subagentId);
           opts.events?.emit("delegate.completed", {
+            sessionId,
             target,
             task: i.task,
             ok: false,
@@ -7021,6 +7119,7 @@ function createDelegateTool(opts) {
         if ("__emptyResult" in result) {
           const partial2 = await readSubagentPartial(opts, subagentId);
           opts.events?.emit("delegate.completed", {
+            sessionId,
             target,
             task: i.task,
             ok: false,
@@ -7054,6 +7153,7 @@ function createDelegateTool(opts) {
           costUsd = void 0;
         }
         opts.events?.emit("delegate.completed", {
+          sessionId,
           target,
           task: i.task,
           ok: result.status === "success",
@@ -7088,6 +7188,7 @@ function createDelegateTool(opts) {
       } catch (err) {
         const message = toErrorMessage(err);
         opts.events?.emit("delegate.completed", {
+          sessionId,
           target,
           task: i.task,
           ok: false,
@@ -7187,13 +7288,13 @@ async function readSubagentPartial(opts, subagentId) {
   if (!opts.sessionsRoot) return void 0;
   const candidates = [];
   if (opts.directorRunId) {
-    candidates.push(path8.join(opts.sessionsRoot, opts.directorRunId, `${subagentId}.jsonl`));
+    candidates.push(path9.join(opts.sessionsRoot, opts.directorRunId, `${subagentId}.jsonl`));
   } else {
     try {
       const entries = await fsp7.readdir(opts.sessionsRoot, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          candidates.push(path8.join(opts.sessionsRoot, entry.name, `${subagentId}.jsonl`));
+          candidates.push(path9.join(opts.sessionsRoot, entry.name, `${subagentId}.jsonl`));
         }
       }
     } catch {
@@ -7465,7 +7566,7 @@ var FileSessionWriter = class _FileSessionWriter {
     this.meta = meta;
     this.events = events;
     this.resumed = opts.resumed ?? false;
-    this.manifestFile = opts.dir ? path8.join(opts.dir, `${path8.basename(id)}.summary.json`) : "";
+    this.manifestFile = opts.dir ? path9.join(opts.dir, `${path9.basename(id)}.summary.json`) : "";
     this.filePath = opts.filePath ?? "";
     this.secretScrubber = opts.secretScrubber;
     this.onCloseCb = opts.onClose;
@@ -7834,6 +7935,7 @@ var FileSessionWriter = class _FileSessionWriter {
       promptPreview
     });
     this.events?.emit("checkpoint.written", {
+      sessionId: this.id,
       promptIndex,
       promptPreview,
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -8003,6 +8105,7 @@ var FileSessionWriter = class _FileSessionWriter {
       revertedFiles: []
     });
     this.events?.emit("session.rewound", {
+      sessionId: this.id,
       toPromptIndex: targetPromptIndex,
       revertedFiles: [],
       removedEvents: removedCount
@@ -8042,7 +8145,7 @@ var FileSessionWriter = class _FileSessionWriter {
       ts: (/* @__PURE__ */ new Date()).toISOString(),
       context
     });
-    this.events?.emit("in_flight.started", { context, ts: (/* @__PURE__ */ new Date()).toISOString() });
+    this.events?.emit("in_flight.started", { sessionId: this.id, context, ts: (/* @__PURE__ */ new Date()).toISOString() });
   }
   /**
    * Close the in-flight marker. Idempotent in spirit
@@ -8057,18 +8160,15 @@ var FileSessionWriter = class _FileSessionWriter {
       ts: (/* @__PURE__ */ new Date()).toISOString(),
       reason
     });
-    this.events?.emit("in_flight.ended", { reason, ts: (/* @__PURE__ */ new Date()).toISOString() });
+    this.events?.emit("in_flight.ended", { sessionId: this.id, reason, ts: (/* @__PURE__ */ new Date()).toISOString() });
   }
 };
-function sanitizeModel(model) {
-  return model.replace(/[^a-zA-Z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
-}
-function generateSessionId(startedAt, model) {
+
+// src/storage/session-id.ts
+function generateSessionId(startedAt, _model) {
   const date = startedAt.slice(0, 10);
-  const time = startedAt.slice(11, 19).replace(/:/g, "-");
-  const suffix = randomBytes(2).toString("hex");
-  const modelPart = model ? `_${sanitizeModel(model)}` : "";
-  return `${date}/${time}Z${modelPart}_${suffix}`;
+  const seedTime = Number.isNaN(Date.parse(startedAt)) ? Date.now() : Date.parse(startedAt);
+  return `${date}/sess_${ulid(seedTime)}`;
 }
 
 // src/storage/session-summary.ts
@@ -8199,17 +8299,17 @@ var DefaultSessionStore = class _DefaultSessionStore {
   }
   /** Absolute path to the session index file. */
   get indexFile() {
-    return path8.join(this.dir, "_index.jsonl");
+    return path9.join(this.dir, "_index.jsonl");
   }
   /** Join session ID to its absolute path within the store directory. */
   sessionPath(id, ext) {
-    return path8.join(this.dir, `${id}${ext}`);
+    return sessionScopedPath(this.dir, id, ext);
   }
   shardManifestPath(shardKey) {
-    return shardKey ? path8.join(this.dir, shardKey, "_manifest.json") : path8.join(this.dir, "_manifest.json");
+    return shardKey ? path9.join(this.dir, shardKey, "_manifest.json") : path9.join(this.dir, "_manifest.json");
   }
   shardKeyForSessionId(id) {
-    const dirName = path8.dirname(id);
+    const dirName = path9.dirname(id);
     return dirName === "." ? "" : dirName;
   }
   invalidateShardManifestBySessionId(id) {
@@ -8221,15 +8321,15 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * subdirectory so sessions group naturally by day.
    */
   async ensureShardDir(id) {
-    const dirPath = path8.dirname(path8.join(this.dir, id));
+    const dirPath = path9.dirname(sessionScopedPath(this.dir, id, ""));
     await ensureDir(dirPath);
     return dirPath;
   }
   async create(meta) {
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const id = meta.id && meta.id.length > 0 ? meta.id : generateSessionId(startedAt, meta.model ?? meta.provider);
+    const id = meta.id && meta.id.length > 0 ? meta.id : generateSessionId(startedAt);
     const shardDir = await this.ensureShardDir(id);
-    const file = path8.join(shardDir, `${path8.basename(id)}.jsonl`);
+    const file = this.sessionPath(id, ".jsonl");
     const t0 = Date.now();
     let handle;
     try {
@@ -8291,7 +8391,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
           // Shard directory (sessions/<date>/) — must match create() so the
           // .summary.json sidecar lands next to the JSONL instead of the
           // sessions root (where summaryFor() would never find it).
-          dir: path8.dirname(file),
+          dir: path9.dirname(file),
           filePath: file,
           secretScrubber: this.secretScrubber,
           onClose: (s) => this.appendToIndex(s)
@@ -8311,6 +8411,26 @@ var DefaultSessionStore = class _DefaultSessionStore {
     }
   }
   async load(id) {
+    return this.loadInternal(id, { full: true });
+  }
+  /**
+   * Fast-path loader that skips message reconstruction and adjacency repair.
+   *
+   * Use this for callers that only need the raw event stream + session
+   * metadata — e.g. session listers, analytics, audit, and the TUI's
+   * "events only" views. It avoids the message array build and
+   * repairToolUseAdjacency cost on large session files (a long agent
+   * run can have 50k+ events; rebuilding messages is O(events) and
+   * allocates per-block, so skipping it is a meaningful win).
+   *
+   * The returned data.messages is an empty array; data.toolCallEnds
+   * is computed from the raw events. usage is the sum across all
+   * llm_response events — same as full load().
+   */
+  async loadEventsOnly(id) {
+    return this.loadInternal(id, { full: false });
+  }
+  async loadInternal(id, mode) {
     const file = this.sessionPath(id, ".jsonl");
     const t0 = Date.now();
     let outcome = "success";
@@ -8324,87 +8444,107 @@ var DefaultSessionStore = class _DefaultSessionStore {
         cacheHit = true;
         this._loadCache.delete(id);
         this._loadCache.set(id, cached);
-        return cached.data;
+        if (mode.full) return cached.data;
+        return { ...cached.data, messages: [] };
       }
-      const raw = await fsp7.readFile(file, "utf8");
-      const lines = raw.split("\n").filter((l) => l.trim());
       const events = [];
       let sessionStartEvent;
       let sessionEndEvent;
       let sessionModel;
       let sessionProvider;
       let sessionPendingToolUses;
-      const messages = [];
-      const openToolUses = /* @__PURE__ */ new Set();
+      const messages = mode.full ? [] : void 0;
+      const openToolUses = mode.full ? /* @__PURE__ */ new Set() : void 0;
       let usage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-      for (const line of lines) {
-        try {
-          const parsed = JSON.parse(line);
-          if (parsed !== null && typeof parsed === "object" && typeof parsed.type === "string" && typeof parsed.ts === "string") {
-            const ev = parsed;
-            events.push(ev);
-            if (ev.type === "session_start" && !sessionStartEvent) {
-              sessionStartEvent = ev;
-              sessionModel = ev.model;
-              sessionProvider = ev.provider;
-            }
-            if (ev.type === "session_end") {
-              sessionEndEvent = ev;
-              sessionPendingToolUses = ev.pendingToolUses;
-            }
-            if (ev.type === "user_input") {
-              openToolUses.clear();
-              messages.push({ role: "user", content: ev.content, ts: ev.ts });
-            } else if (ev.type === "llm_response") {
-              messages.push({ role: "assistant", content: ev.content, ts: ev.ts });
-              for (const b of ev.content) {
-                if (b.type === "tool_use") openToolUses.add(b.id);
+      const stream = createReadStream(file, { encoding: "utf8" });
+      const rl = createInterface({ input: stream, crlfDelay: Infinity });
+      try {
+        for await (const line of rl) {
+          if (!line.trim()) continue;
+          try {
+            const parsed = JSON.parse(line);
+            if (parsed !== null && typeof parsed === "object" && typeof parsed.type === "string" && typeof parsed.ts === "string") {
+              const ev = parsed;
+              events.push(ev);
+              if (ev.type === "session_start" && !sessionStartEvent) {
+                sessionStartEvent = ev;
+                sessionModel = ev.model;
+                sessionProvider = ev.provider;
               }
-              usage = {
-                input: usage.input + (ev.usage.input ?? 0),
-                output: usage.output + (ev.usage.output ?? 0),
-                cacheRead: (usage.cacheRead ?? 0) + (ev.usage.cacheRead ?? 0),
-                cacheWrite: (usage.cacheWrite ?? 0) + (ev.usage.cacheWrite ?? 0)
-              };
-            } else if (ev.type === "tool_result") {
-              if (!openToolUses.has(ev.id)) {
-                this.events?.emit("session.damaged", {
-                  sessionId: id,
-                  detail: `Orphan tool_result "${ev.id}" has no matching tool_use`
-                });
-                continue;
+              if (ev.type === "session_end") {
+                sessionEndEvent = ev;
+                sessionPendingToolUses = ev.pendingToolUses;
               }
-              openToolUses.delete(ev.id);
-              const resultBlock = {
-                type: "tool_result",
-                tool_use_id: ev.id,
-                content: typeof ev.content === "string" ? ev.content : JSON.stringify(ev.content),
-                is_error: ev.isError
-              };
-              const last = messages[messages.length - 1];
-              const lastIsToolResultUser = last?.role === "user" && Array.isArray(last.content) && last.content.every((b) => b.type === "tool_result");
-              if (lastIsToolResultUser && Array.isArray(last.content)) {
-                last.content.push(resultBlock);
-              } else {
-                messages.push({ role: "user", content: [resultBlock], ts: ev.ts });
+              if (mode.full && messages !== void 0 && openToolUses !== void 0) {
+                if (ev.type === "user_input") {
+                  openToolUses.clear();
+                  messages.push({ role: "user", content: ev.content, ts: ev.ts });
+                } else if (ev.type === "llm_response") {
+                  messages.push({ role: "assistant", content: ev.content, ts: ev.ts });
+                  for (const b of ev.content) {
+                    if (b.type === "tool_use") openToolUses.add(b.id);
+                  }
+                  usage = {
+                    input: usage.input + (ev.usage.input ?? 0),
+                    output: usage.output + (ev.usage.output ?? 0),
+                    cacheRead: (usage.cacheRead ?? 0) + (ev.usage.cacheRead ?? 0),
+                    cacheWrite: (usage.cacheWrite ?? 0) + (ev.usage.cacheWrite ?? 0)
+                  };
+                } else if (ev.type === "tool_result") {
+                  if (!openToolUses.has(ev.id)) {
+                    this.events?.emit("session.damaged", {
+                      sessionId: id,
+                      detail: `Orphan tool_result "${ev.id}" has no matching tool_use`
+                    });
+                    continue;
+                  }
+                  openToolUses.delete(ev.id);
+                  const resultBlock = {
+                    type: "tool_result",
+                    tool_use_id: ev.id,
+                    content: typeof ev.content === "string" ? ev.content : JSON.stringify(ev.content),
+                    is_error: ev.isError
+                  };
+                  const last = messages[messages.length - 1];
+                  const lastIsToolResultUser = last?.role === "user" && Array.isArray(last.content) && last.content.every((b) => b.type === "tool_result");
+                  if (lastIsToolResultUser && Array.isArray(last.content)) {
+                    last.content.push(resultBlock);
+                  } else {
+                    messages.push({ role: "user", content: [resultBlock], ts: ev.ts });
+                  }
+                }
+              } else if (ev.type === "llm_response") {
+                usage = {
+                  input: usage.input + (ev.usage.input ?? 0),
+                  output: usage.output + (ev.usage.output ?? 0),
+                  cacheRead: (usage.cacheRead ?? 0) + (ev.usage.cacheRead ?? 0),
+                  cacheWrite: (usage.cacheWrite ?? 0) + (ev.usage.cacheWrite ?? 0)
+                };
               }
             }
+          } catch {
           }
-        } catch {
         }
+      } finally {
+        rl.close();
+        stream.close();
       }
-      if (openToolUses.size > 0) {
-        this.events?.emit("session.damaged", {
-          sessionId: id,
-          detail: `${openToolUses.size} tool_use blocks without matching results - replay repaired`
-        });
-      }
-      const repaired = repairToolUseAdjacency(messages);
-      if (repaired.report.changed) {
-        this.events?.emit("session.damaged", {
-          sessionId: id,
-          detail: `Repaired replay adjacency: removed ${repaired.report.removedToolUses.length} tool_use, ${repaired.report.removedToolResults.length} tool_result, ${repaired.report.removedMessages} empty messages`
-        });
+      let finalMessages = [];
+      if (mode.full && messages !== void 0 && openToolUses !== void 0) {
+        if (openToolUses.size > 0) {
+          this.events?.emit("session.damaged", {
+            sessionId: id,
+            detail: `${openToolUses.size} tool_use blocks without matching results - replay repaired`
+          });
+        }
+        const repaired = repairToolUseAdjacency(messages);
+        if (repaired.report.changed) {
+          this.events?.emit("session.damaged", {
+            sessionId: id,
+            detail: `Repaired replay adjacency: removed ${repaired.report.removedToolUses.length} tool_use, ${repaired.report.removedToolResults.length} tool_result, ${repaired.report.removedMessages} empty messages`
+          });
+        }
+        finalMessages = repaired.messages;
       }
       const meta = {
         id,
@@ -8415,27 +8555,29 @@ var DefaultSessionStore = class _DefaultSessionStore {
         pendingToolUses: sessionPendingToolUses
       };
       const toolCallEnds = extractToolCallEnds(events);
-      const data = { metadata: meta, events, messages: repaired.messages, usage, toolCallEnds };
-      if (this._loadCache.size >= _DefaultSessionStore.LOAD_CACHE_MAX_ENTRIES) {
-        const oldest = this._loadCache.keys().next().value;
-        if (oldest !== void 0) {
-          this._loadCache.delete(oldest);
+      const data = { metadata: meta, events, messages: finalMessages, usage, toolCallEnds };
+      if (mode.full) {
+        if (this._loadCache.size >= _DefaultSessionStore.LOAD_CACHE_MAX_ENTRIES) {
+          const oldest = this._loadCache.keys().next().value;
+          if (oldest !== void 0) {
+            this._loadCache.delete(oldest);
+          }
         }
+        this._loadCache.set(id, { mtimeMs: stat7.mtimeMs, size: stat7.size, data });
       }
-      this._loadCache.set(id, { mtimeMs: stat7.mtimeMs, size: stat7.size, data });
       return data;
     } catch (err) {
       outcome = "failure";
       errorMsg = toErrorMessage(err);
       throw err;
     } finally {
-      this.emitRead(id, file, "load", outcome, Date.now() - t0, errorMsg);
+      this.emitRead(id, file, mode.full ? "load" : "load_events_only", outcome, Date.now() - t0, errorMsg);
       if (cacheHit) {
         this.events?.emit("storage.cache_hit", {
           sessionId: id,
           store: "session",
           filePath: file,
-          operation: "load",
+          operation: mode.full ? "load" : "load_events_only",
           durationMs: Date.now() - t0
         });
       }
@@ -8583,14 +8725,20 @@ var DefaultSessionStore = class _DefaultSessionStore {
   async appendToIndex(summary) {
     try {
       await ensureDir(this.dir);
-      const line = JSON.stringify(summary) + "\n";
-      await fsp7.appendFile(this.indexFile, line, "utf8");
-      this._indexCache = null;
-      this.invalidateShardManifestBySessionId(summary.id);
-      this.indexAppendCount++;
-      if (this.indexAppendCount >= _DefaultSessionStore.COMPACT_EVERY) {
-        await this.compactIndex();
-        this.indexAppendCount = 0;
+      let shouldCompact = false;
+      await withFileLock(this.indexFile, async () => {
+        const line = JSON.stringify(summary) + "\n";
+        await fsp7.appendFile(this.indexFile, line, "utf8");
+        this._indexCache = null;
+        this.invalidateShardManifestBySessionId(summary.id);
+        this.indexAppendCount++;
+        if (this.indexAppendCount >= _DefaultSessionStore.COMPACT_EVERY) {
+          shouldCompact = true;
+          this.indexAppendCount = 0;
+        }
+      });
+      if (shouldCompact) {
+        await withFileLock(this.indexFile, () => this.compactIndexInner());
       }
     } catch {
     }
@@ -8599,30 +8747,28 @@ var DefaultSessionStore = class _DefaultSessionStore {
   async writeTombstone(id) {
     try {
       await ensureDir(this.dir);
-      const line = JSON.stringify({ action: "delete", id }) + "\n";
-      await fsp7.appendFile(this.indexFile, line, "utf8");
-      this._indexCache = null;
-      this.invalidateShardManifestBySessionId(id);
-      this.indexAppendCount++;
+      await withFileLock(this.indexFile, async () => {
+        const line = JSON.stringify({ action: "delete", id }) + "\n";
+        await fsp7.appendFile(this.indexFile, line, "utf8");
+        this._indexCache = null;
+        this.invalidateShardManifestBySessionId(id);
+        this.indexAppendCount++;
+      });
     } catch {
     }
   }
   /**
    * Compact the index: read all entries, drop tombstones, deduplicate
-   * (keep latest per session), and rewrite. Atomic via temp+rename.
+   * (keep latest per session), and rewrite atomically. Acquires the index
+   * file lock so a concurrent append (this process or another wstack in the
+   * same project) can't be overwritten by the rewrite.
    */
   async compactIndex() {
     const t0 = Date.now();
     let outcome = "success";
     let errorMsg;
     try {
-      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 fsp7.writeFile(tmp, lines, "utf8");
-      await fsp7.rename(tmp, this.indexFile);
-      this._indexCache = null;
+      await withFileLock(this.indexFile, () => this.compactIndexInner());
     } catch (err) {
       outcome = "failure";
       errorMsg = toErrorMessage(err);
@@ -8630,6 +8776,19 @@ var DefaultSessionStore = class _DefaultSessionStore {
       this.emitWrite("~compact~", this.indexFile, "compact", outcome, Date.now() - t0, void 0, errorMsg);
     }
   }
+  /**
+   * Lock-free compaction body. The caller MUST already hold the index file
+   * lock (via withFileLock(this.indexFile, ...)). Uses atomicWrite for the
+   * rewrite so the temp file gets a random suffix (no collision between two
+   * compactions) and the Windows transient-EPERM rename retry.
+   */
+  async compactIndexInner() {
+    const entries = await this.readIndex();
+    if (entries.length === 0) return;
+    const lines = entries.map((s) => JSON.stringify(s)).join("\n") + "\n";
+    await atomicWrite(this.indexFile, lines, { mode: 384 });
+    this._indexCache = null;
+  }
   /**
    * Read the index file and return deduplicated session summaries.
    * Entries with a matching tombstone are filtered out.
@@ -8688,11 +8847,11 @@ var DefaultSessionStore = class _DefaultSessionStore {
     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 fsp7.writeFile(tmp, lines, "utf8");
-    await fsp7.rename(tmp, this.indexFile);
-    this._indexCache = null;
+    await withFileLock(this.indexFile, async () => {
+      await atomicWrite(this.indexFile, lines, { mode: 384 });
+      this._indexCache = null;
+    });
     return valid.length;
   }
   async listFromDirectoryScan(limit) {
@@ -8768,7 +8927,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     return entry;
   }
   async collectSessionFilesInShard(shardKey) {
-    const dir = shardKey ? path8.join(this.dir, shardKey) : this.dir;
+    const dir = shardKey ? path9.join(this.dir, shardKey) : this.dir;
     const entries = await this.collectSessionFiles(dir, shardKey);
     return shardKey ? entries.filter((entry) => entry.id.startsWith(`${shardKey}/`)) : entries.filter((entry) => !entry.id.includes("/"));
   }
@@ -8791,13 +8950,13 @@ var DefaultSessionStore = class _DefaultSessionStore {
         if (entry.name === "_index.jsonl") continue;
         const base = entry.name.replace(/\.jsonl$/, "");
         const id = prefix ? `${prefix}/${base}` : base;
-        files.push({ id, filePath: path8.join(dir, entry.name) });
+        files.push({ id, filePath: path9.join(dir, entry.name) });
       }
     }
     const childFileArrays = await Promise.all(
       dirEntries.map((entry) => {
         const childPrefix = depth === 0 ? entry.name : `${prefix}/${entry.name}`;
-        return this.collectSessionFiles(path8.join(dir, entry.name), childPrefix, depth + 1);
+        return this.collectSessionFiles(path9.join(dir, entry.name), childPrefix, depth + 1);
       })
     );
     return [...childFileArrays.flat(), ...files];
@@ -8830,7 +8989,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     const childIdArrays = await Promise.all(
       dirEntries.map((entry) => {
         const childPrefix = depth === 0 ? entry.name : `${prefix}/${entry.name}`;
-        return this.collectSessionIds(path8.join(dir, entry.name), childPrefix, depth + 1);
+        return this.collectSessionIds(path9.join(dir, entry.name), childPrefix, depth + 1);
       })
     );
     return [...childIdArrays.flat(), ...fileIds];
@@ -8947,14 +9106,15 @@ var DefaultSessionStore = class _DefaultSessionStore {
   async deleteSession(id) {
     const jsonlPath = this.sessionPath(id, ".jsonl");
     const summaryPath = this.sessionPath(id, ".summary.json");
-    const shardDir = path8.dirname(path8.join(this.dir, id));
-    const base = path8.basename(id);
-    const sessDir = path8.join(shardDir, base);
+    const shardDir = path9.dirname(jsonlPath);
+    const base = path9.basename(id);
+    const sessDir = path9.join(shardDir, base);
     const deletions = [
       fsp7.unlink(jsonlPath),
       fsp7.unlink(summaryPath),
-      fsp7.unlink(path8.join(shardDir, `${base}.plan.json`)),
-      fsp7.unlink(path8.join(shardDir, `${base}.todos.json`))
+      fsp7.unlink(sessionScopedPath(this.dir, id, ".plan.json")),
+      fsp7.unlink(sessionScopedPath(this.dir, id, ".tasks.json")),
+      fsp7.unlink(sessionScopedPath(this.dir, id, ".todos.json"))
     ];
     const results = await Promise.allSettled(deletions);
     for (const r of results) {
@@ -8990,14 +9150,14 @@ var DefaultSessionStore = class _DefaultSessionStore {
     let deleted = 0;
     let activeSessionId = null;
     try {
-      const raw = await fsp7.readFile(path8.join(this.dir, "active.json"), "utf8");
+      const raw = await fsp7.readFile(path9.join(this.dir, "active.json"), "utf8");
       const active = JSON.parse(raw);
       activeSessionId = active.sessionId ?? null;
     } catch {
     }
     const isPrunableJsonl = (name) => name.endsWith(".jsonl") && name !== "_index.jsonl" && name !== "_mailbox.jsonl" && !name.endsWith(".replay.jsonl") && !name.endsWith(".audit.jsonl");
     const pruneFile = async (dir, name, prefix) => {
-      const jsonlPath = path8.join(dir, name);
+      const jsonlPath = path9.join(dir, name);
       try {
         const stat7 = await fsp7.stat(jsonlPath);
         if (stat7.mtimeMs >= cutoff) return;
@@ -9017,7 +9177,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         continue;
       }
       if (!entry.isDirectory()) continue;
-      const dateDir = path8.join(this.dir, entry.name);
+      const dateDir = path9.join(this.dir, entry.name);
       const files = await fsp7.readdir(dateDir, { withFileTypes: true }).catch(() => []);
       for (const file of files) {
         if (!file.isFile() || !isPrunableJsonl(file.name)) continue;
@@ -9029,7 +9189,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const dateDir = path8.join(this.dir, entry.name);
+      const dateDir = path9.join(this.dir, entry.name);
       try {
         const remaining = await fsp7.readdir(dateDir);
         if (remaining.length === 0) {
@@ -9160,9 +9320,9 @@ function makeDirectorSessionFactory(opts) {
   let dir;
   if (opts.store) {
     store = opts.store;
-    dir = opts.sessionsRoot ? path8.join(opts.sessionsRoot, runId) : "(caller-managed)";
+    dir = opts.sessionsRoot ? path9.join(opts.sessionsRoot, runId) : "(caller-managed)";
   } else if (opts.sessionsRoot) {
-    dir = path8.join(opts.sessionsRoot, runId);
+    dir = path9.join(opts.sessionsRoot, runId);
     store = new DefaultSessionStore({ dir });
   } else {
     throw new Error("makeDirectorSessionFactory requires either `store` or `sessionsRoot`");
@@ -9474,7 +9634,7 @@ var FleetManager = class {
       })),
       usage: this.usage.snapshot()
     };
-    await fsp7.mkdir(path8.dirname(this.manifestPath), { recursive: true });
+    await fsp7.mkdir(path9.dirname(this.manifestPath), { recursive: true });
     await atomicWrite(this.manifestPath, JSON.stringify(manifest, null, 2), { mode: 384 });
     return this.manifestPath;
   }
@@ -9632,7 +9792,7 @@ var DefaultMailbox = class {
   /** Counts malformed JSONL lines skipped during parsing for observability. */
   _corruptionCount = 0;
   constructor(sessionDir) {
-    this.filePath = path8.join(sessionDir, MAILBOX_FILE);
+    this.filePath = path9.join(sessionDir, MAILBOX_FILE);
   }
   get mailboxPath() {
     return this.filePath;
@@ -9661,7 +9821,7 @@ var DefaultMailbox = class {
       taskContext: input.taskContext
     };
     const line = JSON.stringify(msg) + LINE_SEPARATOR;
-    await fsp7.mkdir(path8.dirname(this.filePath), { recursive: true });
+    await fsp7.mkdir(path9.dirname(this.filePath), { recursive: true });
     await withFileLock(this.filePath, async () => {
       await fsp7.appendFile(this.filePath, line, "utf8");
       this._pushToCache(msg);
@@ -10103,6 +10263,7 @@ var BrainMonitor = class {
     try {
       const request = {
         id: `brainmon-${randomUUID()}`,
+        sessionId: this.opts.sessionId?.(),
         source: "system",
         question: input.question,
         context: input.context,
@@ -10128,6 +10289,7 @@ var BrainMonitor = class {
       const decision = await this.opts.brain.decide(request);
       const intervened = await this.maybeIntervene(kind, request, decision);
       this.opts.events.emit("brain.intervention", {
+        sessionId: request.sessionId,
         kind,
         request,
         decision,
@@ -10171,7 +10333,7 @@ var REGISTRY_CACHE_TTL_MS = 2e3;
 var LINE_SEPARATOR2 = "\n";
 var MESSAGE_CACHE_MAX_ENTRIES2 = 1e4;
 function resolveProjectDir(projectRoot, globalRoot) {
-  return path8.join(globalRoot, "projects", projectSlug(projectRoot));
+  return path9.join(globalRoot, "projects", projectSlug(projectRoot));
 }
 var GlobalMailbox = class {
   /** Path to the JSONL message file. */
@@ -10224,14 +10386,14 @@ var GlobalMailbox = class {
    * @param hqPublisher — optional HQ publisher, or getter, for cross-project telemetry
    */
   constructor(projectDir, events, hqPublisher) {
-    this.messagePath = path8.join(projectDir, MAILBOX_FILE2);
-    this.registryPath = path8.join(projectDir, "_mailbox.registry.json");
-    this.clientRegistryPath = path8.join(projectDir, CLIENT_REGISTRY_FILE);
+    this.messagePath = path9.join(projectDir, MAILBOX_FILE2);
+    this.registryPath = path9.join(projectDir, "_mailbox.registry.json");
+    this.clientRegistryPath = path9.join(projectDir, CLIENT_REGISTRY_FILE);
     this._events = events;
     this._hqPublisher = hqPublisher;
   }
   get hqMailboxId() {
-    return `${path8.basename(path8.dirname(this.messagePath))}:mailbox`;
+    return `${path9.basename(path9.dirname(this.messagePath))}:mailbox`;
   }
   get hqPublisher() {
     return typeof this._hqPublisher === "function" ? this._hqPublisher() : this._hqPublisher;
@@ -10268,7 +10430,7 @@ var GlobalMailbox = class {
       taskContext: input.taskContext
     };
     const line = JSON.stringify(msg) + LINE_SEPARATOR2;
-    await fsp7.mkdir(path8.dirname(this.messagePath), { recursive: true });
+    await fsp7.mkdir(path9.dirname(this.messagePath), { recursive: true });
     await withFileLock(this.messagePath, async () => {
       await fsp7.appendFile(this.messagePath, line, "utf8");
       this._pushToCache(msg);
@@ -10519,13 +10681,17 @@ var GlobalMailbox = class {
       const client = registry.get(input.clientId);
       if (client) {
         client.lastSeenAt = (/* @__PURE__ */ new Date()).toISOString();
+        if (typeof input.sessionId === "string" && input.sessionId.length > 0) {
+          client.sessionId = input.sessionId;
+        }
       }
       this._clientRegistryCache = registry;
       this._clientRegistryCacheAt = Date.now();
       await this._writeClientRegistry(registry);
     });
     this._events?.emitCustom("mailbox.client_heartbeat", {
-      clientId: input.clientId
+      clientId: input.clientId,
+      ...input.sessionId ? { sessionId: input.sessionId } : {}
     });
     this.publishHqMailboxSnapshot();
   }
@@ -10763,7 +10929,7 @@ var GlobalMailbox = class {
     this._messageCache.push(msg);
   }
   async _ensureRegistry() {
-    await fsp7.mkdir(path8.dirname(this.registryPath), { recursive: true });
+    await fsp7.mkdir(path9.dirname(this.registryPath), { recursive: true });
   }
   async _readRegistry(opts) {
     if (!opts?.fresh && this._registryCache && Date.now() - this._registryCacheAt < REGISTRY_CACHE_TTL_MS) {
@@ -10808,7 +10974,7 @@ var GlobalMailbox = class {
   }
   // ── Client registry internals ───────────────────────────────────────────
   async _ensureClientRegistry() {
-    await fsp7.mkdir(path8.dirname(this.clientRegistryPath), { recursive: true });
+    await fsp7.mkdir(path9.dirname(this.clientRegistryPath), { recursive: true });
   }
   async _readClientRegistry(opts) {
     if (!opts?.fresh && this._clientRegistryCache && Date.now() - this._clientRegistryCacheAt < REGISTRY_CACHE_TTL_MS) {
@@ -10855,8 +11021,8 @@ var GlobalMailbox = class {
 var MAILBOX_BRIDGE_LOCK_FILENAME = ".mailbox-bridge.lock";
 var MAILBOX_BRIDGE_TOKEN_FILENAME = ".mailbox.token";
 async function acquireOrJoin(opts) {
-  const lockPath = path8.join(opts.projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
-  const tokenPath = path8.join(opts.projectDir, MAILBOX_BRIDGE_TOKEN_FILENAME);
+  const lockPath = path9.join(opts.projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
+  const tokenPath = path9.join(opts.projectDir, MAILBOX_BRIDGE_TOKEN_FILENAME);
   const inspected = await readLockForInspection(lockPath);
   if (inspected.kind === "live") {
     const existing = inspected.lock;
@@ -10884,8 +11050,8 @@ async function acquireOrJoin(opts) {
   return { kind: "acquired", lock: tentative, tokenPath };
 }
 async function finalize(projectDir, tentative, boundPort) {
-  const lockPath = path8.join(projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
-  const tokenPath = path8.join(projectDir, MAILBOX_BRIDGE_TOKEN_FILENAME);
+  const lockPath = path9.join(projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
+  const tokenPath = path9.join(projectDir, MAILBOX_BRIDGE_TOKEN_FILENAME);
   const finalized = {
     ...tentative,
     port: boundPort,
@@ -10896,8 +11062,8 @@ async function finalize(projectDir, tentative, boundPort) {
   return finalized;
 }
 async function release(projectDir, generation) {
-  const lockPath = path8.join(projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
-  const tokenPath = path8.join(projectDir, MAILBOX_BRIDGE_TOKEN_FILENAME);
+  const lockPath = path9.join(projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
+  const tokenPath = path9.join(projectDir, MAILBOX_BRIDGE_TOKEN_FILENAME);
   try {
     const raw = await fsp7.readFile(lockPath, "utf-8");
     const parsed = JSON.parse(raw);
@@ -10931,7 +11097,7 @@ async function readLockForInspection(lockPath) {
   return { kind: "live", lock: parsed };
 }
 async function readLiveLock(projectDir) {
-  const lockPath = path8.join(projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
+  const lockPath = path9.join(projectDir, MAILBOX_BRIDGE_LOCK_FILENAME);
   const result = await readLockForInspection(lockPath);
   if (result.kind === "live") {
     return { kind: "live", lock: result.lock };
@@ -10942,7 +11108,7 @@ async function readLiveLock(projectDir) {
   return { kind: "absent" };
 }
 async function atomicWriteJson(targetPath, value) {
-  const dir = path8.dirname(targetPath);
+  const dir = path9.dirname(targetPath);
   await fsp7.mkdir(dir, { recursive: true });
   const tmp = `${targetPath}.tmp.${process.pid}.${randomBytes(4).toString("hex")}`;
   const body = JSON.stringify(value, null, 2) + "\n";
@@ -11228,9 +11394,9 @@ function makeMailboxTool(opts = {}) {
   const shortHint = "Sub-commands: check (unread), send (to/broadcast), ack (read/complete), query (filter), status (all agents), online (active only), unread (count).";
   return {
     name: "mailbox",
-    description: "Inter-agent mailbox with cross-session support. Send messages, check for incoming messages, acknowledge with read receipts, query by criteria, see online agents.",
-    usageHint: shortHint,
-    category: "coordination",
+    description: "Low-level inter-agent mailbox with 7 actions (check, send, ack, query, status, online, unread). For most use cases, prefer the simpler `mail_send` and `mail_inbox` tools \u2014 they cover the common send/read operations with a cleaner interface. This tool is for advanced queries (filter by sender, priority, since-timestamp), agent status/online lists, and message ack/control.",
+    usageHint: shortHint + " For simple send/read, use mail_send / mail_inbox instead.",
+    category: "Coordination",
     permission: "auto",
     mutating: true,
     capabilities: [ToolCapabilities.COORDINATION_MAIL],
@@ -11243,7 +11409,7 @@ function makeMailboxTool(opts = {}) {
           description: "Which mailbox operation to perform."
         },
         to: { type: "string", description: "Recipient agent id, or '*' / 'all' for broadcast." },
-        type: { type: "string", enum: ["note", "ask", "assign", "steer", "btw", "broadcast", "status", "result"], description: "Message type." },
+        type: { type: "string", enum: ["note", "ask", "assign", "steer", "btw", "broadcast", "status", "result", "review"], description: "Message type." },
         subject: { type: "string", description: "Short subject line." },
         body: { type: "string", description: "Full message content." },
         priority: { type: "string", enum: ["low", "normal", "high"] },
@@ -11492,9 +11658,9 @@ function makeMailSendTool(opts = {}) {
   const resolveMailbox = makeResolver(opts);
   return {
     name: "mail_send",
-    description: 'Send a mail to other agents working on this project (other terminals, TUIs, WebUIs). Use it to hand off work ("can you review src/auth.ts?"), ask questions, or announce what you just did. to="*" broadcasts to everyone; to="leader" reaches every leader process; an exact id like "leader@a1b2c3d4" reaches one agent. Recipients see your mail automatically before their next step.',
-    usageHint: 'mail_send to="*" subject="auth refactor done" body="touched src/auth/*, please review"',
-    category: "coordination",
+    description: 'Send a mail to other agents working on this project (other terminals, TUIs, WebUIs). Use it to hand off work, ask questions, announce what you just did, or request a review (type="review" \u2014 passive ask, no immediate reply required). to="*" broadcasts to everyone; to="leader" reaches every leader process; an exact id like "leader@a1b2c3d4" reaches one agent. Recipients see your mail automatically before their next step. Pick the type that matches the intent: note (default), ask (blocking question), assign (task), steer (mid-task direction), result (completion notice), review (passive ask), btw/status/broadcast/control (informational).',
+    usageHint: 'mail_send to="<id>" type="review" body="please skim <file>"',
+    category: "Coordination",
     permission: "auto",
     mutating: true,
     capabilities: [ToolCapabilities.COORDINATION_MAIL],
@@ -11509,8 +11675,8 @@ function makeMailSendTool(opts = {}) {
         body: { type: "string", description: "The message." },
         type: {
           type: "string",
-          enum: ["note", "ask", "assign", "steer", "btw", "broadcast", "status", "result"],
-          description: 'Message intent. Default: "broadcast" when to="*", otherwise "note".'
+          enum: ["note", "ask", "assign", "steer", "btw", "broadcast", "status", "result", "review"],
+          description: 'Message intent. Default: "broadcast" when to="*", otherwise "note". Actionable types: ask (blocking question), assign (task), result (completion notice), review (passive ask \u2014 code/doc/PR review, no immediate reply required). Behavioral: steer (mid-task direction change), btw (low-priority aside). Informational: note/status/broadcast/control.'
         },
         priority: { type: "string", enum: ["low", "normal", "high"] },
         replyTo: { type: "string", description: "Message id this replies to." }
@@ -11552,9 +11718,9 @@ function makeMailInboxTool(opts = {}) {
   const resolveMailbox = makeResolver(opts);
   return {
     name: "mail_inbox",
-    description: 'Read your unread mail from other agents on this project and mark it read. Covers mail addressed to you directly, to your base name (e.g. "leader"), and broadcasts ("*"). Urgent steer/btw mail is already injected automatically \u2014 use this to catch up on notes, questions, handoffs and results, or after a long stretch of tool work.',
+    description: 'Read your unread mail from other agents on this project and mark it read. Covers mail addressed to you directly, to your base name (e.g. "leader"), and broadcasts ("*"). Urgent steer/btw mail is already injected automatically \u2014 use this to catch up on notes, questions, handoffs, results, and review requests (type="review" \u2014 passive asks where no reply is required). Best called after a long stretch of tool work.',
     usageHint: "mail_inbox  (optionally: limit=10, markRead=false to peek)",
-    category: "coordination",
+    category: "Coordination",
     permission: "auto",
     mutating: false,
     capabilities: [ToolCapabilities.COORDINATION_MAIL],
@@ -11805,7 +11971,7 @@ function createMailboxHooks(opts) {
 var DEFAULT_MAX_ENTRIES = 1e4;
 var LOG_FILENAME = "package-authors.json";
 function logPath(storageDir) {
-  return path8.join(storageDir, LOG_FILENAME);
+  return path9.join(storageDir, LOG_FILENAME);
 }
 async function loadLog(storageDir, projectRoot) {
   try {
@@ -11829,7 +11995,7 @@ async function saveLog(storageDir, log) {
   await fsp7.rename(tmp, logPath(storageDir));
 }
 function detectEcosystem(manifestPath) {
-  const name = path8.basename(manifestPath).toLowerCase();
+  const name = path9.basename(manifestPath).toLowerCase();
   if (name === "package.json") return "npm";
   if (name === "go.mod") return "go";
   if (name === "cargo.toml") return "cargo";
@@ -12107,13 +12273,27 @@ var KnowledgeGraph = class {
   pendingDeliveries = /* @__PURE__ */ new Map();
   filePath;
   graphFilePath;
+  /**
+   * Stable per-node insertion sequence. `nodes` (a Map) preserves insertion
+   * order even across `update()` (Map.set on an existing key keeps its slot),
+   * but the type index's `Set<string>` does NOT — `update()` removes then
+   * re-adds a node's id, moving it to the set's tail. Index-routed queries sort
+   * by this sequence so they return nodes in creation order, matching the old
+   * `nodes.values()` scan that callers like decision-history `slice(-10)` rely on.
+   */
+  seq = /* @__PURE__ */ new Map();
+  seqCounter = 0;
+  /** Assign a stable insertion sequence the first time a node id is seen. */
+  _trackSeq(id) {
+    if (!this.seq.has(id)) this.seq.set(id, this.seqCounter++);
+  }
   /** Exposed for unit-testing only: read current index contents. */
   getIndex() {
     return this.index;
   }
   constructor(sessionDir) {
-    this.filePath = path8.join(sessionDir, "_knowledge_graph");
-    this.graphFilePath = path8.join(this.filePath, "graph.jsonl");
+    this.filePath = path9.join(sessionDir, "_knowledge_graph");
+    this.graphFilePath = path9.join(this.filePath, "graph.jsonl");
   }
   // ── Write ──────────────────────────────────────────────────────────────
   /**
@@ -12123,6 +12303,7 @@ var KnowledgeGraph = class {
   async add(node) {
     const full = { id: randomUUID(), ...node };
     this.nodes.set(full.id, full);
+    this._trackSeq(full.id);
     this._addToIndex(full, this._indexKeys(full));
     await this._persist(full);
     this._deliver(full);
@@ -12145,7 +12326,19 @@ var KnowledgeGraph = class {
     return this.nodes.get(id);
   }
   getAll(filter) {
-    return Array.from(this.nodes.values()).filter((n) => this._matches(n, filter ?? {}));
+    const f = filter ?? {};
+    if (f.type) {
+      const ids = this.index.get(`type:${f.type}`);
+      if (!ids || ids.size === 0) return [];
+      const out = [];
+      for (const id of ids) {
+        const node = this.nodes.get(id);
+        if (node && this._matches(node, f)) out.push(node);
+      }
+      out.sort((a, b) => (this.seq.get(a.id) ?? 0) - (this.seq.get(b.id) ?? 0));
+      return out;
+    }
+    return Array.from(this.nodes.values()).filter((n) => this._matches(n, f));
   }
   getGoals(filter) {
     return this.getAll({ type: "goal", ...filter });
@@ -12321,9 +12514,11 @@ var KnowledgeGraph = class {
               this._removeFromIndex(oldNode, this._indexKeys(oldNode));
             }
             this.nodes.set(parsed.node.id, parsed.node);
+            this._trackSeq(parsed.node.id);
             this._addToIndex(parsed.node, this._indexKeys(parsed.node));
           } else {
             this.nodes.set(parsed.id, parsed);
+            this._trackSeq(parsed.id);
             this._addToIndex(parsed, this._indexKeys(parsed));
           }
         } catch {
@@ -13353,11 +13548,12 @@ var AutonomousBrain = class {
     };
   }
   _inferDecisionType(req) {
-    if (req.question.toLowerCase().includes("spawn")) return "spawn";
-    if (req.question.toLowerCase().includes("approve") || req.question.toLowerCase().includes("change")) return "approve_change";
-    if (req.question.toLowerCase().includes("retry") || req.question.toLowerCase().includes("fail")) return "retry_task";
-    if (req.question.toLowerCase().includes("priorit")) return "prioritize_goals";
-    if (req.question.toLowerCase().includes("decompos")) return "decompose_goal";
+    const q = req.question.toLowerCase();
+    if (q.includes("spawn")) return "spawn";
+    if (q.includes("approve") || q.includes("change")) return "approve_change";
+    if (q.includes("retry") || q.includes("fail")) return "retry_task";
+    if (q.includes("priorit")) return "prioritize_goals";
+    if (q.includes("decompos")) return "decompose_goal";
     return "assign_task";
   }
   _serializeContext(ctx) {
@@ -14214,17 +14410,17 @@ ${input.detail}`
   _waitForDagProgress(timeoutMs) {
     const before = this._dagProgressKey();
     if (this.dag.isDone()) return Promise.resolve();
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       let off;
       const timer = setTimeout(() => {
         off?.();
-        resolve5();
+        resolve6();
       }, timeoutMs);
       off = this.dag.onEvent(() => {
         if (this._dagProgressKey() === before) return;
         clearTimeout(timer);
         off?.();
-        resolve5();
+        resolve6();
       });
     });
   }
@@ -14501,6 +14697,7 @@ ${input.detail}`
 var AgentMonitorService = class {
   _fleetBus;
   _events;
+  _sessionId;
   _transcriptsDir;
   _maxEntries;
   _streamEnabled;
@@ -14516,6 +14713,7 @@ var AgentMonitorService = class {
   constructor(opts) {
     this._fleetBus = opts.fleetBus;
     this._events = opts.events;
+    this._sessionId = opts.sessionId;
     this._transcriptsDir = opts.transcriptsDir;
     this._maxEntries = opts.maxEntriesPerAgent ?? 500;
     this._streamEnabled = opts.streamEnabled ?? false;
@@ -14600,6 +14798,7 @@ var AgentMonitorService = class {
       iteration: 0
     });
     this._events.emit("agent.status_changed", {
+      sessionId: this._sessionId,
       subagentId,
       agentName,
       status: "spawned",
@@ -14624,6 +14823,7 @@ var AgentMonitorService = class {
       iteration: 999
     });
     this._events.emit("agent.status_changed", {
+      sessionId: this._sessionId,
       subagentId,
       agentName: session.agentName,
       status,
@@ -14729,6 +14929,7 @@ var AgentMonitorService = class {
     this._appendToFile(subagentId, entry).catch(() => {
     });
     this._events.emit("agent.timeline.message", {
+      sessionId: this._sessionId,
       subagentId: entry.subagentId,
       agentName: entry.agentName,
       content: entry.content,
@@ -14741,9 +14942,9 @@ var AgentMonitorService = class {
     this._onEntry?.(entry);
   }
   async _appendToFile(subagentId, entry) {
-    const dir = path8.join(this._transcriptsDir, subagentId);
+    const dir = path9.join(this._transcriptsDir, subagentId);
     await fsp7.mkdir(dir, { recursive: true });
-    const filePath = path8.join(dir, "transcript.jsonl");
+    const filePath = path9.join(dir, "transcript.jsonl");
     const line = JSON.stringify(entry) + "\n";
     await fsp7.appendFile(filePath, line, { encoding: "utf8" });
   }
@@ -14935,6 +15136,6 @@ var AdaptiveConcurrencyController = class {
   }
 };
 
-export { ACP_AGENTS, AGENTS_BY_PHASE, AGENT_CATALOG, TOOLS as AGENT_TOOL_PRESETS, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, AdaptiveConcurrencyController, AgentMonitorService, AutonomousBrain, AutonomousCoordinator, BUG_HUNTER_AGENT, BUILD_AGENTS, BrainDecisionQueue, BrainMonitor, BudgetExceededError, BudgetThresholdSignal, ChangeManager, CollabSession, ConsensusProtocol, DECISION_TIMEOUT_MS, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_QUALITY_CHECKS, DEFAULT_SUBAGENT_BASELINE, DELIVERY_AGENTS, DEPENDENCY_FILE_PATTERNS, DISCOVERY_AGENTS, DOMAIN_AGENTS, DefaultBrainArbiter, DefaultMailbox, DefaultMultiAgentCoordinator, Director, DirectorAlertLevel, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FLEET_ROSTER_WITHACP, FleetBus, FleetCostCapError, FleetManager, FleetSpawnBudgetError, FleetUsageAggregator, GlobalMailbox, HEAVY_BUDGET, HumanEscalatingBrainArbiter, InMemoryAgentBridge, InMemoryBridgeTransport, KNOWLEDGE_AGENTS, KnowledgeGraph, LIGHT_BUDGET, LargeAnswerStore, MAILBOX_BRIDGE_LOCK_FILENAME, MAILBOX_BRIDGE_TOKEN_FILENAME, MAILBOX_HEALTH_DEFAULT_FAILURE_THRESHOLD, MAILBOX_HEALTH_DEFAULT_FROM, MAILBOX_HEALTH_DEFAULT_INTERVAL_MS, MAILBOX_HEALTH_DEFAULT_TIMEOUT_MS, MEDIUM_BUDGET, META_AGENTS, MailboxHealthWatchdog, NULL_FLEET_BUS, ObservableBrainArbiter, PLANNING_AGENTS, REFACTOR_PLANNER_AGENT, REVIEW_AGENTS, SECURITY_SCANNER_AGENT, SubagentBudget, TIMEOUT_PREEMPT_FRACTION, TaskAuctioneer, TaskDAG, VERIFY_AGENTS, acquireOrJoin, applyRosterBudget, attachAutoExtend, attachDepWatcherBridge, buildDownAlert, buildRecoveryAlert, composeDirectorPrompt, composeSubagentPrompt, createAgentMonitorService, createDelegateTool, createMailboxHooks, createMessage, detectEcosystem, dispatchAgent, finalize, formatHumanPrompt, getAgentDefinition, getFullPackageLog, getManifestPackages, getPackageAuthor, getPackagesByAgent, mailboxSessionTag, makeAgentSubagentRunner, makeAskResultTool, makeAskTool, makeAssignTool, makeAwaitTasksTool, makeCollabDebugTool, makeDependencyWatcherConfig, makeDirectorSessionFactory, makeFleetEmitTool, makeFleetHealthTool, makeFleetSessionTool, makeFleetStatusTool, makeFleetUsageTool, makeLLMClassifier, makeMailInboxTool, makeMailSendTool, makeMailboxTool, makeRollUpTool, makeSpawnTool, makeTerminateTool, makeWorkCompleteTool, normalizeRecipient, readLiveLock, recordPackageAction, release, resolveMailboxIdentity, resolveProjectDir, rosterSummaryFromConfigs, scoreAgents, startPackageOutdatedWatcher, updatePackageOutdatedStatus, validateWatchdogOptions, withDisabledToolFiltering };
+export { ACP_AGENTS, AGENTS_BY_PHASE, AGENT_CATALOG, TOOLS as AGENT_TOOL_PRESETS, ALL_AGENT_DEFINITIONS, ALL_FLEET_AGENTS, AUDIT_LOG_AGENT, AdaptiveConcurrencyController, AgentMonitorService, AutonomousBrain, AutonomousCoordinator, BUG_HUNTER_AGENT, BUILD_AGENTS, BrainDecisionQueue, BrainMonitor, BudgetExceededError, BudgetThresholdSignal, ChangeManager, CollabSession, ConsensusProtocol, DECISION_TIMEOUT_MS, DEFAULT_DIRECTOR_PREAMBLE, DEFAULT_DISPATCH_ROLE, DEFAULT_QUALITY_CHECKS, DEFAULT_SUBAGENT_BASELINE, DELIVERY_AGENTS, DEPENDENCY_FILE_PATTERNS, DISCOVERY_AGENTS, DOMAIN_AGENTS, DefaultBrainArbiter, DefaultMailbox, DefaultMultiAgentCoordinator, Director, DirectorAlertLevel, FLEET_ROSTER, FLEET_ROSTER_BUDGETS, FLEET_ROSTER_WITHACP, FleetBus, FleetCostCapError, FleetManager, FleetSpawnBudgetError, FleetUsageAggregator, GlobalMailbox, HEAVY_BUDGET, HumanEscalatingBrainArbiter, InMemoryAgentBridge, InMemoryBridgeTransport, KNOWLEDGE_AGENTS, KnowledgeGraph, LIGHT_BUDGET, LargeAnswerStore, MAILBOX_BRIDGE_LOCK_FILENAME, MAILBOX_BRIDGE_TOKEN_FILENAME, MAILBOX_HEALTH_DEFAULT_FAILURE_THRESHOLD, MAILBOX_HEALTH_DEFAULT_FROM, MAILBOX_HEALTH_DEFAULT_INTERVAL_MS, MAILBOX_HEALTH_DEFAULT_TIMEOUT_MS, MEDIUM_BUDGET, META_AGENTS, MailboxHealthWatchdog, NULL_FLEET_BUS, ObservableBrainArbiter, PLANNING_AGENTS, REFACTOR_PLANNER_AGENT, REVIEW_AGENTS, SECURITY_SCANNER_AGENT, SubagentBudget, TIMEOUT_PREEMPT_FRACTION, TaskAuctioneer, TaskDAG, VERIFY_AGENTS, acquireOrJoin, applyRosterBudget, attachAutoExtend, attachDepWatcherBridge, buildDownAlert, buildRecoveryAlert, composeDirectorPrompt, composeSubagentPrompt, createAgentMonitorService, createDelegateTool, createMailboxHooks, createMessage, detectEcosystem, dispatchAgent, finalize, formatHumanPrompt, getAgentDefinition, getFullPackageLog, getManifestPackages, getPackageAuthor, getPackagesByAgent, mailboxSessionTag, makeAgentSubagentRunner, makeAskResultTool, makeAskTool, makeAssignTool, makeAwaitTasksTool, makeCollabDebugTool, makeDependencyWatcherConfig, makeDirectorSessionFactory, makeFleetEmitTool, makeFleetTool as makeFleetHealthTool, makeFleetTool as makeFleetSessionTool, makeFleetTool as makeFleetStatusTool, makeFleetTool, makeFleetTool as makeFleetUsageTool, makeLLMClassifier, makeMailInboxTool, makeMailSendTool, makeMailboxTool, makeRollUpTool, makeSpawnTool, makeTerminateAllTool, makeTerminateTool, makeWorkCompleteTool, normalizeRecipient, readLiveLock, recordPackageAction, release, resolveMailboxIdentity, resolveProjectDir, rosterSummaryFromConfigs, scoreAgents, startPackageOutdatedWatcher, updatePackageOutdatedStatus, validateWatchdogOptions, withDisabledToolFiltering };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map