@amalgm/chat 0.2.8 → 0.2.9-main.34746990150

package/dist/usage/finalize.js

@@ -1,14 +1,4 @@
-/**
- * Turn-usage finalization. A turn accumulates per-step usage records;
- * finalization collapses them into one provider-neutral record:
- *
- * - pi: sum of exact billable steps, native provider USD cost preserved.
- * - codex: cumulative-meter delta (last cumulative − first baseline,
- *   clamped per bucket so compaction resets never go negative), falling
- *   back to summing exact steps.
- * - everyone else: prefer an exact `chat_turn` record, else sum the exact
- *   billable steps.
- */
+/** Turn aggregates prefer provider totals; derivations require proven inputs. */
 import { addTokenLists, hasTokenListBuckets, normalizeTokenList, subtractTokenLists, zeroTokenList, } from './tokens.js';
 import { normalizeUsage } from './normalize.js';
 /**
@@ -24,7 +14,7 @@ export function usageFromTokenList(tokenList, base = {}) {
         cacheReadTokens: normalized.cacheRead,
         cacheWriteTokens: normalized.cacheWrite,
         thoughtTokens: normalized.thought,
-        inputContextSize: base.inputContextSize ?? normalized.total,
+        inputContextSize: base.inputContextSize,
         operation: 'chat_turn',
         billable: true,
         exact: true,
@@ -36,45 +26,37 @@ export function usageFromTokenList(tokenList, base = {}) {
  */
 export function summedTurnUsage(records, base = {}) {
     const sum = records.reduce((acc, entry) => addTokenLists(acc, entry.tokenList), zeroTokenList());
-    if (!hasTokenListBuckets(sum) || sum.total <= 0)
+    if (!records.length || (!hasTokenListBuckets(sum) && !records.some(entry => entry.costUsd != null)))
         return null;
+    const costs = records.map(entry => entry.costUsd);
     return usageFromTokenList(sum, {
         ...base,
+        costUsd: costs.every(value => typeof value === 'number') ? costs.reduce((sum, value) => sum + value, 0) : null,
         source: base.source || 'turn_sum',
     });
 }
