@cabane/companion 0.6.115 → 0.6.117

package/dist/cli.js

@@ -6847,6 +6847,16 @@ function readUsage(ev) {
     cacheCreationTokens: num(usage.cache_write_input_tokens)
   };
 }
+function codexUsageDelta(cumulative, baseline) {
+  if (!baseline) return cumulative;
+  const sub = (a, b) => Math.max(0, a - b);
+  return {
+    inputTokens: sub(cumulative.inputTokens, baseline.inputTokens),
+    outputTokens: sub(cumulative.outputTokens, baseline.outputTokens),
+    cacheReadTokens: sub(cumulative.cacheReadTokens, baseline.cacheReadTokens),
+    cacheCreationTokens: sub(cumulative.cacheCreationTokens, baseline.cacheCreationTokens)
+  };
+}
 function toStatus(v) {
   return v === "completed" || v === "failed" ? v : "in_progress";
 }
@@ -6921,9 +6931,26 @@ function decideResume3(stored, currentCwd) {
   }
   return {
     resume: state.threadId,
-    promptFingerprint: typeof state.promptFingerprint === "string" ? state.promptFingerprint : null
+    promptFingerprint: typeof state.promptFingerprint === "string" ? state.promptFingerprint : null,
+    usageBaseline: readUsageBaseline(state.usageBaseline)
   };
 }
