@oxagen/cli 2.1.4-501 → 2.1.4-504

package/oxagen.mjs

@@ -8747,6 +8747,95 @@ var init_claude_desktop_writer = __esm({
   }
 });
 
+// ../../packages/tacho/src/claude-code/context.ts
+import { createHash as createHash3 } from "node:crypto";
+function digestText(value) {
+  return `sha256:${createHash3("sha256").update(value, "utf8").digest("hex")}`;
+}
+function deliveredContext(text4, bundleEtag) {
+  return text4 === null ? { chars: 0, bundle_etag: bundleEtag } : { digest: digestText(text4), chars: text4.length, bundle_etag: bundleEtag };
+}
+function readDeliveredContext(value) {
+  if (typeof value !== "object" || value === null) return void 0;
+  const { digest: digest6, chars, bundle_etag } = value;
+  if (typeof chars !== "number" || !Number.isSafeInteger(chars) || chars < 0)
+    return void 0;
+  if (digest6 !== void 0 && !isSha256Digest(digest6)) return void 0;
+  if (bundle_etag !== void 0 && (typeof bundle_etag !== "string" || bundle_etag.length === 0 || bundle_etag.length > 128))
+    return void 0;
+  return {
+    ...digest6 !== void 0 ? { digest: digest6 } : {},
+    chars,
+    ...bundle_etag !== void 0 ? { bundle_etag } : {}
+  };
+}
+function snapshotEnv(env, secretPattern = DEFAULT_SECRET_ENV_PATTERN) {
+  const out = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (value === void 0) {
+      continue;
+    }
+    if (!/^(CLAUDE|OTEL|ANTHROPIC|TERM_PROGRAM$|SHELL$|CI$|GITHUB_ACTIONS$)/.test(
+      key
+    )) {
+      continue;
+    }
+    if (secretPattern.test(key)) {
+      continue;
+    }
+    out[key] = value.length > 1024 ? `${value.slice(0, 1024)}...` : value;
+  }
+  return out;
+}
+function hostFactsFromEnv(env) {
+  const facts = {};
+  const pid = env["CLAUDE_PID"];
+  if (pid !== void 0 && /^\d+$/.test(pid)) {
+    facts.claude_pid = Number(pid);
+  }
+  if (env["CLAUDE_CODE_EXECPATH"] !== void 0) {
+    facts.claude_execpath = env["CLAUDE_CODE_EXECPATH"];
+  }
+  if (env["CLAUDE_CODE_CHILD_SESSION"] !== void 0) {
+    facts.is_child_session = env["CLAUDE_CODE_CHILD_SESSION"] === "1";
+  }
+  if (env["CLAUDE_CODE_BRIDGE_SESSION_ID"] !== void 0) {
+    facts.bridge_session_id = env["CLAUDE_CODE_BRIDGE_SESSION_ID"];
+  }
+  return facts;
+}
+function contextFactsFromEnv(env) {
+  const facts = {};
+  if (env["CLAUDE_CODE_ENTRYPOINT"] !== void 0) {
+    facts.entrypoint = env["CLAUDE_CODE_ENTRYPOINT"];
+  }
+  if (env["CLAUDE_EFFORT"] !== void 0) {
+    facts.effort = env["CLAUDE_EFFORT"];
+  }
+  if (env["CLAUDE_PROJECT_DIR"] !== void 0) {
+    facts.project_dir = env["CLAUDE_PROJECT_DIR"];
+  }
+  if (env["TERM_PROGRAM"] !== void 0) {
+    facts.terminal_type = env["TERM_PROGRAM"];
+  }
+  return facts;
+}
+function harnessVersionFromExecPath(execPath) {
+  if (execPath === void 0) {
+    return void 0;
+  }
+  const match = /\/versions\/(\d+\.\d+\.\d+)(?:\/|$)/.exec(execPath);
+  return match?.[1];
+}
+var DEFAULT_SECRET_ENV_PATTERN;
+var init_context2 = __esm({
+  "../../packages/tacho/src/claude-code/context.ts"() {
+    "use strict";
+    init_digest();
+    DEFAULT_SECRET_ENV_PATTERN = /KEY|TOKEN|SECRET|PASSWORD|PASSWD|CREDENTIAL|PRIVATE|HEADERS|AUTH/i;
+  }
+});
+
 // ../../packages/tacho/src/claude-code/cursor-adapter.ts
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -8780,6 +8869,10 @@ function translateCursorPayload(raw) {
     subagent_id: subagentId,
     subagent_type: subagentType,
     duration,
+    task,
+    description,
+    summary,
+    error_message: errorMessage2,
     ...rest
   } = raw;
   const id = str2(conversationId) ?? str2(cursorSessionId);