-/**
- * Codex reports a cumulative meter per step.
- * The turn's usage is `last cumulative − first record's baseline`
- * (`previousCumulativeTokenList`, else zero), subtracted with per-bucket
- * clamping so a meter reset across compaction never yields negative
- * deltas. When no cumulative meter exists (or the delta is empty), fall
- * back to summing exact step records.
- */
+/** Cumulative snapshots are not model-step records and must never be summed. */
 function codexTurnUsage(records, base = {}) {
-    const cumulativeRecords = records.filter((entry) => (entry?.cumulativeTokenList
-        && hasTokenListBuckets(entry.cumulativeTokenList)
-        && entry.cumulativeTokenList.total > 0));
-    if (cumulativeRecords.length > 0) {
-        const first = cumulativeRecords[0];
-        const last = cumulativeRecords[cumulativeRecords.length - 1];
-        const baseline = first.previousCumulativeTokenList && hasTokenListBuckets(first.previousCumulativeTokenList)
-            ? first.previousCumulativeTokenList
-            : zeroTokenList();
-        const delta = subtractTokenLists(last.cumulativeTokenList, baseline);
-        if (delta.total > 0) {
-            return usageFromTokenList(delta, {
-                ...base,
-                inputContextSize: last.inputContextSize,
-                contextLimit: last.contextLimit,
-                totalProcessedTokens: last.cumulativeTokenList.total,
-                source: 'codex_app_server_turn_delta',
-            });
+    const meters = records.filter(entry => entry.cumulativeTokenList);
+    if (!meters.length)
+        return null;
+    const first = meters[0];
+    const last = meters[meters.length - 1];
+    const baseline = first.previousCumulativeTokenList;
+    const delta = subtractTokenLists(last.cumulativeTokenList, baseline ?? {});
+    // Any reset within the turn makes that bucket unknown, even if it later rises.
+    for (const [index, current] of meters.entries()) {
+        const prior = index === 0 ? baseline : meters[index - 1].cumulativeTokenList;
+        const change = subtractTokenLists(current.cumulativeTokenList, prior ?? {});
+        for (const key of Object.keys(delta)) {
+            if (change[key] === null)
+                delta[key] = null;
         }
     }
-    return summedTurnUsage(records.filter((entry) => entry.exact === true), {
-        ...base,
-        source: 'codex_app_server_step_sum',
+    return usageFromTokenList(delta, {
+        ...base, inputContextSize: last.inputContextSize, contextLimit: last.contextLimit,
+        totalProcessedTokens: last.cumulativeTokenList.total,
+        source: 'codex_app_server_turn_delta',
     });
 }
 /** Finalize the turn usage. Null means there is nothing billable. */
@@ -103,15 +85,13 @@ export function finalizeTurnUsage({ contract, usage, usageRecords } = {}) {
         }
         return null;
     }
-    if (contract?.harness === 'codex') {
-        const codexUsage = codexTurnUsage(records, {
+    if (contract?.harness === 'codex' && !records.some(entry => entry.operation === 'chat_turn' && entry.exact)) {
+        return codexTurnUsage(records, {
             contextLimit: usage?.contextLimit,
             inputContextSize: usage?.inputContextSize,
             costUsd: null,
             marketCostUsd: null,
         });
-        if (codexUsage)
-            return codexUsage;
     }
     const billableRecords = records.filter((entry) => entry && entry.billable !== false);
     if (billableRecords.length === 0)
@@ -122,7 +102,7 @@ export function finalizeTurnUsage({ contract, usage, usageRecords } = {}) {
         costUsd: null,
         marketCostUsd: null,
     };
-    const exactTurnRecord = billableRecords.find((entry) => (entry.exact === true && entry.operation === 'chat_turn' && (entry.tokenList?.total ?? 0) > 0));
+    const exactTurnRecord = [...billableRecords].reverse().find((entry) => (entry.exact === true && entry.operation === 'chat_turn' && (hasTokenListBuckets(entry.tokenList ?? {}) || entry.costUsd != null)));
     if (exactTurnRecord) {
         return usageFromTokenList(exactTurnRecord.tokenList, {
             ...base,
@@ -130,6 +110,8 @@ export function finalizeTurnUsage({ contract, usage, usageRecords } = {}) {
             contextLimit: exactTurnRecord.contextLimit,
             totalProcessedTokens: exactTurnRecord.totalProcessedTokens,
             source: exactTurnRecord.source || 'native_chat_turn',
+            costUsd: exactTurnRecord.costUsd,
+            marketCostUsd: exactTurnRecord.marketCostUsd,
         });
     }
     return summedTurnUsage(billableRecords.filter((entry) => entry.exact === true), base);

package/dist/usage/finalize.js.map

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

package/dist/usage/index.d.ts

@@ -1,10 +1,11 @@
 /**
  * @amalgm/chat usage module — the usage and billing-normalization law.
  */
-export { n, nonNegativeOrNull, normalizeTokenList, hasTokenListBuckets, zeroTokenList, addTokenLists, subtractTokenLists, totalUsageTokens, type TokenList, type TokenListInput, type UsageLike, } from './tokens.js';
+export { nonNegativeOrNull, normalizeTokenList, hasTokenListBuckets, zeroTokenList, addTokenLists, subtractTokenLists, totalUsageTokens, type TokenList, type TokenListInput, type UsageLike, } from './tokens.js';
 export { positiveOrNull, normalizeUsage, providerFromModel, type UsageInput, type NormalizedUsage, } from './normalize.js';
 export { usageFromTokenList, summedTurnUsage, finalizeTurnUsage, type UsageContract, type TurnUsageRecord, type FinalizeTurnUsageArgs, } from './finalize.js';
 export { decideBeginProxyTurn, decideTurnUsageLog, buildUsageLogRow, type BeginProxyTurnBody, type BeginProxyTurnDecision, type BillingPort, type UsageLogPayload, type UsageLogRow, type UsageLogPort, type TurnUsageLogDecision, type DecideTurnUsageLogArgs, } from './ports.js';
 export { MODEL_CATALOG, getModel, calculateCost, getModelsByProvider, getProviders, type CatalogModel, } from './model-catalog.js';
 export { createStepUsage, createStepUsageLedger, recordStepUsage, aggregateTurnUsage, usageDeltaFromCumulative, type UsageTokenCounts, type UsageExactness, type StepUsageModel, type StepUsage, type StepUsageInput, type StepUsageLedger, type TurnUsage, } from './steps.js';
+export { usageFromAcpPrompt } from './acp.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/usage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/usage/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,CAAC,EACD,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,SAAS,GACf,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,iBAAiB,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,qBAAqB,GAC3B,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,GAC5B,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,aAAa,EACb,QAAQ,EACR,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,KAAK,YAAY,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,SAAS,GACf,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/usage/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,SAAS,GACf,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,KAAK,UAAU,EACf,KAAK,eAAe,GACrB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,iBAAiB,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,qBAAqB,GAC3B,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,kBAAkB,EACvB,KAAK,sBAAsB,EAC3B,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,sBAAsB,GAC5B,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,aAAa,EACb,QAAQ,EACR,aAAa,EACb,mBAAmB,EACnB,YAAY,EACZ,KAAK,YAAY,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,SAAS,GACf,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC"}

package/dist/usage/index.js

@@ -1,10 +1,11 @@
 /**
  * @amalgm/chat usage module — the usage and billing-normalization law.
  */
-export { n, nonNegativeOrNull, normalizeTokenList, hasTokenListBuckets, zeroTokenList, addTokenLists, subtractTokenLists, totalUsageTokens, } from './tokens.js';
+export { nonNegativeOrNull, normalizeTokenList, hasTokenListBuckets, zeroTokenList, addTokenLists, subtractTokenLists, totalUsageTokens, } from './tokens.js';
 export { positiveOrNull, normalizeUsage, providerFromModel, } from './normalize.js';
 export { usageFromTokenList, summedTurnUsage, finalizeTurnUsage, } from './finalize.js';
 export { decideBeginProxyTurn, decideTurnUsageLog, buildUsageLogRow, } from './ports.js';
 export { MODEL_CATALOG, getModel, calculateCost, getModelsByProvider, getProviders, } from './model-catalog.js';
 export { createStepUsage, createStepUsageLedger, recordStepUsage, aggregateTurnUsage, usageDeltaFromCumulative, } from './steps.js';
+export { usageFromAcpPrompt } from './acp.js';
 //# sourceMappingURL=index.js.map

package/dist/usage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/usage/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,CAAC,EACD,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAIjB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,cAAc,EACd,cAAc,EACd,iBAAiB,GAGlB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,iBAAiB,GAIlB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,GASjB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,aAAa,EACb,QAAQ,EACR,aAAa,EACb,mBAAmB,EACnB,YAAY,GAEb,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,wBAAwB,GAQzB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/usage/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,gBAAgB,GAIjB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,cAAc,EACd,cAAc,EACd,iBAAiB,GAGlB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,iBAAiB,GAIlB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,GASjB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,aAAa,EACb,QAAQ,EACR,aAAa,EACb,mBAAmB,EACnB,YAAY,GAEb,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,wBAAwB,GAQzB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC"}

package/dist/usage/normalize.d.ts

@@ -60,9 +60,8 @@ export interface UsageInput {
  * - `costUsd`/`marketCostUsd` are null when unknown — never zero. Zero
  *   means "measured as free"; null means "not measured".
  * - `inputTokens` always means non-cached input; total-input figures are
- *   decomposed by subtracting the cache buckets (clamped at 0).
- * - `inputContextSize` is the next-turn context footprint (defaults to the
- *   tokenList total).
+ *   decomposed only when the cache buckets are known and consistent.
+ * - `inputContextSize` is a separately measured context footprint.
  * - `source` is a free-form provenance string (engine default `'runtime'`);
  *   well-known values include `'claude_agent_sdk_model_usage'`,
  *   `'codex_app_server_turn_delta'`, `'codex_app_server_step_sum'`,
@@ -72,12 +71,12 @@ export interface NormalizedUsage {
     tokenList: TokenList;
     cumulativeTokenList: TokenList | null;
     previousCumulativeTokenList: TokenList | null;
-    inputTokens: number;
-    outputTokens: number;
-    cacheReadTokens: number;
-    cacheWriteTokens: number;
-    thoughtTokens: number;
-    inputContextSize: number;
+    inputTokens: number | null;
+    outputTokens: number | null;
+    cacheReadTokens: number | null;
+    cacheWriteTokens: number | null;
+    thoughtTokens: number | null;
+    inputContextSize: number | null;
     contextUsedTokens: number | null;
     contextLimit: number | null;
     usedTokens: number | null;

package/dist/usage/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/usage/normalize.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../src/usage/normalize.ts"],"names":[],"mappings":"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"}

package/dist/usage/normalize.js

@@ -3,7 +3,7 @@
  * OpenAI camelCase, codex cumulative meters, opencode step records) funnels
  * through `normalizeUsage` into one canonical `NormalizedUsage` shape.
  */
-import { n, nonNegativeOrNull, normalizeTokenList } from './tokens.js';
+import { nonNegativeOrNull, normalizeTokenList } from './tokens.js';
 /**
  * Return the numeric value when finite and positive, otherwise null.
  */
@@ -13,14 +13,15 @@ export function positiveOrNull(value) {
 }
 /** Normalize a provider usage record into the canonical shape. */
 export function normalizeUsage(input = {}) {
-    const cacheRead = n(input.cacheReadTokens ?? input.cachedInputTokens ?? input.cache_read_input_tokens);
-    const cacheWrite = n(input.cacheWriteTokens ?? input.cacheCreationInputTokens ?? input.cache_creation_input_tokens);
-    const output = n(input.outputTokens ?? input.completionTokens ?? input.output_tokens);
-    const thought = n(input.thoughtTokens ?? input.reasoningTokens);
+    const cacheRead = nonNegativeOrNull(input.cacheReadTokens ?? input.cachedInputTokens ?? input.cache_read_input_tokens);
+    const cacheWrite = nonNegativeOrNull(input.cacheWriteTokens ?? input.cacheCreationInputTokens ?? input.cache_creation_input_tokens);
+    const output = nonNegativeOrNull(input.outputTokens ?? input.completionTokens ?? input.output_tokens);
+    const thought = nonNegativeOrNull(input.thoughtTokens ?? input.reasoningTokens);
     const totalInput = input.totalInputTokens ?? input.promptTokens ?? (input.inputTokensAreTotal ? input.inputTokens : null);
     const nonCachedInput = totalInput == null
-        ? n(input.inputTokens ?? input.input_tokens ?? input.nonCachedInputTokens)
-        : Math.max(0, n(totalInput) - cacheRead - cacheWrite);
+        ? nonNegativeOrNull(input.inputTokens ?? input.input_tokens ?? input.nonCachedInputTokens)
+        : nonNegativeOrNull(totalInput) !== null && cacheRead !== null && cacheWrite !== null
+            && Number(totalInput) >= cacheRead + cacheWrite ? Number(totalInput) - cacheRead - cacheWrite : null;
     const tokenList = normalizeTokenList({
         tokenList: input.tokenList,
         inputTokens: nonCachedInput,
@@ -29,8 +30,7 @@ export function normalizeUsage(input = {}) {
         cacheWriteTokens: cacheWrite,
         thoughtTokens: thought,
     });
-    const inputContextSize = nonNegativeOrNull(input.inputContextSize ?? input.input_context_size)
-        ?? tokenList.total;
+    const inputContextSize = nonNegativeOrNull(input.inputContextSize ?? input.input_context_size);
     return {
         tokenList,
         cumulativeTokenList: input.cumulativeTokenList && typeof input.cumulativeTokenList === 'object'
@@ -39,20 +39,20 @@ export function normalizeUsage(input = {}) {
         previousCumulativeTokenList: input.previousCumulativeTokenList && typeof input.previousCumulativeTokenList === 'object'
             ? normalizeTokenList({ tokenList: input.previousCumulativeTokenList })
             : null,
-        inputTokens: nonCachedInput,
-        outputTokens: output,
-        cacheReadTokens: cacheRead,
-        cacheWriteTokens: cacheWrite,
-        thoughtTokens: thought,
+        inputTokens: tokenList.input,
+        outputTokens: tokenList.output,
+        cacheReadTokens: tokenList.cacheRead,
+        cacheWriteTokens: tokenList.cacheWrite,
+        thoughtTokens: tokenList.thought,
         inputContextSize,
-        contextUsedTokens: positiveOrNull(input.contextUsedTokens ?? input.usedTokens ?? inputContextSize),
+        contextUsedTokens: nonNegativeOrNull(input.contextUsedTokens ?? input.usedTokens ?? inputContextSize),
         contextLimit: positiveOrNull(input.contextLimit ?? input.maxTokens ?? input.modelContextWindow),
-        usedTokens: positiveOrNull(input.usedTokens ?? input.contextUsedTokens ?? inputContextSize),
-        lastUsedTokens: positiveOrNull(input.lastUsedTokens ?? input.contextUsedTokens ?? input.usedTokens ?? inputContextSize),
+        usedTokens: nonNegativeOrNull(input.usedTokens ?? input.contextUsedTokens ?? inputContextSize),
+        lastUsedTokens: nonNegativeOrNull(input.lastUsedTokens ?? input.contextUsedTokens ?? input.usedTokens ?? inputContextSize),
         maxTokens: positiveOrNull(input.maxTokens ?? input.contextLimit ?? input.modelContextWindow),
-        totalProcessedTokens: positiveOrNull(input.totalProcessedTokens),
-        costUsd: (input.costUsd ?? input.costUSD ?? input.cost ?? null),
-        marketCostUsd: (input.marketCostUsd ?? null),
+        totalProcessedTokens: nonNegativeOrNull(input.totalProcessedTokens),
+        costUsd: nonNegativeOrNull(input.costUsd ?? input.costUSD ?? input.cost),
+        marketCostUsd: nonNegativeOrNull(input.marketCostUsd),
         operation: String(input.operation || input.usageOperation || 'chat_step'),
         billable: input.billable !== false,
         source: (input.source || 'runtime'),

package/dist/usage/normalize.js.map

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

package/dist/usage/ports.d.ts

@@ -74,10 +74,10 @@ export interface UsageLogRow {
     auth_method: string | null;
     provider: string | null;
     model: string | null;
-    input_tokens: number;
-    output_tokens: number;
-    cache_read_tokens: number;
-    cache_write_tokens: number;
+    input_tokens: number | null;
+    output_tokens: number | null;
+    cache_read_tokens: number | null;
+    cache_write_tokens: number | null;
     cost_usd: number | null;
     market_cost_usd: number | null;
     container_id: string | null;

package/dist/usage/ports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ports.d.ts","sourceRoot":"","sources":["../../src/usage/ports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ports.d.ts","sourceRoot":"","sources":["../../src/usage/ports.ts"],"names":[],"mappings":"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"}

package/dist/usage/ports.js

@@ -53,10 +53,10 @@ export function buildUsageLogRow({ userId, sessionId, messageId, agentId, harnes
         auth_method: authMethod || null,
         provider,
         model: modelId || null,
-        input_tokens: usage.inputTokens || 0,
-        output_tokens: usage.outputTokens || 0,
-        cache_read_tokens: usage.cacheReadTokens || 0,
-        cache_write_tokens: usage.cacheWriteTokens || 0,
+        input_tokens: usage.inputTokens,
+        output_tokens: usage.outputTokens,
+        cache_read_tokens: usage.cacheReadTokens,
+        cache_write_tokens: usage.cacheWriteTokens,
         cost_usd: usage.costUsd,
         market_cost_usd: marketCostUsd ?? usage.costUsd,
         container_id: options.containerId || null,
@@ -84,7 +84,7 @@ export function decideTurnUsageLog({ contract, messageId, usage, usageRecords })
     const turnUsage = finalizeTurnUsage({ contract, usage, usageRecords });
     if (!turnUsage)
         return { skipped: true, reason: 'no_turn_usage' };
-    const marketCostUsd = turnUsage.marketCostUsd ?? calculateCost(contract.usageModelId || contract.modelId, turnUsage.inputTokens, turnUsage.outputTokens, turnUsage.cacheReadTokens, turnUsage.cacheWriteTokens);
+    const marketCostUsd = turnUsage.marketCostUsd ?? ([turnUsage.inputTokens, turnUsage.outputTokens, turnUsage.cacheReadTokens, turnUsage.cacheWriteTokens].every(value => value !== null) ? calculateCost(contract.usageModelId || contract.modelId, turnUsage.inputTokens, turnUsage.outputTokens, turnUsage.cacheReadTokens, turnUsage.cacheWriteTokens) : null);
     return {
         skipped: false,
         source: 'local_turn_exact',

package/dist/usage/ports.js.map

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

package/dist/usage/tokens.d.ts

@@ -1,21 +1,19 @@
 /**
  * Token counting primitives owned by the usage module.
  */
-/** Coerce to a finite number, else 0. */
-export declare function n(value: unknown): number;
 /**
  * Return the numeric value when finite and non-negative, otherwise null.
- * `Number(null)` is zero, so callers representing absence pass `undefined`.
+ * Absence is never a measured zero.
  */
 export declare function nonNegativeOrNull(value: unknown): number | null;
 /** The six-bucket token list every normalized usage record carries. */
 export interface TokenList {
-    input: number;
-    output: number;
-    cacheRead: number;
-    cacheWrite: number;
-    thought: number;
-    total: number;
+    input: number | null;
+    output: number | null;
+    cacheRead: number | null;
+    cacheWrite: number | null;
+    thought: number | null;
+    total: number | null;
 }
 /**
  * Loose input accepted by `normalizeTokenList`: either a nested
@@ -30,32 +28,13 @@ export interface TokenListInput {
     thoughtTokens?: unknown;
     totalTokens?: unknown;
 }
-/**
- * Engine `normalizeTokenList()`: coerce any of the accepted key spellings
- * into the canonical six-bucket list. `total` prefers an explicit
- * non-negative total (nested or flat), else the computed sum of the four
- * context buckets — `thought` is informational and never counted into the
- * computed total.
- */
+/** Unknown buckets stay unknown; reasoning is included in output, not added again. */
 export declare function normalizeTokenList(input?: TokenListInput): TokenList;
-/**
- * Engine `hasTokenListBuckets()`: true when any bucket coerces to a finite
- * number. Mirrors the engine's `Number()` coercion exactly — `null`
- * coerces to 0 (finite → true), `undefined` to NaN (→ false).
- */
-export declare function hasTokenListBuckets(tokenList?: Partial<Record<keyof TokenList, unknown>>): boolean;
-/** Engine `zeroTokenList()`: a fresh all-zero list. */
+export declare function hasTokenListBuckets(list?: Partial<Record<keyof TokenList, unknown>>): boolean;
+/** Additive identity, used only for a proven empty accumulator. */
 export declare function zeroTokenList(): TokenList;
-/**
- * Engine `addTokenLists()`: bucket-wise sum, re-normalized (so `total` is
- * recomputed from the four context buckets, never carried over).
- */
 export declare function addTokenLists(a?: Partial<TokenList>, b?: Partial<TokenList>): TokenList;
-/**
- * Engine `subtractTokenLists()`: bucket-wise `after - before`, clamped at
- * 0 per bucket — a cumulative meter that reset (e.g. across compaction)
- * can never produce a negative delta.
- */
+/** A missing baseline or a counter reset cannot prove a delta. */
 export declare function subtractTokenLists(after?: Partial<TokenList>, before?: Partial<TokenList>): TokenList;
 export interface UsageLike {
     tokenList?: {
@@ -67,10 +46,6 @@ export interface UsageLike {
     cacheReadTokens?: unknown;
     cacheWriteTokens?: unknown;
 }
-/**
- * Total tokens for a usage record: tokenList total, else context size, else
- * the sum of the four buckets. Precedence uses `||`, exactly as the engine —
- * a zero total falls through to the next source.
- */
-export declare function totalUsageTokens(usage?: UsageLike): number;
+/** Explicit totals and measured context are distinct from unknown token buckets. */
+export declare function totalUsageTokens(usage?: UsageLike): number | null;
 //# sourceMappingURL=tokens.d.ts.map

package/dist/usage/tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/usage/tokens.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,yCAAyC;AACzC,wBAAgB,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAGxC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG/D;AAED,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,cAAmB,GAAG,SAAS,CAoBxE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,OAAO,CAAC,MAAM,CAAC,MAAM,SAAS,EAAE,OAAO,CAAC,CAAM,GAAG,OAAO,CAGtG;AAED,uDAAuD;AACvD,wBAAgB,aAAa,IAAI,SAAS,CAEzC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAE,OAAO,CAAC,SAAS,CAAM,EAAE,CAAC,GAAE,OAAO,CAAC,SAAS,CAAM,GAAG,SAAS,CAQ/F;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,OAAO,CAAC,SAAS,CAAM,EAAE,MAAM,GAAE,OAAO,CAAC,SAAS,CAAM,GAAG,SAAS,CAQ7G;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,GAAE,SAAc,GAAG,MAAM,CAM9D"}
+{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/usage/tokens.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAI/D;AAED,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,cAAmB,GAAG,SAAS,CAYxE;AAED,wBAAgB,mBAAmB,CAAC,IAAI,GAAE,OAAO,CAAC,MAAM,CAAC,MAAM,SAAS,EAAE,OAAO,CAAC,CAAM,GAAG,OAAO,CAGjG;AAED,mEAAmE;AACnE,wBAAgB,aAAa,IAAI,SAAS,CAEzC;AAeD,wBAAgB,aAAa,CAAC,CAAC,GAAE,OAAO,CAAC,SAAS,CAAM,EAAE,CAAC,GAAE,OAAO,CAAC,SAAS,CAAM,GAAG,SAAS,CAE/F;AAED,kEAAkE;AAClE,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,OAAO,CAAC,SAAS,CAAM,EAAE,MAAM,GAAE,OAAO,CAAC,SAAS,CAAM,GAAG,SAAS,CAE7G;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,KAAK,GAAE,SAAc,GAAG,MAAM,GAAG,IAAI,CAIrE"}