@wrongstack/core 0.257.2 → 0.264.0

package/dist/storage/index.js

@@ -1,9 +1,9 @@
 import { randomBytes, randomUUID, createHash } from 'crypto';
 import * as fsp from 'fs/promises';
-import * as path13 from 'path';
-import 'fs';
+import * as path2 from 'path';
 import * as os from 'os';
 import { hostname } from 'os';
+import 'fs';
 
 // src/utils/expect-defined.ts
 function expectDefined(value, label) {
@@ -15,9 +15,9 @@ function expectDefined(value, label) {
   return value;
 }
 async function atomicWrite(targetPath, content, opts = {}) {
-  const dir = path13.dirname(targetPath);
+  const dir = path2.dirname(targetPath);
   await fsp.mkdir(dir, { recursive: true });
-  const tmp = path13.join(dir, `.${path13.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
+  const tmp = path2.join(dir, `.${path2.basename(targetPath)}.${randomBytes(6).toString("hex")}.tmp`);
   try {
     if (typeof content === "string") {
       await fsp.writeFile(tmp, content, { flag: "wx", encoding: opts.encoding ?? "utf8" });
@@ -35,8 +35,8 @@ async function atomicWrite(targetPath, content, opts = {}) {
     }
     let mode;
     try {
-      const stat5 = await fsp.stat(targetPath);
-      mode = stat5.mode & 511;
+      const stat6 = await fsp.stat(targetPath);
+      mode = stat6.mode & 511;
     } catch {
       mode = opts.mode;
     }
@@ -56,9 +56,9 @@ async function ensureDir(dir) {
   await fsp.mkdir(dir, { recursive: true });
 }
 async function withFileLock(targetPath, fn, opts = {}) {
-  const dir = path13.dirname(targetPath);
+  const dir = path2.dirname(targetPath);
   await fsp.mkdir(dir, { recursive: true });
-  const lockPath = path13.join(dir, `.${path13.basename(targetPath)}.lock`);
+  const lockPath = path2.join(dir, `.${path2.basename(targetPath)}.lock`);
   const timeoutMs = opts.timeoutMs ?? 5e3;
   const staleMs = opts.staleMs ?? 3e4;
   const started = Date.now();
@@ -69,10 +69,15 @@ async function withFileLock(targetPath, fn, opts = {}) {
       await handle.writeFile(`${process.pid}:${Date.now()}`);
       break;
     } catch (err) {
-      if (err.code !== "EEXIST") throw err;
+      const code = err.code;
+      if (code === "ENOENT") {
+        await fsp.mkdir(dir, { recursive: true });
+        continue;
+      }
+      if (code !== "EEXIST") throw err;
       try {
-        const stat5 = await fsp.stat(lockPath);
-        if (Date.now() - stat5.mtimeMs > staleMs) {
+        const stat6 = await fsp.stat(lockPath);
+        if (Date.now() - stat6.mtimeMs > staleMs) {
           await fsp.unlink(lockPath);
           continue;
         }
@@ -214,6 +219,215 @@ function isEmptyMessage(msg) {
   return msg.content.length === 0;
 }
 
+// src/utils/error.ts
+function toErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+
+// 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/term.ts
+var hasStdout = () => typeof process !== "undefined" && !!process.stdout;
+function isStdoutTTY() {
+  return hasStdout() && Boolean(process.stdout.isTTY);
+}
+
+// src/utils/color.ts
+var isColorTty = () => {
+  if (envFlag(process.env.NO_COLOR)) return false;
+  if (envFlag(process.env.FORCE_COLOR)) return true;
+  return isStdoutTTY();
+};
+function envFlag(value) {
+  if (value === void 0) return false;
+  if (value.trim() === "") return false;
+  return !/^(0|false|no|off)$/i.test(value.trim());
+}
+var COLOR = isColorTty();
+var wrap = (open6, close) => (s) => COLOR ? `\x1B[${open6}m${s}\x1B[${close}m` : s;
+var color = {
+  reset: wrap("0", "0"),
+  bold: wrap("1", "22"),
+  dim: wrap("2", "22"),
+  italic: wrap("3", "23"),
+  underline: wrap("4", "24"),
+  red: wrap("31", "39"),
+  green: wrap("32", "39"),
+  yellow: wrap("33", "39"),
+  blue: wrap("34", "39"),
+  magenta: wrap("35", "39"),
+  cyan: wrap("36", "39"),
+  gray: wrap("90", "39"),
+  amber: wrap("38;5;214", "39"),
+  pink: wrap("38;5;205", "39"),
+  bgRed: wrap("41", "49"),
+  bgGreen: wrap("42", "49")
+};
+function projectHash(absRoot) {
+  return createHash("sha256").update(path2.resolve(absRoot)).digest("hex").slice(0, 12);
+}
+function projectSlug(absRoot) {
+  const base = slugify(path2.basename(absRoot));
+  const hash = createHash("sha256").update(path2.resolve(absRoot)).digest("hex").slice(0, 6);
+  return `${base}-${hash}`;
+}
+function slugify(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "project";
+}
+function wstackGlobalRoot() {
+  const fromEnv = process.env["WRONGSTACK_HOME"];
+  if (fromEnv && fromEnv.trim().length > 0) return path2.resolve(fromEnv);
+  return path2.join(os.homedir(), ".wrongstack");
+}
+function resolveWstackPaths(opts) {
+  const globalRoot = opts.globalRoot ?? (opts.userHome ? path2.join(opts.userHome, ".wrongstack") : wstackGlobalRoot());
+  const hash = projectHash(opts.projectRoot);
+  const slug = projectSlug(opts.projectRoot);
+  const projectDir = path2.join(globalRoot, "projects", slug);
+  return {
+    globalRoot,
+    configDir: globalRoot,
+    globalConfig: path2.join(globalRoot, "config.json"),
+    secretsKey: path2.join(globalRoot, ".key"),
+    globalMemory: path2.join(globalRoot, "memory.md"),
+    globalSkills: path2.join(globalRoot, "skills"),
+    globalPrompts: path2.join(globalRoot, "prompts"),
+    cacheDir: path2.join(globalRoot, "cache"),
+    modelsCache: path2.join(globalRoot, "cache", "models.dev.json"),
+    modelsOverlayCache: path2.join(globalRoot, "cache", "models-overlay.json"),
+    historyFile: path2.join(globalRoot, "history"),
+    logFile: path2.join(globalRoot, "logs", "wrongstack.log"),
+    projectDir,
+    projectCodebaseIndex: path2.join(projectDir, "codebase-index"),
+    projectMemory: path2.join(projectDir, "memory.md"),
+    projectSessions: path2.join(projectDir, "sessions"),
+    projectTrust: path2.join(projectDir, "trust.json"),
+    projectMeta: path2.join(projectDir, "meta.json"),
+    projectLocalConfig: path2.join(projectDir, "config.local.json"),
+    inProjectConfig: path2.join(opts.projectRoot, ".wrongstack", "config.json"),
+    inProjectAgentsFile: path2.join(opts.projectRoot, ".wrongstack", "AGENTS.md"),
+    inProjectSkills: path2.join(opts.projectRoot, ".wrongstack", "skills"),
+    inProjectWorktrees: path2.join(opts.projectRoot, ".wrongstack", "worktrees"),
+    projectHash: hash,
+    projectSlug: slug,
+    projectGoal: path2.join(projectDir, "goal.json"),
+    projectSpecs: path2.join(projectDir, "specs"),
+    projectTaskGraphs: path2.join(projectDir, "task-graphs"),
+    projectSddSession: path2.join(projectDir, "sdd-session.json"),
+    projectPlan: path2.join(projectDir, "plan.json"),
+    projectAutophase: path2.join(projectDir, "autophase"),
+    syncConfig: path2.join(globalRoot, "sync.json")
+  };
+}
+
+// src/utils/deep-merge.ts
+var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
+  "__proto__",
+  "constructor",
+  "prototype",
+  "__defineGetter__",
+  "__defineSetter__",
+  "__lookupGetter__",
+  "__lookupSetter__"
+]);
+function isPrimitiveArray(a) {
+  return a.every((v) => v === null || typeof v !== "object" && typeof v !== "function");
+}
+function deepMerge(base, patch, options = {}) {
+  const {
+    conflictResolution = "prefer-patch",
+    arrayMode = "replace",
+    protectProto = true,
+    onNonPrimitiveArrayReplace
+  } = options;
+  if (typeof base !== "object" || base === null) {
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  if (typeof patch !== "object" || patch === null) {
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  if (Array.isArray(base) && Array.isArray(patch)) {
+    if (arrayMode === "concat-primitives" && isPrimitiveArray(base) && isPrimitiveArray(patch)) {
+      return [.../* @__PURE__ */ new Set([...base, ...patch])];
+    }
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  if (Array.isArray(base) || Array.isArray(patch)) {
+    return conflictResolution === "prefer-patch" ? patch : base;
+  }
+  const baseObj = base;
+  const patchObj = patch;
+  const out = { ...baseObj };
+  for (const [k, v] of Object.entries(patchObj)) {
+    if (protectProto && FORBIDDEN_PROTO_KEYS.has(k)) continue;
+    const existing = out[k];
+    if (v !== null && typeof v === "object" && !Array.isArray(v) && existing !== null && typeof existing === "object" && !Array.isArray(existing)) {
+      out[k] = deepMerge(existing, v, options);
+    } else if (Array.isArray(v) && Array.isArray(existing)) {
+      if (onNonPrimitiveArrayReplace && !isPrimitiveArray(v)) {
+        onNonPrimitiveArrayReplace(k, existing.length, v.length);
+      }
+      out[k] = deepMerge(existing, v, options);
+    } else if (v !== void 0) {
+      if (onNonPrimitiveArrayReplace && Array.isArray(v) && !isPrimitiveArray(v)) {
+        const existingLen = Array.isArray(existing) ? existing.length : 0;
+        onNonPrimitiveArrayReplace(k, existingLen, v.length);
+      }
+      out[k] = v;
+    }
+  }
+  return out;
+}
+
+// src/utils/regex-guard.ts
+var MAX_PATTERN_LEN = 512;
+var DANGEROUS_PATTERNS = [
+  /(\([^)]*[+*][^)]*\))[+*]/,
+  // (a+)+, (.*)+, etc
+  /(\(\?:[^)]*[+*][^)]*\))[+*]/
+  // same, with non-capturing group
+];
+function compileUserRegex(pattern, flags) {
+  if (typeof pattern !== "string") {
+    return { ok: false, reason: "pattern must be a string" };
+  }
+  if (pattern.length === 0) {
+    return { ok: false, reason: "pattern is empty" };
+  }
+  if (pattern.length > MAX_PATTERN_LEN) {
+    return { ok: false, reason: `pattern exceeds ${MAX_PATTERN_LEN} characters` };
+  }
+  for (const rx of DANGEROUS_PATTERNS) {
+    if (rx.test(pattern)) {
+      return {
+        ok: false,
+        reason: "pattern looks vulnerable to catastrophic backtracking \u2014 rewrite without nested quantifiers"
+      };
+    }
+  }
+  try {
+    return { ok: true, regex: new RegExp(pattern, flags) };
+  } catch (err) {
+    return {
+      ok: false,
+      reason: err instanceof Error ? err.message : "invalid regex"
+    };
+  }
+}
+
 // src/storage/session-store.ts
 function sanitizeModel(model) {
   return model.replace(/[^a-zA-Z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
@@ -234,13 +448,47 @@ var DefaultSessionStore = class _DefaultSessionStore {
     this.events = opts.events;
     this.secretScrubber = opts.secretScrubber;
   }
+  // ── Storage event helpers ───────────────────────────────────────────────────
+  emitRead(sessionId, filePath, operation, outcome, durationMs, error) {
+    this.events?.emit("storage.read", {
+      sessionId,
+      store: "session",
+      filePath,
+      operation,
+      outcome,
+      durationMs,
+      ...error !== void 0 ? { error } : {}
+    });
+  }
+  emitWrite(sessionId, filePath, operation, outcome, durationMs, eventCount, error) {
+    this.events?.emit("storage.write", {
+      sessionId,
+      store: "session",
+      filePath,
+      operation,
+      outcome,
+      durationMs,
+      ...eventCount !== void 0 ? { eventCount } : {},
+      ...error !== void 0 ? { error } : {}
+    });
+  }
+  emitError(sessionId, filePath, operation, error, recoverable) {
+    this.events?.emit("storage.error", {
+      sessionId,
+      store: "session",
+      filePath,
+      operation,
+      error,
+      recoverable
+    });
+  }
   /** Absolute path to the session index file. */
   get indexFile() {
-    return path13.join(this.dir, "_index.jsonl");
+    return path2.join(this.dir, "_index.jsonl");
   }
   /** Join session ID to its absolute path within the store directory. */
   sessionPath(id, ext) {
-    return path13.join(this.dir, `${id}${ext}`);
+    return path2.join(this.dir, `${id}${ext}`);
   }
   /**
    * Ensure the directory implied by the session ID exists. When the ID
@@ -248,7 +496,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * subdirectory so sessions group naturally by day.
    */
   async ensureShardDir(id) {
-    const dirPath = path13.dirname(path13.join(this.dir, id));
+    const dirPath = path2.dirname(path2.join(this.dir, id));
     await ensureDir(dirPath);
     return dirPath;
   }
@@ -256,23 +504,27 @@ var DefaultSessionStore = class _DefaultSessionStore {
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
     const id = meta.id && meta.id.length > 0 ? meta.id : generateSessionId(startedAt, meta.model ?? meta.provider);
     const shardDir = await this.ensureShardDir(id);
-    const file = path13.join(shardDir, `${path13.basename(id)}.jsonl`);
+    const file = path2.join(shardDir, `${path2.basename(id)}.jsonl`);
+    const t0 = Date.now();
     let handle;
     try {
       handle = await fsp.open(file, "a", 384);
     } catch (err) {
+      this.emitError(id, file, "create", toErrorMessage(err), false);
       throw new Error(
-        `Failed to open session file: ${err instanceof Error ? err.message : String(err)}`,
+        `Failed to open session file: ${toErrorMessage(err)}`,
         { cause: err }
       );
     }
     try {
-      return new FileSessionWriter(id, handle, startedAt, meta, this.events, {
+      const writer = new FileSessionWriter(id, handle, startedAt, meta, this.events, {
         dir: shardDir,
         filePath: file,
         secretScrubber: this.secretScrubber,
         onClose: (s) => this.appendToIndex(s)
       });
+      this.emitWrite(id, file, "create", "success", Date.now() - t0);
+      return writer;
     } catch (err) {
       await handle.close().catch((e) => console.warn(JSON.stringify({
         level: "warn",
@@ -280,18 +532,21 @@ var DefaultSessionStore = class _DefaultSessionStore {
         message: e instanceof Error ? e.message : String(e),
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       })));
+      this.emitError(id, file, "create", toErrorMessage(err), true);
       throw err;
     }
   }
   async resume(id) {
     const file = this.sessionPath(id, ".jsonl");
+    const t0 = Date.now();
     const data = await this.load(id);
     let handle;
     try {
       handle = await fsp.open(file, "a", 384);
     } catch (err) {
+      this.emitError(id, file, "resume", toErrorMessage(err), false);
       throw new Error(
-        `Failed to open session "${id}" for append: ${err instanceof Error ? err.message : String(err)}`,
+        `Failed to open session "${id}" for append: ${toErrorMessage(err)}`,
         { cause: err }
       );
     }
@@ -311,12 +566,13 @@ 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: path13.dirname(file),
+          dir: path2.dirname(file),
           filePath: file,
           secretScrubber: this.secretScrubber,
           onClose: (s) => this.appendToIndex(s)
         }
       );
+      this.emitWrite(id, file, "resume", "success", Date.now() - t0);
       return { writer, data };
     } catch (err) {
       await handle.close().catch((e) => console.warn(JSON.stringify({
@@ -325,27 +581,39 @@ var DefaultSessionStore = class _DefaultSessionStore {
         message: e instanceof Error ? e.message : String(e),
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       })));
+      this.emitError(id, file, "resume", toErrorMessage(err), true);
       throw err;
     }
   }
   async load(id) {
     const file = this.sessionPath(id, ".jsonl");
-    const raw = await fsp.readFile(file, "utf8");
-    const lines = raw.split("\n").filter((l) => l.trim());
-    const events = [];
-    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") {
-          events.push(parsed);
+    const t0 = Date.now();
+    let outcome = "success";
+    let errorMsg;
+    try {
+      const raw = await fsp.readFile(file, "utf8");
+      const lines = raw.split("\n").filter((l) => l.trim());
+      const events = [];
+      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") {
+            events.push(parsed);
+          }
+        } catch {
         }
-      } catch {
       }
+      const meta = this.metaFromEvents(id, events);
+      const { messages, usage } = this.replay(events, id);
+      const toolCallEnds = extractToolCallEnds(events);
+      return { metadata: meta, events, messages, usage, toolCallEnds };
+    } catch (err) {
+      outcome = "failure";
+      errorMsg = toErrorMessage(err);
+      throw err;
+    } finally {
+      this.emitRead(id, file, "load", outcome, Date.now() - t0, errorMsg);
     }
-    const meta = this.metaFromEvents(id, events);
-    const { messages, usage } = this.replay(events, id);
-    const toolCallEnds = extractToolCallEnds(events);
-    return { metadata: meta, events, messages, usage, toolCallEnds };
   }
   async list(limit = 20) {
     try {
@@ -412,12 +680,22 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * (keep latest per session), and rewrite. Atomic via temp+rename.
    */
   async compactIndex() {
-    const entries = await this.readIndex();
-    if (entries.length === 0) return;
-    const tmp = `${this.indexFile}.compact.tmp`;
-    const lines = entries.map((s) => JSON.stringify(s)).join("\n") + "\n";
-    await fsp.writeFile(tmp, lines, "utf8");
-    await fsp.rename(tmp, this.indexFile);
+    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 fsp.writeFile(tmp, lines, "utf8");
+      await fsp.rename(tmp, this.indexFile);
+    } catch (err) {
+      outcome = "failure";
+      errorMsg = toErrorMessage(err);
+    } finally {
+      this.emitWrite("~compact~", this.indexFile, "compact", outcome, Date.now() - t0, void 0, errorMsg);
+    }
   }
   /**
    * Read the index file and return deduplicated session summaries.
@@ -482,7 +760,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         continue;
       if (entry.isDirectory()) {
         const childPrefix = depth === 0 ? entry.name : `${prefix}/${entry.name}`;
-        ids.push(...await this.collectSessionIds(path13.join(dir, entry.name), childPrefix, depth + 1));
+        ids.push(...await this.collectSessionIds(path2.join(dir, entry.name), childPrefix, depth + 1));
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
         if (entry.name === "_index.jsonl") continue;
         const base = entry.name.replace(/\.jsonl$/, "");
@@ -493,22 +771,31 @@ var DefaultSessionStore = class _DefaultSessionStore {
   }
   async summaryFor(id) {
     const manifest = this.sessionPath(id, ".summary.json");
+    const t0 = Date.now();
+    let outcome = "success";
+    let errorMsg;
     try {
       const raw = await fsp.readFile(manifest, "utf8");
+      this.emitRead(id, manifest, "summary", "success", Date.now() - t0);
       return JSON.parse(raw);
     } catch {
       const full = this.sessionPath(id, ".jsonl");
-      const stat5 = await fsp.stat(full);
-      const summary = await this.summarize(id, stat5.mtime.toISOString());
+      const stat6 = await fsp.stat(full);
+      const summary = await this.summarize(id, stat6.mtime.toISOString());
       await atomicWrite(manifest, JSON.stringify(summary), { mode: 384 }).catch((err) => {
+        const msg = toErrorMessage(err);
+        this.emitError(id, manifest, "summary_fallback", msg, true);
         console.warn(JSON.stringify({
           level: "warn",
           event: "session_store.manifest_write_failed",
           sessionId: id,
-          message: err instanceof Error ? err.message : String(err),
+          message: msg,
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         }));
       });
+      outcome = "failure";
+      errorMsg = "summary fallback \u2014 manifest rebuilt";
+      this.emitRead(id, manifest, "summary", outcome, Date.now() - t0, errorMsg);
       return summary;
     }
   }
@@ -524,14 +811,14 @@ var DefaultSessionStore = class _DefaultSessionStore {
   async deleteSession(id) {
     const jsonlPath = this.sessionPath(id, ".jsonl");
     const summaryPath = this.sessionPath(id, ".summary.json");
-    const shardDir = path13.dirname(path13.join(this.dir, id));
-    const base = path13.basename(id);
-    const sessDir = path13.join(shardDir, base);
+    const shardDir = path2.dirname(path2.join(this.dir, id));
+    const base = path2.basename(id);
+    const sessDir = path2.join(shardDir, base);
     const deletions = [
       fsp.unlink(jsonlPath),
       fsp.unlink(summaryPath),
-      fsp.unlink(path13.join(shardDir, `${base}.plan.json`)),
-      fsp.unlink(path13.join(shardDir, `${base}.todos.json`))
+      fsp.unlink(path2.join(shardDir, `${base}.plan.json`)),
+      fsp.unlink(path2.join(shardDir, `${base}.todos.json`))
     ];
     const results = await Promise.allSettled(deletions);
     for (const r of results) {
@@ -553,7 +840,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         level: "warn",
         event: "session_store.rmdir_failed",
         sessionId: id,
-        message: err instanceof Error ? err.message : String(err),
+        message: toErrorMessage(err),
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       }));
     });
@@ -567,17 +854,17 @@ var DefaultSessionStore = class _DefaultSessionStore {
     let deleted = 0;
     let activeSessionId = null;
     try {
-      const raw = await fsp.readFile(path13.join(this.dir, "active.json"), "utf8");
+      const raw = await fsp.readFile(path2.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 = path13.join(dir, name);
+      const jsonlPath = path2.join(dir, name);
       try {
-        const stat5 = await fsp.stat(jsonlPath);
-        if (stat5.mtimeMs >= cutoff) return;
+        const stat6 = await fsp.stat(jsonlPath);
+        if (stat6.mtimeMs >= cutoff) return;
       } catch {
         return;
       }
@@ -594,7 +881,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
         continue;
       }
       if (!entry.isDirectory()) continue;
-      const dateDir = path13.join(this.dir, entry.name);
+      const dateDir = path2.join(this.dir, entry.name);
       const files = await fsp.readdir(dateDir, { withFileTypes: true }).catch(() => []);
       for (const file of files) {
         if (!file.isFile() || !isPrunableJsonl(file.name)) continue;
@@ -606,7 +893,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const dateDir = path13.join(this.dir, entry.name);
+      const dateDir = path2.join(this.dir, entry.name);
       try {
         const remaining = await fsp.readdir(dateDir);
         if (remaining.length === 0) {
@@ -774,14 +1061,14 @@ function extractToolCallEnds(events) {
   return result;
 }
 var FileSessionWriter = class _FileSessionWriter {
-  constructor(id, handle, startedAt, meta, events, opts = {}) {
+  constructor(id, handle, startedAt, meta, events, opts = {}, traceId) {
     this.id = id;
     this.handle = handle;
     this.startedAt = startedAt;
     this.meta = meta;
     this.events = events;
     this.resumed = opts.resumed ?? false;
-    this.manifestFile = opts.dir ? path13.join(opts.dir, `${path13.basename(id)}.summary.json`) : "";
+    this.manifestFile = opts.dir ? path2.join(opts.dir, `${path2.basename(id)}.summary.json`) : "";
     this.filePath = opts.filePath ?? "";
     this.secretScrubber = opts.secretScrubber;
     this.onCloseCb = opts.onClose;
@@ -793,6 +1080,7 @@ var FileSessionWriter = class _FileSessionWriter {
       provider: meta.provider ?? "unknown",
       tokenTotal: 0
     };
+    this.traceId = traceId;
   }
   id;
   handle;
@@ -825,6 +1113,8 @@ var FileSessionWriter = class _FileSessionWriter {
   lastAppendWarnAt = 0;
   secretScrubber;
   onCloseCb;
+  /** Implements SessionWriter.traceId — propagated from ContextInit.traceId. */
+  traceId;
   // ── Write buffer — batches events to reduce per-event disk I/O ─────────
   //
   // Every append() pushes the scrubbed event into an in-memory buffer instead
@@ -978,9 +1268,14 @@ var FileSessionWriter = class _FileSessionWriter {
     const eventCount = this.writeBuffer.length;
     const batch = this.writeBuffer.map((e) => JSON.stringify(e)).join("\n") + "\n";
     this.writeBuffer = [];
+    const t0 = Date.now();
+    let outcome = "success";
+    let errorMsg;
     try {
       await this.enqueueWrite(batch);
     } catch (err) {
+      outcome = "failure";
+      errorMsg = toErrorMessage(err);
       this.appendFailCount += eventCount;
       const now = Date.now();
       if (now - this.lastAppendWarnAt > 5e3) {
@@ -988,12 +1283,24 @@ var FileSessionWriter = class _FileSessionWriter {
         const tail = suppressed > 0 ? ` (+${suppressed} suppressed)` : "";
         console.warn(
           "[session] flush failed:",
-          err instanceof Error ? err.message : String(err),
+          toErrorMessage(err),
           tail
         );
         this.lastAppendWarnAt = now;
         this.appendFailCount = 0;
       }
+    } finally {
+      this.events?.emit("storage.write", {
+        sessionId: this.id,
+        store: "session",
+        filePath: this.filePath,
+        operation: "flush",
+        outcome,
+        durationMs: Date.now() - t0,
+        ...errorMsg !== void 0 ? { error: errorMsg } : {},
+        ...eventCount !== void 0 ? { eventCount } : {},
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
     }
   }
   observeForSummary(event) {
@@ -1059,14 +1366,46 @@ var FileSessionWriter = class _FileSessionWriter {
       outcome: this.outcome ?? "completed"
     };
     if (this.manifestFile) {
+      const t0 = Date.now();
+      let outcome = "success";
+      let errorMsg;
       try {
         await atomicWrite(this.manifestFile, JSON.stringify(this.summary), { mode: 384 });
-      } catch {
+      } catch (err) {
+        outcome = "failure";
+        errorMsg = toErrorMessage(err);
+      } finally {
+        this.events?.emit("storage.write", {
+          sessionId: this.id,
+          store: "session",
+          filePath: this.manifestFile,
+          operation: "close",
+          outcome,
+          durationMs: Date.now() - t0,
+          ...errorMsg !== void 0 ? { error: errorMsg } : {},
+          ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+        });
       }
     }
+    const idxT0 = Date.now();
+    let idxOutcome = "success";
+    let idxError;
     try {
       await this.onCloseCb?.(this.summary);
-    } catch {
+    } catch (err) {
+      idxOutcome = "failure";
+      idxError = toErrorMessage(err);
+    } finally {
+      this.events?.emit("storage.write", {
+        sessionId: this.summary.id,
+        store: "session",
+        filePath: this.filePath,
+        operation: "index_append",
+        outcome: idxOutcome,
+        durationMs: Date.now() - idxT0,
+        ...idxError !== void 0 ? { error: idxError } : {},
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
     }
     try {
       await this.handle.close();
@@ -1225,28 +1564,86 @@ function userInputTitle(content) {
 }
 var QueueStore = class {
   file;
+  // Use `| undefined` (not `?`) so exactOptionalPropertyTypes doesn't
+  // reject assigning an optional constructor parameter to these fields.
+  events;
+  traceId;
   constructor(opts) {
-    this.file = path13.join(opts.dir, "queue.json");
+    this.file = path2.join(opts.dir, "queue.json");
+    this.events = opts.events;
+    this.traceId = opts.traceId;
   }
   async write(items) {
+    const t0 = Date.now();
     if (items.length === 0) {
       await this.clear();
       return;
     }
-    await atomicWrite(this.file, JSON.stringify(items), { mode: 384 });
+    try {
+      await atomicWrite(this.file, JSON.stringify(items), { mode: 384 });
+      this.events?.emit("storage.write", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "write",
+        outcome: "success",
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
+    } catch (err) {
+      this.events?.emit("storage.error", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "write",
+        outcome: "failure",
+        error: toErrorMessage(err),
+        recoverable: false,
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
+      console.warn(JSON.stringify({
+        level: "warn",
+        event: "queue_store.write_failed",
+        path: this.file,
+        message: toErrorMessage(err),
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      }));
+    }
   }
   async read() {
+    const t0 = Date.now();
     let raw;
     try {
       raw = await fsp.readFile(this.file, "utf8");
     } catch (err) {
       const code = err.code;
-      if (code === "ENOENT") return [];
+      if (code === "ENOENT") {
+        this.events?.emit("storage.read", {
+          sessionId: this.traceId ?? "~boot~",
+          store: "queue",
+          filePath: this.file,
+          operation: "read",
+          outcome: "success",
+          durationMs: Date.now() - t0,
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+        return [];
+      }
+      this.events?.emit("storage.error", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "read",
+        outcome: "failure",
+        error: toErrorMessage(err),
+        recoverable: true,
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
       console.warn(JSON.stringify({
         level: "warn",
         event: "queue_store.read_failed",
         path: this.file,
-        message: err instanceof Error ? err.message : String(err),
+        message: toErrorMessage(err),
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       }));
       return [];
@@ -1255,9 +1652,40 @@ var QueueStore = class {
     try {
       parsed = JSON.parse(raw);
     } catch {
+      this.events?.emit("storage.read", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "read",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "parse_failed",
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
+      return [];
+    }
+    if (!Array.isArray(parsed)) {
+      this.events?.emit("storage.read", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "read",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "invalid_schema",
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
       return [];
     }
-    if (!Array.isArray(parsed)) return [];
+    this.events?.emit("storage.read", {
+      sessionId: this.traceId ?? "~boot~",
+      store: "queue",
+      filePath: this.file,
+      operation: "read",
+      outcome: "success",
+      durationMs: Date.now() - t0,
+      ...this.traceId !== void 0 && { traceId: this.traceId }
+    });
     const out = [];
     for (const v of parsed) {
       if (isPersistedQueueItem(v)) out.push(v);
@@ -1265,11 +1693,31 @@ var QueueStore = class {
     return out;
   }
   async clear() {
+    const t0 = Date.now();
     try {
       await fsp.unlink(this.file);
+      this.events?.emit("storage.write", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "clear",
+        outcome: "success",
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
     } catch (err) {
       const code = err.code;
       if (code === "ENOENT") return;
+      this.events?.emit("storage.error", {
+        sessionId: this.traceId ?? "~boot~",
+        store: "queue",
+        filePath: this.file,
+        operation: "clear",
+        outcome: "failure",
+        error: toErrorMessage(err),
+        recoverable: true,
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
       console.warn(JSON.stringify({
         level: "warn",
         event: "queue_store.clear_failed",
@@ -1305,7 +1753,7 @@ var DefaultAttachmentStore = class {
     let data = input.data;
     if (this.spoolDir && bytes >= this.spoolThreshold) {
       await fsp.mkdir(this.spoolDir, { recursive: true });
-      spooledPath = path13.join(this.spoolDir, `${id}.bin`);
+      spooledPath = path2.join(this.spoolDir, `${id}.bin`);
       await atomicWrite(spooledPath, input.data, {
         encoding: input.kind === "image" ? "base64" : "utf8"
       });
@@ -1516,7 +1964,7 @@ var FileMemoryBackend = class {
   }
   async remember(scope, entry, filePath) {
     const file = this.resolveFile(filePath, scope);
-    await ensureDir(path13.dirname(file));
+    await ensureDir(path2.dirname(file));
     let existing = "";
     try {
       existing = await fsp.readFile(file, "utf8");
@@ -1652,6 +2100,7 @@ var MAX_BYTES_TOTAL = 32e3;
 var DefaultMemoryStore = class {
   files;
   events;
+  traceId;
   backend;
   /**
    * Per-scope serialization queue. `remember` / `forget` / `consolidate` /
@@ -1717,15 +2166,70 @@ var DefaultMemoryStore = class {
       if (writeErr) {
         parts.push(`> \u26A0\uFE0F Memory write error (${labelOf(scope)}): ${writeErr.message}`);
       }
-      const body = await this.backend.readAll(scope, this.files[scope]);
-      if (body.trim()) parts.push(`## ${labelOf(scope)}
+      const t0 = Date.now();
+      const filePath = this.files[scope];
+      try {
+        const body = await this.backend.readAll(scope, filePath);
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.read", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "readAll",
+          outcome: "success",
+          durationMs: dur,
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+        if (body.trim()) parts.push(`## ${labelOf(scope)}
 
 ${body.trim()}`);
+      } catch (err) {
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.read", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "readAll",
+          outcome: "failure",
+          durationMs: dur,
+          error: toErrorMessage(err),
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+        throw err;
+      }
     }
     return parts.join("\n\n");
   }
   async read(scope) {
-    return this.backend.readAll(scope, this.files[scope]);
+    const t0 = Date.now();
+    const filePath = this.files[scope];
+    try {
+      const body = await this.backend.readAll(scope, filePath);
+      const dur = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId: "~memory~",
+        store: "memory",
+        filePath,
+        operation: "read",
+        outcome: "success",
+        durationMs: dur,
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
+      return body;
+    } catch (err) {
+      const dur = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId: "~memory~",
+        store: "memory",
+        filePath,
+        operation: "read",
+        outcome: "failure",
+        durationMs: dur,
+        error: toErrorMessage(err),
+        ...this.traceId !== void 0 && { traceId: this.traceId }
+      });
+      throw err;
+    }
   }
   /**
    * List entries from a scope, newest first. Delegates to the backend
@@ -1751,7 +2255,34 @@ ${body.trim()}`);
     const ts = (/* @__PURE__ */ new Date()).toISOString();
     return this.runSerialized(scope, async () => {
       const entry = { scope, text, ts, ...metadata };
-      await this.backend.remember(scope, entry, this.files[scope]);
+      const filePath = this.files[scope];
+      const t0 = Date.now();
+      try {
+        await this.backend.remember(scope, entry, filePath);
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.write", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "remember",
+          outcome: "success",
+          durationMs: dur,
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+      } catch (err) {
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.write", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "remember",
+          outcome: "failure",
+          durationMs: dur,
+          error: toErrorMessage(err),
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+        throw err;
+      }
       const raw = await this.backend.readAll(scope, this.files[scope]);
       if (Buffer.byteLength(raw, "utf8") > MAX_BYTES_TOTAL) {
         const removed = await this.backend.consolidate(scope, this.files[scope]);
@@ -1879,7 +2410,35 @@ ${body.trim()}`);
   }
   async forget(query, scope = "project-memory") {
     return this.runSerialized(scope, async () => {
-      const removed = await this.backend.forget(scope, query, this.files[scope]);
+      const filePath = this.files[scope];
+      const t0 = Date.now();
+      let removed = 0;
+      try {
+        removed = await this.backend.forget(scope, query, filePath);
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.write", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "forget",
+          outcome: "success",
+          durationMs: dur,
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+      } catch (err) {
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.write", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "forget",
+          outcome: "failure",
+          durationMs: dur,
+          error: toErrorMessage(err),
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+        throw err;
+      }
       if (removed > 0) {
         this.events?.emit("memory.forgotten", {
           scope,
@@ -1893,7 +2452,35 @@ ${body.trim()}`);
   }
   async consolidate(scope) {
     return this.runSerialized(scope, async () => {
-      const removed = await this.backend.consolidate(scope, this.files[scope]);
+      const filePath = this.files[scope];
+      const t0 = Date.now();
+      let removed = 0;
+      try {
+        removed = await this.backend.consolidate(scope, filePath);
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.write", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "consolidate",
+          outcome: "success",
+          durationMs: dur,
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+      } catch (err) {
+        const dur = Date.now() - t0;
+        this.events?.emit("storage.write", {
+          sessionId: "~memory~",
+          store: "memory",
+          filePath,
+          operation: "consolidate",
+          outcome: "failure",
+          durationMs: dur,
+          error: toErrorMessage(err),
+          ...this.traceId !== void 0 && { traceId: this.traceId }
+        });
+        throw err;
+      }
       if (removed > 0) {
         this.events?.emit("memory.consolidated", {
           scope,
@@ -1906,7 +2493,34 @@ ${body.trim()}`);
   async clear(scope) {
     if (scope) {
       await this.runSerialized(scope, async () => {
-        await this.backend.clear(scope, this.files[scope]);
+        const filePath = this.files[scope];
+        const t0 = Date.now();
+        try {
+          await this.backend.clear(scope, filePath);
+          const dur = Date.now() - t0;
+          this.events?.emit("storage.write", {
+            sessionId: "~memory~",
+            store: "memory",
+            filePath,
+            operation: "clear",
+            outcome: "success",
+            durationMs: dur,
+            ...this.traceId !== void 0 && { traceId: this.traceId }
+          });
+        } catch (err) {
+          const dur = Date.now() - t0;
+          this.events?.emit("storage.write", {
+            sessionId: "~memory~",
+            store: "memory",
+            filePath,
+            operation: "clear",
+            outcome: "failure",
+            durationMs: dur,
+            error: toErrorMessage(err),
+            ...this.traceId !== void 0 && { traceId: this.traceId }
+          });
+          throw err;
+        }
         this.events?.emit("memory.cleared", { scope });
         await this.mirrorBackup(scope);
       });
@@ -1914,15 +2528,54 @@ ${body.trim()}`);
     }
     await Promise.all(
       ["project-agents", "project-memory", "user-memory"].map(
-        (s) => this.runSerialized(s, async () => {
-          await this.backend.clear(s, this.files[s]);
+        async (s) => this.runSerialized(s, async () => {
+          const filePath = this.files[s];
+          const t0 = Date.now();
+          try {
+            await this.backend.clear(s, filePath);
+            const dur = Date.now() - t0;
+            this.events?.emit("storage.write", {
+              sessionId: "~memory~",
+              store: "memory",
+              filePath,
+              operation: "clear",
+              outcome: "success",
+              durationMs: dur,
+              ...this.traceId !== void 0 && { traceId: this.traceId }
+            });
+          } catch (err) {
+            const dur = Date.now() - t0;
+            this.events?.emit("storage.write", {
+              sessionId: "~memory~",
+              store: "memory",
+              filePath,
+              operation: "clear",
+              outcome: "failure",
+              durationMs: dur,
+              error: toErrorMessage(err),
+              ...this.traceId !== void 0 && { traceId: this.traceId }
+            });
+            throw err;
+          }
           this.events?.emit("memory.cleared", { scope: s });
           await this.mirrorBackup(s);
         })
       )
     );
   }
-  /** Mirror current memory content to the persistent backup directory. */
+  /**
+   * Return a new MemoryStore proxy that carries `traceId` on every storage
+   * event. The original store is left unchanged — callers that need a
+   * trace-decorated view (e.g. session-run tools) receive the proxy while
+   * the singleton remains trace-free for boot-time use.
+   *
+   * The proxy implements the full `MemoryStore` interface; all other
+   * properties (backend, etc.) are delegated to the original store.
+   */
+  withTraceId(traceId) {
+    this.traceId = traceId;
+    return this;
+  }
   async mirrorBackup(scope) {
     if (!this.persistBackup || scope === "project-agents") return;
     try {
@@ -2460,7 +3113,7 @@ var DefaultConfigStore = class {
         console.error(JSON.stringify({
           level: "error",
           event: "config_store.watcher_threw",
-          message: err instanceof Error ? err.message : String(err),
+          message: toErrorMessage(err),
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         }));
       }
@@ -2484,67 +3137,6 @@ function deepFreeze(obj) {
   }
   return Object.freeze(obj);
 }
-
-// src/utils/deep-merge.ts
-var FORBIDDEN_PROTO_KEYS = /* @__PURE__ */ new Set([
-  "__proto__",
-  "constructor",
-  "prototype",
-  "__defineGetter__",
-  "__defineSetter__",
-  "__lookupGetter__",
-  "__lookupSetter__"
-]);
-function isPrimitiveArray(a) {
-  return a.every((v) => v === null || typeof v !== "object" && typeof v !== "function");
-}
-function deepMerge(base, patch, options = {}) {
-  const {
-    conflictResolution = "prefer-patch",
-    arrayMode = "replace",
-    protectProto = true,
-    onNonPrimitiveArrayReplace
-  } = options;
-  if (typeof base !== "object" || base === null) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  if (typeof patch !== "object" || patch === null) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  if (Array.isArray(base) && Array.isArray(patch)) {
-    if (arrayMode === "concat-primitives" && isPrimitiveArray(base) && isPrimitiveArray(patch)) {
-      return [.../* @__PURE__ */ new Set([...base, ...patch])];
-    }
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  if (Array.isArray(base) || Array.isArray(patch)) {
-    return conflictResolution === "prefer-patch" ? patch : base;
-  }
-  const baseObj = base;
-  const patchObj = patch;
-  const out = { ...baseObj };
-  for (const [k, v] of Object.entries(patchObj)) {
-    if (protectProto && FORBIDDEN_PROTO_KEYS.has(k)) continue;
-    const existing = out[k];
-    if (v !== null && typeof v === "object" && !Array.isArray(v) && existing !== null && typeof existing === "object" && !Array.isArray(existing)) {
-      out[k] = deepMerge(existing, v, options);
-    } else if (Array.isArray(v) && Array.isArray(existing)) {
-      if (onNonPrimitiveArrayReplace && !isPrimitiveArray(v)) {
-        onNonPrimitiveArrayReplace(k, existing.length, v.length);
-      }
-      out[k] = deepMerge(existing, v, options);
-    } else if (v !== void 0) {
-      if (onNonPrimitiveArrayReplace && Array.isArray(v) && !isPrimitiveArray(v)) {
-        const existingLen = Array.isArray(existing) ? existing.length : 0;
-        onNonPrimitiveArrayReplace(k, existingLen, v.length);
-      }
-      out[k] = v;
-    }
-  }
-  return out;
-}
-
-// src/security/secret-vault.ts
 function decryptConfigSecrets(cfg, vault, opts) {
   const warn = ((msg) => console.warn(msg));
   return walk(cfg, vault, (v, key) => {
@@ -2635,21 +3227,6 @@ function isContextWindowModeId(id) {
   return CONTEXT_WINDOW_MODES.some((m) => m.id === id);
 }
 
-// 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: err instanceof Error ? err.message : String(err)
-    };
-  }
-}
-
 // src/types/default-config.ts
 var DEFAULT_TOOLS_CONFIG = Object.freeze({
   defaultExecutionStrategy: "smart",
@@ -2673,6 +3250,13 @@ var DEFAULT_SESSION_LOGGING_CONFIG = Object.freeze({
 });
 
 // src/storage/config-loader.ts
+function storageErrorString(err) {
+  if (err instanceof Error) {
+    const code = err.code;
+    return code ? `${code}: ${err.message}` : err.message;
+  }
+  return String(err);
+}
 var BEHAVIOR_DEFAULTS = {
   version: 1,
   context: {
@@ -2775,11 +3359,15 @@ var DefaultConfigLoader = class {
   strict;
   vault;
   extraSources;
+  events;
+  traceId;
   constructor(opts) {
     this.paths = opts.paths;
     this.strict = opts.strict ?? false;
     this.vault = opts.vault;
     this.extraSources = opts.sources ?? [];
+    this.events = opts.events;
+    this.traceId = opts.traceId;
   }
   async load(opts = {}) {
     let cfg = { ...BEHAVIOR_DEFAULTS };
@@ -2811,7 +3399,7 @@ var DefaultConfigLoader = class {
           level: "warn",
           event: "config.source_load_failed",
           source: src.name,
-          message: err instanceof Error ? err.message : String(err),
+          message: toErrorMessage(err),
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         }));
       }
@@ -2856,7 +3444,33 @@ var DefaultConfigLoader = class {
     if (this.vault && toWrite.githubToken && !toWrite.githubToken.startsWith("enc:")) {
       toWrite = { ...toWrite, githubToken: this.vault.encrypt(toWrite.githubToken) };
     }
-    await atomicWrite(this.paths.syncConfig, JSON.stringify(toWrite, null, 2), { mode: 384 });
+    const fp = this.paths.syncConfig;
+    const t0 = Date.now();
+    try {
+      await atomicWrite(fp, JSON.stringify(toWrite, null, 2), { mode: 384 });
+      this.events?.emit("storage.write", {
+        sessionId: "~config~",
+        store: "config",
+        filePath: fp,
+        operation: "persist_sync",
+        outcome: "success",
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+    } catch (err) {
+      this.events?.emit("storage.error", {
+        sessionId: "~config~",
+        store: "config",
+        filePath: fp,
+        operation: "persist_sync",
+        outcome: "failure",
+        error: storageErrorString(err),
+        recoverable: false,
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   /**
    * Read ~/.wrongstack/sync.json (encrypted GitHub token storage) and decrypt
@@ -2865,21 +3479,64 @@ var DefaultConfigLoader = class {
    * isolated — it should never be part of project-local or env-driven config.
    */
   async loadSyncConfig() {
+    const fp = this.paths.syncConfig;
+    const t0 = Date.now();
     try {
-      const raw = await fsp.readFile(this.paths.syncConfig, "utf8");
+      const raw = await fsp.readFile(fp, "utf8");
       const parsed = safeParse(raw);
-      if (!parsed.ok || !parsed.value) return null;
+      if (!parsed.ok || !parsed.value) {
+        this.events?.emit("storage.read", {
+          sessionId: "~config~",
+          store: "config",
+          filePath: fp,
+          operation: "load_sync",
+          outcome: "failure",
+          durationMs: Date.now() - t0,
+          error: "parse error or empty file",
+          ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+        });
+        return null;
+      }
       if (this.vault) {
         const decrypted = decryptConfigSecrets({ sync: parsed.value }, this.vault);
-        return decrypted.sync ?? null;
+        const result = decrypted.sync ?? null;
+        this.events?.emit("storage.read", {
+          sessionId: "~config~",
+          store: "config",
+          filePath: fp,
+          operation: "load_sync",
+          outcome: "success",
+          durationMs: Date.now() - t0,
+          ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+        });
+        return result;
       }
+      this.events?.emit("storage.read", {
+        sessionId: "~config~",
+        store: "config",
+        filePath: fp,
+        operation: "load_sync",
+        outcome: "success",
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
       return parsed.value;
     } catch (err) {
       if (err.code === "ENOENT") return null;
+      this.events?.emit("storage.read", {
+        sessionId: "~config~",
+        store: "config",
+        filePath: fp,
+        operation: "load_sync",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: storageErrorString(err),
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
       console.warn(JSON.stringify({
         level: "warn",
         event: "config.sync_load_failed",
-        message: err instanceof Error ? err.message : String(err),
+        message: toErrorMessage(err),
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       }));
       return null;
@@ -2887,15 +3544,26 @@ var DefaultConfigLoader = class {
   }
   async readJson(file) {
     let raw;
+    const t0 = Date.now();
     try {
       raw = await fsp.readFile(file, "utf8");
     } catch (err) {
       if (err.code !== "ENOENT") {
+        this.events?.emit("storage.read", {
+          sessionId: "~config~",
+          store: "config",
+          filePath: file,
+          operation: "read_json",
+          outcome: "failure",
+          durationMs: Date.now() - t0,
+          error: storageErrorString(err),
+          ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+        });
         console.warn(JSON.stringify({
           level: "warn",
           event: "config.read_failed",
           path: file,
-          message: err instanceof Error ? err.message : String(err),
+          message: toErrorMessage(err),
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
         }));
       }
@@ -2903,6 +3571,16 @@ var DefaultConfigLoader = class {
     }
     const parsed = safeParse(raw);
     if (!parsed.ok || !parsed.value) {
+      this.events?.emit("storage.read", {
+        sessionId: "~config~",
+        store: "config",
+        filePath: file,
+        operation: "read_json",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "parse error or empty file",
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
       console.warn(JSON.stringify({
         level: "warn",
         event: "config.parse_failed",
@@ -3036,7 +3714,7 @@ var RecoveryLock = class {
   sessionStore;
   probe;
   constructor(opts) {
-    this.file = path13.join(opts.dir, LOCK_FILE);
+    this.file = path2.join(opts.dir, LOCK_FILE);
     this.pid = opts.pid ?? process.pid;
     this.hostname = opts.hostname ?? os.hostname();
     this.maxAgeMs = opts.maxAgeMs ?? DEFAULT_MAX_AGE_MS;
@@ -3097,7 +3775,7 @@ var RecoveryLock = class {
    * null return before calling this.
    */
   async write(sessionId) {
-    await ensureDir(path13.dirname(this.file));
+    await ensureDir(path2.dirname(this.file));
     const lock = {
       v: 1,
       sessionId,
@@ -3164,42 +3842,6 @@ function defaultIsPidAlive(pid) {
   }
 }
 
-// src/utils/regex-guard.ts
-var MAX_PATTERN_LEN = 512;
-var DANGEROUS_PATTERNS = [
-  /(\([^)]*[+*][^)]*\))[+*]/,
-  // (a+)+, (.*)+, etc
-  /(\(\?:[^)]*[+*][^)]*\))[+*]/
-  // same, with non-capturing group
-];
-function compileUserRegex(pattern, flags) {
-  if (typeof pattern !== "string") {
-    return { ok: false, reason: "pattern must be a string" };
-  }
-  if (pattern.length === 0) {
-    return { ok: false, reason: "pattern is empty" };
-  }
-  if (pattern.length > MAX_PATTERN_LEN) {
-    return { ok: false, reason: `pattern exceeds ${MAX_PATTERN_LEN} characters` };
-  }
-  for (const rx of DANGEROUS_PATTERNS) {
-    if (rx.test(pattern)) {
-      return {
-        ok: false,
-        reason: "pattern looks vulnerable to catastrophic backtracking \u2014 rewrite without nested quantifiers"
-      };
-    }
-  }
-  try {
-    return { ok: true, regex: new RegExp(pattern, flags) };
-  } catch (err) {
-    return {
-      ok: false,
-      reason: err instanceof Error ? err.message : "invalid regex"
-    };
-  }
-}
-
 // src/storage/session-reader.ts
 var DefaultSessionReader = class {
   store;
@@ -3479,9 +4121,9 @@ function sessionScopedPath(dir, sessionId, suffix) {
   if (!sessionId || sessionId.includes("\\") || sessionId.includes("..")) {
     throw invalid(sessionId);
   }
-  const resolved = path13.resolve(dir, `${sessionId}${suffix}`);
-  const rel = path13.relative(path13.resolve(dir), resolved);
-  if (rel.startsWith("..") || path13.isAbsolute(rel)) {
+  const resolved = path2.resolve(dir, `${sessionId}${suffix}`);
+  const rel = path2.relative(path2.resolve(dir), resolved);
+  if (rel.startsWith("..") || path2.isAbsolute(rel)) {
     throw invalid(sessionId);
   }
   return resolved;
@@ -3501,20 +4143,53 @@ var MAX_TEXT_LENGTH = 2e3;
 var MAX_ANNOTATIONS = 1e3;
 var AnnotationsStore = class {
   dir;
+  events;
+  traceId;
   /** Per-session write queue. Created lazily on first add. */
   writeChains = /* @__PURE__ */ new Map();
   constructor(opts) {
     this.dir = opts.dir;
+    this.events = opts.events;
+    this.traceId = opts.traceId;
   }
   // ── Reads ──────────────────────────────────────────────────────────────
   /**
    * Return all annotations for `sessionId` in insertion order
    * (oldest first). Returns an empty array when no file exists
-   * yet (the normal case for a fresh session).
+   * yet (the normal case for a fresh session) and also degrades
+   * gracefully to `[]` on a read error (permissions, corruption) —
+   * the failure is still surfaced via a `storage.read` event so it
+   * never silently hides I/O problems from observers.
    */
   async list(sessionId) {
-    const file = await this.readFile(sessionId);
-    return file ? file.annotations : [];
+    const t0 = Date.now();
+    const fp = this.filePath(sessionId);
+    try {
+      const file = await this.readFile(sessionId);
+      const durationMs = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "annotations",
+        filePath: fp,
+        operation: "list",
+        outcome: "success",
+        durationMs,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      return file ? file.annotations : [];
+    } catch (err) {
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "annotations",
+        filePath: fp,
+        operation: "list",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: toErrorMessage(err),
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      return [];
+    }
   }
   /**
    * Convenience: only unresolved annotations, newest first — the
@@ -3566,25 +4241,62 @@ var AnnotationsStore = class {
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
       resolved: false
     };
-    await this.enqueue(input.sessionId, async () => {
-      await withFileLock(this.filePath(input.sessionId), async () => {
-        const all = await this.list(input.sessionId);
-        all.push(annotation);
-        if (all.length > MAX_ANNOTATIONS) {
-          const sorted = all.map((a, i) => ({ a, i })).sort((x, y) => {
-            if (x.a.resolved !== y.a.resolved) return x.a.resolved ? 1 : -1;
-            return x.a.createdAt.localeCompare(y.a.createdAt);
-          });
-          const evictCount = all.length - MAX_ANNOTATIONS;
-          const toEvict = new Set(sorted.slice(0, evictCount).map((s) => s.a.id));
-          const kept = all.filter((a) => !toEvict.has(a.id));
-          await this.writeFile(input.sessionId, { version: FILE_VERSION, annotations: kept });
-        } else {
-          await this.writeFile(input.sessionId, { version: FILE_VERSION, annotations: all });
-        }
+    const fp = this.filePath(input.sessionId);
+    const t0 = Date.now();
+    try {
+      await this.enqueue(input.sessionId, async () => {
+        await withFileLock(fp, async () => {
+          const all = await this.list(input.sessionId);
+          all.push(annotation);
+          if (all.length > MAX_ANNOTATIONS) {
+            const sorted = all.map((a, i) => ({ a, i })).sort((x, y) => {
+              if (x.a.resolved !== y.a.resolved) return x.a.resolved ? 1 : -1;
+              return x.a.createdAt.localeCompare(y.a.createdAt);
+            });
+            const evictCount = all.length - MAX_ANNOTATIONS;
+            const toEvict = new Set(sorted.slice(0, evictCount).map((s) => s.a.id));
+            const kept = all.filter((a) => !toEvict.has(a.id));
+            await this.writeFile(input.sessionId, { version: FILE_VERSION, annotations: kept });
+            const durationMs = Date.now() - t0;
+            this.events?.emit("storage.write", {
+              sessionId: input.sessionId,
+              store: "annotations",
+              filePath: fp,
+              operation: "evict",
+              outcome: "success",
+              durationMs,
+              ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+            });
+          } else {
+            await this.writeFile(input.sessionId, { version: FILE_VERSION, annotations: all });
+            const durationMs = Date.now() - t0;
+            this.events?.emit("storage.write", {
+              sessionId: input.sessionId,
+              store: "annotations",
+              filePath: fp,
+              operation: "add",
+              outcome: "success",
+              durationMs,
+              ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+            });
+          }
+        });
       });
-    });
-    return annotation;
+      return annotation;
+    } catch (err) {
+      this.events?.emit("storage.error", {
+        sessionId: input.sessionId,
+        store: "annotations",
+        filePath: fp,
+        operation: "add",
+        outcome: "failure",
+        error: toErrorMessage(err),
+        recoverable: false,
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   /**
    * Mark an annotation as resolved. Returns the updated record, or
@@ -3594,26 +4306,53 @@ var AnnotationsStore = class {
    */
   async resolve(input) {
     let updated = null;
-    await this.enqueue(input.sessionId, async () => {
-      await withFileLock(this.filePath(input.sessionId), async () => {
-        const all = await this.list(input.sessionId);
-        const idx = all.findIndex((a) => a.id === input.annotationId);
-        if (idx === -1) {
-          updated = null;
-          return;
-        }
-        const next = {
-          ...expectDefined(all[idx]),
-          resolved: true,
-          resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
-          resolvedBy: input.resolvedBy
-        };
-        all[idx] = next;
-        await this.writeFile(input.sessionId, { version: FILE_VERSION, annotations: all });
-        updated = next;
+    const fp = this.filePath(input.sessionId);
+    const t0 = Date.now();
+    try {
+      await this.enqueue(input.sessionId, async () => {
+        await withFileLock(fp, async () => {
+          const all = await this.list(input.sessionId);
+          const idx = all.findIndex((a) => a.id === input.annotationId);
+          if (idx === -1) {
+            updated = null;
+            return;
+          }
+          const next = {
+            ...expectDefined(all[idx]),
+            resolved: true,
+            resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            resolvedBy: input.resolvedBy
+          };
+          all[idx] = next;
+          await this.writeFile(input.sessionId, { version: FILE_VERSION, annotations: all });
+          updated = next;
+          const durationMs = Date.now() - t0;
+          this.events?.emit("storage.write", {
+            sessionId: input.sessionId,
+            store: "annotations",
+            filePath: fp,
+            operation: "resolve",
+            outcome: "success",
+            durationMs,
+            ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+          });
+        });
       });
-    });
-    return updated;
+      return updated;
+    } catch (err) {
+      this.events?.emit("storage.error", {
+        sessionId: input.sessionId,
+        store: "annotations",
+        filePath: fp,
+        operation: "resolve",
+        outcome: "failure",
+        error: toErrorMessage(err),
+        recoverable: false,
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   // ── Internals ──────────────────────────────────────────────────────────
   filePath(sessionId) {
@@ -3621,16 +4360,21 @@ var AnnotationsStore = class {
   }
   async readFile(sessionId) {
     const fp = this.filePath(sessionId);
+    let raw;
+    try {
+      raw = await fsp.readFile(fp, "utf8");
+    } catch (err) {
+      if (err.code === "ENOENT") return null;
+      throw err;
+    }
     try {
-      const raw = await fsp.readFile(fp, "utf8");
       const parsed = JSON.parse(raw);
       if (parsed.version !== FILE_VERSION) {
         return { version: FILE_VERSION, annotations: [] };
       }
       return parsed;
-    } catch (err) {
-      if (err.code === "ENOENT") return null;
-      return { version: FILE_VERSION, annotations: [] };
+    } catch {
+      return null;
     }
   }
   async writeFile(sessionId, file) {
@@ -3684,9 +4428,20 @@ function hashRequest(request) {
   const digest = createHash("sha256").update(json, "utf8").digest("hex");
   return `sha256:${digest}`;
 }
+
+// src/storage/replay-log-store.ts
+function storageErrorString2(err) {
+  if (err instanceof Error) {
+    const code = err.code;
+    return code ? `${code}: ${err.message}` : err.message;
+  }
+  return String(err);
+}
 var DEFAULT_MAX_ENTRIES = 1e3;
 var ReplayLogStore = class {
   dir;
+  events;
+  traceId;
   writeChains = /* @__PURE__ */ new Map();
   /** Per-session hash → entry index, kept in memory after the first load. */
   cache = /* @__PURE__ */ new Map();
@@ -3695,6 +4450,8 @@ var ReplayLogStore = class {
   maxEntries;
   constructor(opts) {
     this.dir = opts.dir;
+    this.events = opts.events;
+    this.traceId = opts.traceId;
     this.maxEntries = opts.maxEntries ?? DEFAULT_MAX_ENTRIES;
   }
   // ── Writes ──────────────────────────────────────────────────────────────
@@ -3705,38 +4462,61 @@ var ReplayLogStore = class {
    */
   async record(input) {
     const hash = hashRequest(input.request);
-    await this.enqueue(input.sessionId, async () => {
-      await withFileLock(this.filePath(input.sessionId), async () => {
-        const entries = await this.readAll(input.sessionId);
-        if (entries.some((entry2) => entry2.hash === hash)) return;
-        const entry = {
-          hash,
-          ts: (/* @__PURE__ */ new Date()).toISOString(),
-          request: input.request,
-          response: input.response
-        };
-        entries.push(entry);
-        const keep = entries.slice(-this.maxEntries);
-        const cache = /* @__PURE__ */ new Map();
-        for (const e of keep) cache.set(e.hash, e);
-        this.cache.set(input.sessionId, cache);
-        await this.rewriteCache(input.sessionId, cache);
+    const fp = this.filePath(input.sessionId);
+    const t0 = Date.now();
+    try {
+      await this.enqueue(input.sessionId, async () => {
+        await withFileLock(fp, async () => {
+          const cache = await this.ensureCache(input.sessionId);
+          if (cache.has(hash)) return;
+          const entry = {
+            hash,
+            ts: (/* @__PURE__ */ new Date()).toISOString(),
+            request: input.request,
+            response: input.response
+          };
+          const currentCount = this.diskCount.get(input.sessionId) ?? 0;
+          const willEvict = currentCount + 1 > this.maxEntries;
+          if (!willEvict) {
+            await fsp.appendFile(fp, JSON.stringify(entry) + "\n", "utf8");
+            cache.set(hash, entry);
+            this.diskCount.set(input.sessionId, currentCount + 1);
+            this.events?.emit("storage.write", {
+              sessionId: input.sessionId,
+              store: "replay",
+              filePath: fp,
+              operation: "record",
+              outcome: "success",
+              durationMs: Date.now() - t0,
+              ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+            });
+            return;
+          }
+          const all = await this.readAll(input.sessionId);
+          all.push(entry);
+          const keep = all.slice(-this.maxEntries);
+          const refreshed = /* @__PURE__ */ new Map();
+          for (const e of keep) refreshed.set(e.hash, e);
+          this.cache.set(input.sessionId, refreshed);
+          this.diskCount.set(input.sessionId, keep.length);
+          await this.writeAll(input.sessionId, keep, "compact");
+        });
       });
-    });
-    return hash;
-  }
-  /**
-   * Compact the replay log to keep only the most recent maxEntries.
-   * Called when entry count exceeds the cap. Rewrites the entire file
-   * but only happens O(n / maxEntries) times per session.
-   */
-  async rewriteCache(sessionId, cache) {
-    const all = [...cache.values()];
-    const keep = all.slice(-this.maxEntries);
-    await this.writeAll(sessionId, keep);
-    cache.clear();
-    for (const e of keep) cache.set(e.hash, e);
-    this.diskCount.set(sessionId, keep.length);
+      return hash;
+    } catch (err) {
+      this.events?.emit("storage.error", {
+        sessionId: input.sessionId,
+        store: "replay",
+        filePath: fp,
+        operation: "record",
+        outcome: "failure",
+        error: storageErrorString2(err),
+        recoverable: false,
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   // ── Reads ───────────────────────────────────────────────────────────────
   /**
@@ -3745,13 +4525,65 @@ var ReplayLogStore = class {
    * per session (in-memory cache).
    */
   async lookup(sessionId, hash) {
-    const cache = await this.ensureCache(sessionId);
-    return cache.get(hash) ?? null;
+    const fp = this.filePath(sessionId);
+    const t0 = Date.now();
+    try {
+      const cache = await this.ensureCache(sessionId);
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "replay",
+        filePath: fp,
+        operation: "lookup",
+        outcome: "success",
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      return cache.get(hash) ?? null;
+    } catch (err) {
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "replay",
+        filePath: fp,
+        operation: "lookup",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: storageErrorString2(err),
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   /** All recorded entries for a session, in insertion order. */
   async load(sessionId) {
-    const cache = await this.ensureCache(sessionId);
-    return [...cache.values()];
+    const fp = this.filePath(sessionId);
+    const t0 = Date.now();
+    try {
+      const cache = await this.ensureCache(sessionId);
+      const durationMs = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "replay",
+        filePath: fp,
+        operation: "load",
+        outcome: "success",
+        durationMs,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      return [...cache.values()];
+    } catch (err) {
+      const durationMs = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "replay",
+        filePath: fp,
+        operation: "load",
+        outcome: "failure",
+        durationMs,
+        error: storageErrorString2(err),
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   /**
    * List every session id that has a replay log in the store dir.
@@ -3770,7 +4602,7 @@ var ReplayLogStore = class {
             level: "warn",
             event: "replay_log_store.list_readdir_failed",
             dir,
-            message: err instanceof Error ? err.message : String(err),
+            message: toErrorMessage(err),
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           }));
         }
@@ -3779,7 +4611,7 @@ var ReplayLogStore = class {
       for (const entry of entries) {
         if (entry.name.startsWith(".")) continue;
         if (entry.isDirectory()) {
-          if (depth === 0) await scan(path13.join(dir, entry.name), entry.name, depth + 1);
+          if (depth === 0) await scan(path2.join(dir, entry.name), entry.name, depth + 1);
           continue;
         }
         if (!entry.isFile() || !entry.name.endsWith(".replay.jsonl")) continue;
@@ -3789,7 +4621,7 @@ var ReplayLogStore = class {
         out.push({
           sessionId,
           entryCount: all.length,
-          path: path13.join(dir, entry.name)
+          path: path2.join(dir, entry.name)
         });
       }
     };
@@ -3821,13 +4653,24 @@ var ReplayLogStore = class {
       return out;
     } catch (err) {
       if (err.code === "ENOENT") return [];
-      return [];
+      throw err;
     }
   }
-  async writeAll(sessionId, entries) {
+  async writeAll(sessionId, entries, operation = "record") {
     const fp = this.filePath(sessionId);
+    const t0 = Date.now();
     const body = entries.map((e) => JSON.stringify(e)).join("\n") + (entries.length ? "\n" : "");
     await atomicWrite(fp, body);
+    const durationMs = Date.now() - t0;
+    this.events?.emit("storage.write", {
+      sessionId,
+      store: "replay",
+      filePath: fp,
+      operation,
+      outcome: "success",
+      durationMs,
+      ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+    });
   }
   async ensureCache(sessionId) {
     let cache = this.cache.get(sessionId);
@@ -3867,15 +4710,15 @@ var SessionRecovery = class {
   async detectStale(sessionId) {
     const fp = this.filePath(sessionId);
     const TAIL_SIZE = 8192;
-    let stat5;
+    let stat6;
     try {
-      stat5 = await fsp.stat(fp);
+      stat6 = await fsp.stat(fp);
     } catch (err) {
       if (err.code === "ENOENT") return null;
       return null;
     }
-    if (stat5.size === 0) return null;
-    const position = Math.max(0, stat5.size - TAIL_SIZE);
+    if (stat6.size === 0) return null;
+    const position = Math.max(0, stat6.size - TAIL_SIZE);
     const buf = Buffer.alloc(TAIL_SIZE);
     let fh;
     try {
@@ -3979,7 +4822,7 @@ var SessionRecovery = class {
           continue;
         if (entry.isDirectory()) {
           if (depth === 0) {
-            await collect(path13.join(dir, entry.name), entry.name, depth + 1);
+            await collect(path2.join(dir, entry.name), entry.name, depth + 1);
           }
           continue;
         }
@@ -4005,16 +4848,27 @@ var GENESIS_PREV = "0".repeat(64);
 var DEFAULT_FSYNC_EVERY = 100;
 var ToolAuditLog = class {
   dir;
+  events;
+  traceId;
   /** In-memory cache of the last entry's hash (per session), to compute chains efficiently. */
   tailHash = /* @__PURE__ */ new Map();
   /** In-memory counter for entry indices — avoids re-reading the file on every write. */
   tailIndex = /* @__PURE__ */ new Map();
+  /**
+   * File mtime+size recorded after our last write, per session. Used to
+   * detect cross-process writes (session handoff, recovery) that would
+   * invalidate the in-memory tail cache: if the stat no longer matches
+   * we re-read the file to re-establish the chain tip before appending.
+   */
+  tailStat = /* @__PURE__ */ new Map();
   /** Tracks writes since last fsync, per session. */
   unSyncedWrites = /* @__PURE__ */ new Map();
   writeChains = /* @__PURE__ */ new Map();
   fsyncEvery;
   constructor(opts) {
     this.dir = opts.dir;
+    this.events = opts.events;
+    this.traceId = opts.traceId;
     this.fsyncEvery = opts.fsyncEvery ?? DEFAULT_FSYNC_EVERY;
   }
   /**
@@ -4025,96 +4879,223 @@ var ToolAuditLog = class {
    */
   async record(input) {
     let entry;
-    await this.enqueue(input.sessionId, async () => {
-      await withFileLock(this.filePath(input.sessionId), async () => {
-        const entries = await this.readAll(input.sessionId);
-        const prev = entries.at(-1);
-        const prevHash = prev?.hash ?? GENESIS_PREV;
-        const index = prev ? prev.index + 1 : 0;
-        const id = randomUUID();
-        const ts = (/* @__PURE__ */ new Date()).toISOString();
-        const content = {
-          id,
-          ts,
-          prevHash,
-          toolName: input.toolName,
-          toolUseId: input.toolUseId,
-          input: input.input,
-          output: input.output,
-          isError: input.isError,
-          index
-        };
-        const hash = createHash("sha256").update(stableStringify2(content), "utf8").digest("hex");
-        entry = {
-          id,
-          ts,
-          prevHash,
-          hash,
-          toolName: input.toolName,
-          toolUseId: input.toolUseId,
-          input: input.input,
-          output: input.output,
-          isError: input.isError,
-          index
-        };
-        entries.push(entry);
-        await this.writeAll(input.sessionId, entries);
-        this.tailHash.set(input.sessionId, hash);
-        this.tailIndex.set(input.sessionId, index + 1);
+    const fp = this.filePath(input.sessionId);
+    const t0 = Date.now();
+    try {
+      await this.enqueue(input.sessionId, async () => {
+        await withFileLock(fp, async () => {
+          const tip = await this._resolveChainTip(input.sessionId, fp);
+          const prevHash = tip.prevHash;
+          const index = tip.nextIndex;
+          const id = randomUUID();
+          const ts = (/* @__PURE__ */ new Date()).toISOString();
+          const content = {
+            id,
+            ts,
+            prevHash,
+            toolName: input.toolName,
+            toolUseId: input.toolUseId,
+            input: input.input,
+            output: input.output,
+            isError: input.isError,
+            index
+          };
+          const hash = createHash("sha256").update(stableStringify2(content), "utf8").digest("hex");
+          entry = {
+            id,
+            ts,
+            prevHash,
+            hash,
+            toolName: input.toolName,
+            toolUseId: input.toolUseId,
+            input: input.input,
+            output: input.output,
+            isError: input.isError,
+            index
+          };
+          await fsp.appendFile(fp, JSON.stringify(entry) + "\n", "utf8");
+          try {
+            const st = await fsp.stat(fp);
+            this.tailStat.set(input.sessionId, { mtimeMs: st.mtimeMs, size: st.size });
+          } catch {
+          }
+          this.tailHash.set(input.sessionId, hash);
+          this.tailIndex.set(input.sessionId, index + 1);
+          await this._trackUnsynced(input.sessionId, fp);
+          const durationMs = Date.now() - t0;
+          this.events?.emit("storage.write", {
+            sessionId: input.sessionId,
+            store: "audit",
+            filePath: fp,
+            operation: "record",
+            outcome: "success",
+            durationMs,
+            ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+          });
+        });
       });
-    });
-    return entry;
+      return entry;
+    } catch (err) {
+      this.events?.emit("storage.error", {
+        sessionId: input.sessionId,
+        store: "audit",
+        filePath: fp,
+        operation: "record",
+        outcome: "failure",
+        error: toErrorMessage(err),
+        recoverable: false,
+        durationMs: Date.now() - t0,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
+  }
+  /**
+   * Resolve the chain tip (previous hash + next index) for an append.
+   * Uses the in-memory `tailHash`/`tailIndex` cache when the file's
+   * stat matches our last known write; falls back to a full read on
+   * cache miss or when an external writer has extended the file.
+   */
+  async _resolveChainTip(sessionId, fp) {
+    const cachedHash = this.tailHash.get(sessionId);
+    const cachedIndex = this.tailIndex.get(sessionId);
+    const cachedStat = this.tailStat.get(sessionId);
+    if (cachedHash !== void 0 && cachedIndex !== void 0 && cachedStat) {
+      try {
+        const st = await fsp.stat(fp);
+        if (st.mtimeMs === cachedStat.mtimeMs && st.size === cachedStat.size) {
+          return { prevHash: cachedHash, nextIndex: cachedIndex };
+        }
+      } catch (err) {
+        if (err.code === "ENOENT") {
+          this.tailHash.delete(sessionId);
+          this.tailIndex.delete(sessionId);
+          this.tailStat.delete(sessionId);
+          return { prevHash: GENESIS_PREV, nextIndex: 0 };
+        }
+        throw err;
+      }
+    }
+    const entries = await this.readAll(sessionId);
+    const prev = entries.at(-1);
+    const prevHash = prev?.hash ?? GENESIS_PREV;
+    const nextIndex = prev ? prev.index + 1 : 0;
+    this.tailHash.set(sessionId, prevHash);
+    this.tailIndex.set(sessionId, nextIndex);
+    try {
+      const st = await fsp.stat(fp);
+      this.tailStat.set(sessionId, { mtimeMs: st.mtimeMs, size: st.size });
+    } catch {
+    }
+    return { prevHash, nextIndex };
   }
   /**
    * Walk the chain and verify every entry's hash and prevHash.
    * Returns a structured verdict — never throws.
    */
   async verify(sessionId) {
-    const entries = await this.readAll(sessionId);
-    if (entries.length === 0) return { ok: true, entries: 0 };
-    if (entries[0]?.prevHash !== GENESIS_PREV) {
-      return {
-        ok: false,
-        brokenAt: 0,
-        reason: "first entry is not the genesis (prevHash != 0\u20260)"
-      };
+    const fp = this.filePath(sessionId);
+    const t0 = Date.now();
+    let entries;
+    try {
+      entries = await this.readAll(sessionId);
+    } catch (err) {
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "audit",
+        filePath: fp,
+        operation: "verify",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: toErrorMessage(err),
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      return { ok: true, entries: 0 };
     }
-    let prevHash = GENESIS_PREV;
-    for (let i = 0; i < entries.length; i++) {
-      const e = expectDefined(entries[i]);
-      if (e.prevHash !== prevHash) {
+    const verdict = (() => {
+      if (entries.length === 0) return { ok: true, entries: 0 };
+      if (entries[0]?.prevHash !== GENESIS_PREV) {
         return {
           ok: false,
-          brokenAt: i,
-          reason: `prevHash mismatch at entry ${i} (expected ${prevHash.slice(0, 8)}\u2026, got ${e.prevHash.slice(0, 8)}\u2026)`
+          brokenAt: 0,
+          reason: "first entry is not the genesis (prevHash != 0\u20260)"
         };
       }
-      const content = {
-        id: e.id,
-        ts: e.ts,
-        prevHash: e.prevHash,
-        toolName: e.toolName,
-        toolUseId: e.toolUseId,
-        input: e.input,
-        output: e.output,
-        isError: e.isError,
-        index: e.index
-      };
-      const expectedHash = createHash("sha256").update(stableStringify2(content), "utf8").digest("hex");
-      if (expectedHash !== e.hash) {
-        return {
-          ok: false,
-          brokenAt: i,
-          reason: `hash mismatch at entry ${i} (entry content was modified)`
+      let prevHash = GENESIS_PREV;
+      for (let i = 0; i < entries.length; i++) {
+        const e = expectDefined(entries[i]);
+        if (e.prevHash !== prevHash) {
+          return {
+            ok: false,
+            brokenAt: i,
+            reason: `prevHash mismatch at entry ${i} (expected ${prevHash.slice(0, 8)}\u2026, got ${e.prevHash.slice(0, 8)}\u2026)`
+          };
+        }
+        const content = {
+          id: e.id,
+          ts: e.ts,
+          prevHash: e.prevHash,
+          toolName: e.toolName,
+          toolUseId: e.toolUseId,
+          input: e.input,
+          output: e.output,
+          isError: e.isError,
+          index: e.index
         };
+        const expectedHash = createHash("sha256").update(stableStringify2(content), "utf8").digest("hex");
+        if (expectedHash !== e.hash) {
+          return {
+            ok: false,
+            brokenAt: i,
+            reason: `hash mismatch at entry ${i} (entry content was modified)`
+          };
+        }
+        prevHash = e.hash;
       }
-      prevHash = e.hash;
-    }
-    return { ok: true, entries: entries.length };
+      return { ok: true, entries: entries.length };
+    })();
+    this.events?.emit("storage.read", {
+      sessionId,
+      store: "audit",
+      filePath: fp,
+      operation: "verify",
+      outcome: verdict.ok ? "success" : "failure",
+      durationMs: Date.now() - t0,
+      ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+    });
+    return verdict;
   }
   /** All entries for a session, in insertion order. */
   async load(sessionId) {
-    return this.readAll(sessionId);
+    const fp = this.filePath(sessionId);
+    const t0 = Date.now();
+    try {
+      const entries = await this.readAll(sessionId);
+      const durationMs = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "audit",
+        filePath: fp,
+        operation: "load",
+        outcome: "success",
+        durationMs,
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      return entries;
+    } catch (err) {
+      const durationMs = Date.now() - t0;
+      this.events?.emit("storage.read", {
+        sessionId,
+        store: "audit",
+        filePath: fp,
+        operation: "load",
+        outcome: "failure",
+        durationMs,
+        error: toErrorMessage(err),
+        ...this.traceId !== void 0 ? { traceId: this.traceId } : {}
+      });
+      throw err;
+    }
   }
   // ── Internals ────────────────────────────────────────────────────────────
   filePath(sessionId) {
@@ -4136,13 +5117,15 @@ var ToolAuditLog = class {
       return out;
     } catch (err) {
       if (err.code === "ENOENT") return [];
-      return [];
+      throw err;
     }
   }
-  async writeAll(sessionId, entries) {
-    const fp = this.filePath(sessionId);
-    const line = entries.map((e) => JSON.stringify(e)).join("\n") + (entries.length ? "\n" : "");
-    await atomicWrite(fp, line, { mode: 384 });
+  /**
+   * Tracks writes since last fsync and triggers periodic fsync.
+   * Called after each O(1) append to maintain the same durability
+   * guarantees as the old writeAll approach.
+   */
+  async _trackUnsynced(sessionId, fp) {
     const count = (this.unSyncedWrites.get(sessionId) ?? 0) + 1;
     this.unSyncedWrites.set(sessionId, count);
     if (this.fsyncEvery !== Number.POSITIVE_INFINITY && count % this.fsyncEvery === 0) {
@@ -4311,7 +5294,7 @@ var SessionRegistry = class {
   heartbeatTimer = null;
   currentSessionId = null;
   constructor(globalRoot) {
-    this.filePath = path13.join(globalRoot, REGISTRY_FILE);
+    this.filePath = path2.join(globalRoot, REGISTRY_FILE);
   }
   // ── Public API ──────────────────────────────────────────────────────────
   /**
@@ -4478,7 +5461,7 @@ var SessionRegistry = class {
     const retryDelayMs = 20;
     for (let attempt = 0; attempt < maxRetries; attempt++) {
       try {
-        await fsp.mkdir(path13.dirname(this.filePath), { recursive: true });
+        await fsp.mkdir(path2.dirname(this.filePath), { recursive: true });
         const lockHandle = await fsp.open(lockPath, "wx").catch(() => null);
         if (!lockHandle) {
           await new Promise((r) => setTimeout(r, retryDelayMs * (attempt + 1)));
@@ -4691,7 +5674,7 @@ var DefaultSessionRewinder = class {
   sessionsDir;
   projectRoot;
   async listCheckpoints(sessionId) {
-    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path2.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     const fileCountMap = /* @__PURE__ */ new Map();
@@ -4716,7 +5699,7 @@ var DefaultSessionRewinder = class {
     return checkpoints;
   }
   async rewindToCheckpoint(sessionId, checkpointIndex) {
-    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path2.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     let targetIdx = -1;
@@ -4755,7 +5738,7 @@ var DefaultSessionRewinder = class {
     return { ...result, toPromptIndex: checkpointIndex, removedEvents };
   }
   async rewindLastN(sessionId, n) {
-    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path2.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     const checkpoints = [];
@@ -4784,7 +5767,7 @@ var DefaultSessionRewinder = class {
     return { ...result, toPromptIndex: targetIndex, removedEvents: snapshotsToRevert.length };
   }
   async rewindToStart(sessionId) {
-    const file = path13.join(this.sessionsDir, `${sessionId}.jsonl`);
+    const file = path2.join(this.sessionsDir, `${sessionId}.jsonl`);
     const raw = await fsp.readFile(file, "utf8");
     const events = parseEvents(raw);
     const allSnapshots = [];
@@ -4820,10 +5803,10 @@ async function revertSnapshots(snapshots, projectRoot) {
   for (const snapshot of snapshots) {
     for (const file of snapshot.files) {
       try {
-        const absPath = path13.resolve(file.path);
-        const root = path13.resolve(projectRoot);
-        const rel = path13.relative(root, absPath);
-        if (rel.startsWith("..") || path13.isAbsolute(rel)) {
+        const absPath = path2.resolve(file.path);
+        const root = path2.resolve(projectRoot);
+        const rel = path2.relative(root, absPath);
+        if (rel.startsWith("..") || path2.isAbsolute(rel)) {
           errors.push(`${file.path}: path resolves outside project root \u2014 skipping`);
           continue;
         }
@@ -4842,30 +5825,72 @@ async function revertSnapshots(snapshots, projectRoot) {
           }
         }
       } catch (err) {
-        errors.push(`${file.path}: ${err instanceof Error ? err.message : String(err)}`);
+        errors.push(`${file.path}: ${toErrorMessage(err)}`);
       }
     }
   }
   return { revertedFiles, errors };
 }
-async function loadTodosCheckpoint(filePath) {
+async function loadTodosCheckpoint(filePath, events, traceId) {
+  const t0 = Date.now();
   let raw;
   try {
     raw = await fsp.readFile(filePath, "utf8");
-  } catch {
+  } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: traceId ?? "~boot~",
+      store: "todos",
+      filePath,
+      operation: "load",
+      outcome: "failure",
+      error: toErrorMessage(err),
+      recoverable: true
+    });
     return null;
   }
   try {
     const parsed = JSON.parse(raw);
-    if (parsed?.version !== 1 || !Array.isArray(parsed.todos)) return null;
+    if (parsed?.version !== 1 || !Array.isArray(parsed.todos)) {
+      events?.emit("storage.read", {
+        sessionId: traceId ?? "~boot~",
+        store: "todos",
+        filePath,
+        operation: "load",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "invalid_schema",
+        ...traceId !== void 0 && { traceId }
+      });
+      return null;
+    }
+    events?.emit("storage.read", {
+      sessionId: traceId ?? "~boot~",
+      store: "todos",
+      filePath,
+      operation: "load",
+      outcome: "success",
+      durationMs: Date.now() - t0,
+      ...traceId !== void 0 && { traceId }
+    });
     return parsed.todos.filter(
       (t) => !!t && typeof t.id === "string" && typeof t.content === "string" && typeof t.status === "string" && (t.activeForm === void 0 || typeof t.activeForm === "string")
     );
   } catch {
+    events?.emit("storage.read", {
+      sessionId: traceId ?? "~boot~",
+      store: "todos",
+      filePath,
+      operation: "load",
+      outcome: "failure",
+      durationMs: Date.now() - t0,
+      error: "parse_failed",
+      ...traceId !== void 0 && { traceId }
+    });
     return null;
   }
 }
-async function saveTodosCheckpoint(filePath, sessionId, todos) {
+async function saveTodosCheckpoint(filePath, sessionId, todos, events, traceId) {
+  const t0 = Date.now();
   const payload = {
     version: 1,
     sessionId,
@@ -4874,22 +5899,40 @@ async function saveTodosCheckpoint(filePath, sessionId, todos) {
   };
   try {
     await atomicWrite(filePath, JSON.stringify(payload, null, 2), { mode: 384 });
+    events?.emit("storage.write", {
+      sessionId: traceId ?? sessionId,
+      store: "todos",
+      filePath,
+      operation: "save",
+      outcome: "success",
+      durationMs: Date.now() - t0,
+      ...traceId !== void 0 && { traceId }
+    });
   } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: traceId ?? sessionId,
+      store: "todos",
+      filePath,
+      operation: "save",
+      outcome: "failure",
+      error: toErrorMessage(err),
+      recoverable: false
+    });
     console.warn(JSON.stringify({
       level: "warn",
       event: "todos_checkpoint.save_failed",
-      message: err instanceof Error ? err.message : String(err),
+      message: toErrorMessage(err),
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
     }));
   }
 }
-function attachTodosCheckpoint(state, filePath, sessionId) {
+function attachTodosCheckpoint(state, filePath, sessionId, events, traceId) {
   let timer = null;
   let pending = null;
   let writeChain = Promise.resolve();
   const enqueueWrite = (todos) => {
-    writeChain = writeChain.then(() => saveTodosCheckpoint(filePath, sessionId, todos)).catch((err) => {
-      const msg = err instanceof Error ? err.message : String(err);
+    writeChain = writeChain.then(() => saveTodosCheckpoint(filePath, sessionId, todos, events, traceId)).catch((err) => {
+      const msg = toErrorMessage(err);
       console.error(JSON.stringify({
         level: "error",
         event: "todos_checkpoint.write_chain_failed",
@@ -4927,28 +5970,82 @@ function attachTodosCheckpoint(state, filePath, sessionId) {
     }
   };
 }
-async function loadPlan(filePath) {
+async function loadPlan(filePath, events) {
+  const t0 = Date.now();
   let raw;
   try {
     raw = await fsp.readFile(filePath, "utf8");
-  } catch {
+  } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: "~boot~",
+      store: "plan",
+      filePath,
+      operation: "load",
+      error: toErrorMessage(err),
+      recoverable: true
+    });
     return null;
   }
   try {
     const parsed = JSON.parse(raw);
-    if (parsed?.version !== 1 || !Array.isArray(parsed.items)) return null;
+    if (parsed?.version !== 1 || !Array.isArray(parsed.items)) {
+      events?.emit("storage.read", {
+        sessionId: "~boot~",
+        store: "plan",
+        filePath,
+        operation: "load",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "invalid_schema"
+      });
+      return null;
+    }
+    events?.emit("storage.read", {
+      sessionId: "~boot~",
+      store: "plan",
+      filePath,
+      operation: "load",
+      outcome: "success",
+      durationMs: Date.now() - t0
+    });
     return parsed;
   } catch {
+    events?.emit("storage.read", {
+      sessionId: "~boot~",
+      store: "plan",
+      filePath,
+      operation: "load",
+      outcome: "failure",
+      durationMs: Date.now() - t0,
+      error: "parse_failed"
+    });
     return null;
   }
 }
-async function savePlan(filePath, plan) {
+async function savePlan(filePath, plan, events) {
+  const t0 = Date.now();
   try {
     await atomicWrite(filePath, JSON.stringify(plan, null, 2), { mode: 384 });
+    events?.emit("storage.write", {
+      sessionId: "~boot~",
+      store: "plan",
+      filePath,
+      operation: "save",
+      outcome: "success",
+      durationMs: Date.now() - t0
+    });
   } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: "~boot~",
+      store: "plan",
+      filePath,
+      operation: "save",
+      error: toErrorMessage(err),
+      recoverable: false
+    });
     console.warn(
       "[plan-store] save failed:",
-      err instanceof Error ? err.message : String(err)
+      toErrorMessage(err)
     );
   }
 }
@@ -5179,37 +6276,98 @@ function emptyTaskFile(sessionId) {
     tasks: []
   };
 }
-async function loadTasks(filePath) {
+async function loadTasks(filePath, events, traceId) {
+  const t0 = Date.now();
   let raw;
   try {
     raw = await fsp.readFile(filePath, "utf8");
-  } catch {
+  } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: traceId ?? "~boot~",
+      store: "tasks",
+      filePath,
+      operation: "load",
+      outcome: "failure",
+      error: toErrorMessage(err),
+      recoverable: true
+    });
     return null;
   }
   try {
     const parsed = JSON.parse(raw);
-    if (parsed?.version !== 1 || !Array.isArray(parsed.tasks)) return null;
+    if (parsed?.version !== 1 || !Array.isArray(parsed.tasks)) {
+      events?.emit("storage.read", {
+        sessionId: traceId ?? "~boot~",
+        store: "tasks",
+        filePath,
+        operation: "load",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "invalid_schema",
+        ...traceId !== void 0 && { traceId }
+      });
+      return null;
+    }
+    events?.emit("storage.read", {
+      sessionId: traceId ?? "~boot~",
+      store: "tasks",
+      filePath,
+      operation: "load",
+      outcome: "success",
+      durationMs: Date.now() - t0,
+      ...traceId !== void 0 && { traceId }
+    });
     return parsed;
   } catch {
+    events?.emit("storage.read", {
+      sessionId: traceId ?? "~boot~",
+      store: "tasks",
+      filePath,
+      operation: "load",
+      outcome: "failure",
+      durationMs: Date.now() - t0,
+      error: "parse_failed",
+      ...traceId !== void 0 && { traceId }
+    });
     return null;
   }
 }
-async function saveTasks(filePath, tasks) {
+async function saveTasks(filePath, tasks, events, traceId) {
+  const t0 = Date.now();
   try {
     tasks.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     await atomicWrite(filePath, JSON.stringify(tasks, null, 2), { mode: 384 });
+    events?.emit("storage.write", {
+      sessionId: traceId ?? "~boot~",
+      store: "tasks",
+      filePath,
+      operation: "save",
+      outcome: "success",
+      durationMs: Date.now() - t0,
+      ...traceId !== void 0 && { traceId }
+    });
   } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: traceId ?? "~boot~",
+      store: "tasks",
+      filePath,
+      operation: "save",
+      outcome: "failure",
+      error: toErrorMessage(err),
+      recoverable: false,
+      ...traceId !== void 0 && { traceId }
+    });
     console.warn(
       "[task-store] save failed:",
-      err instanceof Error ? err.message : String(err)
+      toErrorMessage(err)
     );
   }
 }
-async function mutateTasks(filePath, sessionId, fn) {
+async function mutateTasks(filePath, sessionId, fn, events, traceId) {
   return withFileLock(filePath, async () => {
-    const file = await loadTasks(filePath) ?? emptyTaskFile(sessionId);
+    const file = await loadTasks(filePath, events, traceId) ?? emptyTaskFile(sessionId);
     const updated = await fn(file);
-    await saveTasks(filePath, updated);
+    await saveTasks(filePath, updated, events, traceId);
     return updated;
   });
 }
@@ -5380,7 +6538,7 @@ var DirectorStateCheckpoint = class {
     } catch (err) {
       console.warn(
         "[director-state] checkpoint write failed:",
-        err instanceof Error ? err.message : String(err)
+        toErrorMessage(err)
       );
     } finally {
       this.writing = false;
@@ -5391,113 +6549,36 @@ var DirectorStateCheckpoint = class {
     }
   }
 };
-
-// src/utils/term.ts
-var hasStdout = () => typeof process !== "undefined" && !!process.stdout;
-function isStdoutTTY() {
-  return hasStdout() && Boolean(process.stdout.isTTY);
-}
-
-// src/utils/color.ts
-var isColorTty = () => {
-  if (envFlag(process.env.NO_COLOR)) return false;
-  if (envFlag(process.env.FORCE_COLOR)) return true;
-  return isStdoutTTY();
-};
-function envFlag(value) {
-  if (value === void 0) return false;
-  if (value.trim() === "") return false;
-  return !/^(0|false|no|off)$/i.test(value.trim());
-}
-var COLOR = isColorTty();
-var wrap = (open6, close) => (s) => COLOR ? `\x1B[${open6}m${s}\x1B[${close}m` : s;
-var color = {
-  reset: wrap("0", "0"),
-  bold: wrap("1", "22"),
-  dim: wrap("2", "22"),
-  italic: wrap("3", "23"),
-  underline: wrap("4", "24"),
-  red: wrap("31", "39"),
-  green: wrap("32", "39"),
-  yellow: wrap("33", "39"),
-  blue: wrap("34", "39"),
-  magenta: wrap("35", "39"),
-  cyan: wrap("36", "39"),
-  gray: wrap("90", "39"),
-  amber: wrap("38;5;214", "39"),
-  pink: wrap("38;5;205", "39"),
-  bgRed: wrap("41", "49"),
-  bgGreen: wrap("42", "49")
-};
-function projectHash(absRoot) {
-  return createHash("sha256").update(path13.resolve(absRoot)).digest("hex").slice(0, 12);
-}
-function projectSlug(absRoot) {
-  const base = slugify(path13.basename(absRoot));
-  const hash = createHash("sha256").update(path13.resolve(absRoot)).digest("hex").slice(0, 6);
-  return `${base}-${hash}`;
-}
-function slugify(name) {
-  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "project";
-}
-function wstackGlobalRoot() {
-  const fromEnv = process.env["WRONGSTACK_HOME"];
-  if (fromEnv && fromEnv.trim().length > 0) return path13.resolve(fromEnv);
-  return path13.join(os.homedir(), ".wrongstack");
-}
-function resolveWstackPaths(opts) {
-  const globalRoot = opts.globalRoot ?? (opts.userHome ? path13.join(opts.userHome, ".wrongstack") : wstackGlobalRoot());
-  const hash = projectHash(opts.projectRoot);
-  const slug = projectSlug(opts.projectRoot);
-  const projectDir = path13.join(globalRoot, "projects", slug);
-  return {
-    globalRoot,
-    configDir: globalRoot,
-    globalConfig: path13.join(globalRoot, "config.json"),
-    secretsKey: path13.join(globalRoot, ".key"),
-    globalMemory: path13.join(globalRoot, "memory.md"),
-    globalSkills: path13.join(globalRoot, "skills"),
-    globalPrompts: path13.join(globalRoot, "prompts"),
-    cacheDir: path13.join(globalRoot, "cache"),
-    modelsCache: path13.join(globalRoot, "cache", "models.dev.json"),
-    modelsOverlayCache: path13.join(globalRoot, "cache", "models-overlay.json"),
-    historyFile: path13.join(globalRoot, "history"),
-    logFile: path13.join(globalRoot, "logs", "wrongstack.log"),
-    projectDir,
-    projectCodebaseIndex: path13.join(projectDir, "codebase-index"),
-    projectMemory: path13.join(projectDir, "memory.md"),
-    projectSessions: path13.join(projectDir, "sessions"),
-    projectTrust: path13.join(projectDir, "trust.json"),
-    projectMeta: path13.join(projectDir, "meta.json"),
-    projectLocalConfig: path13.join(projectDir, "config.local.json"),
-    inProjectConfig: path13.join(opts.projectRoot, ".wrongstack", "config.json"),
-    inProjectAgentsFile: path13.join(opts.projectRoot, ".wrongstack", "AGENTS.md"),
-    inProjectSkills: path13.join(opts.projectRoot, ".wrongstack", "skills"),
-    inProjectWorktrees: path13.join(opts.projectRoot, ".wrongstack", "worktrees"),
-    projectHash: hash,
-    projectSlug: slug,
-    projectGoal: path13.join(projectDir, "goal.json"),
-    projectSpecs: path13.join(projectDir, "specs"),
-    projectTaskGraphs: path13.join(projectDir, "task-graphs"),
-    projectSddSession: path13.join(projectDir, "sdd-session.json"),
-    projectPlan: path13.join(projectDir, "plan.json"),
-    projectAutophase: path13.join(projectDir, "autophase"),
-    syncConfig: path13.join(globalRoot, "sync.json")
-  };
-}
-
-// src/storage/goal-store.ts
 var MAX_JOURNAL_ENTRIES = 500;
 function goalFilePath(projectRoot) {
   return resolveWstackPaths({ projectRoot }).projectGoal;
 }
-async function loadGoal(filePath) {
+async function loadGoal(filePath, events) {
+  const t0 = Date.now();
   let raw;
   try {
     raw = await fsp.readFile(filePath, "utf8");
   } catch (err) {
     const code = err.code;
-    if (code === "ENOENT") return null;
+    if (code === "ENOENT") {
+      events?.emit("storage.read", {
+        sessionId: "~boot~",
+        store: "goal",
+        filePath,
+        operation: "load",
+        outcome: "success",
+        durationMs: Date.now() - t0
+      });
+      return null;
+    }
+    events?.emit("storage.error", {
+      sessionId: "~boot~",
+      store: "goal",
+      filePath,
+      operation: "load",
+      error: toErrorMessage(err),
+      recoverable: false
+    });
     throw err;
   }
   try {
@@ -5510,8 +6591,25 @@ async function loadGoal(filePath) {
         message: "invalid schema \u2014 consider deleting and re-creating",
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       }));
+      events?.emit("storage.read", {
+        sessionId: "~boot~",
+        store: "goal",
+        filePath,
+        operation: "load",
+        outcome: "failure",
+        durationMs: Date.now() - t0,
+        error: "invalid_schema"
+      });
       return null;
     }
+    events?.emit("storage.read", {
+      sessionId: "~boot~",
+      store: "goal",
+      filePath,
+      operation: "load",
+      outcome: "success",
+      durationMs: Date.now() - t0
+    });
     return parsed;
   } catch {
     console.warn(JSON.stringify({
@@ -5521,15 +6619,41 @@ async function loadGoal(filePath) {
       message: "JSON parse failed \u2014 consider deleting and re-creating",
       timestamp: (/* @__PURE__ */ new Date()).toISOString()
     }));
+    events?.emit("storage.read", {
+      sessionId: "~boot~",
+      store: "goal",
+      filePath,
+      operation: "load",
+      outcome: "failure",
+      durationMs: Date.now() - t0,
+      error: "parse_failed"
+    });
     return null;
   }
 }
-async function saveGoal(filePath, goal) {
+async function saveGoal(filePath, goal, events) {
+  const t0 = Date.now();
   try {
     await atomicWrite(filePath, JSON.stringify(goal, null, 2), { mode: 384 });
+    events?.emit("storage.write", {
+      sessionId: "~boot~",
+      store: "goal",
+      filePath,
+      operation: "save",
+      outcome: "success",
+      durationMs: Date.now() - t0
+    });
   } catch (err) {
+    events?.emit("storage.error", {
+      sessionId: "~boot~",
+      store: "goal",
+      filePath,
+      operation: "save",
+      error: toErrorMessage(err),
+      recoverable: false
+    });
     throw new FsError({
-      message: err instanceof Error ? err.message : String(err),
+      message: toErrorMessage(err),
       code: ERROR_CODES.FS_ATOMIC_WRITE_FAILED,
       path: filePath,
       cause: err
@@ -5691,7 +6815,7 @@ var DefaultPromptStore = class {
         if (!file.endsWith(".json")) continue;
         try {
           const raw = JSON.parse(
-            await fsp.readFile(path13.join(this.dir, file), "utf8")
+            await fsp.readFile(path2.join(this.dir, file), "utf8")
           );
           entries.push(raw.entry);
         } catch {
@@ -5704,7 +6828,7 @@ var DefaultPromptStore = class {
     );
   }
   async get(id) {
-    const file = path13.join(this.dir, `${id}.json`);
+    const file = path2.join(this.dir, `${id}.json`);
     try {
       const raw = JSON.parse(await fsp.readFile(file, "utf8"));
       return raw.entry;
@@ -5714,12 +6838,12 @@ var DefaultPromptStore = class {
   }
   async save(entry) {
     await ensureDir(this.dir);
-    const file = path13.join(this.dir, `${entry.id}.json`);
+    const file = path2.join(this.dir, `${entry.id}.json`);
     const raw = { version: 1, entry };
     await atomicWrite(file, JSON.stringify(raw, null, 2));
   }
   async delete(id) {
-    const file = path13.join(this.dir, `${id}.json`);
+    const file = path2.join(this.dir, `${id}.json`);
     try {
       await fsp.unlink(file);
       return true;
@@ -5753,7 +6877,7 @@ var CloudSync = class {
     this.paths = paths;
     this.getConfig = getConfig;
     this.setConfig = setConfig;
-    this.statePath = path13.join(paths.globalRoot, "sync-state.json");
+    this.statePath = path2.join(paths.globalRoot, "sync-state.json");
   }
   paths;
   getConfig;
@@ -5860,7 +6984,7 @@ var CloudSync = class {
       const rel = segments.slice(2).join("/");
       const destPath = resolvePulledCategoryPath(cat, localPath, rel, entry.path);
       const blobData = await this.getBlob(token, owner, repoName, entry.sha);
-      await fsp.mkdir(path13.dirname(destPath), { recursive: true });
+      await fsp.mkdir(path2.dirname(destPath), { recursive: true });
       await fsp.writeFile(destPath, Buffer.from(blobData, "base64"));
     }
     const localRev = await this.hashLocalCategories(cfg.categories);
@@ -5967,12 +7091,12 @@ var CloudSync = class {
       const localPath = this.categoryToPath(cat);
       if (!localPath) continue;
       try {
-        const stat5 = await fsp.stat(localPath);
-        if (stat5.isDirectory()) {
+        const stat6 = await fsp.stat(localPath);
+        if (stat6.isDirectory()) {
           const files = await this.walkDir(localPath, localPath);
           for (const file of files) {
             const content = await fsp.readFile(file, "utf8");
-            const rel = path13.relative(localPath, file).replace(/\\/g, "/");
+            const rel = path2.relative(localPath, file).replace(/\\/g, "/");
             entries.push({ path: `data/${cat}/${rel}`, content, mode: "100644" });
             hashes.push(content);
           }
@@ -5993,8 +7117,8 @@ var CloudSync = class {
       const localPath = this.categoryToPath(cat);
       if (!localPath) continue;
       try {
-        const stat5 = await fsp.stat(localPath);
-        if (stat5.isDirectory()) {
+        const stat6 = await fsp.stat(localPath);
+        if (stat6.isDirectory()) {
           const files = await this.walkDir(localPath, localPath);
           for (const file of files) {
             const content = await fsp.readFile(file);
@@ -6029,7 +7153,7 @@ var CloudSync = class {
     const results = [];
     const entries = await fsp.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path13.join(dir, entry.name);
+      const full = path2.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...await this.walkDir(full, base));
       } else {
@@ -6051,9 +7175,9 @@ function resolvePulledCategoryPath(cat, localPath, rel, remotePath) {
     return localPath;
   }
   if (!rel) return localPath;
-  const normalizedRel = path13.normalize(rel);
-  const traversesUp = normalizedRel === ".." || normalizedRel.startsWith(`..${path13.sep}`);
-  if (path13.isAbsolute(normalizedRel) || traversesUp) {
+  const normalizedRel = path2.normalize(rel);
+  const traversesUp = normalizedRel === ".." || normalizedRel.startsWith(`..${path2.sep}`);
+  if (path2.isAbsolute(normalizedRel) || traversesUp) {
     throw new FsError({
       message: `Refusing CloudSync path traversal: ${remotePath}`,
       code: ERROR_CODES.FS_DELETE_FAILED,
@@ -6061,10 +7185,10 @@ function resolvePulledCategoryPath(cat, localPath, rel, remotePath) {
       context: { reason: "path_traversal", normalizedRel }
     });
   }
-  const dest = path13.resolve(localPath, normalizedRel);
-  const root = path13.resolve(localPath);
-  const relative4 = path13.relative(root, dest);
-  if (relative4.startsWith("..") || path13.isAbsolute(relative4)) {
+  const dest = path2.resolve(localPath, normalizedRel);
+  const root = path2.resolve(localPath);
+  const relative4 = path2.relative(root, dest);
+  if (relative4.startsWith("..") || path2.isAbsolute(relative4)) {
     throw new FsError({
       message: `Refusing CloudSync path outside category root: ${remotePath}`,
       code: ERROR_CODES.FS_DELETE_FAILED,
@@ -6124,7 +7248,7 @@ function isAllowed(type, level) {
   return true;
 }
 function createSessionEventBridge(writer, level = "standard", options = {}) {
-  const normalizedLevel = level ?? "standard";
+  let currentLevel = level ?? "standard";
   const resolveWriter = typeof writer === "function" ? writer : () => writer;
   const progressCounters = /* @__PURE__ */ new Map();
   const toolProgressConfig = options.sampling?.toolProgress ?? {};
@@ -6145,14 +7269,19 @@ function createSessionEventBridge(writer, level = "standard", options = {}) {
     return true;
   }
   return {
-    level: normalizedLevel,
+    get level() {
+      return currentLevel;
+    },
+    setAuditLevel(next) {
+      currentLevel = next ?? "standard";
+    },
     allows(type) {
-      return isAllowed(type, normalizedLevel);
+      return isAllowed(type, currentLevel);
     },
     async append(event) {
       const target = resolveWriter();
       if (!target) return;
-      if (!isAllowed(event.type, normalizedLevel)) return;
+      if (!isAllowed(event.type, currentLevel)) return;
       if (!shouldSample(event)) return;
       try {
         await target.append(event);
@@ -6163,7 +7292,7 @@ function createSessionEventBridge(writer, level = "standard", options = {}) {
       const target = resolveWriter();
       if (!target || events.length === 0) return;
       const allowed = events.filter(
-        (e) => isAllowed(e.type, normalizedLevel) && shouldSample(e)
+        (e) => isAllowed(e.type, currentLevel) && shouldSample(e)
       );
       if (allowed.length === 0) return;
       try {