@frod.io/bridge 0.7.4 → 0.7.5

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// @frod.io/bridge 0.7.4. One file; do not edit: the source is apps/bridge/src in the platform repository.
+// @frod.io/bridge 0.7.5. One file; do not edit: the source is apps/bridge/src in the platform repository.
 import { createRequire as __createRequire } from 'node:module';
 const require = __createRequire(import.meta.url);
 var __create = Object.create;
@@ -4090,6 +4090,25 @@ var LineBuffer = class {
 // src/session-store.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3, chmodSync as chmodSync3 } from "node:fs";
 import { join as join4 } from "node:path";
+
+// src/adapters/usage-delta.ts
+var KEYS = ["inputTokens", "outputTokens", "cacheCreationTokens", "cacheReadTokens"];
+function usageDelta(current, previous) {
+  if (!previous || KEYS.some((key) => current[key] < previous[key])) return { ...current };
+  return {
+    inputTokens: current.inputTokens - previous.inputTokens,
+    outputTokens: current.outputTokens - previous.outputTokens,
+    cacheCreationTokens: current.cacheCreationTokens - previous.cacheCreationTokens,
+    cacheReadTokens: current.cacheReadTokens - previous.cacheReadTokens
+  };
+}
+function isUsageCounters(value) {
+  if (!value || typeof value !== "object") return false;
+  const row = value;
+  return KEYS.every((key) => typeof row[key] === "number" && Number.isFinite(row[key]) && row[key] >= 0);
+}
+
+// src/session-store.ts
 var PATH = join4(FROD_DIR, "sessions.json");
 function read() {
   if (!existsSync3(PATH)) return {};
@@ -4107,6 +4126,9 @@ function write(store) {
 function getStored(platformSessionId) {
   return read()[platformSessionId] ?? null;
 }
+function getStoredByHostSessionId(hostSessionId) {
+  return Object.values(read()).filter((session) => session.hostSessionId === hostSessionId).sort((a, b) => Date.parse(b.lastPromptAt ?? b.startedAt) - Date.parse(a.lastPromptAt ?? a.startedAt))[0] ?? null;
+}
 function putStored(platformSessionId, s) {
   const store = read();
   store[platformSessionId] = s;
@@ -4121,6 +4143,14 @@ function touchStored(platformSessionId) {
     write(store);
   }
 }
+function putStoredUsage(platformSessionId, adapter, counters) {
+  const store = read();
+  const session = store[platformSessionId];
+  if (!session || !isUsageCounters(counters)) return;
+  session.cumulativeUsage = { adapter, counters: { ...counters } };
+  session.lastPromptAt = (/* @__PURE__ */ new Date()).toISOString();
+  write(store);
+}
 
 // src/log.ts
 var REDACT = [
@@ -4860,6 +4890,8 @@ var CodexTranslator = class {
   }
   /** The newest `thread/tokenUsage/updated` of this turn, or null if none arrived. */
   usage = null;
+  /** The running thread counters immediately before this turn's first model call. */
+  billingBase = null;
   /** Item ids whose text was already streamed as deltas — not repeated on completion. */
   streamed = /* @__PURE__ */ new Set();
   /** Tool items announced with `item/started`, so a completion without a start still opens a card. */
@@ -4949,19 +4981,42 @@ var CodexTranslator = class {
   }
   onTokenUsage(p) {
     const u = p.tokenUsage;
-    if (u && typeof u === "object" && u.last && u.total) this.usage = u;
+    if (u && typeof u === "object" && u.last && u.total) {
+      if (!this.billingBase) {
+        const total = countersOf(u.total);
+        const last = countersOf(u.last);
+        if (total && last && countersCover(total, last)) this.billingBase = usageDelta(total, last);
+      }
+      this.usage = u;
+    }
     return true;
   }
 };
-function toUsage(usage, model) {
+function countersOf(breakdown) {
+  const inputTokens = num(breakdown.inputTokens);
+  const outputTokens = num(breakdown.outputTokens);
+  if (inputTokens === null || outputTokens === null) return null;
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens: num(breakdown.cacheWriteInputTokens) ?? 0,
+    cacheReadTokens: num(breakdown.cachedInputTokens) ?? 0
+  };
+}
+function countersCover(total, part) {
+  return total.inputTokens >= part.inputTokens && total.outputTokens >= part.outputTokens && total.cacheCreationTokens >= part.cacheCreationTokens && total.cacheReadTokens >= part.cacheReadTokens;
+}
+function toUsage(usage, model, billingBase = null) {
   if (!usage || !model) return null;
   const { last, total } = usage;
-  if (num(total.inputTokens) === null || num(total.outputTokens) === null) return null;
+  const cumulative = countersOf(total);
+  if (!cumulative) return null;
+  const turn = usageDelta(cumulative, billingBase);
   return {
-    input_tokens: Math.max(0, total.inputTokens - (num(total.cachedInputTokens) ?? 0)),
-    output_tokens: total.outputTokens,
-    cache_creation_tokens: num(total.cacheWriteInputTokens) ?? 0,
-    cache_read_tokens: num(total.cachedInputTokens) ?? 0,
+    input_tokens: Math.max(0, turn.inputTokens - turn.cacheReadTokens),
+    output_tokens: turn.outputTokens,
+    cache_creation_tokens: turn.cacheCreationTokens,
+    cache_read_tokens: turn.cacheReadTokens,
     model,
     context_tokens: num(last.inputTokens),
     context_window: num(usage.modelContextWindow)
@@ -5232,7 +5287,8 @@ var CodexAdapter = class _CodexAdapter {
       const status2 = typeof turn.status === "string" ? turn.status : "completed";
       const err = turn.error;
       const stopReason = status2 === "interrupted" ? "cancelled" : status2 === "failed" ? "error" : "end_turn";
-      const usage = toUsage(live.turn?.translator.usage ?? null, live.model);
+      const translator = live.turn?.translator;
+      const usage = toUsage(translator?.usage ?? null, live.model, translator?.billingBase ?? null);
       live.turnId = null;
       this.settleTurn(live, {
         stopReason,
@@ -5571,19 +5627,29 @@ function stopReasonFor(acp) {
   }
 }
 var num2 = (v) => typeof v === "number" && Number.isFinite(v) ? v : null;
-function toUsage2(meta, fallbackModel, contextWindow) {
+function cumulativeUsageOf(meta) {
   const total = meta?.usage;
+  if (!total) return null;
+  const inputTokens = num2(total.inputTokens);
+  const outputTokens = num2(total.outputTokens);
+  if (inputTokens === null || outputTokens === null) return null;
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens: num2(total.cacheCreationTokens) ?? 0,
+    cacheReadTokens: num2(total.cachedReadTokens) ?? 0
+  };
+}
+function toUsage2(meta, fallbackModel, contextWindow, previous = null) {
   const model = str2(meta?.modelId) ?? fallbackModel;
-  if (!total || !model) return null;
-  const input = num2(total.inputTokens);
-  const output = num2(total.outputTokens);
-  if (input === null || output === null) return null;
-  const cacheRead = num2(total.cachedReadTokens) ?? 0;
+  const cumulative = cumulativeUsageOf(meta);
+  if (!cumulative || !model) return null;
+  const turn = usageDelta(cumulative, previous);
   return {
-    input_tokens: Math.max(0, input - cacheRead),
-    output_tokens: output,
-    cache_creation_tokens: num2(total.cacheCreationTokens) ?? 0,
-    cache_read_tokens: cacheRead,
+    input_tokens: Math.max(0, turn.inputTokens - turn.cacheReadTokens),
+    output_tokens: turn.outputTokens,
+    cache_creation_tokens: turn.cacheCreationTokens,
+    cache_read_tokens: turn.cacheReadTokens,
     model,
     context_tokens: num2(meta?.inputTokens),
     context_window: contextWindow
@@ -5809,6 +5875,8 @@ ${res.stderr ?? ""}`;
       turn: null,
       model: spec.model?.name ?? null,
       contextWindow: null,
+      cumulativeUsage: null,
+      needsUsageBaseline: false,
       onExit: o.onExit,
       askPermission: o.askPermission,
       reportAutoAllowed: o.reportAutoAllowed,
@@ -5839,6 +5907,10 @@ ${res.stderr ?? ""}`;
     const mcpServers = mcpServersFor(spec);
     const params = { cwd: o.sessionDir, mcpServers, _meta: sessionMeta(spec) };
     const resumeId = spec.resume_session_id ?? null;
+    const resumedStore = resumeId ? getStoredByHostSessionId(resumeId) : null;
+    if (resumedStore?.cumulativeUsage?.adapter === "grok" && isUsageCounters(resumedStore.cumulativeUsage.counters)) {
+      live.cumulativeUsage = { ...resumedStore.cumulativeUsage.counters };
+    }
     let resumed = false;
     let started;
     if (resumeId) {
@@ -5850,12 +5922,25 @@ ${res.stderr ?? ""}`;
       }
     }
     if (!started) started = await this.request(live, "session/new", params);
+    if (!resumed) live.cumulativeUsage = null;
+    live.needsUsageBaseline = resumed && !live.cumulativeUsage;
     const sessionId = typeof started?.sessionId === "string" ? started.sessionId : null;
     if (!sessionId) throw new Error("Grok Build started but did not name the session \u2014 it cannot be addressed.");
     live.acpSessionId = sessionId;
     const models = started?.models ?? init?._meta?.modelState ?? null;
     live.model = live.model ?? (typeof models?.currentModelId === "string" ? models.currentModelId : null);
     live.contextWindow = contextWindowOf(models, live.model);
+    try {
+      putStored(spec.session_id, {
+        hostSessionId: sessionId,
+        cwd: o.sessionDir,
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        lastPromptAt: null,
+        ...resumed && live.cumulativeUsage ? { cumulativeUsage: { adapter: "grok", counters: { ...live.cumulativeUsage } } } : {}
+      });
+    } catch (err) {
+      log.warn(`[${spec.session_id.slice(0, 8)}] grok: could not open the usage-counter record (${err instanceof Error ? err.message : String(err)})`);
+    }
     log.event("grok.started", {
       session: spec.session_id,
       acp_session: sessionId,
@@ -5880,7 +5965,21 @@ ${res.stderr ?? ""}`;
         const meta = r._meta ?? null;
         if (typeof meta?.modelId === "string" && meta.modelId) live.model = meta.modelId;
         const { stopReason, error } = stopReasonFor(r.stopReason);
-        this.settleTurn(live, { stopReason, usage: toUsage2(meta, live.model, live.contextWindow), ...error ? { error } : {} });
+        const cumulative = cumulativeUsageOf(meta);
+        const usage = live.needsUsageBaseline ? null : toUsage2(meta, live.model, live.contextWindow, live.cumulativeUsage);
+        if (cumulative) {
+          if (live.needsUsageBaseline) {
+            log.warn(`[${live.spec.session_id.slice(0, 8)}] grok: resumed without an earlier usage snapshot \u2014 this turn is unpriced and seeds the next increment`);
+            live.needsUsageBaseline = false;
+          }
+          live.cumulativeUsage = cumulative;
+          try {
+            putStoredUsage(live.spec.session_id, "grok", cumulative);
+          } catch (err) {
+            log.warn(`[${live.spec.session_id.slice(0, 8)}] grok: could not remember usage counters (${err instanceof Error ? err.message : String(err)})`);
+          }
+        }
+        this.settleTurn(live, { stopReason, usage, ...error ? { error } : {} });
       }).catch((err) => {
         this.settleTurn(live, { stopReason: "error", usage: null, error: err.message });
       });
@@ -7790,6 +7889,8 @@ function askChild(input) {
       } catch {
       }
     };
+    child.stdin?.on("error", () => {
+    });
     child.on("error", (err) => finish({ problem: `could not start: ${err.message}` }));
     child.on("exit", (code) => {
       if (!done) finish({ problem: `ended (exit ${code ?? "signal"}) before answering` });
@@ -7849,8 +7950,56 @@ function samplesInWords(samples) {
   return samples.map((s) => `${label[s.provider]} ${s.usedPct === null ? `(${s.words ?? "no number"})` : `${Math.round(s.usedPct)}% of ${win[s.window]}`}`).join(" \xB7 ") || "nothing to report";
 }
 
+// package.json
+var package_default = {
+  name: "@frod.io/bridge",
+  version: "0.7.5",
+  type: "module",
+  description: "Your computer is a desk: hosts a Frod.io agent's sessions with your own Claude Code, Codex or Grok Build. Installs and updates itself.",
+  license: "UNLICENSED",
+  homepage: "https://frod.io",
+  repository: {
+    type: "git",
+    url: "https://github.com/awafeek/agentic-engineering.git",
+    directory: "apps/bridge"
+  },
+  bin: {
+    "frod-bridge": "dist/cli.js"
+  },
+  files: [
+    "dist",
+    "README.md"
+  ],
+  engines: {
+    node: ">=20"
+  },
+  publishConfig: {
+    access: "public"
+  },
+  scripts: {
+    build: "node scripts/bundle.mjs && tsc --noEmit",
+    bundle: "node scripts/bundle.mjs",
+    lint: "eslint src",
+    test: "vitest run --passWithNoTests",
+    "type-check": "tsc --noEmit",
+    "pack:check": "npm pack --dry-run"
+  },
+  devDependencies: {
+    "@eslint/js": "^9.39.3",
+    "@types/node": "^22.0.0",
+    "@types/ws": "^8.18.1",
+    esbuild: "^0.27.3",
+    eslint: "^9.0.0",
+    tsx: "^4.19.0",
+    typescript: "^5.7.0",
+    "typescript-eslint": "^8.56.1",
+    vitest: "^4.0.18",
+    ws: "^8.21.3"
+  }
+};
+
 // src/cli.ts
-var VERSION = "0.7.4";
+var VERSION = package_default.version;
 function arg(flag, argv) {
   const i = argv.indexOf(flag);
   return i >= 0 ? argv[i + 1] : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frod.io/bridge",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "type": "module",
   "description": "Your computer is a desk: hosts a Frod.io agent's sessions with your own Claude Code, Codex or Grok Build. Installs and updates itself.",
   "license": "UNLICENSED",