@wrongstack/core 0.73.1 → 0.82.6

package/dist/storage/index.js

@@ -1,6 +1,6 @@
 import { randomBytes, randomUUID, createHash } from 'crypto';
 import * as fsp from 'fs/promises';
-import * as path14 from 'path';
+import * as path2 from 'path';
 import * as os from 'os';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -10,9 +10,9 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 async function atomicWrite(targetPath, content, opts = {}) {
-  const dir = path14.dirname(targetPath);
+  const dir = path2.dirname(targetPath);
   await fsp.mkdir(dir, { recursive: true });
-  const tmp = path14.join(dir, `.${path14.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" });
@@ -75,6 +75,12 @@ async function renameWithRetry(from, to) {
 }
 
 // src/utils/message-invariants.ts
+function expectDefined(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function repairToolUseAdjacency(messages) {
   const removedToolUses = [];
   const removedToolResults = [];
@@ -82,7 +88,7 @@ function repairToolUseAdjacency(messages) {
   let changed = false;
   const out = [];
   for (let i = 0; i < messages.length; i++) {
-    const original = messages[i];
+    const original = expectDefined(messages[i]);
     let msg = original;
     if (hasToolUse(msg)) {
       const nextIds = toolResultIds(messages[i + 1]);
@@ -167,7 +173,23 @@ function isEmptyMessage(msg) {
 }
 
 // src/storage/session-store.ts
-var DefaultSessionStore = class {
+function expectDefined2(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
+function sanitizeModel(model) {
+  return model.replace(/[^a-zA-Z0-9_-]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 40);
+}
+function generateSessionId(startedAt, model) {
+  const date = startedAt.slice(0, 10);
+  const time = startedAt.slice(11, 19).replace(/:/g, "-");
+  const suffix = randomBytes(2).toString("hex");
+  const modelPart = model ? `_${sanitizeModel(model)}` : "";
+  return `${date}/${time}Z${modelPart}_${suffix}`;
+}
+var DefaultSessionStore = class _DefaultSessionStore {
   dir;
   events;
   secretScrubber;
@@ -176,19 +198,29 @@ var DefaultSessionStore = class {
     this.events = opts.events;
     this.secretScrubber = opts.secretScrubber;
   }
+  /** Absolute path to the session index file. */
+  get indexFile() {
+    return path2.join(this.dir, "_index.jsonl");
+  }
   /** Join session ID to its absolute path within the store directory. */
   sessionPath(id, ext) {
-    return path14.join(this.dir, `${id}${ext}`);
+    return path2.join(this.dir, `${id}${ext}`);
   }
-  async ensureShardDir(_id) {
-    await ensureDir(this.dir);
-    return this.dir;
+  /**
+   * Ensure the directory implied by the session ID exists. When the ID
+   * contains a date prefix like `2026-06-06/...`, this creates the date
+   * subdirectory so sessions group naturally by day.
+   */
+  async ensureShardDir(id) {
+    const dirPath = path2.dirname(path2.join(this.dir, id));
+    await ensureDir(dirPath);
+    return dirPath;
   }
   async create(meta) {
     const startedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const id = meta.id ?? `${startedAt.replace(/[:.]/g, "-")}-${randomBytes(2).toString("hex")}`;
+    const id = meta.id && meta.id.length > 0 ? meta.id : generateSessionId(startedAt, meta.model ?? meta.provider);
     const shardDir = await this.ensureShardDir(id);
-    const file = path14.join(shardDir, `${id}.jsonl`);
+    const file = path2.join(shardDir, `${path2.basename(id)}.jsonl`);
     let handle;
     try {
       handle = await fsp.open(file, "a", 384);
@@ -202,7 +234,8 @@ var DefaultSessionStore = class {
       return new FileSessionWriter(id, handle, startedAt, meta, this.events, {
         dir: shardDir,
         filePath: file,
-        secretScrubber: this.secretScrubber
+        secretScrubber: this.secretScrubber,
+        onClose: (s) => this.appendToIndex(s)
       });
     } catch (err) {
       await handle.close().catch(() => {
@@ -233,7 +266,7 @@ var DefaultSessionStore = class {
           provider: data.metadata.provider
         },
         this.events,
-        { resumed: true, dir: this.dir, filePath: file, secretScrubber: this.secretScrubber }
+        { resumed: true, dir: this.dir, filePath: file, secretScrubber: this.secretScrubber, onClose: (s) => this.appendToIndex(s) }
       );
       return { writer, data };
     } catch (err) {
@@ -263,6 +296,15 @@ var DefaultSessionStore = class {
   async list(limit = 20) {
     try {
       await ensureDir(this.dir);
+      const indexed = await this.readIndex();
+      if (indexed.length > 0) {
+        indexed.sort((a, b) => {
+          if (a.startedAt < b.startedAt) return 1;
+          if (a.startedAt > b.startedAt) return -1;
+          return a.id.localeCompare(b.id);
+        });
+        return indexed.slice(0, limit);
+      }
       const ids = await this.collectSessionIds(this.dir);
       const sessions = await Promise.all(ids.map((id) => this.summaryFor(id).catch(() => null)));
       const out = sessions.filter((s) => s !== null);
@@ -276,16 +318,121 @@ var DefaultSessionStore = class {
       return [];
     }
   }
-  /** Recursively collect all session IDs from shard subdirectories. */
-  async collectSessionIds(dir) {
+  // ── Session index (_index.jsonl) ─────────────────────────────────────────
+  //
+  // One JSON line per closed session, appended atomically on close().
+  // When a session is deleted, a tombstone {action:"delete",id:"..."} is
+  // appended. On read, tombstones filter out matching session entries.
+  // This keeps listing O(lines-in-index) instead of O(files-on-disk).
+  //
+  // The index auto-compacts every N appends to prevent unbounded growth
+  // from tombstones and duplicate entries (resume cycles).
+  indexAppendCount = 0;
+  static COMPACT_EVERY = 30;
+  /** Append a session summary to the index. */
+  async appendToIndex(summary) {
+    try {
+      await ensureDir(this.dir);
+      const line = JSON.stringify(summary) + "\n";
+      await fsp.appendFile(this.indexFile, line, "utf8");
+      this.indexAppendCount++;
+      if (this.indexAppendCount >= _DefaultSessionStore.COMPACT_EVERY) {
+        await this.compactIndex();
+        this.indexAppendCount = 0;
+      }
+    } catch {
+    }
+  }
+  /** Append a tombstone entry for a deleted session. */
+  async writeTombstone(id) {
+    try {
+      await ensureDir(this.dir);
+      const line = JSON.stringify({ action: "delete", id }) + "\n";
+      await fsp.appendFile(this.indexFile, line, "utf8");
+      this.indexAppendCount++;
+    } catch {
+    }
+  }
+  /**
+   * Compact the index: read all entries, drop tombstones, deduplicate
+   * (keep latest per session), and rewrite. Atomic via temp+rename.
+   */
+  async compactIndex() {
+    const entries = await this.readIndex();
+    if (entries.length === 0) return;
+    const tmp = `${this.indexFile}.compact.tmp`;
+    const lines = entries.map((s) => JSON.stringify(s)).join("\n") + "\n";
+    await fsp.writeFile(tmp, lines, "utf8");
+    await fsp.rename(tmp, this.indexFile);
+  }
+  /**
+   * Read the index file and return deduplicated session summaries.
+   * Entries with a matching tombstone are filtered out.
+   * Returns empty array when the index doesn't exist or is corrupt.
+   */
+  async readIndex() {
+    let raw;
+    try {
+      raw = await fsp.readFile(this.indexFile, "utf8");
+    } catch {
+      return [];
+    }
+    const deleted = /* @__PURE__ */ new Set();
+    const seen = /* @__PURE__ */ new Map();
+    for (const line of raw.split("\n")) {
+      if (!line.trim()) continue;
+      try {
+        const entry = JSON.parse(line);
+        if (entry.action === "delete" && entry.id) {
+          deleted.add(entry.id);
+          seen.delete(entry.id);
+          continue;
+        }
+        if (entry.id && !deleted.has(entry.id)) {
+          seen.set(entry.id, entry);
+        }
+      } catch {
+      }
+    }
+    return Array.from(seen.values());
+  }
+  /**
+   * Rebuild the index from disk by scanning all sessions and writing a
+   * fresh _index.jsonl. Useful after manual cleanup or index corruption.
+   */
+  async rebuildIndex() {
+    const ids = await this.collectSessionIds(this.dir);
+    const summaries = await Promise.all(ids.map((id) => this.summaryFor(id).catch(() => null)));
+    const valid = summaries.filter((s) => s !== null);
+    const tmp = `${this.indexFile}.tmp`;
+    const lines = valid.map((s) => JSON.stringify(s)).join("\n") + "\n";
+    await fsp.writeFile(tmp, lines, "utf8");
+    await fsp.rename(tmp, this.indexFile);
+    return valid.length;
+  }
+  /** Recursively collect session IDs from date-shard subdirectories.
+   *  IDs include the date-prefix path (e.g. "2026-06-06/17-46-57Z_…").
+   *  Skips `.jsonl`/`.summary.json` root files, dot-files, and
+   *  sub-directories that belong to fleet/subagent sessions. */
+  async collectSessionIds(dir, prefix = "", depth = 0) {
     const ids = [];
-    const entries = await fsp.readdir(dir, { withFileTypes: true });
+    let entries;
+    try {
+      entries = await fsp.readdir(dir, { withFileTypes: true });
+    } catch {
+      return ids;
+    }
     for (const entry of entries) {
-      const full = path14.join(dir, entry.name);
+      if (entry.name.startsWith(".") && entry.name !== ".wrongstack") continue;
+      if (entry.name === "shared" || entry.name === "subagents" || entry.name === "attachments")
+        continue;
       if (entry.isDirectory()) {
-        ids.push(...await this.collectSessionIds(full));
+        const childPrefix = depth === 0 ? entry.name : `${prefix}/${entry.name}`;
+        ids.push(...await this.collectSessionIds(path2.join(dir, entry.name), childPrefix, depth + 1));
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
-        ids.push(entry.name.replace(/\.jsonl$/, ""));
+        if (entry.name === "_index.jsonl") continue;
+        const base = entry.name.replace(/\.jsonl$/, "");
+        ids.push(prefix ? `${prefix}/${base}` : base);
       }
     }
     return ids;
@@ -308,9 +455,70 @@ var DefaultSessionStore = class {
       return summary;
     }
   }
-  async delete(id) {
-    await fsp.unlink(this.sessionPath(id, ".jsonl"));
+  /**
+   * Delete a session and all associated files: JSONL, summary, plan/todos
+   * sidecars, and the session directory (fleet.json, shared/, subagents/).
+   */
+  async deleteSession(id) {
+    await fsp.unlink(this.sessionPath(id, ".jsonl")).catch(() => void 0);
     await fsp.unlink(this.sessionPath(id, ".summary.json")).catch(() => void 0);
+    const shardDir = path2.dirname(path2.join(this.dir, id));
+    const base = path2.basename(id);
+    for (const ext of [".plan.json", ".todos.json"]) {
+      await fsp.unlink(path2.join(shardDir, `${base}${ext}`)).catch(() => void 0);
+    }
+    const sessDir = path2.join(shardDir, base);
+    await fsp.rm(sessDir, { recursive: true, force: true }).catch(() => void 0);
+    await this.writeTombstone(id);
+  }
+  async delete(id) {
+    await this.deleteSession(id);
+  }
+  async prune(maxAgeDays = 30) {
+    const cutoff = Date.now() - maxAgeDays * 864e5;
+    let deleted = 0;
+    let activeSessionId = null;
+    try {
+      const raw = await fsp.readFile(path2.join(this.dir, "active.json"), "utf8");
+      const active = JSON.parse(raw);
+      activeSessionId = active.sessionId ?? null;
+    } catch {
+    }
+    const entries = await fsp.readdir(this.dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      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() || !file.name.endsWith(".jsonl")) continue;
+        const jsonlPath = path2.join(dateDir, file.name);
+        try {
+          const stat5 = await fsp.stat(jsonlPath);
+          if (stat5.mtimeMs >= cutoff) continue;
+        } catch {
+          continue;
+        }
+        const id = `${entry.name}/${file.name.replace(/\.jsonl$/, "")}`;
+        if (activeSessionId && id === activeSessionId) continue;
+        await this.deleteSession(id);
+        deleted++;
+      }
+    }
+    if (deleted > 0) {
+      await this.compactIndex().catch(() => void 0);
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const dateDir = path2.join(this.dir, entry.name);
+      try {
+        const remaining = await fsp.readdir(dateDir);
+        if (remaining.length === 0) {
+          await fsp.rmdir(dateDir).catch(() => void 0);
+        }
+      } catch {
+      }
+    }
+    return deleted;
   }
   async clearHistory(id) {
     await this.ensureShardDir(id);
@@ -332,13 +540,42 @@ var DefaultSessionStore = class {
       const data = await this.load(id);
       const firstUser = data.events.find((e) => e.type === "user_input");
       const title = firstUser && firstUser.type === "user_input" ? userInputTitle(firstUser.content) : "(empty session)";
+      let iterationCount = 0;
+      let toolCallCount = 0;
+      let toolErrorCount = 0;
+      let fileChangeCount = 0;
+      const toolBreakdown = {};
+      let outcome = void 0;
+      const lastEvent = data.events[data.events.length - 1];
+      for (const e of data.events) {
+        if (e.type === "in_flight_start") iterationCount++;
+        else if (e.type === "tool_call_start") {
+          toolCallCount++;
+          toolBreakdown[e.name] = (toolBreakdown[e.name] ?? 0) + 1;
+        } else if (e.type === "tool_result" && e.isError) toolErrorCount++;
+        else if (e.type === "file_snapshot") fileChangeCount += e.files.length;
+      }
+      if (lastEvent?.type === "session_end") {
+        outcome = "completed";
+      } else if (lastEvent?.type === "in_flight_start") {
+        outcome = "aborted";
+      } else if (data.events.some((e) => e.type === "error")) {
+        outcome = "error";
+      }
       return {
         id,
         title,
         startedAt: data.metadata.startedAt,
+        endedAt: data.metadata.endedAt,
         model: data.metadata.model ?? "unknown",
         provider: data.metadata.provider ?? "unknown",
-        tokenTotal: data.usage.input + data.usage.output
+        tokenTotal: data.usage.input + data.usage.output,
+        iterationCount: iterationCount > 0 ? iterationCount : void 0,
+        toolCallCount: toolCallCount > 0 ? toolCallCount : void 0,
+        toolErrorCount: toolErrorCount > 0 ? toolErrorCount : void 0,
+        fileChangeCount: fileChangeCount > 0 ? fileChangeCount : void 0,
+        toolBreakdown: Object.keys(toolBreakdown).length > 0 ? toolBreakdown : {},
+        outcome
       };
     } catch {
       return {
@@ -437,9 +674,10 @@ var FileSessionWriter = class {
     this.meta = meta;
     this.events = events;
     this.resumed = opts.resumed ?? false;
-    this.manifestFile = opts.dir ? path14.join(opts.dir, `${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;
     this.summary = {
       id,
       title: "(empty session)",
@@ -469,6 +707,15 @@ var FileSessionWriter = class {
   appendFailCount = 0;
   lastAppendWarnAt = 0;
   secretScrubber;
+  onCloseCb;
+  // ── Enriched summary tracking ──────────────────────────────────────────
+  iterationCount = 0;
+  toolCallCount = 0;
+  toolErrorCount = 0;
+  toolBreakdown = {};
+  fileChangeCount = 0;
+  compactionCount = 0;
+  outcome = void 0;
   /**
    * Scrub secrets out of conversation-turn events before they are observed
    * for the summary, written to the JSONL log, or surfaced on resume. Only
@@ -546,8 +793,22 @@ var FileSessionWriter = class {
   observeForSummary(event) {
     if (event.type === "tool_use") {
       this.openToolUses.add(event.id);
+    } else if (event.type === "tool_call_start") {
+      this.toolCallCount++;
+      this.toolBreakdown[event.name] = (this.toolBreakdown[event.name] ?? 0) + 1;
     } else if (event.type === "tool_result") {
       this.openToolUses.delete(event.id);
+      if (event.isError) {
+        this.toolErrorCount++;
+        this.outcome = "error";
+      }
+    } else if (event.type === "file_snapshot") {
+      this.fileChangeCount += event.files.length;
+    } else if (event.type === "compaction") {
+      this.compactionCount++;
+    }
+    if (event.type === "error" || event.type === "provider_error") {
+      this.outcome = "error";
     }
     if (event.type === "user_input" && this.summary.title === "(empty session)") {
       this.summary = { ...this.summary, title: userInputTitle(event.content) };
@@ -558,18 +819,35 @@ var FileSessionWriter = class {
     } else if (event.type === "session_end") {
       const total = event.usage.input + event.usage.output;
       if (total > 0) this.summary = { ...this.summary, tokenTotal: total };
+    } else if (event.type === "in_flight_start") {
+      this.iterationCount++;
     }
   }
   async close() {
     if (this.closing) return;
     this.closing = true;
     this.closed = true;
+    this.summary = {
+      ...this.summary,
+      endedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      iterationCount: this.iterationCount,
+      toolCallCount: this.toolCallCount,
+      toolErrorCount: this.toolErrorCount,
+      fileChangeCount: this.fileChangeCount,
+      compactionCount: this.compactionCount > 0 ? this.compactionCount : void 0,
+      toolBreakdown: { ...this.toolBreakdown },
+      outcome: this.outcome ?? "completed"
+    };
     if (this.manifestFile) {
       try {
         await atomicWrite(this.manifestFile, JSON.stringify(this.summary), { mode: 384 });
       } catch {
       }
     }
+    try {
+      await this.onCloseCb?.(this.summary);
+    } catch {
+    }
     try {
       await this.handle.close();
     } catch {
@@ -611,7 +889,7 @@ var FileSessionWriter = class {
     let targetCheckpointLine = -1;
     let afterTarget = false;
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
+      const line = expectDefined2(lines[i]);
       if (!line.trim()) continue;
       let event;
       try {
@@ -716,7 +994,7 @@ function userInputTitle(content) {
 var QueueStore = class {
   file;
   constructor(opts) {
-    this.file = path14.join(opts.dir, "queue.json");
+    this.file = path2.join(opts.dir, "queue.json");
   }
   async write(items) {
     if (items.length === 0) {
@@ -783,7 +1061,7 @@ var DefaultAttachmentStore = class {
     let data = input.data;
     if (this.spoolDir && bytes >= this.spoolThreshold) {
       await fsp.mkdir(this.spoolDir, { recursive: true });
-      spooledPath = path14.join(this.spoolDir, `${id}.bin`);
+      spooledPath = path2.join(this.spoolDir, `${id}.bin`);
       await atomicWrite(spooledPath, input.data, {
         encoding: input.kind === "image" ? "base64" : "utf8"
       });
@@ -968,7 +1246,7 @@ ${body.trim()}`);
   async remember(text, scope = "project-memory") {
     return this.runSerialized(scope, async () => {
       const file = this.files[scope];
-      await ensureDir(path14.dirname(file));
+      await ensureDir(path2.dirname(file));
       let existing = "";
       try {
         existing = await fsp.readFile(file, "utf8");
@@ -1607,7 +1885,7 @@ var RecoveryLock = class {
   sessionStore;
   probe;
   constructor(opts) {
-    this.file = path14.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;
@@ -1665,7 +1943,7 @@ var RecoveryLock = class {
    * null return before calling this.
    */
   async write(sessionId) {
-    await ensureDir(path14.dirname(this.file));
+    await ensureDir(path2.dirname(this.file));
     const lock = {
       v: 1,
       sessionId,
@@ -1769,6 +2047,12 @@ function compileUserRegex(pattern, flags) {
 }
 
 // src/storage/session-reader.ts
+function expectDefined3(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DefaultSessionReader = class {
   store;
   constructor(opts) {
@@ -1830,7 +2114,7 @@ var DefaultSessionReader = class {
         continue;
       }
       for (let i = 0; i < data.events.length; i++) {
-        const ev = data.events[i];
+        const ev = expectDefined3(data.events[i]);
         if (allowedTypes && !allowedTypes.has(ev.type)) continue;
         const text = eventText(ev);
         if (text === null) continue;
@@ -2043,6 +2327,12 @@ function renderPlainText(meta, events) {
   }
   return lines.join("\n");
 }
+function expectDefined4(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var FILE_VERSION = 1;
 var MAX_TEXT_LENGTH = 2e3;
 var MAX_ANNOTATIONS = 1e3;
@@ -2134,7 +2424,7 @@ var AnnotationsStore = class {
         return;
       }
       const next = {
-        ...all[idx],
+        ...expectDefined4(all[idx]),
         resolved: true,
         resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
         resolvedBy: input.resolvedBy
@@ -2150,7 +2440,7 @@ var AnnotationsStore = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path14.join(this.dir, `${sessionId}.annotations.json`);
+    return path2.join(this.dir, `${sessionId}.annotations.json`);
   }
   async readFile(sessionId) {
     const fp = this.filePath(sessionId);
@@ -2307,7 +2597,7 @@ var ReplayLogStore = class {
       out.push({
         sessionId,
         entryCount: all.length,
-        path: path14.join(this.dir, name)
+        path: path2.join(this.dir, name)
       });
     }
     return out.sort((a, b) => a.sessionId.localeCompare(b.sessionId));
@@ -2317,7 +2607,7 @@ var ReplayLogStore = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path14.join(this.dir, `${sessionId}.replay.jsonl`);
+    return path2.join(this.dir, `${sessionId}.replay.jsonl`);
   }
   async readAll(sessionId) {
     const fp = this.filePath(sessionId);
@@ -2367,6 +2657,12 @@ var ReplayLogStore = class {
     return next;
   }
 };
+function expectDefined5(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var SessionRecovery = class {
   constructor(dir) {
     this.dir = dir;
@@ -2407,7 +2703,7 @@ var SessionRecovery = class {
       const lines = raw.split("\n").filter((l) => l.trim());
       for (let i = lines.length - 1; i >= 0; i--) {
         try {
-          const ev = JSON.parse(lines[i]);
+          const ev = JSON.parse(expectDefined5(lines[i]));
           if (ev.type === "in_flight_start") {
             return {
               sessionId,
@@ -2459,13 +2755,13 @@ var SessionRecovery = class {
     let lastCheckpoint = null;
     let lastCheckpointIdx = -1;
     for (let i = 0; i < events.length; i++) {
-      if (events[i].type === "checkpoint") {
-        lastCheckpoint = events[i];
+      if (events[i]?.type === "checkpoint") {
+        lastCheckpoint = expectDefined5(events[i]);
         lastCheckpointIdx = i;
       }
     }
     const pendingEvents = lastCheckpointIdx >= 0 ? events.slice(lastCheckpointIdx + 1) : events;
-    const lastEv = events[events.length - 1];
+    const lastEv = expectDefined5(events[events.length - 1]);
     const inFlightStart = lastEv.type === "in_flight_start" ? lastEv : null;
     const context = inFlightStart && inFlightStart.type === "in_flight_start" ? inFlightStart.context : null;
     return {
@@ -2505,9 +2801,15 @@ var SessionRecovery = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path14.join(this.dir, `${sessionId}.jsonl`);
+    return path2.join(this.dir, `${sessionId}.jsonl`);
   }
 };
+function expectDefined6(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var GENESIS_PREV = "0".repeat(64);
 var DEFAULT_FSYNC_EVERY = 100;
 var ToolAuditLog = class {
@@ -2574,7 +2876,7 @@ var ToolAuditLog = class {
   async verify(sessionId) {
     const entries = await this.readAll(sessionId);
     if (entries.length === 0) return { ok: true, entries: 0 };
-    if (entries[0].prevHash !== GENESIS_PREV) {
+    if (entries[0]?.prevHash !== GENESIS_PREV) {
       return {
         ok: false,
         brokenAt: 0,
@@ -2583,7 +2885,7 @@ var ToolAuditLog = class {
     }
     let prevHash = GENESIS_PREV;
     for (let i = 0; i < entries.length; i++) {
-      const e = entries[i];
+      const e = expectDefined6(entries[i]);
       if (e.prevHash !== prevHash) {
         return {
           ok: false,
@@ -2623,7 +2925,7 @@ var ToolAuditLog = class {
     if (!sessionId || sessionId.includes("/") || sessionId.includes("\\") || sessionId.includes("..")) {
       throw new Error(`Invalid sessionId: ${sessionId}`);
     }
-    return path14.join(this.dir, `${sessionId}.audit.jsonl`);
+    return path2.join(this.dir, `${sessionId}.audit.jsonl`);
   }
   async readAll(sessionId) {
     const fp = this.filePath(sessionId);
@@ -2791,11 +3093,20 @@ var SessionAnalyzer = class {
   }
   calcDuration(events) {
     if (events.length < 2) return 0;
-    const first = new Date(events[0].ts).getTime();
-    const last = new Date(events[events.length - 1].ts).getTime();
+    const firstEvent = events[0];
+    const lastEvent = events[events.length - 1];
+    if (!firstEvent || !lastEvent) return 0;
+    const first = new Date(firstEvent.ts).getTime();
+    const last = new Date(lastEvent.ts).getTime();
     return last - first;
   }
 };
+function expectDefined7(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var DefaultSessionRewinder = class {
   constructor(sessionsDir, projectRoot) {
     this.sessionsDir = sessionsDir;
@@ -2804,7 +3115,7 @@ var DefaultSessionRewinder = class {
   sessionsDir;
   projectRoot;
   async listCheckpoints(sessionId) {
-    const file = path14.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();
@@ -2829,12 +3140,12 @@ var DefaultSessionRewinder = class {
     return checkpoints;
   }
   async rewindToCheckpoint(sessionId, checkpointIndex) {
-    const file = path14.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;
     for (let i = 0; i < events.length; i++) {
-      const event = events[i];
+      const event = expectDefined7(events[i]);
       if (event.type === "checkpoint") {
         const checkpointEvent = event;
         if (checkpointEvent.promptIndex === checkpointIndex) {
@@ -2848,7 +3159,7 @@ var DefaultSessionRewinder = class {
     }
     const snapshotsToRevert = [];
     for (let i = targetIdx + 1; i < events.length; i++) {
-      const event = events[i];
+      const event = expectDefined7(events[i]);
       if (event.type === "checkpoint") {
         break;
       }
@@ -2864,7 +3175,7 @@ var DefaultSessionRewinder = class {
     return { ...result, toPromptIndex: checkpointIndex, removedEvents };
   }
   async rewindLastN(sessionId, n) {
-    const file = path14.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 = [];
@@ -2893,7 +3204,7 @@ var DefaultSessionRewinder = class {
     return { ...result, toPromptIndex: targetIndex, removedEvents: snapshotsToRevert.length };
   }
   async rewindToStart(sessionId) {
-    const file = path14.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 = [];
@@ -2929,10 +3240,10 @@ async function revertSnapshots(snapshots, projectRoot) {
   for (const snapshot of snapshots) {
     for (const file of snapshot.files) {
       try {
-        const absPath = path14.resolve(file.path);
-        const root = path14.resolve(projectRoot);
-        const rel = path14.relative(root, absPath);
-        if (rel.startsWith("..") || path14.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;
         }
@@ -2968,7 +3279,7 @@ async function loadTodosCheckpoint(filePath) {
     const parsed = JSON.parse(raw);
     if (parsed?.version !== 1 || !Array.isArray(parsed.todos)) return null;
     return parsed.todos.filter(
-      (t) => !!t && typeof t.id === "string" && typeof t.content === "string" && typeof t.status === "string"
+      (t) => !!t && typeof t.id === "string" && typeof t.content === "string" && typeof t.status === "string" && (t.activeForm === void 0 || typeof t.activeForm === "string")
     );
   } catch {
     return null;
@@ -3491,8 +3802,8 @@ var FsError = class extends WrongStackError {
 // src/storage/goal-store.ts
 var MAX_JOURNAL_ENTRIES = 500;
 function goalFilePath(projectRoot) {
-  const hash = createHash("sha256").update(path14.resolve(projectRoot)).digest("hex").slice(0, 12);
-  return path14.join(os.homedir(), ".wrongstack", "projects", hash, "goal.json");
+  const hash = createHash("sha256").update(path2.resolve(projectRoot)).digest("hex").slice(0, 12);
+  return path2.join(os.homedir(), ".wrongstack", "projects", hash, "goal.json");
 }
 async function loadGoal(filePath) {
   let raw;
@@ -3607,7 +3918,7 @@ var DefaultPromptStore = class {
         if (!file.endsWith(".json")) continue;
         try {
           const raw = JSON.parse(
-            await fsp.readFile(path14.join(this.dir, file), "utf8")
+            await fsp.readFile(path2.join(this.dir, file), "utf8")
           );
           entries.push(raw.entry);
         } catch {
@@ -3620,7 +3931,7 @@ var DefaultPromptStore = class {
     );
   }
   async get(id) {
-    const file = path14.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;
@@ -3630,12 +3941,12 @@ var DefaultPromptStore = class {
   }
   async save(entry) {
     await ensureDir(this.dir);
-    const file = path14.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 = path14.join(this.dir, `${id}.json`);
+    const file = path2.join(this.dir, `${id}.json`);
     try {
       await fsp.unlink(file);
       return true;
@@ -3663,13 +3974,19 @@ var DefaultPromptStore = class {
     };
   }
 };
+function expectDefined8(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var ALL_SYNC_CATEGORIES = ["settings", "skills", "prompts", "memory", "history"];
 var CloudSync = class {
   constructor(paths, getConfig, setConfig) {
     this.paths = paths;
     this.getConfig = getConfig;
     this.setConfig = setConfig;
-    this.statePath = path14.join(paths.globalRoot, "sync-state.json");
+    this.statePath = path2.join(paths.globalRoot, "sync-state.json");
   }
   paths;
   getConfig;
@@ -3705,8 +4022,8 @@ var CloudSync = class {
     const cfg = this.getConfig();
     if (!cfg?.enabled) return { ok: false, action: "push", categories: [], message: "Not enabled." };
     const parts = cfg.repo.split("/");
-    const owner = parts[0];
-    const repoName = parts[1];
+    const owner = expectDefined8(parts[0]);
+    const repoName = expectDefined8(parts[1]);
     const branch = "main";
     const baseTreeSha = this.state?.sha;
     const { treeEntries, rev } = await this.buildLocalTree(cfg.categories);
@@ -3758,8 +4075,8 @@ var CloudSync = class {
     const cfg = this.getConfig();
     if (!cfg?.enabled) return { ok: false, action: "pull", categories: [], message: "Not enabled." };
     const pullParts = cfg.repo.split("/");
-    const owner = pullParts[0];
-    const repoName = pullParts[1];
+    const owner = expectDefined8(pullParts[0]);
+    const repoName = expectDefined8(pullParts[1]);
     const branchData = await this.getRef(token, owner, repoName, "main");
     const currentSha = branchData.object.sha;
     const commitData = await this.getCommit(token, owner, repoName, currentSha);
@@ -3776,7 +4093,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(path14.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);
@@ -3814,7 +4131,7 @@ var CloudSync = class {
   // ── GitHub API helpers ──────────────────────────────────────────────
   async githubFetch(token, owner, repo, method, pathSegment, body) {
     const url = `https://api.github.com/repos/${owner}/${repo}${pathSegment}`;
-    const res = await fetch(url, {
+    const init = {
       signal: AbortSignal.timeout(15e3),
       method,
       headers: {
@@ -3822,9 +4139,10 @@ var CloudSync = class {
         Accept: "application/vnd.github+json",
         "X-GitHub-Api-Version": "2022-11-28",
         "Content-Type": "application/json"
-      },
-      body: body !== void 0 ? JSON.stringify(body) : void 0
-    });
+      }
+    };
+    if (body !== void 0) init.body = JSON.stringify(body);
+    const res = await fetch(url, init);
     if (!res.ok) {
       const errText = await res.text();
       throw new Error(`GitHub API ${method} ${pathSegment} failed (${res.status}): ${errText}`);
@@ -3882,7 +4200,7 @@ var CloudSync = class {
           const files = await this.walkDir(localPath, localPath);
           for (const file of files) {
             const content = await fsp.readFile(file, "utf8");
-            const rel = path14.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);
           }
@@ -3939,7 +4257,7 @@ var CloudSync = class {
     const results = [];
     const entries = await fsp.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const full = path14.join(dir, entry.name);
+      const full = path2.join(dir, entry.name);
       if (entry.isDirectory()) {
         results.push(...await this.walkDir(full, base));
       } else {
@@ -3956,15 +4274,15 @@ function resolvePulledCategoryPath(cat, localPath, rel, remotePath) {
     return localPath;
   }
   if (!rel) return localPath;
-  const normalizedRel = path14.normalize(rel);
-  const traversesUp = normalizedRel === ".." || normalizedRel.startsWith(`..${path14.sep}`);
-  if (path14.isAbsolute(normalizedRel) || traversesUp) {
+  const normalizedRel = path2.normalize(rel);
+  const traversesUp = normalizedRel === ".." || normalizedRel.startsWith(`..${path2.sep}`);
+  if (path2.isAbsolute(normalizedRel) || traversesUp) {
     throw new Error(`Refusing CloudSync path traversal: ${remotePath}`);
   }
-  const dest = path14.resolve(localPath, normalizedRel);
-  const root = path14.resolve(localPath);
-  const relative3 = path14.relative(root, dest);
-  if (relative3.startsWith("..") || path14.isAbsolute(relative3)) {
+  const dest = path2.resolve(localPath, normalizedRel);
+  const root = path2.resolve(localPath);
+  const relative3 = path2.relative(root, dest);
+  if (relative3.startsWith("..") || path2.isAbsolute(relative3)) {
     throw new Error(`Refusing CloudSync path outside category root: ${remotePath}`);
   }
   return dest;