@wrongstack/core 0.313.1 → 0.316.2

package/dist/{chunk-AI4LLQ2U.js → chunk-27QIURLN.js}

@@ -1,23 +1,86 @@
+import {
+  shouldSkipSessionDirectoryEntry
+} from "./chunk-JMULFFLN.js";
 import {
   SESSION_CATALOG_DEFAULT_LEASE_MS,
   SESSION_CATALOG_DEFAULT_RESERVATION_MS,
   SESSION_CATALOG_MAX_AGENTS
-} from "./chunk-E6I5RXVK.js";
+} from "./chunk-AYW5YINX.js";
+import {
+  isSessionTranscriptFileName
+} from "./chunk-5BMIE7QG.js";
 import {
   loadDatabaseSync
-} from "./chunk-GM54GJBU.js";
+} from "./chunk-IRUTEHCE.js";
 import {
   DefaultSecretScrubber
-} from "./chunk-3E244UDA.js";
-import {
-  isSessionTranscriptFileName
-} from "./chunk-AD7ZFZCS.js";
+} from "./chunk-QSTSJOCK.js";
 import {
   isPidAlive
 } from "./chunk-TRT2HRWZ.js";
 import {
   atomicWrite
-} from "./chunk-7ZHZE5EO.js";
+} from "./chunk-OSGLYW5J.js";
+import {
+  totalUsageTokens
+} from "./chunk-3ECENVHL.js";
+
+// src/session-catalog/session-agents.ts
+function deriveSessionAgents(events) {
+  const rows = /* @__PURE__ */ new Map();
+  const upsert = (agentId) => {
+    let row = rows.get(agentId);
+    if (!row) {
+      row = { agentId, status: "running", interleavedEventCount: 0 };
+      rows.set(agentId, row);
+    }
+    return row;
+  };
+  for (const event of events) {
+    if (event.agentId !== void 0 && event.agentId !== "") {
+      const isLifecycle = event.type === "agent_spawned" || event.type === "agent_session_linked" || event.type === "agent_stopped" || event.type === "agent_error";
+      const row = upsert(event.agentId);
+      if (!isLifecycle) row.interleavedEventCount += 1;
+    }
+    switch (event.type) {
+      case "agent_spawned": {
+        const row = upsert(event.agentId);
+        row.role = event.role;
+        row.spawnedAt ??= event.ts;
+        break;
+      }
+      case "agent_session_linked": {
+        const row = upsert(event.agentId);
+        row.agentSessionId = event.agentSessionId;
+        if (event.transcriptPath !== void 0) row.transcriptPath = event.transcriptPath;
+        if (event.provider !== void 0) row.provider = event.provider;
+        if (event.model !== void 0) row.model = event.model;
+        if (event.parentAgentId !== void 0) row.parentAgentId = event.parentAgentId;
+        row.spawnedAt ??= event.ts;
+        break;
+      }
+      case "agent_stopped": {
+        const row = upsert(event.agentId);
+        row.endedAt = event.ts;
+        if (row.status !== "failed") {
+          row.status = event.reason === "failed" || event.reason === "aborted" ? "failed" : "completed";
+        }
+        if (event.usage !== void 0) row.usage = event.usage;
+        break;
+      }
+      case "agent_error": {
+        const row = upsert(event.agentId);
+        row.status = "failed";
+        row.error = event.error;
+        row.endedAt ??= event.ts;
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  return [...rows.values()];
+}
 
 // src/session-catalog/store.ts
 import { randomBytes, randomUUID } from "node:crypto";
@@ -122,6 +185,30 @@ function initializeCatalogSchema(db) {
       acquired_at INTEGER NOT NULL,
       expires_at INTEGER NOT NULL
     );
+    CREATE TABLE IF NOT EXISTS session_agents (
+      session_id TEXT NOT NULL,
+      agent_id TEXT NOT NULL,
+      role TEXT,
+      provider TEXT,
+      model TEXT,
+      agent_session_id TEXT,
+      transcript_path TEXT,
+      parent_agent_id TEXT,
+      spawned_at TEXT,
+      ended_at TEXT,
+      status TEXT NOT NULL,
+      error TEXT,
+      interleaved_event_count INTEGER NOT NULL DEFAULT 0,
+      usage_json TEXT,
+      ordinal INTEGER NOT NULL DEFAULT 0,
+      PRIMARY KEY (session_id, agent_id)
+    );
+    CREATE TABLE IF NOT EXISTS session_agent_index (
+      session_id TEXT PRIMARY KEY,
+      transcript_size INTEGER NOT NULL,
+      transcript_mtime_ms REAL NOT NULL,
+      derived_at TEXT NOT NULL
+    );
     CREATE INDEX IF NOT EXISTS idx_sessions_activity ON sessions(indexed_at DESC);
     CREATE INDEX IF NOT EXISTS idx_leases_expiry ON session_leases(lease_expires_at);
     CREATE INDEX IF NOT EXISTS idx_reservations_expiry ON resume_reservations(expires_at);
@@ -140,7 +227,9 @@ function walkSessionFiles(root, suffix) {
   const visit = (dir) => {
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
       if (entry.isDirectory()) {
-        if (entry.name !== "_cas" && entry.name !== "_trash") visit(path.join(dir, entry.name));
+        if (entry.name === "_cas" || entry.name === "_trash") continue;
+        if (shouldSkipSessionDirectoryEntry(entry.name)) continue;
+        visit(path.join(dir, entry.name));
       } else if (entry.isFile() && entry.name.endsWith(suffix))
         result.push(path.join(dir, entry.name));
     }
@@ -158,6 +247,8 @@ function summarizeTranscriptFile(transcriptFilePath, id) {
   let toolCallCount = 0;
   let compactionCount = 0;
   let tokenTotal = 0;
+  let routedModel;
+  let routedProvider;
   for (const line of lines) {
     if (!line) continue;
     let event;
@@ -173,7 +264,9 @@ function summarizeTranscriptFile(transcriptFilePath, id) {
       messageCount++;
     if (event.type === "llm_response") {
       iterationCount++;
-      tokenTotal += event.usage.input + event.usage.output + (event.usage.cacheRead ?? 0) + (event.usage.cacheWrite ?? 0);
+      tokenTotal += totalUsageTokens(event.usage);
+      if (event.model) routedModel = event.model;
+      if (event.provider) routedProvider = event.provider;
     }
     if (event.type === "tool_call_end") toolCallCount++;
     if (event.type === "compaction") compactionCount++;
@@ -184,8 +277,8 @@ function summarizeTranscriptFile(transcriptFilePath, id) {
     title: id,
     startedAt: start.ts,
     ...endedAt ? { endedAt } : {},
-    model: start.model,
-    provider: start.provider,
+    model: routedModel ?? start.model,
+    provider: routedProvider ?? start.provider,
     tokenTotal,
     ...lastActivityAt ? { lastActivityAt } : {},
     messageCount,
@@ -478,6 +571,30 @@ var SessionCatalogStore = class {
       return credential;
     });
   }
+  /**
+   * Extend a live reservation the requester still owns.
+   *
+   * Deliberately does NOT call `reapExpired()` first: reaping would delete an
+   * already-expired row and turn the accurate "expired" answer into the
+   * indistinguishable "not owned by this requester". The caller needs to know
+   * which of the two happened.
+   */
+  renewReservation(reservationId, requesterInstanceId, reservationMs) {
+    return this.transaction(() => {
+      const row = this.db.prepare("SELECT * FROM resume_reservations WHERE reservation_id=?").get(reservationId);
+      if (!row || row.requester_instance_id !== requesterInstanceId)
+        throw conflict("Resume reservation is not owned by this requester");
+      if (row.expires_at <= Date.now()) throw conflict("Resume reservation expired");
+      const expiresAt = Date.now() + boundedMs(reservationMs, SESSION_CATALOG_DEFAULT_RESERVATION_MS, MAX_RESERVATION_MS);
+      this.db.prepare("UPDATE resume_reservations SET expires_at=? WHERE reservation_id=?").run(expiresAt, reservationId);
+      return {
+        reservationId,
+        targetSessionId: row.target_session_id,
+        requesterInstanceId,
+        expiresAt
+      };
+    });
+  }
   cancelReservation(reservationId, requesterInstanceId) {
     this.db.prepare("DELETE FROM resume_reservations WHERE reservation_id=? AND requester_instance_id=?").run(reservationId, requesterInstanceId);
   }
@@ -677,6 +794,105 @@ var SessionCatalogStore = class {
     const row = this.db.prepare("SELECT * FROM sessions WHERE session_id=?").get(sessionId);
     return row ? this.catalogRecord(row) : null;
   }
+  /**
+   * The agent roster of one session, derived from its journal.
+   *
+   * Cached in `session_agents`, keyed to the transcript's size and mtime: the
+   * journal is the authority, so the cache is a memo of a pure function over
+   * it rather than a second place agents get recorded. When the file has grown
+   * (the usual case — a live session) the rows are re-derived from scratch, so
+   * a partial read can never leave a half-updated roster behind.
+   *
+   * Returns `[]` for a session with no transcript on disk. A caller cannot
+   * distinguish that from "a real session that spawned nothing", and should
+   * not need to: both mean there is no agent to show.
+   */
+  listSessionAgents(sessionId) {
+    assertId(sessionId);
+    const summary = this.getSummary(sessionId);
+    if (!summary) return [];
+    const file = path2.join(this.sessionsDir, summary.transcriptRelativePath);
+    let stat;
+    try {
+      stat = fs2.statSync(file);
+    } catch {
+      return [];
+    }
+    const cached = this.db.prepare(
+      "SELECT transcript_size, transcript_mtime_ms FROM session_agent_index WHERE session_id=?"
+    ).get(sessionId);
+    if (cached && Number(cached.transcript_size) === stat.size && Number(cached.transcript_mtime_ms) === stat.mtimeMs) {
+      return this.readSessionAgentRows(sessionId);
+    }
+    let raw;
+    try {
+      raw = fs2.readFileSync(file, "utf8");
+    } catch {
+      return [];
+    }
+    const events = [];
+    for (const line of raw.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      try {
+        events.push(JSON.parse(trimmed));
+      } catch {
+      }
+    }
+    const derived = deriveSessionAgents(events);
+    this.writeSessionAgentRows(sessionId, derived, stat.size, stat.mtimeMs);
+    return derived;
+  }
+  readSessionAgentRows(sessionId) {
+    const rows = this.db.prepare("SELECT * FROM session_agents WHERE session_id=? ORDER BY ordinal ASC").all(sessionId);
+    return rows.map((row) => ({
+      agentId: row.agent_id,
+      ...row.role !== null ? { role: row.role } : {},
+      ...row.provider !== null ? { provider: row.provider } : {},
+      ...row.model !== null ? { model: row.model } : {},
+      ...row.agent_session_id !== null ? { agentSessionId: row.agent_session_id } : {},
+      ...row.transcript_path !== null ? { transcriptPath: row.transcript_path } : {},
+      ...row.parent_agent_id !== null ? { parentAgentId: row.parent_agent_id } : {},
+      ...row.spawned_at !== null ? { spawnedAt: row.spawned_at } : {},
+      ...row.ended_at !== null ? { endedAt: row.ended_at } : {},
+      status: row.status,
+      ...row.error !== null ? { error: row.error } : {},
+      interleavedEventCount: Number(row.interleaved_event_count),
+      ...row.usage_json !== null ? { usage: parseJson(row.usage_json) } : {}
+    }));
+  }
+  writeSessionAgentRows(sessionId, records, size, mtimeMs) {
+    this.transaction(() => {
+      this.db.prepare("DELETE FROM session_agents WHERE session_id=?").run(sessionId);
+      const insert = this.db.prepare(
+        `INSERT INTO session_agents(session_id,agent_id,role,provider,model,agent_session_id,transcript_path,parent_agent_id,spawned_at,ended_at,status,error,interleaved_event_count,usage_json,ordinal)
+         VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`
+      );
+      records.forEach((record, ordinal) => {
+        insert.run(
+          sessionId,
+          record.agentId,
+          record.role ?? null,
+          record.provider ?? null,
+          record.model ?? null,
+          record.agentSessionId ?? null,
+          record.transcriptPath ?? null,
+          record.parentAgentId ?? null,
+          record.spawnedAt ?? null,
+          record.endedAt ?? null,
+          record.status,
+          record.error ?? null,
+          record.interleavedEventCount,
+          record.usage ? JSON.stringify(record.usage) : null,
+          ordinal
+        );
+      });
+      this.db.prepare(
+        `INSERT INTO session_agent_index(session_id,transcript_size,transcript_mtime_ms,derived_at)
+           VALUES (?,?,?,?) ON CONFLICT(session_id) DO UPDATE SET transcript_size=excluded.transcript_size,transcript_mtime_ms=excluded.transcript_mtime_ms,derived_at=excluded.derived_at`
+      ).run(sessionId, size, mtimeMs, (/* @__PURE__ */ new Date()).toISOString());
+    });
+  }
   resolveId(query) {
     const normalized = query.trim();
     if (!normalized) throw new Error("Session not found: (empty query)");
@@ -851,6 +1067,7 @@ var SessionCatalogStore = class {
 };
 
 export {
+  deriveSessionAgents,
   SessionCatalogStore
 };
-//# sourceMappingURL=chunk-AI4LLQ2U.js.map
+//# sourceMappingURL=chunk-27QIURLN.js.map