@wrongstack/core 0.73.1 → 0.82.6

package/dist/coordination/index.js

@@ -410,7 +410,7 @@ var InMemoryBridgeTransport = class {
   }
   subscribe(agentId, handler) {
     if (!this.subs.has(agentId)) this.subs.set(agentId, /* @__PURE__ */ new Set());
-    this.subs.get(agentId).add(handler);
+    this.subs.get(agentId)?.add(handler);
     return () => this.subs.get(agentId)?.delete(handler);
   }
   close(agentId) {
@@ -528,6 +528,12 @@ function createMessage(type, from, payload, to) {
     priority: "normal"
   };
 }
+function expectDefined(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 var GLOB_CHARS = /* @__PURE__ */ new Set(["*", "?", "["]);
 var IS_WINDOWS = process.platform === "win32";
 var SEP = IS_WINDOWS ? "\\" : "/";
@@ -541,7 +547,7 @@ function globToRegex(pat) {
   let i = 0;
   let re = "^";
   while (i < pat.length) {
-    const c = pat[i];
+    const c = expectDefined(pat[i]);
     if (c === "*") {
       if (pat[i + 1] === "*") {
         re += ".*";
@@ -580,7 +586,7 @@ function globToRegex(pat) {
 }
 function baseDir(pat) {
   let i = pat.length - 1;
-  while (i >= 0 && !GLOB_CHARS.has(pat[i]) && pat[i] !== SEP && pat[i] !== "/") i--;
+  while (i >= 0 && !GLOB_CHARS.has(expectDefined(pat[i])) && pat[i] !== SEP && pat[i] !== "/") i--;
   const cut = i >= 0 ? pat.lastIndexOf(SEP, i) : pat.lastIndexOf("/", i);
   return cut < 0 ? "." : pat.slice(0, cut);
 }
@@ -811,7 +817,7 @@ var CollabSession = class extends EventEmitter {
       this.emit("session.error", error);
       throw error;
     }
-    for (const result of results.flat()) {
+    for (const result of results?.flat() ?? []) {
       await this.parseAndEmit(result);
     }
     const report = this.assembleReport();
@@ -872,7 +878,7 @@ var CollabSession = class extends EventEmitter {
   }
   budgetForRole(role) {
     if (this.options.budgetOverrides?.[role]) {
-      return this.options.budgetOverrides[role];
+      return this.options.budgetOverrides[role] ?? { maxIterations: 0, maxToolCalls: 0, timeoutMs: 0 };
     }
     const defaults = {
       "bug-hunter": { maxIterations: 2e3, maxToolCalls: 5e3, timeoutMs: 10 * 60 * 1e3 },
@@ -3461,6 +3467,11 @@ function getAgentDefinition(role) {
 
 // src/coordination/dispatcher.ts
 var DEFAULT_DISPATCH_ROLE = "executor";
+var FALLBACK_DEFINITION = {
+  config: { role: "unknown", name: "Unknown Agent" },
+  budget: {},
+  capability: { phase: "meta", summary: "", keywords: [] }
+};
 function normalize(text) {
   return ` ${text.toLowerCase().replace(/[^a-z0-9]+/g, " ").trim()} `;
 }
@@ -3488,7 +3499,7 @@ function scoreAgents(task, catalog = AGENT_CATALOG) {
 }
 function heuristicConfidence(candidates) {
   if (candidates.length === 0) return 0;
-  const top = candidates[0].score;
+  const top = candidates[0]?.score ?? 0;
   const second = candidates[1]?.score ?? 0;
   const strength = Math.min(1, top / 3);
   const margin = (top - second + 1) / (top + 1);
@@ -3504,7 +3515,7 @@ async function dispatchAgent(task, opts = {}) {
   if (top && confidence >= threshold) {
     return {
       role: top.role,
-      definition: catalog[top.role],
+      definition: catalog[top.role] ?? FALLBACK_DEFINITION,
       confidence,
       method: "heuristic",
       reason: `Matched keywords: ${top.matched.slice(0, 4).join(", ")}`,
@@ -3512,7 +3523,7 @@ async function dispatchAgent(task, opts = {}) {
     };
   }
   if (opts.classifier) {
-    const pool = (candidates.length > 0 ? candidates.slice(0, maxCandidates).map((c) => catalog[c.role]) : ALL_AGENT_DEFINITIONS).map((d) => ({
+    const pool = (candidates.length > 0 ? candidates.slice(0, maxCandidates).map((c) => catalog[c.role] ?? FALLBACK_DEFINITION) : ALL_AGENT_DEFINITIONS).map((d) => ({
       role: d.config.role,
       name: d.config.name,
       summary: d.capability.summary
@@ -3522,7 +3533,7 @@ async function dispatchAgent(task, opts = {}) {
       if (choice && catalog[choice.role]) {
         return {
           role: choice.role,
-          definition: catalog[choice.role],
+          definition: catalog[choice.role] ?? FALLBACK_DEFINITION,
           confidence: 1,
           method: "llm",
           reason: choice.reason ?? "Selected by LLM classifier",
@@ -3535,17 +3546,17 @@ async function dispatchAgent(task, opts = {}) {
   if (top) {
     return {
       role: top.role,
-      definition: catalog[top.role],
+      definition: catalog[top.role] ?? FALLBACK_DEFINITION,
       confidence,
       method: "heuristic",
       reason: `Weak match (${top.matched.slice(0, 3).join(", ") || "low signal"})`,
       alternatives: candidates.slice(1, maxCandidates)
     };
   }
-  const fallbackRole = catalog[DEFAULT_DISPATCH_ROLE] ? DEFAULT_DISPATCH_ROLE : Object.keys(catalog)[0];
+  const fallbackRole = catalog[DEFAULT_DISPATCH_ROLE] ? DEFAULT_DISPATCH_ROLE : Object.keys(catalog)[0] ?? DEFAULT_DISPATCH_ROLE;
   return {
     role: fallbackRole,
-    definition: catalog[fallbackRole],
+    definition: catalog[fallbackRole] ?? FALLBACK_DEFINITION,
     confidence: 0,
     method: "fallback",
     reason: "No keyword signal; defaulting to the generalist Executor",
@@ -3624,7 +3635,7 @@ function makeSpawnTool(director, roster) {
         });
         const dispatchRole = dispatchResult.role;
         if (roster?.[dispatchRole]) {
-          cfg = instantiateRosterConfig(dispatchRole, roster[dispatchRole]);
+          cfg = instantiateRosterConfig(dispatchRole, roster[dispatchRole] ?? {});
         } else {
           const def = dispatchResult.definition;
           cfg = {
@@ -4451,16 +4462,16 @@ var SubagentBudget = class _SubagentBudget {
     }
     if (exceeded.length === 0) return [];
     if (!this._onThreshold) {
-      const first2 = exceeded[0];
+      const first2 = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       throw new BudgetExceededError(first2.kind, first2.limit, first2.used);
     }
     if (this._mode === "sync") {
-      const first2 = exceeded[0];
+      const first2 = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       throw new BudgetExceededError(first2.kind, first2.limit, first2.used);
     }
     const bus = this._events;
     if (!bus || !bus.hasListenerFor("budget.threshold_reached")) {
-      const first2 = exceeded[0];
+      const first2 = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       throw new BudgetExceededError(first2.kind, first2.limit, first2.used);
     }
     for (const entry of exceeded) {
@@ -4468,8 +4479,9 @@ var SubagentBudget = class _SubagentBudget {
       const decision2 = this._negotiateExtension(entry.kind, exceeded);
       this._pendingNegotiations.set(entry.kind, decision2);
     }
-    const first = exceeded[0];
+    const first = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
     const decision = this._pendingNegotiations.get(first.kind);
+    if (!decision) throw new Error(`No pending negotiation for ${first.kind}`);
     throw new BudgetThresholdSignal(first.kind, first.limit, first.used, decision);
   }
   /**
@@ -4491,8 +4503,11 @@ var SubagentBudget = class _SubagentBudget {
    * a fresh signal.
    */
   async _negotiateExtension(kind, exceeded) {
+    if (!this._onThreshold) {
+      return "stop";
+    }
     try {
-      const first = exceeded[0];
+      const first = exceeded[0] ?? { kind: "iterations", limit: 0, used: 0 };
       const result = this._onThreshold({
         kind: first.kind,
         used: first.used,
@@ -5515,6 +5530,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
   takeNextDispatchableTask() {
     for (let i = 0; i < this.pendingTasks.length; i++) {
       const task = this.pendingTasks[i];
+      if (!task) continue;
       const subagentId = task.subagentId ? this.isIdleSubagent(task.subagentId) ? task.subagentId : null : this.findIdleSubagent();
       if (!subagentId) continue;
       this.pendingTasks.splice(i, 1);
@@ -5706,14 +5722,14 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
         const idleExceeded = idleLimit !== void 0 && budget.idleMs() >= idleLimit;
         if (idleExceeded && !wallExceeded) {
           this.subagents.get(ctx.subagentId)?.abortController.abort();
-          reject(new BudgetExceededError("timeout", idleLimit, budget.idleMs()));
+          reject(new BudgetExceededError("timeout", idleLimit ?? 0, budget.idleMs()));
           return;
         }
         if (!wallExceeded) {
           scheduleNext();
           return;
         }
-        const limit = wallLimit;
+        const limit = wallLimit ?? 0;
         if (!budget.onThreshold) {
           this.subagents.get(ctx.subagentId)?.abortController.abort();
           reject(new BudgetExceededError("timeout", limit, elapsed));
@@ -7131,6 +7147,7 @@ function createDelegateTool(opts) {
       if (typeof i.task !== "string" || !i.task.trim()) {
         return { ok: false, error: "`task` is required." };
       }
+      const target = i.role ?? i.name ?? "subagent";
       try {
         let director = await opts.host.ensureDirector();
         if (!director) {
@@ -7191,6 +7208,7 @@ function createDelegateTool(opts) {
         if (!cfg.timeoutMs) {
           cfg.timeoutMs = Math.max(3e4, timeoutMs - SUBAGENT_TIMEOUT_BUFFER_MS);
         }
+        opts.events?.emit("delegate.started", { target, task: i.task });
         const subagentId = await director.spawn(cfg);
         const taskId = await director.assign({
           id: `${randomUUID()}`,
@@ -7225,6 +7243,17 @@ function createDelegateTool(opts) {
         });
         if ("__timeout" in result) {
           const partial2 = await readSubagentPartial(opts, subagentId);
+          opts.events?.emit("delegate.completed", {
+            target,
+            task: i.task,
+            ok: false,
+            status: "host_timeout",
+            summary: `[${target}] timed out \u2014 no result within ${Math.round(timeoutMs / 1e3)}s`,
+            durationMs: timeoutMs,
+            iterations: partial2?.events ?? 0,
+            toolCalls: partial2?.toolUsesObserved ?? 0,
+            subagentId
+          });
           return {
             ok: false,
             stopReason: "host_timeout",
@@ -7241,6 +7270,24 @@ function createDelegateTool(opts) {
         const retryable = result.error?.retryable;
         const backoffMs = result.error?.backoffMs;
         const summary = buildDelegateSummary(i.role, result);
+        let costUsd;
+        try {
+          costUsd = dir.snapshot().perSubagent[result.subagentId]?.cost;
+        } catch {
+          costUsd = void 0;
+        }
+        opts.events?.emit("delegate.completed", {
+          target,
+          task: i.task,
+          ok: result.status === "success",
+          status: result.status,
+          summary,
+          durationMs: result.durationMs,
+          iterations: result.iterations,
+          toolCalls: result.toolCalls,
+          costUsd,
+          subagentId: result.subagentId
+        });
         return {
           ok: result.status === "success",
           status: result.status,
@@ -7262,10 +7309,21 @@ function createDelegateTool(opts) {
           summary
         };
       } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        opts.events?.emit("delegate.completed", {
+          target,
+          task: i.task,
+          ok: false,
+          status: "error",
+          summary: `[${target}] failed \u2014 ${message}`,
+          durationMs: 0,
+          iterations: 0,
+          toolCalls: 0
+        });
         return {
           ok: false,
           stopReason: "error",
-          error: err instanceof Error ? err.message : String(err)
+          error: message
         };
       }
     }
@@ -7571,6 +7629,12 @@ function defaultFormatTaskInput(task) {
 }
 
 // src/utils/message-invariants.ts
+function expectDefined2(value) {
+  if (value === null || value === void 0) {
+    throw new Error("Expected value to be defined");
+  }
+  return value;
+}
 function repairToolUseAdjacency(messages) {
   const removedToolUses = [];
   const removedToolResults = [];
@@ -7578,7 +7642,7 @@ function repairToolUseAdjacency(messages) {
   let changed = false;
   const out = [];
   for (let i = 0; i < messages.length; i++) {
-    const original = messages[i];
+    const original = expectDefined2(messages[i]);
     let msg = original;
     if (hasToolUse(msg)) {
       const nextIds = toolResultIds(messages[i + 1]);
@@ -7663,7 +7727,23 @@ function isEmptyMessage(msg) {
 }
 
 // src/storage/session-store.ts
-var DefaultSessionStore = class {
+function expectDefined3(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;
@@ -7672,19 +7752,29 @@ var DefaultSessionStore = class {
     this.events = opts.events;
     this.secretScrubber = opts.secretScrubber;
   }
+  /** Absolute path to the session index file. */
+  get indexFile() {
+    return path4.join(this.dir, "_index.jsonl");
+  }
   /** Join session ID to its absolute path within the store directory. */
   sessionPath(id, ext) {
     return path4.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 = path4.dirname(path4.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 = path4.join(shardDir, `${id}.jsonl`);
+    const file = path4.join(shardDir, `${path4.basename(id)}.jsonl`);
     let handle;
     try {
       handle = await fsp6.open(file, "a", 384);
@@ -7698,7 +7788,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(() => {
@@ -7729,7 +7820,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) {
@@ -7759,6 +7850,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);
@@ -7772,16 +7872,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 fsp6.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 fsp6.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 fsp6.writeFile(tmp, lines, "utf8");
+    await fsp6.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 fsp6.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 fsp6.writeFile(tmp, lines, "utf8");
+    await fsp6.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 fsp6.readdir(dir, { withFileTypes: true });
+    let entries;
+    try {
+      entries = await fsp6.readdir(dir, { withFileTypes: true });
+    } catch {
+      return ids;
+    }
     for (const entry of entries) {
-      const full = path4.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(path4.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;
@@ -7804,9 +8009,70 @@ var DefaultSessionStore = class {
       return summary;
     }
   }
-  async delete(id) {
-    await fsp6.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 fsp6.unlink(this.sessionPath(id, ".jsonl")).catch(() => void 0);
     await fsp6.unlink(this.sessionPath(id, ".summary.json")).catch(() => void 0);
+    const shardDir = path4.dirname(path4.join(this.dir, id));
+    const base = path4.basename(id);
+    for (const ext of [".plan.json", ".todos.json"]) {
+      await fsp6.unlink(path4.join(shardDir, `${base}${ext}`)).catch(() => void 0);
+    }
+    const sessDir = path4.join(shardDir, base);
+    await fsp6.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 fsp6.readFile(path4.join(this.dir, "active.json"), "utf8");
+      const active = JSON.parse(raw);
+      activeSessionId = active.sessionId ?? null;
+    } catch {
+    }
+    const entries = await fsp6.readdir(this.dir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const dateDir = path4.join(this.dir, entry.name);
+      const files = await fsp6.readdir(dateDir, { withFileTypes: true }).catch(() => []);
+      for (const file of files) {
+        if (!file.isFile() || !file.name.endsWith(".jsonl")) continue;
+        const jsonlPath = path4.join(dateDir, file.name);
+        try {
+          const stat4 = await fsp6.stat(jsonlPath);
+          if (stat4.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 = path4.join(this.dir, entry.name);
+      try {
+        const remaining = await fsp6.readdir(dateDir);
+        if (remaining.length === 0) {
+          await fsp6.rmdir(dateDir).catch(() => void 0);
+        }
+      } catch {
+      }
+    }
+    return deleted;
   }
   async clearHistory(id) {
     await this.ensureShardDir(id);
@@ -7828,13 +8094,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 {
@@ -7933,9 +8228,10 @@ var FileSessionWriter = class {
     this.meta = meta;
     this.events = events;
     this.resumed = opts.resumed ?? false;
-    this.manifestFile = opts.dir ? path4.join(opts.dir, `${id}.summary.json`) : "";
+    this.manifestFile = opts.dir ? path4.join(opts.dir, `${path4.basename(id)}.summary.json`) : "";
     this.filePath = opts.filePath ?? "";
     this.secretScrubber = opts.secretScrubber;
+    this.onCloseCb = opts.onClose;
     this.summary = {
       id,
       title: "(empty session)",
@@ -7965,6 +8261,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
@@ -8042,8 +8347,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) };
@@ -8054,18 +8373,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 {
@@ -8107,7 +8443,7 @@ var FileSessionWriter = class {
     let targetCheckpointLine = -1;
     let afterTarget = false;
     for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
+      const line = expectDefined3(lines[i]);
       if (!line.trim()) continue;
       let event;
       try {
@@ -8273,7 +8609,10 @@ function attachAutoExtend(events, policy = {}) {
       if (kind === "timeout" || kind === "idle_timeout") {
         if (progress > lastTimeoutProgress) {
           lastTimeoutProgress = progress;
-          const next2 = Math.min(Math.ceil(limit * (1 + factor)), ceiling.timeoutMs);
+          const next2 = Math.min(
+            Math.ceil(limit * (1 + factor)),
+            ceiling.timeoutMs ?? DEFAULT_CEILING.timeoutMs
+          );
           extend({ timeoutMs: next2 });
         } else {
           deny();
@@ -8287,7 +8626,7 @@ function attachAutoExtend(events, policy = {}) {
       }
       extendCounts.set(kind, count + 1);
       const field = FIELD_BY_KIND[kind];
-      const cap = ceiling[field];
+      const cap = ceiling[field] ?? DEFAULT_CEILING[field];
       const next = Math.min(Math.ceil(limit * (1 + factor)), cap);
       extend({ [field]: next });
     })