@thehammer/danx-session-telemetry 0.1.41 → 0.1.42

package/dist/.source-hash

@@ -1 +1 @@
-b066d72035e89bbf909f51f078f014e0b3910566bcb2d035c5f469b44573efa6
+f4864e2bc2491a9df2c4f0c3ec86da8a35ad36225049696e9e2ca5b544931859

package/dist/pricing.d.ts

@@ -114,15 +114,28 @@ export type PriceResult = {
  * cleanly, whatever its id looks like.
  */
 export declare function priceUsage(model: string, speed: string, tokens: PricedTokens): PriceResult;
+/**
+ * The list price `priceUsage` charges for a model at a speed (a fast request on a model that bills fast at the standard rate reads the
+ * standard table), or `null` when the tables have none. The default `PriceLookup` of {@link priceLedgerCredit}.
+ */
+export declare function listedPrice(model: string, speed: string): ModelPrice | null;
+/**
+ * DX-4595 - dollars for `tokens` at `price` (USD per million tokens): each bucket with its own price. The ONE copy of the formula: `priceUsage`
+ * charges the list price with it, and spend pacing charges an account's own (editable) prices with it.
+ */
+export declare function costOfTokens(tokens: PricedTokens, price: ModelPrice): number;
 /** True when `model` has a standard-speed price (used by tests + guards). */
 export declare function isPricedModel(model: string): boolean;
+/** What a model costs at a speed, per million tokens; `null` when there is no price. */
+export type PriceLookup = (model: string, speed: string) => ModelPrice | null;
 /**
  * DX-4508 — one ledger credit's cost, exactly as the server's usage-ledger writer stores it (moved here from
  * `src/dashboard/usage-ledger.ts` so the live sub-agent view, `subagent-live.ts`, prices a reply with the SAME rule
  * instead of a copy): a `<synthetic>` reply costs nothing and is never unpriced; a reply with no model is unpriced only
- * when it carries tokens; any other model goes through {@link priceUsage}, an unpriced one costing 0 and naming itself.
+ * when it carries tokens; any other model is priced by `priceOf` (the list prices by default, so as {@link priceUsage} does), an unpriced
+ * one costing 0 and naming itself. DX-4595: spend pacing passes an account's own prices as `priceOf` and so gets the same rule.
  */
-export declare function priceLedgerCredit(model: string | null, speed: string, tokens: PricedTokens): {
+export declare function priceLedgerCredit(model: string | null, speed: string, tokens: PricedTokens, priceOf?: PriceLookup): {
     costUsd: number;
     unpriced: {
         model: string;

package/dist/pricing.js

@@ -163,20 +163,29 @@ export function listListPrices() {
  * cleanly, whatever its id looks like.
  */
 export function priceUsage(model, speed, tokens) {
+    const price = listedPrice(model, speed);
+    return price === null ? { kind: "unpriced", model, speed } : { kind: "priced", costUsd: costOfTokens(tokens, price) };
+}
+/**
+ * The list price `priceUsage` charges for a model at a speed (a fast request on a model that bills fast at the standard rate reads the
+ * standard table), or `null` when the tables have none. The default `PriceLookup` of {@link priceLedgerCredit}.
+ */
+export function listedPrice(model, speed) {
     const useFastTable = speed === FAST_SPEED && !FAST_BILLS_AT_STANDARD_RATE.has(model);
     const table = useFastTable ? FAST_PRICING : PRICING;
-    if (!Object.hasOwn(table, model))
-        return { kind: "unpriced", model, speed };
-    const p = table[model];
-    return {
-        kind: "priced",
-        costUsd: (tokens.input * p.input +
-            tokens.output * p.output +
-            tokens.cacheRead * p.cacheRead +
-            tokens.cacheWrite5m * p.cacheWrite5m +
-            tokens.cacheWrite1h * p.cacheWrite1h) /
-            1_000_000,
-    };
+    return Object.hasOwn(table, model) ? table[model] : null;
+}
+/**
+ * DX-4595 - dollars for `tokens` at `price` (USD per million tokens): each bucket with its own price. The ONE copy of the formula: `priceUsage`
+ * charges the list price with it, and spend pacing charges an account's own (editable) prices with it.
+ */
+export function costOfTokens(tokens, price) {
+    return ((tokens.input * price.input +
+        tokens.output * price.output +
+        tokens.cacheRead * price.cacheRead +
+        tokens.cacheWrite5m * price.cacheWrite5m +
+        tokens.cacheWrite1h * price.cacheWrite1h) /
+        1_000_000);
 }
 /** True when `model` has a standard-speed price (used by tests + guards). */
 export function isPricedModel(model) {
@@ -188,15 +197,16 @@ export function isPricedModel(model) {
  * DX-4508 — one ledger credit's cost, exactly as the server's usage-ledger writer stores it (moved here from
  * `src/dashboard/usage-ledger.ts` so the live sub-agent view, `subagent-live.ts`, prices a reply with the SAME rule
  * instead of a copy): a `<synthetic>` reply costs nothing and is never unpriced; a reply with no model is unpriced only
- * when it carries tokens; any other model goes through {@link priceUsage}, an unpriced one costing 0 and naming itself.
+ * when it carries tokens; any other model is priced by `priceOf` (the list prices by default, so as {@link priceUsage} does), an unpriced
+ * one costing 0 and naming itself. DX-4595: spend pacing passes an account's own prices as `priceOf` and so gets the same rule.
  */
-export function priceLedgerCredit(model, speed, tokens) {
+export function priceLedgerCredit(model, speed, tokens, priceOf = listedPrice) {
     if (model === SYNTHETIC_MODEL)
         return { costUsd: 0, unpriced: null };
     if (model === null) {
         const zero = tokens.input === 0 && tokens.output === 0 && tokens.cacheRead === 0 && tokens.cacheWrite5m === 0 && tokens.cacheWrite1h === 0;
         return zero ? { costUsd: 0, unpriced: null } : { costUsd: 0, unpriced: { model: "(none)", speed } };
     }
-    const r = priceUsage(model, speed, tokens);
-    return r.kind === "priced" ? { costUsd: r.costUsd, unpriced: null } : { costUsd: 0, unpriced: { model: r.model, speed: r.speed } };
+    const price = priceOf(model, speed);
+    return price === null ? { costUsd: 0, unpriced: { model, speed } } : { costUsd: costOfTokens(tokens, price), unpriced: null };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thehammer/danx-session-telemetry",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "Shared Claude Code transcript collector (DX-2962) — incremental JSONL tailing for the danxbot worker and the danx-dashboard-mcp desktop bridge, so both run identical collector code.",
   "license": "MIT",
   "type": "module",
@@ -31,6 +31,7 @@
     "node": ">=20"
   },
   "scripts": {
+    "prepublishOnly": "bash ../../scripts/assert-tree-contains-origin-main.sh @thehammer/danx-session-telemetry",
     "build": "tsc -p tsconfig.json",
     "verify:boot": "bash scripts/verify-boot.sh",
     "test": "vitest run",