@@ -8815,6 +8908,19 @@ function translateCursorPayload(raw) {
   if (typeof duration === "number") out["duration_ms"] = duration;
   if (typeof subagentId === "string") out["agent_id"] = subagentId;
   if (typeof subagentType === "string") out["agent_type"] = subagentType;
+  const digestOnly = [
+    ["task", task],
+    ["description", description],
+    ["summary", summary]
+  ];
+  if (event === "postToolUseFailure" && errorMessage2 !== void 0)
+    out["error"] = errorMessage2;
+  else digestOnly.push(["error_message", errorMessage2]);
+  for (const [name, value] of digestOnly) {
+    if (typeof value !== "string") continue;
+    out[`${name}_digest`] = digestText(value);
+    out[`${name}_length`] = value.length;
+  }
   return out;
 }
 function reasonOf(value, fallback) {
@@ -8881,6 +8987,7 @@ var CURSOR_TO_CLAUDE_EVENT, CURSOR_HOOK_EVENTS, CURSOR_ENFORCEMENT_EVENTS, CURSO
 var init_cursor_adapter = __esm({
   "../../packages/tacho/src/claude-code/cursor-adapter.ts"() {
     "use strict";
+    init_context2();
     CURSOR_TO_CLAUDE_EVENT = {
       sessionStart: "SessionStart",
       sessionEnd: "SessionEnd",
@@ -9349,7 +9456,7 @@ var init_agents = __esm({
 });
 
 // ../../packages/tacho/src/ids.ts
-import { createHash as createHash3, randomBytes as randomBytes2 } from "node:crypto";
+import { createHash as createHash4, randomBytes as randomBytes2 } from "node:crypto";
 function uuidBytes(uuid) {
   const hex = uuid.replace(/-/g, "");
   if (!/^[0-9a-f]{32}$/i.test(hex)) {
@@ -9362,7 +9469,7 @@ function formatUuid(bytes) {
   return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20, 32)}`;
 }
 function uuidv5(namespace, name) {
-  const hash3 = createHash3("sha1").update(uuidBytes(namespace)).update(Buffer.from(name, "utf8")).digest();
+  const hash3 = createHash4("sha1").update(uuidBytes(namespace)).update(Buffer.from(name, "utf8")).digest();
   const bytes = Buffer.from(hash3.subarray(0, 16));
   bytes[6] = (bytes[6] ?? 0) & 15 | 80;
   bytes[8] = (bytes[8] ?? 0) & 63 | 128;
@@ -9375,11 +9482,11 @@ function eventIdIdem(sessionUuidValue, seq) {
   if (!Number.isInteger(seq) || seq < 0) {
     throw new TypeError(`seq must be a non-negative integer, got ${seq}`);
   }
-  const hash3 = createHash3("sha256").update(sessionUuidValue).update(" ").update(String(seq)).digest("hex");
+  const hash3 = createHash4("sha256").update(sessionUuidValue).update(" ").update(String(seq)).digest("hex");
   return `evt_${hash3}`;
 }
 function effectId(sessionUuidValue, toolUseId, target2) {
-  return `eff_${createHash3("sha256").update(sessionUuidValue).update(" ").update(toolUseId).update(" ").update(target2).digest("hex")}`;
+  return `eff_${createHash4("sha256").update(sessionUuidValue).update(" ").update(toolUseId).update(" ").update(target2).digest("hex")}`;
 }
 function ulid(now = Date.now()) {
   let time = now;
@@ -9405,7 +9512,7 @@ function backfillEventId(sessionUuidValue, seq, rawSourceDigest, tsMs) {
     timePart = CROCKFORD[time % 32] + timePart;
     time = Math.floor(time / 32);
   }
-  const hash3 = createHash3("sha256").update(sessionUuidValue).update(" ").update(String(seq)).update(" ").update(rawSourceDigest).digest();
+  const hash3 = createHash4("sha256").update(sessionUuidValue).update(" ").update(String(seq)).update(" ").update(rawSourceDigest).digest();
   let bits2 = 0n;
   for (let index = 0; index < 10; index += 1)
     bits2 = bits2 << 8n | BigInt(hash3[index] ?? 0);
@@ -9882,95 +9989,6 @@ var init_stella_writer = __esm({
   }
 });
 
-// ../../packages/tacho/src/claude-code/context.ts
-import { createHash as createHash4 } from "node:crypto";
-function digestText(value) {
-  return `sha256:${createHash4("sha256").update(value, "utf8").digest("hex")}`;
-}
-function deliveredContext(text4, bundleEtag) {
-  return text4 === null ? { chars: 0, bundle_etag: bundleEtag } : { digest: digestText(text4), chars: text4.length, bundle_etag: bundleEtag };
-}
-function readDeliveredContext(value) {
-  if (typeof value !== "object" || value === null) return void 0;
-  const { digest: digest6, chars, bundle_etag } = value;
-  if (typeof chars !== "number" || !Number.isSafeInteger(chars) || chars < 0)
-    return void 0;
-  if (digest6 !== void 0 && !isSha256Digest(digest6)) return void 0;
-  if (bundle_etag !== void 0 && (typeof bundle_etag !== "string" || bundle_etag.length === 0 || bundle_etag.length > 128))
-    return void 0;
-  return {
-    ...digest6 !== void 0 ? { digest: digest6 } : {},
-    chars,
-    ...bundle_etag !== void 0 ? { bundle_etag } : {}
-  };
-}
-function snapshotEnv(env, secretPattern = DEFAULT_SECRET_ENV_PATTERN) {
-  const out = {};
-  for (const [key, value] of Object.entries(env)) {
-    if (value === void 0) {
-      continue;
-    }
-    if (!/^(CLAUDE|OTEL|ANTHROPIC|TERM_PROGRAM$|SHELL$|CI$|GITHUB_ACTIONS$)/.test(
-      key
-    )) {
-      continue;
-    }
-    if (secretPattern.test(key)) {
-      continue;
-    }
-    out[key] = value.length > 1024 ? `${value.slice(0, 1024)}...` : value;
-  }
-  return out;
-}
-function hostFactsFromEnv(env) {
-  const facts = {};
-  const pid = env["CLAUDE_PID"];
-  if (pid !== void 0 && /^\d+$/.test(pid)) {
-    facts.claude_pid = Number(pid);
-  }
-  if (env["CLAUDE_CODE_EXECPATH"] !== void 0) {
-    facts.claude_execpath = env["CLAUDE_CODE_EXECPATH"];
-  }
-  if (env["CLAUDE_CODE_CHILD_SESSION"] !== void 0) {
-    facts.is_child_session = env["CLAUDE_CODE_CHILD_SESSION"] === "1";
-  }
-  if (env["CLAUDE_CODE_BRIDGE_SESSION_ID"] !== void 0) {
-    facts.bridge_session_id = env["CLAUDE_CODE_BRIDGE_SESSION_ID"];
-  }
-  return facts;
-}
-function contextFactsFromEnv(env) {
-  const facts = {};
-  if (env["CLAUDE_CODE_ENTRYPOINT"] !== void 0) {
-    facts.entrypoint = env["CLAUDE_CODE_ENTRYPOINT"];
-  }
-  if (env["CLAUDE_EFFORT"] !== void 0) {
-    facts.effort = env["CLAUDE_EFFORT"];
-  }
-  if (env["CLAUDE_PROJECT_DIR"] !== void 0) {
-    facts.project_dir = env["CLAUDE_PROJECT_DIR"];
-  }
-  if (env["TERM_PROGRAM"] !== void 0) {
-    facts.terminal_type = env["TERM_PROGRAM"];
-  }
-  return facts;
-}
-function harnessVersionFromExecPath(execPath) {
-  if (execPath === void 0) {
-    return void 0;
-  }
-  const match = /\/versions\/(\d+\.\d+\.\d+)(?:\/|$)/.exec(execPath);
-  return match?.[1];
-}
-var DEFAULT_SECRET_ENV_PATTERN;
-var init_context2 = __esm({
-  "../../packages/tacho/src/claude-code/context.ts"() {
-    "use strict";
-    init_digest();
-    DEFAULT_SECRET_ENV_PATTERN = /KEY|TOKEN|SECRET|PASSWORD|PASSWD|CREDENTIAL|PRIVATE|HEADERS|AUTH/i;
-  }
-});
-
 // ../../packages/tacho/src/host/process-scan.ts
 import { execFile, spawnSync } from "node:child_process";
 import { readFileSync as readFileSync4, readlinkSync as readlinkSync2 } from "node:fs";
@@ -10923,11 +10941,18 @@ async function loadCedarRuntimeFrom(sources) {
     return null;
   }
 }
-function loadCedarRuntime() {
-  cached ??= loadCedarRuntimeFrom(DEFAULT_SOURCES);
+function loadCedarRuntime(now = Date.now) {
+  if (failedAt !== void 0 && now() - failedAt >= CEDAR_RETRY_AFTER_MS) {
+    cached = void 0;
+    failedAt = void 0;
+  }
+  cached ??= loadCedarRuntimeFrom(DEFAULT_SOURCES).then((runtime) => {
+    if (runtime === null) failedAt = now();
+    return runtime;
+  });
   return cached;
 }
-var CEDAR_WASM_ASSET, SPECIFIER, DEFAULT_SOURCES, cached;
+var CEDAR_WASM_ASSET, SPECIFIER, DEFAULT_SOURCES, CEDAR_RETRY_AFTER_MS, cached, failedAt;
 var init_runtime = __esm({
   "../../packages/tacho/src/policy/runtime.ts"() {
     "use strict";
@@ -10948,6 +10973,7 @@ var init_runtime = __esm({
         SPECIFIER
       )
     };
+    CEDAR_RETRY_AFTER_MS = 6e4;
   }
 });
 
@@ -11818,9 +11844,18 @@ function normalizeHook(raw, env, options) {
     }
     case "SessionEnd": {
       const reason3 = str3(input["reason"]) ?? str3(input["end_reason"]) ?? "other";
+      const completed = [
+        "prompt_input_exit",
+        "clear",
+        "other",
+        "resume",
+        "completed",
+        "window_close",
+        "user_close"
+      ].includes(reason3);
       const body2 = {
         session_end_reason: reason3,
-        session_outcome: reason3 === "prompt_input_exit" || reason3 === "other" || reason3 === "clear" ? "completed" : "aborted"
+        session_outcome: completed ? "completed" : "aborted"
       };
       return [draft("agent_stop", body2, { hook_source_kind: reason3 })];
     }
@@ -22025,33 +22060,35 @@ function restoreClaude(options, released) {
     else delete settings[HELPER_KEY];
     touched = true;
   }
+  const current = envOf2(settings);
+  const foreignKey = current !== void 0 && (isSecret(current[CLAUDE_API_KEY]) || isSecret(current[CLAUDE_AUTH_TOKEN]));
+  const why = foreignKey ? { reason: "foreign_key_present" } : {};
   let secretRestored = false;
-  if (released !== void 0) {
+  if (released !== void 0 && !foreignKey) {
     const member2 = sidecar?.taken.find((t) => t.kind === released.kind)?.member ?? (released.kind === "bearer" ? CLAUDE_AUTH_TOKEN : CLAUDE_API_KEY);
-    const env = { ...envOf2(settings) ?? {} };
+    const env = { ...current ?? {} };
     env[member2] = released.secret;
     settings["env"] = env;
     touched = true;
     secretRestored = true;
   } else if (sidecar?.created_env === true) {
-    const env = envOf2(settings);
-    if (env !== void 0 && Object.keys(env).length === 0) {
+    if (current !== void 0 && Object.keys(current).length === 0) {
       delete settings["env"];
       touched = true;
     }
   }
   if (!touched) {
     dropSidecar();
-    return { changed: false, secretRestored };
+    return { changed: false, secretRestored, ...why };
   }
   const next = serializeLike2(text4, settings);
   if (next === text4) {
     dropSidecar();
-    return { changed: false, secretRestored };
+    return { changed: false, secretRestored, ...why };
   }
   writeAtomicPreserving2(file, next);
   dropSidecar();
-  return { changed: true, secretRestored };
+  return { changed: true, secretRestored, ...why };
 }
 function restoreCodex(options, released) {
   const file = fileFor2("codex", options);
@@ -23497,7 +23534,7 @@ import { readFileSync as readFileSync11 } from "node:fs";
 import { dirname as dirname8, resolve as resolve2 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.4-501";
+  if (true) return "2.1.4-504";
   try {
     const here = dirname8(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -23644,13 +23681,14 @@ function runtimeCommands(entry2 = process.argv[1], env = process.env, nodePath =
   }
   const transient = transientBinDir(binDir, env);
   const flagged = transient !== void 0 ? { transient } : {};
+  const node2 = stableExecutablePath(nodePath, platform, exists);
   return {
-    hookCommand: `${shellQuote(nodePath, platform)} ${shellQuote(P.join(binDir, "tacho-hook.mjs"), platform)}`,
+    hookCommand: `${shellQuote(node2, platform)} ${shellQuote(P.join(binDir, "tacho-hook.mjs"), platform)}`,
     credentialHelperCommand: helperCommandFor(
-      `${shellQuote(nodePath, platform)} ${shellQuote(P.join(binDir, "tacho.mjs"), platform)}`
+      `${shellQuote(node2, platform)} ${shellQuote(P.join(binDir, "tacho.mjs"), platform)}`
     ),
-    daemonCommand: [nodePath, P.join(binDir, "tachod.mjs")],
-    mcpStdioCommand: [nodePath, P.join(binDir, "tacho.mjs"), "mcp-stdio"],
+    daemonCommand: [node2, P.join(binDir, "tachod.mjs")],
+    mcpStdioCommand: [node2, P.join(binDir, "tacho.mjs"), "mcp-stdio"],
     binDir,
     ...flagged
   };
@@ -23668,7 +23706,10 @@ function oxagenRuntimeCommands(entry2 = process.argv[1], env = process.env, node
   } else if (native) {
     prefix = [stableExecutablePath(nodePath, platform, exists)];
   } else if (entry2 !== void 0 && !/\.[cm]?tsx?$/.test(entry2)) {
-    prefix = [nodePath, P.resolve(entry2)];
+    prefix = [
+      stableExecutablePath(nodePath, platform, exists),
+      P.resolve(entry2)
+    ];
   } else {
     return runtimeCommands(void 0, env, nodePath, platform, false, exists);
   }
@@ -25561,9 +25602,9 @@ ${lines.join("\n")}
        * one torn write (a crash mid-append, before `repairTail` runs at the next
        * startup) must not stop every reader of this session. The retention
        * sweep reads through here. `unshipped` and `stats` read through
-       * `eventsAfterShipped`, and `head`, `compact`, `lastSeqOf`, and
-       * `appendRecovered` read back from the tail through `eventsBackward`. Both
-       * skip a bad line the same way.
+       * `eventsAfterShipped`, and `head`, `eventsSince`, `compact`, `lastSeqOf`,
+       * and `appendRecovered` read back from the tail through `eventsBackward`.
+       * Both skip a bad line the same way.
        */
       read(sessionUuid2) {
         const path2 = this.fileFor(sessionUuid2);
@@ -26036,6 +26077,26 @@ ${lines.join("\n")}
         const suffix = ".bodies.jsonl";
         return readdirSync7(this.dir).filter((name) => name.endsWith(suffix)).map((name) => name.slice(0, -suffix.length));
       }
+      /**
+       * A session's latest events, in seq order: read back from the tail, and
+       * stopped at the first event whose `ts` is before `since` (epoch ms). That
+       * event is left out, and so is everything written before it. An event
+       * whose `ts` does not parse cannot be placed in time, so it is kept and the
+       * walk goes on past it.
+       *
+       * The read costs the lines it walks, not the file. It takes the file's seq
+       * order for time order, and a caller has to accept that: an event written
+       * late with an earlier `ts` ends the walk, so an event written before it
+       * is not returned, whatever its own `ts`.
+       */
+      eventsSince(sessionUuid2, since) {
+        const out = [];
+        for (const event of this.eventsBackward(sessionUuid2)) {
+          if (Date.parse(event.ts) < since) break;
+          out.push(event);
+        }
+        return out.reverse();
+      }
       /**
        * The last sealed event of a session, if any: the last line of its file
        * that parses, read back from the tail.
@@ -37730,34 +37791,33 @@ function createGitLane(deps) {
   function recordReconciliation(session, reading, snapshot) {
     const mark = session.recorder.markChain();
     try {
-      record([
-        session.recorder.sealCollectorEvent(
-          "oxagen:worktree_reconciled",
-          worktreeReconciledBody(reading.changes),
-          {
-            attrs: {
-              // What the list measures, so a reader can tell a list that
-              // leaves out pulled commits and earlier edits from one that
-              // does not (ADR-188).
-              changes_basis: reading.basis,
-              pre_session_changes: PRE_SESSION_CHANGES[reading.preexisting],
-              // Whether the rows of files that held edits before the session
-              // count the session's lines alone, or the whole file against
-              // `HEAD` for want of a copy.
-              ...reading.preSessionCounts !== void 0 ? { pre_session_edit_counts: reading.preSessionCounts } : {},
-              ...snapshot ? {
-                worktree_root: snapshot.root,
-                ...snapshot.repository ? { repository_url: snapshot.repository } : {},
-                ...snapshot.baseline ? { diff_base_sha: snapshot.baseline } : {},
-                ...snapshot.head ? { diff_head_sha: snapshot.head } : {},
-                diff_complete: String(snapshot.complete),
-                diff_limitations: snapshot.limitations.join(",")
-              } : {}
-            },
-            ...snapshot ? { content: jsonContent(JSON.stringify(snapshot)) } : {}
-          }
-        )
-      ]);
+      const reconciled = session.recorder.sealCollectorEvent(
+        "oxagen:worktree_reconciled",
+        worktreeReconciledBody(reading.changes),
+        {
+          attrs: {
+            // What the list measures, so a reader can tell a list that
+            // leaves out pulled commits and earlier edits from one that
+            // does not (ADR-188).
+            changes_basis: reading.basis,
+            pre_session_changes: PRE_SESSION_CHANGES[reading.preexisting],
+            // Whether the rows of files that held edits before the session
+            // count the session's lines alone, or the whole file against
+            // `HEAD` for want of a copy.
+            ...reading.preSessionCounts !== void 0 ? { pre_session_edit_counts: reading.preSessionCounts } : {},
+            ...snapshot ? {
+              worktree_root: snapshot.root,
+              ...snapshot.repository ? { repository_url: snapshot.repository } : {},
+              ...snapshot.baseline ? { diff_base_sha: snapshot.baseline } : {},
+              ...snapshot.head ? { diff_head_sha: snapshot.head } : {},
+              diff_complete: String(snapshot.complete),
+              diff_limitations: snapshot.limitations.join(",")
+            } : {}
+          },
+          ...snapshot ? { content: jsonContent(JSON.stringify(snapshot)) } : {}
+        }
+      );
+      record([reconciled], session.recorder.takeBodies());
     } catch (error) {
       session.recorder.rollbackChain(mark);
       requestGitRead(session.recorder.sessionUuid, {
@@ -43563,6 +43623,10 @@ function createDaySpend(deps) {
   let held;
   function own(day) {
     if (held !== void 0 && held.day >= day) return held.ownMicros;
+    if (held !== void 0) {
+      held = { day, ownMicros: 0 };
+      return 0;
+    }
     let seeded = 0;
     try {
       seeded = nonNegative2(deps.priorDaySpendMicros?.(day) ?? 0);
@@ -47729,7 +47793,15 @@ async function initializeDaemon(options, server, port, ready) {
     });
   }
   function record(events, bodies = []) {
-    if (events.length === 0) return;
+    if (events.length === 0) {
+      if (bodies.length > 0) {
+        const where = bodies.map((body2) => `session ${body2.session_uuid} seq ${body2.seq}`).join(", ");
+        log(
+          `dropped ${bodies.length} frame ${bodies.length === 1 ? "body" : "bodies"} handed over without an event (${where}). A body ships only with its own event, so this content will not ship.`
+        );
+      }
+      return;
+    }
     const retention = retentionInForce();
     wal.append(
       events,
@@ -49178,6 +49250,24 @@ async function initializeDaemon(options, server, port, ready) {
     }
   }
   await refreshUpstreams();
+  function walDaySpendMicros(day) {
+    const start = Date.parse(`${day}T00:00:00.000Z`);
+    const end = Date.parse(nextUtcDayStart(day));
+    let total2 = 0;
+    for (const session of wal.sessions()) {
+      for (const event of wal.eventsSince(session, start)) {
+        if (event.kind !== "llm_call") continue;
+        if (event.attrs[TACHO_METERING_ATTR] !== TACHO_METERING_OBSERVED)
+          continue;
+        const at = Date.parse(event.ts);
+        if (!(at >= start && at < end)) continue;
+        const cost = event.body.cost_usd_micros;
+        if (typeof cost === "number") total2 += cost;
+      }
+    }
+    return total2;
+  }
+  let startupDaySpend;
   const modelProxy = createModelProxy({
     registry: registry2,
     hostRecorder: () => hostRecorder,
@@ -49191,25 +49281,14 @@ async function initializeDaemon(options, server, port, ready) {
       ...displacedUpstreams,
       ...options.modelUpstreams
     }),
-    // A restart must not hand the agent's day back either (ADR-160). Only a
-    // session whose last frame is from `day` can hold a frame from it, so
-    // the rest of the week the WAL keeps is not parsed.
+    // A restart must not hand the agent's day back either (ADR-160). The day
+    // counter asks this once per process (`createDaySpend`), so the figure
+    // read at startup is used once. A first call on a later day than
+    // startup's reads the WAL for that day.
     priorDaySpendMicros: (day) => {
-      const start = Date.parse(`${day}T00:00:00.000Z`);
-      let total2 = 0;
-      for (const session of wal.sessions()) {
-        const last = wal.lastEvent(session);
-        if (last !== void 0 && Date.parse(last.ts) < start) continue;
-        for (const event of wal.read(session)) {
-          if (event.kind !== "llm_call") continue;
-          if (event.attrs[TACHO_METERING_ATTR] !== TACHO_METERING_OBSERVED)
-            continue;
-          if (utcDay(Date.parse(event.ts)) !== day) continue;
-          const cost = event.body.cost_usd_micros;
-          if (typeof cost === "number") total2 += cost;
-        }
-      }
-      return total2;
+      const seeded = startupDaySpend;
+      startupDaySpend = void 0;
+      return seeded?.day === day ? seeded.micros : walDaySpendMicros(day);
     },
     recordedDaySpend: () => recordedDaySpend === void 0 ? void 0 : {
       day: recordedDaySpend.day,
@@ -49587,6 +49666,14 @@ async function initializeDaemon(options, server, port, ready) {
       );
     }
   }
+  try {
+    const day = utcDay(now());
+    startupDaySpend = { day, micros: walDaySpendMicros(day) };
+  } catch (error) {
+    log(
+      `day spend not read from the WAL at startup: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
   ready(api);
   servingSince = now();
   if (options.listen ?? true) {
@@ -52268,7 +52355,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.4-501",
+      version: "2.1.4-504",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -52320,11 +52407,11 @@ var init_package = __esm({
       devDependencies: {
         "@oxagen/telemetry": "workspace:*",
         "@types/node": "25.9.8",
-        "@vitest/coverage-v8": "2.1.9",
+        "@vitest/coverage-v8": "3.2.6",
         esbuild: "0.28.2",
         tsx: "4.23.5",
         typescript: "6.0.3",
-        vitest: "2.1.9"
+        vitest: "3.2.6"
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxagen/cli",
-  "version": "2.1.4-501",
+  "version": "2.1.4-504",
   "description": "Oxagen governance CLI — spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
   "type": "module",
   "bin": {