@koda-sl/baker-bridge 0.65.0 → 0.66.1

package/dist/hono/turn-model-usage.test.js

@@ -0,0 +1,88 @@
+import { describe, expect, it } from "vitest";
+import { addQueryModelUsage, queryModelUsage, turnModelUsageList } from "./turn-model-usage.js";
+function usage(overrides = {}) {
+    return {
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadInputTokens: 0,
+        cacheCreationInputTokens: 0,
+        webSearchRequests: 0,
+        costUSD: 0,
+        contextWindow: 200_000,
+        maxOutputTokens: 8_192,
+        ...overrides,
+    };
+}
+function totals(entries, model) {
+    return entries?.find((entry) => entry.model === model);
+}
+describe("queryModelUsage", () => {
+    it("records each model that served part of the query", () => {
+        const snapshot = queryModelUsage({
+            "claude-opus-4-8": usage({ inputTokens: 100, outputTokens: 200, costUSD: 0.5 }),
+            "claude-haiku-4-5": usage({ inputTokens: 10, outputTokens: 5, costUSD: 0.001 }),
+        });
+        const list = turnModelUsageList(snapshot) ?? [];
+        expect(list).toHaveLength(2);
+        expect(totals(list, "claude-opus-4-8")?.outputTokens).toBe(200);
+        expect(totals(list, "claude-haiku-4-5")?.inputTokens).toBe(10);
+    });
+    it("rolls provider-specific aliases up under the canonical model id", () => {
+        const snapshot = queryModelUsage({
+            "anthropic/claude-opus-4-8": usage({ inputTokens: 100, canonicalModel: "claude-opus-4-8" }),
+            "us.anthropic.claude-opus-4-8-v1:0": usage({ inputTokens: 40, canonicalModel: "claude-opus-4-8" }),
+        });
+        const list = turnModelUsageList(snapshot) ?? [];
+        expect(list).toHaveLength(1);
+        expect(list[0]?.model).toBe("claude-opus-4-8");
+        expect(list[0]?.inputTokens).toBe(140);
+    });
+    it("carries cache reads and creations separately from fresh input", () => {
+        const snapshot = queryModelUsage({
+            opus: usage({ inputTokens: 12, cacheReadInputTokens: 40_000, cacheCreationInputTokens: 2_000 }),
+        });
+        const entry = totals(turnModelUsageList(snapshot), "opus");
+        expect(entry?.inputTokens).toBe(12);
+        expect(entry?.cacheReadInputTokens).toBe(40_000);
+        expect(entry?.cacheCreationInputTokens).toBe(2_000);
+    });
+    it("is empty for a missing modelUsage block", () => {
+        expect(turnModelUsageList(queryModelUsage(undefined))).toBeUndefined();
+    });
+});
+describe("addQueryModelUsage", () => {
+    it("sums separate query invocations, because a stalled turn resumes in a fresh query", () => {
+        const turn = new Map();
+        addQueryModelUsage(turn, queryModelUsage({ opus: usage({ inputTokens: 100, outputTokens: 50, costUSD: 0.2 }) }));
+        addQueryModelUsage(turn, queryModelUsage({ opus: usage({ inputTokens: 30, outputTokens: 20, costUSD: 0.1 }) }));
+        const entry = totals(turnModelUsageList(turn), "opus");
+        expect(entry?.inputTokens).toBe(130);
+        expect(entry?.outputTokens).toBe(70);
+        expect(entry?.costUsd).toBeCloseTo(0.3, 10);
+    });
+    it("does NOT double-count cumulative snapshots from the same query", () => {
+        // A single query emits several result messages when a settled task wakes the
+        // model; each is cumulative, so the caller keeps only the latest and folds it
+        // once. Folding just that latest snapshot must not inflate the turn total.
+        const first = queryModelUsage({ opus: usage({ inputTokens: 100, outputTokens: 50, costUSD: 0.2 }) });
+        const second = queryModelUsage({ opus: usage({ inputTokens: 160, outputTokens: 90, costUSD: 0.35 }) });
+        expect(first).toBeDefined();
+        const turn = new Map();
+        addQueryModelUsage(turn, second);
+        const entry = totals(turnModelUsageList(turn), "opus");
+        expect(entry?.inputTokens).toBe(160);
+        expect(entry?.outputTokens).toBe(90);
+        expect(entry?.costUsd).toBeCloseTo(0.35, 10);
+    });
+});
+describe("turnModelUsageList", () => {
+    it("drops an entry with neither tokens nor cost", () => {
+        const turn = addQueryModelUsage(new Map(), queryModelUsage({ "router-probe": usage() }));
+        expect(turnModelUsageList(turn)).toBeUndefined();
+    });
+    it("keeps a zero-token entry that still cost money", () => {
+        const turn = addQueryModelUsage(new Map(), queryModelUsage({ "web-search": usage({ costUSD: 0.01 }) }));
+        expect(turnModelUsageList(turn)?.map((entry) => entry.model)).toEqual(["web-search"]);
+    });
+});
+//# sourceMappingURL=turn-model-usage.test.js.map

package/dist/hono/turn-model-usage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"turn-model-usage.test.js","sourceRoot":"","sources":["../../src/hono/turn-model-usage.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koda-sl/baker-bridge",
-  "version": "0.65.0",
+  "version": "0.66.1",
   "description": "HTTP server wrapping the Claude Agent SDK. Persists chat events to Convex; the dashboard subscribes via Convex realtime",
   "license": "MIT",
   "type": "module",