@ychris12138/dsh-usage-stats 0.2.10 → 0.3.0

package/lib/usage.js

@@ -17,6 +17,9 @@
  * @module dsh-usage-stats/usage
  */
 
+import { resolveProviderIdentity } from "./provider-identity.js";
+import { applyCostSample, costSampleOf, createCostAccumulator, mergeCostAccumulator, renderCost } from "./billing.js";
+
 /** Local-calendar `YYYY-MM-DD` key for a millisecond epoch. */
 export function dayKey(timeMs) {
 	const date = new Date(timeMs);
@@ -80,6 +83,77 @@ function subtractFrom(target, source) {
 	return target;
 }
 
+function billingEntryOf(byDay, day) {
+	let entry = byDay.get(day);
+	if (entry === void 0) {
+		entry = { total: createCostAccumulator(), models: new Map() };
+		byDay.set(day, entry);
+	}
+	return entry;
+}
+
+function modelCostOf(entry, model) {
+	let accumulator = entry.models.get(model);
+	if (accumulator === void 0) {
+		accumulator = createCostAccumulator();
+		entry.models.set(model, accumulator);
+	}
+	return accumulator;
+}
+
+function adjustIdentityCount(map, key, direction) {
+	const next = (map.get(key) ?? 0) + direction;
+	if (next <= 0) map.delete(key);
+	else map.set(key, next);
+}
+
+function createSessionBillingState() {
+	return {
+		total: createCostAccumulator(),
+		days: new Map(),
+		providers: new Map(),
+		models: new Map(),
+		sampleCount: 0,
+		firstAt: null,
+		lastAt: null,
+		penultimateAt: null
+	};
+}
+
+function applySessionCost(state, sample, direction) {
+	const billing = state.billing;
+	applyCostSample(billing.total, sample.cost, direction);
+	const dayEntry = billingEntryOf(billing.days, sample.day);
+	applyCostSample(dayEntry.total, sample.cost, direction);
+	applyCostSample(modelCostOf(dayEntry, sample.model), sample.cost, direction);
+	if (sample.cost.counted !== true) return;
+	adjustIdentityCount(billing.providers, sample.providerId, direction);
+	adjustIdentityCount(billing.models, sample.model, direction);
+	if (direction < 0) {
+		billing.sampleCount = Math.max(0, billing.sampleCount - 1);
+		if (billing.sampleCount === 0) {
+			billing.firstAt = null;
+			billing.lastAt = null;
+			billing.penultimateAt = null;
+		} else {
+			billing.lastAt = billing.penultimateAt;
+			billing.penultimateAt = null;
+		}
+		return;
+	}
+	if (billing.sampleCount === 0) billing.firstAt = sample.time;
+	billing.penultimateAt = billing.lastAt;
+	billing.lastAt = sample.time;
+	billing.sampleCount += 1;
+}
+
+function routeFromModelKey(key) {
+	if (typeof key !== "string") return { providerId: "unknown", model: "unknown" };
+	const slash = key.indexOf("/");
+	if (slash <= 0 || slash === key.length - 1) return { providerId: "unknown", model: "unknown" };
+	return { providerId: key.slice(0, slash), model: key.slice(slash + 1) };
+}
+
 /** Extract the usage sample an event carries, if any. */
 function sampleOf(event) {
 	if (event.type === "assistant/chunk" && event.data?.chunk?.type === "usage") {
@@ -105,18 +179,29 @@ function sampleOf(event) {
  * `request/header` `data.header.config`; samples with no model information
  * land in the `unknown/unknown` bucket.
  */
-function modelOf(event) {
+export function routeModelOf(event) {
 	const source = event.data?.message?.source;
 	if (source !== void 0 && typeof source.model === "string") {
-		return `${typeof source.provider === "string" && source.provider.length > 0 ? source.provider : "unknown"}/${source.model}`;
+		return {
+			providerId: typeof source.provider === "string" && source.provider.length > 0 ? source.provider : "unknown",
+			model: source.model
+		};
 	}
 	const config = event.data?.header?.config;
 	if (config !== void 0 && typeof config.model === "string") {
-		return `${typeof config.provider === "string" && config.provider.length > 0 ? config.provider : "unknown"}/${config.model}`;
+		return {
+			providerId: typeof config.provider === "string" && config.provider.length > 0 ? config.provider : "unknown",
+			model: config.model
+		};
 	}
 	return void 0;
 }
 
+function modelOf(event) {
+	const route = routeModelOf(event);
+	return route === void 0 ? void 0 : `${route.providerId}/${route.model}`;
+}
+
 /** Day entry: totals plus a per-model bucket map. */
 function entryOf(byDay, day) {
 	let entry = byDay.get(day);
@@ -134,14 +219,44 @@ function entryOf(byDay, day) {
  * One session's incremental fold state. `days` holds the already-folded
  * per-day entries; `lastSample`/`currentModel` let a later event slice keep
  * the replace-last-sample semantics and model attribution across fold
- * boundaries without replaying the whole log.
+ * boundaries without replaying the whole log. `currentRoute` is a lightweight
+ * provider/model projection over that same cursor, not a second usage ledger.
  */
 export function createUsageState() {
-	return {
+	return resetUsageState({});
+}
+
+/** Reset only the incremental fold fields while preserving cache metadata. */
+export function resetUsageState(state) {
+	return Object.assign(state, {
 		days: new Map(),
+		billing: createSessionBillingState(),
 		lastSample: null,
 		currentModel: null,
+		currentRoute: null,
 		consumed: 0
+	});
+}
+
+/**
+ * Render the secret-free context for one session's latest provider/model pair.
+ * The provider object supplies connection identity only; credentials and
+ * monitor request details are intentionally excluded from the wire shape.
+ */
+export function currentSessionContext(sessionId, state, provider, config = { monitors: {} }) {
+	const current = state?.currentRoute;
+	if (current === null || current === void 0) return null;
+	const identity = resolveProviderIdentity({
+		...(provider ?? {}),
+		id: current.providerId
+	}, config);
+	return {
+		sessionId,
+		providerId: identity.routeId,
+		providerFamily: identity.providerFamily,
+		model: current.model,
+		accountId: identity.routeId,
+		updatedAt: current.updatedAt
 	};
 }
 
@@ -154,18 +269,31 @@ export function createUsageState() {
  * @param state - session fold state (mutated in place).
  * @param events - the new events, in seq order, starting after the last fold.
  */
-export function applyUsageDelta(state, events) {
+export function applyUsageDelta(state, events, options = {}) {
 	let last = state.lastSample;
 	let currentModel = state.currentModel;
+	let currentRoute = state.currentRoute ?? null;
+	const estimateCost = typeof options.estimateCost === "function" ? options.estimateCost : null;
 	for (const event of events) {
-		if (event.type === "request/header") {
-			const model = modelOf(event);
-			if (model !== void 0) currentModel = model;
+		if (event.type === "request/header" || event.type === "assistant/message") {
+			const route = routeModelOf(event);
+			if (route !== void 0) {
+				// Keep token attribution semantics unchanged: currentModel remains
+				// request/header-driven, while currentRoute may also use the model
+				// source on assistant/message for live context switching.
+				if (event.type === "request/header") currentModel = `${route.providerId}/${route.model}`;
+				currentRoute = {
+					providerId: route.providerId,
+					model: route.model,
+					updatedAt: Number.isFinite(event.time) ? event.time : currentRoute?.updatedAt ?? null
+				};
+			}
 		}
 		const sample = sampleOf(event);
 		if (sample === void 0) continue;
 		const buckets = bucketsOf(sample.usage);
 		const model = modelOf(event) ?? currentModel ?? "unknown/unknown";
+		const route = routeModelOf(event) ?? routeFromModelKey(model);
 		const day = dayKey(event.time);
 		const entry = entryOf(state.days, day);
 		if (last !== null && last.key === sample.key) {
@@ -176,6 +304,7 @@ export function applyUsageDelta(state, events) {
 				const previousModel = previous.models.get(last.model);
 				if (previousModel !== void 0) subtractFrom(previousModel, last.buckets);
 			}
+			if (last.cost !== void 0) applySessionCost(state, last, -1);
 		}
 		addInto(entry.totals, buckets);
 		let modelBucket = entry.models.get(model);
@@ -184,10 +313,26 @@ export function applyUsageDelta(state, events) {
 			entry.models.set(model, modelBucket);
 		}
 		addInto(modelBucket, buckets);
-		last = { key: sample.key, day, model, buckets };
+		const estimate = estimateCost === null ? null : estimateCost({
+			providerId: route.providerId,
+			model: route.model,
+			timestamp: event.time,
+			buckets
+		});
+		last = {
+			key: sample.key,
+			day,
+			model,
+			providerId: route.providerId,
+			time: event.time,
+			buckets,
+			cost: costSampleOf(estimate, buckets)
+		};
+		applySessionCost(state, last, 1);
 	}
 	state.lastSample = last;
 	state.currentModel = currentModel;
+	state.currentRoute = currentRoute;
 }
 
 /**
@@ -222,6 +367,15 @@ export function mergeInto(byDay, sessionDays) {
 	}
 }
 
+/** Merge one session's monetary derivation into a global day map. */
+export function mergeBillingInto(byDay, sessionDays) {
+	for (const [day, entry] of sessionDays) {
+		const target = billingEntryOf(byDay, day);
+		mergeCostAccumulator(target.total, entry.total);
+		for (const [model, accumulator] of entry.models) mergeCostAccumulator(modelCostOf(target, model), accumulator);
+	}
+}
+
 /**
  * Merge one session fold into a global per-day map (convenience wrapper).
  * @param byDay - global map to mutate.
@@ -238,15 +392,17 @@ export function consumeEvents(byDay, events) {
  * @returns `{ days, total, updatedAt }` with `days` sorted ascending; each
  *   day carries `models` (descending by tokens) and a `cacheHitRate` percent.
  */
-export function renderUsage(byDay, updatedAt) {
+export function renderUsage(byDay, updatedAt, billingByDay = new Map()) {
 	const days = [...byDay.entries()]
 		.map(([date, entry]) => {
+			const billing = billingByDay.get(date);
 			const models = [...entry.models.entries()]
 				.map(([model, buckets]) => ({
 					model,
 					...buckets,
 					tokens: totalTokens(buckets),
-					cacheHitRate: cacheHitRate(buckets)
+					cacheHitRate: cacheHitRate(buckets),
+					...renderCost(billing?.models.get(model) ?? createCostAccumulator())
 				}))
 				// All-zero buckets come from warmup requests that report
 				// {input:0, output:0}; rendering them produces empty "0 tokens"
@@ -258,19 +414,40 @@ export function renderUsage(byDay, updatedAt) {
 				...entry.totals,
 				tokens: totalTokens(entry.totals),
 				cacheHitRate: cacheHitRate(entry.totals),
+				...renderCost(billing?.total ?? createCostAccumulator()),
 				models
 			};
 		})
 		.sort((a, b) => (a.date < b.date ? -1 : a.date > b.date ? 1 : 0));
 	const total = zeroBuckets();
 	for (const [, entry] of byDay) addInto(total, entry.totals);
+	const totalCost = createCostAccumulator();
+	for (const [, entry] of billingByDay) mergeCostAccumulator(totalCost, entry.total);
 	return {
 		days,
 		total: {
 			...total,
 			tokens: totalTokens(total),
-			cacheHitRate: cacheHitRate(total)
+			cacheHitRate: cacheHitRate(total),
+			...renderCost(totalCost)
 		},
 		updatedAt
 	};
 }
+
+/** Render one cached session without maintaining a second token total. */
+export function renderSessionUsage(sessionId, state) {
+	const totals = zeroBuckets();
+	for (const [, entry] of state.days) addInto(totals, entry.totals);
+	return {
+		sessionId,
+		title: typeof state.title === "string" && state.title !== "" ? state.title : null,
+		providers: [...state.billing.providers.keys()].sort(),
+		models: [...state.billing.models.keys()].sort(),
+		...totals,
+		tokens: totalTokens(totals),
+		...renderCost(state.billing.total),
+		firstAt: Number.isFinite(state.billing.firstAt) ? new Date(state.billing.firstAt).toISOString() : null,
+		lastAt: Number.isFinite(state.billing.lastAt) ? new Date(state.billing.lastAt).toISOString() : null
+	};
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ychris12138/dsh-usage-stats",
-  "description": "Token usage heatmap, provider balances, and subscription quotas for the dsh web GUI",
-  "version": "0.2.10",
+  "description": "Token usage, provider accounts, session cost estimates, budgets, and exports for the dsh web GUI",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Ychris12138/dsh-usage-stats.git"
@@ -21,6 +21,8 @@
     "lib/",
     "cordis.patch.yml",
     "docs/images/usage-panel.svg",
+    "docs/release-checklist.md",
+    "docs/release-notes-v0.3.0.md",
     "scripts/install.mjs",
     "README.md",
     "LICENSE",
@@ -31,6 +33,7 @@
   "exports": {
     ".": "./lib/index.js",
     "./client": "./lib/client.js",
+    "./pricing": "./lib/pricing.js",
     "./usage": "./lib/usage.js",
     "./package.json": "./package.json"
   },
@@ -48,13 +51,19 @@
     }
   },
   "scripts": {
-    "check": "node --check lib/index.js && node --check lib/usage.js && node --check lib/balance.js && node --check lib/subscriptions.js && node --check lib/accounts.js && node --check lib/client.js && node --check scripts/install.mjs && node --check scripts/smoke-client.mjs && node --check scripts/test-overlay-layering.mjs && node --check scripts/test-bundle.mjs && node --check scripts/test-install.mjs && node --check scripts/test-server.mjs && node --check scripts/test-balance.mjs && node --check scripts/test-subscriptions.mjs && node --check scripts/test-accounts.mjs && node --check scripts/validate-fold.mjs && node --check scripts/verify-raw.mjs && node --check scripts/check-balance.mjs",
-    "test": "npm run test:bundle && npm run test:client && npm run test:overlay && npm run test:server && npm run test:balance && npm run test:subscriptions && npm run test:accounts && npm run test:install",
+    "check": "npm run check:release && node --check lib/index.js && node --check lib/usage.js && node --check lib/billing.js && node --check lib/pricing.js && node --check lib/network.js && node --check lib/provider-identity.js && node --check lib/balance.js && node --check lib/subscriptions.js && node --check lib/accounts.js && node --check lib/export.js && node --check lib/client.js && node --check scripts/install.mjs && node --check scripts/smoke-client.mjs && node --check scripts/test-overlay-layering.mjs && node --check scripts/test-bundle.mjs && node --check scripts/test-install.mjs && node --check scripts/test-server.mjs && node --check scripts/test-export.mjs && node --check scripts/test-provider-identity.mjs && node --check scripts/test-pricing.mjs && node --check scripts/test-billing.mjs && node --check scripts/test-balance.mjs && node --check scripts/test-subscriptions.mjs && node --check scripts/test-accounts.mjs && node --check scripts/release-metadata.mjs && node --check scripts/check-release-metadata.mjs && node --check scripts/sync-release-version.mjs && node --check scripts/validate-fold.mjs && node --check scripts/verify-raw.mjs && node --check scripts/check-balance.mjs",
+    "check:release": "node scripts/check-release-metadata.mjs",
+    "release:sync": "node scripts/sync-release-version.mjs",
+    "test": "npm run test:bundle && npm run test:client && npm run test:overlay && npm run test:server && npm run test:export && npm run test:provider-identity && npm run test:pricing && npm run test:billing && npm run test:balance && npm run test:subscriptions && npm run test:accounts && npm run test:install",
     "test:bundle": "node scripts/test-bundle.mjs",
     "test:client": "node scripts/smoke-client.mjs",
     "test:overlay": "node scripts/test-overlay-layering.mjs",
     "test:install": "node scripts/test-install.mjs",
     "test:server": "node scripts/test-server.mjs",
+    "test:export": "node scripts/test-export.mjs",
+    "test:provider-identity": "node scripts/test-provider-identity.mjs",
+    "test:pricing": "node scripts/test-pricing.mjs",
+    "test:billing": "node scripts/test-billing.mjs",
     "test:balance": "node scripts/test-balance.mjs",
     "test:subscriptions": "node scripts/test-subscriptions.mjs",
     "test:accounts": "node scripts/test-accounts.mjs",
@@ -63,7 +72,8 @@
   },
   "devDependencies": {
     "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react-dom": "^18.2.0",
+    "react-test-renderer": "^18.3.1"
   },
   "license": "MIT",
   "publishConfig": {