+function readUsageBaseline(raw) {
+  if (!raw || typeof raw !== "object") return null;
+  const rec2 = raw;
+  const read = (key) => {
+    const v = rec2[key];
+    return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : null;
+  };
+  const inputTokens = read("inputTokens");
+  const outputTokens = read("outputTokens");
+  const cacheReadTokens = read("cacheReadTokens");
+  const cacheCreationTokens = read("cacheCreationTokens");
+  if (inputTokens === null || outputTokens === null || cacheReadTokens === null || cacheCreationTokens === null) {
+    return null;
+  }
+  return { inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens };
+}
 
 // packages/agent-runtime/src/codex/loop.ts
 async function* decodeCodexStream(events, ctx) {
@@ -6935,6 +6962,8 @@ async function* decodeCodexStream(events, ctx) {
   let ok = false;
   let reason;
   let usage;
+  let cumulativeUsage;
+  let threadIdForSession = ctx.resumedThreadId;
   let settled = false;
   function* flushInterim() {
     const sealed = sealHeld2(held, false);
@@ -6945,11 +6974,17 @@ async function* decodeCodexStream(events, ctx) {
     if (ctx.signal.aborted) return;
     if (ev.type === "thread.started") {
       const threadId = readThreadId(ev);
+      if (threadId) threadIdForSession = threadId;
       if (threadId && !sessionEmitted) {
         const state = encodeSession3({
           threadId,
           cwd: ctx.cwd ?? "",
-          promptFingerprint: ctx.promptFingerprint ?? null
+          promptFingerprint: ctx.promptFingerprint ?? null,
+          // CT1645: the baseline this turn INHERITED, carried through unchanged.
+          // This early write exists so a turn that dies mid-stream still leaves
+          // the thread id recorded; it cannot yet know what this turn will spend.
+          // The closing write below records the new baseline.
+          usageBaseline: ctx.usageBaseline ?? null
         });
         if (threadId !== ctx.resumedThreadId || state !== ctx.storedState) {
           sessionEmitted = true;
@@ -7024,7 +7059,8 @@ async function* decodeCodexStream(events, ctx) {
       const sealed = sealHeld2(held, true);
       held = null;
       if (sealed) yield sealed;
-      usage = readUsage(ev);
+      cumulativeUsage = readUsage(ev);
+      usage = cumulativeUsage ? codexUsageDelta(cumulativeUsage, ctx.usageBaseline ?? null) : void 0;
       ok = true;
       settled = true;
       break;
@@ -7050,6 +7086,15 @@ async function* decodeCodexStream(events, ctx) {
     if (sealed) yield sealed;
     reason = "no_terminal";
   }
+  if (ok && cumulativeUsage && threadIdForSession) {
+    const closing = encodeSession3({
+      threadId: threadIdForSession,
+      cwd: ctx.cwd ?? "",
+      promptFingerprint: ctx.promptFingerprint ?? null,
+      usageBaseline: cumulativeUsage
+    });
+    yield { type: "session", state: closing };
+  }
   const resolvedConfig = ctx.resolvedReasoningEffort ? { reasoningEffort: ctx.resolvedReasoningEffort } : void 0;
   yield {
     type: "result",
@@ -7348,6 +7393,7 @@ function createCodexAdapter(deps = {}) {
       const decision = decideResume3(req.session, directory);
       const resumeThreadId = "resume" in decision ? decision.resume : null;
       const threadPromptFingerprint = "resume" in decision ? decision.promptFingerprint : null;
+      const threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
           "codex adapter: stored session directory no longer matches the current environment \u2014 starting a fresh thread (SJ527-analogue guard)",
@@ -7407,6 +7453,7 @@ function createCodexAdapter(deps = {}) {
           // was actually sent.
           promptFingerprint: spec.promptRidesInput ? spec.promptFingerprint : threadPromptFingerprint,
           storedState: req.session,
+          usageBaseline: threadUsageBaseline,
           // CT601: Codex reports no model in-stream, so record what the thread was
           // started with (null on the default token). Same for the reasoning effort.
           resolvedModel: spec.model,
@@ -7497,9 +7544,9 @@ var OP_FAILURE = {
     message: "files.read returned more than the result ceiling"
   }
 };
-var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT)) => ({
+var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT), usageBaseline = null) => ({
   type: "session",
-  state: encodeSession3({ threadId, cwd, promptFingerprint }),
+  state: encodeSession3({ threadId, cwd, promptFingerprint, usageBaseline }),
   ...degraded ? { degraded: true } : {}
 });
 var CODEX_CONFORMANCE_FIXTURES = [
@@ -7527,6 +7574,16 @@ var CODEX_CONFORMANCE_FIXTURES = [
     expected: [
       sessionEvent3(NEW_THREAD_ID),
       { type: "text", body: "Hello there.", terminal: true },
+      // CT1645: the closing session write — the thread's ending totals, recorded
+      // as the baseline the NEXT turn subtracts. This is a fresh thread, so the
+      // `result` usage below is the frame verbatim (nothing to subtract yet);
+      // what makes it per-turn is this figure being carried into turn two.
+      sessionEvent3(NEW_THREAD_ID, DIR2, false, fingerprintPrompt(PROMPT), {
+        inputTokens: 100,
+        outputTokens: 50,
+        cacheReadTokens: 20,
+        cacheCreationTokens: 5
+      }),
       {
         type: "result",
         ok: true,
@@ -8252,7 +8309,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
       session: encodeSession3({
         threadId: "th1",
         cwd: DIR2,
-        promptFingerprint: fingerprintPrompt(PROMPT)
+        promptFingerprint: fingerprintPrompt(PROMPT),
+        usageBaseline: null
       })
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
@@ -8297,7 +8355,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
       session: encodeSession3({
         threadId: "th1",
         cwd: DIR2,
-        promptFingerprint: fingerprintPrompt("an older composed prompt")
+        promptFingerprint: fingerprintPrompt("an older composed prompt"),
+        usageBaseline: null
       })
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
@@ -8322,7 +8381,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
       session: encodeSession3({
         threadId: "old",
         cwd: "/env/gone",
-        promptFingerprint: fingerprintPrompt(PROMPT)
+        promptFingerprint: fingerprintPrompt(PROMPT),
+        usageBaseline: null
       })
     }),
     nativeStream: [
@@ -9073,6 +9133,7 @@ var MANAGER_ENV_KEYS = ["DBUS_SESSION_BUS_ADDRESS", "XDG_RUNTIME_DIR", "PATH"];
 var managerEnvKey = (env) => MANAGER_ENV_KEYS.map((k) => `${k}=${env[k] ?? ""}`).join("\0");
 function createTurnContainment(turnId, deps = {}) {
   const probe = deps.capabilityProbe ?? scopeCapabilityUsable;
+  const fallbackGraceMs = deps.fallbackGraceMs ?? FALLBACK_GRACE_MS;
   const ownUnit = (deps.ownSystemdUnit ?? readCurrentSystemdUnit)();
   const scopeUnits = [];
   const groups = [];
@@ -9194,7 +9255,7 @@ function createTurnContainment(turnId, deps = {}) {
         } catch {
         }
       }
-      await sleep3(FALLBACK_GRACE_MS);
+      await sleep3(fallbackGraceMs);
       const afterTerm = processGroupMembers(pgid);
       if (!afterTerm.ok) {
         result.failures.push({
@@ -9488,6 +9549,7 @@ var DEFAULT_LEASE_RENEWAL_MS = 3e4;
 function initialOutcome() {
   return {
     sessionWritten: false,
+    lastSessionStateWritten: null,
     sessionDegraded: false,
     sessionWriteRejected: false,
     okResult: false,
@@ -10277,8 +10339,9 @@ var TurnExecution = class {
         if (event.type === "session") {
           o.latestSessionState = event.state;
           if (event.degraded) o.sessionDegraded = true;
-          if (!o.sessionWritten) {
+          if (o.lastSessionStateWritten !== event.state) {
             o.sessionWritten = true;
+            o.lastSessionStateWritten = event.state;
             try {
               await this.opts.api.setActiveRun(
                 workspaceId,

package/dist/runtime.js

@@ -6260,6 +6260,16 @@ function readUsage(ev) {
     cacheCreationTokens: num(usage.cache_write_input_tokens)
   };
 }
+function codexUsageDelta(cumulative, baseline) {
+  if (!baseline) return cumulative;
+  const sub = (a, b) => Math.max(0, a - b);
+  return {
+    inputTokens: sub(cumulative.inputTokens, baseline.inputTokens),
+    outputTokens: sub(cumulative.outputTokens, baseline.outputTokens),
+    cacheReadTokens: sub(cumulative.cacheReadTokens, baseline.cacheReadTokens),
+    cacheCreationTokens: sub(cumulative.cacheCreationTokens, baseline.cacheCreationTokens)
+  };
+}
 function toStatus(v) {
   return v === "completed" || v === "failed" ? v : "in_progress";
 }
@@ -6334,9 +6344,26 @@ function decideResume3(stored, currentCwd) {
   }
   return {
     resume: state.threadId,
-    promptFingerprint: typeof state.promptFingerprint === "string" ? state.promptFingerprint : null
+    promptFingerprint: typeof state.promptFingerprint === "string" ? state.promptFingerprint : null,
+    usageBaseline: readUsageBaseline(state.usageBaseline)
   };
 }
+function readUsageBaseline(raw) {
+  if (!raw || typeof raw !== "object") return null;
+  const rec = raw;
+  const read = (key) => {
+    const v = rec[key];
+    return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : null;
+  };
+  const inputTokens = read("inputTokens");
+  const outputTokens = read("outputTokens");
+  const cacheReadTokens = read("cacheReadTokens");
+  const cacheCreationTokens = read("cacheCreationTokens");
+  if (inputTokens === null || outputTokens === null || cacheReadTokens === null || cacheCreationTokens === null) {
+    return null;
+  }
+  return { inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens };
+}
 
 // packages/agent-runtime/src/codex/loop.ts
 async function* decodeCodexStream(events, ctx) {
@@ -6348,6 +6375,8 @@ async function* decodeCodexStream(events, ctx) {
   let ok = false;
   let reason;
   let usage;
+  let cumulativeUsage;
+  let threadIdForSession = ctx.resumedThreadId;
   let settled = false;
   function* flushInterim() {
     const sealed = sealHeld2(held, false);
@@ -6358,11 +6387,17 @@ async function* decodeCodexStream(events, ctx) {
     if (ctx.signal.aborted) return;
     if (ev.type === "thread.started") {
       const threadId = readThreadId(ev);
+      if (threadId) threadIdForSession = threadId;
       if (threadId && !sessionEmitted) {
         const state = encodeSession3({
           threadId,
           cwd: ctx.cwd ?? "",
-          promptFingerprint: ctx.promptFingerprint ?? null
+          promptFingerprint: ctx.promptFingerprint ?? null,
+          // CT1645: the baseline this turn INHERITED, carried through unchanged.
+          // This early write exists so a turn that dies mid-stream still leaves
+          // the thread id recorded; it cannot yet know what this turn will spend.
+          // The closing write below records the new baseline.
+          usageBaseline: ctx.usageBaseline ?? null
         });
         if (threadId !== ctx.resumedThreadId || state !== ctx.storedState) {
           sessionEmitted = true;
@@ -6437,7 +6472,8 @@ async function* decodeCodexStream(events, ctx) {
       const sealed = sealHeld2(held, true);
       held = null;
       if (sealed) yield sealed;
-      usage = readUsage(ev);
+      cumulativeUsage = readUsage(ev);
+      usage = cumulativeUsage ? codexUsageDelta(cumulativeUsage, ctx.usageBaseline ?? null) : void 0;
       ok = true;
       settled = true;
       break;
@@ -6463,6 +6499,15 @@ async function* decodeCodexStream(events, ctx) {
     if (sealed) yield sealed;
     reason = "no_terminal";
   }
+  if (ok && cumulativeUsage && threadIdForSession) {
+    const closing = encodeSession3({
+      threadId: threadIdForSession,
+      cwd: ctx.cwd ?? "",
+      promptFingerprint: ctx.promptFingerprint ?? null,
+      usageBaseline: cumulativeUsage
+    });
+    yield { type: "session", state: closing };
+  }
   const resolvedConfig = ctx.resolvedReasoningEffort ? { reasoningEffort: ctx.resolvedReasoningEffort } : void 0;
   yield {
     type: "result",
@@ -6761,6 +6806,7 @@ function createCodexAdapter(deps = {}) {
       const decision = decideResume3(req.session, directory);
       const resumeThreadId = "resume" in decision ? decision.resume : null;
       const threadPromptFingerprint = "resume" in decision ? decision.promptFingerprint : null;
+      const threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
           "codex adapter: stored session directory no longer matches the current environment \u2014 starting a fresh thread (SJ527-analogue guard)",
@@ -6820,6 +6866,7 @@ function createCodexAdapter(deps = {}) {
           // was actually sent.
           promptFingerprint: spec.promptRidesInput ? spec.promptFingerprint : threadPromptFingerprint,
           storedState: req.session,
+          usageBaseline: threadUsageBaseline,
           // CT601: Codex reports no model in-stream, so record what the thread was
           // started with (null on the default token). Same for the reasoning effort.
           resolvedModel: spec.model,
@@ -6910,9 +6957,9 @@ var OP_FAILURE = {
     message: "files.read returned more than the result ceiling"
   }
 };
-var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT)) => ({
+var sessionEvent3 = (threadId, cwd = DIR2, degraded = false, promptFingerprint = fingerprintPrompt(PROMPT), usageBaseline = null) => ({
   type: "session",
-  state: encodeSession3({ threadId, cwd, promptFingerprint }),
+  state: encodeSession3({ threadId, cwd, promptFingerprint, usageBaseline }),
   ...degraded ? { degraded: true } : {}
 });
 var CODEX_CONFORMANCE_FIXTURES = [
@@ -6940,6 +6987,16 @@ var CODEX_CONFORMANCE_FIXTURES = [
     expected: [
       sessionEvent3(NEW_THREAD_ID),
       { type: "text", body: "Hello there.", terminal: true },
+      // CT1645: the closing session write — the thread's ending totals, recorded
+      // as the baseline the NEXT turn subtracts. This is a fresh thread, so the
+      // `result` usage below is the frame verbatim (nothing to subtract yet);
+      // what makes it per-turn is this figure being carried into turn two.
+      sessionEvent3(NEW_THREAD_ID, DIR2, false, fingerprintPrompt(PROMPT), {
+        inputTokens: 100,
+        outputTokens: 50,
+        cacheReadTokens: 20,
+        cacheCreationTokens: 5
+      }),
       {
         type: "result",
         ok: true,
@@ -7665,7 +7722,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
       session: encodeSession3({
         threadId: "th1",
         cwd: DIR2,
-        promptFingerprint: fingerprintPrompt(PROMPT)
+        promptFingerprint: fingerprintPrompt(PROMPT),
+        usageBaseline: null
       })
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
@@ -7710,7 +7768,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
       session: encodeSession3({
         threadId: "th1",
         cwd: DIR2,
-        promptFingerprint: fingerprintPrompt("an older composed prompt")
+        promptFingerprint: fingerprintPrompt("an older composed prompt"),
+        usageBaseline: null
       })
     }),
     nativeStream: [threadStarted("th1"), agentMessage("m1", "Back again."), turnCompleted()],
@@ -7735,7 +7794,8 @@ var CODEX_CONFORMANCE_FIXTURES = [
       session: encodeSession3({
         threadId: "old",
         cwd: "/env/gone",
-        promptFingerprint: fingerprintPrompt(PROMPT)
+        promptFingerprint: fingerprintPrompt(PROMPT),
+        usageBaseline: null
       })
     }),
     nativeStream: [
@@ -8496,6 +8556,7 @@ var MANAGER_ENV_KEYS = ["DBUS_SESSION_BUS_ADDRESS", "XDG_RUNTIME_DIR", "PATH"];
 var managerEnvKey = (env) => MANAGER_ENV_KEYS.map((k) => `${k}=${env[k] ?? ""}`).join("\0");
 function createTurnContainment(turnId, deps = {}) {
   const probe = deps.capabilityProbe ?? scopeCapabilityUsable;
+  const fallbackGraceMs = deps.fallbackGraceMs ?? FALLBACK_GRACE_MS;
   const ownUnit = (deps.ownSystemdUnit ?? readCurrentSystemdUnit)();
   const scopeUnits = [];
   const groups = [];
@@ -8617,7 +8678,7 @@ function createTurnContainment(turnId, deps = {}) {
         } catch {
         }
       }
-      await sleep2(FALLBACK_GRACE_MS);
+      await sleep2(fallbackGraceMs);
       const afterTerm = processGroupMembers(pgid);
       if (!afterTerm.ok) {
         result.failures.push({
@@ -8911,6 +8972,7 @@ var DEFAULT_LEASE_RENEWAL_MS = 3e4;
 function initialOutcome() {
   return {
     sessionWritten: false,
+    lastSessionStateWritten: null,
     sessionDegraded: false,
     sessionWriteRejected: false,
     okResult: false,
@@ -9700,8 +9762,9 @@ var TurnExecution = class {
         if (event.type === "session") {
           o.latestSessionState = event.state;
           if (event.degraded) o.sessionDegraded = true;
-          if (!o.sessionWritten) {
+          if (o.lastSessionStateWritten !== event.state) {
             o.sessionWritten = true;
+            o.lastSessionStateWritten = event.state;
             try {
               await this.opts.api.setActiveRun(
                 workspaceId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.115",
+  "version": "0.6.117",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",
@@ -29,8 +29,8 @@
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.270",
-    "@openai/codex-sdk": "0.154.0",
+    "@anthropic-ai/claude-agent-sdk": "0.3.280",
+    "@openai/codex-sdk": "0.155.1",
     "@hono/node-server": "1.19.14",
     "@inquirer/prompts": "7.10.1",
     "commander": "12.1.0",