stitchkit 0.68.6 → 0.68.7

package/dist/agent-runtime/run-execution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-execution.d.ts","sourceRoot":"","sources":["../../src/agent-runtime/run-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,OAAO,EACb,MAAM,IAAI,CAAC;AAGZ,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,UAAU,CAAC;AAEvE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAapD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAKL,KAAK,QAAQ,EAMd,MAAM,WAAW,CAAC;AAuCnB,8DAA8D;AAC9D,MAAM,WAAW,uBAAuB,CAAC,OAAO,EAAE,KAAK,SAAS,OAAO;IACrE,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,IAAI,MAAM,CAAC;IACrB,GAAG,IAAI,IAAI,CAAC;IACZ,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,KAAK,SAAS,OAAO,EAC9D,YAAY,EAAE,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,WAcb;IACtC,WAAW,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,UAAU,CAAC,IAAI,IAAI,CAAC;CACrB,KAAG,OAAO,CAAC,kBAAkB,CAAC,CA23BhC"}
+{"version":3,"file":"run-execution.d.ts","sourceRoot":"","sources":["../../src/agent-runtime/run-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,OAAO,EACb,MAAM,IAAI,CAAC;AAGZ,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,UAAU,CAAC;AAEvE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAapD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAKL,KAAK,QAAQ,EAMd,MAAM,WAAW,CAAC;AAuCnB,8DAA8D;AAC9D,MAAM,WAAW,uBAAuB,CAAC,OAAO,EAAE,KAAK,SAAS,OAAO;IACrE,MAAM,EAAE,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,IAAI,MAAM,CAAC;IACrB,GAAG,IAAI,IAAI,CAAC;IACZ,qBAAqB,EAAE,MAAM,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,KAAK,SAAS,OAAO,EAC9D,YAAY,EAAE,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,WAcb;IACtC,WAAW,EAAE,QAAQ,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,gFAAgF;IAChF,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,UAAU,CAAC,IAAI,IAAI,CAAC;CACrB,KAAG,OAAO,CAAC,kBAAkB,CAAC,CAq4BhC"}

package/dist/agent-runtime/runtime-internals.d.ts

@@ -34,7 +34,7 @@ export declare function abortTerminalReason(signal: AbortSignal): AgentTerminalR
  */
 export declare function addUsage(total: AgentUsage | undefined, step: AgentUsage): AgentUsage;
 /**
- * The provider's own run total where it has one, ours where it does not.
+ * The SDK's own model-step total where it has one, our per-step sum where it does not.
  *
  * `totalUsage` is the SDK's sum over the steps it saw, and it covers only the
  * five token fields it knows about — a `normalizeUsage` hook that reads
@@ -49,7 +49,7 @@ export declare function addUsage(total: AgentUsage | undefined, step: AgentUsage
  * for a billable figure cares about, and pretending otherwise made one run
  * report `provider-reported` on success and `computed` on abort.
  */
-export declare function mergeRunTotals(sdkTotal: AgentUsage, accumulated: AgentUsage | undefined): AgentUsage;
+export declare function mergeModelTotals(sdkTotal: AgentUsage, accumulated: AgentUsage | undefined): AgentUsage;
 /**
  * Every field present, so a reader never has to tell an absent key from a
  * reported zero.

package/dist/agent-runtime/runtime-internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-internals.d.ts","sourceRoot":"","sources":["../../src/agent-runtime/runtime-internals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,gBAAgB,EAErB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,WAAW,CAAC;AAGnB;;;;;GAKG;AAEH,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,CAI1E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAG5E;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO;;;;cAI9C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAQxE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,mBAAmB,CAK5E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAuDpF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,UAAU,EACpB,WAAW,EAAE,UAAU,GAAG,SAAS,GAClC,UAAU,CAiBZ;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAYrE;AAED,8EAA8E;AAC9E,wBAAgB,YAAY,IAAI,UAAU,CAUzC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,GAAG,UAAU,CAmBvE;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;;iBAEhE,IAAI;;EAiBxB"}
+{"version":3,"file":"runtime-internals.d.ts","sourceRoot":"","sources":["../../src/agent-runtime/runtime-internals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,KAAK,gBAAgB,EAErB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAChB,MAAM,WAAW,CAAC;AAGnB;;;;;GAKG;AAEH,wBAAgB,OAAO,CAAC,IAAI,EAAE,SAAS,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,CAI1E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAG5E;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO;;;;cAI9C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,gBAAgB,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAQxE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,mBAAmB,CAK5E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,CAuDpF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,UAAU,EACpB,WAAW,EAAE,UAAU,GAAG,SAAS,GAClC,UAAU,CAiBZ;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,UAAU,CAYrE;AAED,8EAA8E;AAC9E,wBAAgB,YAAY,IAAI,UAAU,CAUzC;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,GAAG,UAAU,CAmBvE;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS;;iBAEhE,IAAI;;EAiBxB"}

package/dist/agent-runtime.js

@@ -1393,7 +1393,7 @@ function addUsage(total, step) {
     ...cost && { cost }
   };
 }
-function mergeRunTotals(sdkTotal, accumulated) {
+function mergeModelTotals(sdkTotal, accumulated) {
   const pick = (total, ours) => total?.value !== undefined ? { value: total.value, provenance: "computed" } : ours ?? { provenance: "unavailable" };
   return {
     inputTokens: pick(sdkTotal.inputTokens, accumulated?.inputTokens),
@@ -1576,7 +1576,9 @@ function createRunExecutor(dependencies) {
     let eventCount = 0;
     let sequence = 0;
     let terminalReason = "success";
-    let usage = input.acceptedRun.usage;
+    let nonModelUsage = input.acceptedRun.usage;
+    let modelUsage;
+    let usage = nonModelUsage;
     let sawProviderFinish = false;
     let step = 0;
     let selectedModel;
@@ -1651,8 +1653,10 @@ function createRunExecutor(dependencies) {
         snapshot = compacted.snapshot;
         observedVersion = snapshot.version;
         run = findRun(snapshot.runs, run.id);
-        if (compacted.usage)
-          usage = addUsage(usage, compacted.usage);
+        if (compacted.usage) {
+          nonModelUsage = addUsage(nonModelUsage, compacted.usage);
+          usage = modelUsage ? addUsage(nonModelUsage, modelUsage) : nonModelUsage;
+        }
       }
       const assertCurrent = async () => {
         if (executionSignal.aborted)
@@ -2009,7 +2013,8 @@ function createRunExecutor(dependencies) {
             usage: part.usage,
             providerMetadata: part.providerMetadata
           }) ?? normalizeSdkUsage(part.usage);
-          usage = addUsage(usage, stepUsage);
+          modelUsage = addUsage(modelUsage, stepUsage);
+          usage = nonModelUsage ? addUsage(nonModelUsage, modelUsage) : modelUsage;
           config.observe?.emit({
             schemaVersion: 1,
             eventId: generateId(),
@@ -2034,7 +2039,8 @@ function createRunExecutor(dependencies) {
         }
         if (part.type === "finish") {
           sawProviderFinish = true;
-          usage = mergeRunTotals(normalizeSdkUsage(part.totalUsage), usage);
+          modelUsage = mergeModelTotals(normalizeSdkUsage(part.totalUsage), modelUsage);
+          usage = nonModelUsage ? addUsage(nonModelUsage, modelUsage) : modelUsage;
         }
         if (eventCount % checkpointEveryEvents === 0)
           await checkpoint();

package/dist/testing.js

@@ -454,6 +454,14 @@ async function conformanceScenario(store, conversationIds) {
   if (interruptedRun.usage?.cost?.value !== 0.25) {
     throw new Error("An interrupt must not discard the figure the run had already spent");
   }
+  const terminalUsage = {
+    inputTokens: { value: 3000, provenance: "computed" },
+    outputTokens: { value: 300, provenance: "computed" },
+    reasoningTokens: { value: 30, provenance: "computed" },
+    cacheReadTokens: { value: 200, provenance: "computed" },
+    cacheWriteTokens: { value: 100, provenance: "computed" },
+    cost: { value: 1.5, currency: "USD", provenance: "computed" }
+  };
   const terminalResults = await Promise.all([
     store.commitRunTerminal({
       conversationId,
@@ -462,11 +470,7 @@ async function conformanceScenario(store, conversationIds) {
       ownerId: "conformance-owner",
       assistant: terminalAssistant,
       reason: "success",
-      usage: {
-        inputTokens: { value: 3000, provenance: "computed" },
-        outputTokens: { value: 300, provenance: "computed" },
-        cost: { value: 1.5, currency: "USD", provenance: "computed" }
-      }
+      usage: terminalUsage
     }),
     store.commitRunTerminal({
       conversationId,
@@ -475,11 +479,7 @@ async function conformanceScenario(store, conversationIds) {
       ownerId: "conformance-owner",
       assistant: terminalAssistant,
       reason: "success",
-      usage: {
-        inputTokens: { value: 3000, provenance: "computed" },
-        outputTokens: { value: 300, provenance: "computed" },
-        cost: { value: 1.5, currency: "USD", provenance: "computed" }
-      }
+      usage: terminalUsage
     })
   ]);
   const terminalOutcomes = terminalResults.map((result) => result.outcome).sort();
@@ -491,13 +491,16 @@ async function conformanceScenario(store, conversationIds) {
     throw new Error("Terminal race produced no applied result");
   }
   const settledRun = terminalApplied.snapshot.runs.find((run) => run.id === running.id);
-  if (settledRun?.usage?.cost?.value !== 1.5) {
+  if (JSON.stringify(settledRun?.usage) !== JSON.stringify(terminalUsage)) {
     throw new Error("Terminal commit did not persist the run usage it was given");
   }
   const terminalView = await store.loadRun({ conversationId, runId: running.id });
   if (terminalView?.run.terminalReason !== "success") {
     throw new Error("loadRun must report the terminal reason a settled run ended with");
   }
+  if (JSON.stringify(terminalView.run.usage) !== JSON.stringify(terminalUsage)) {
+    throw new Error("loadRun must return every persisted terminal usage field");
+  }
   if (JSON.stringify(terminalView.assistant) !== JSON.stringify(terminalAssistant)) {
     throw new Error("loadRun must retain the answer a settled run produced");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stitchkit",
-  "version": "0.68.6",
+  "version": "0.68.7",
   "description": "Contract-first backend framework — one defineContract() into an HTTP API, MCP tools, AI-agent tools and a typed client. Bun and Node.",
   "keywords": [
     "bun",