@kenz1117/dsh-ui-usage-billing 0.9.4 → 0.9.6

package/lib/index.js

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -964,6 +965,7 @@ function emptyUsage() {
 		cacheHit: 0,
 		cacheMiss: 0,
 		cost: 0,
+		reasoning: 0,
 		officialCalls: 0,
 		officialCost: 0
 	};
@@ -985,6 +987,7 @@ function foldUsage(acc, usage, key, subscription, timeMs, official = false) {
 	acc.calls += 1;
 	acc.input += usage.inputTokens + cacheHit + (usage.cacheWriteTokens ?? 0);
 	acc.output += usage.outputTokens;
+	acc.reasoning += usage.reasoningTokens ?? 0;
 	acc.cacheHit += cacheHit;
 	acc.cacheMiss += cacheMiss;
 	if (official) acc.officialCalls += 1;
@@ -1247,6 +1250,7 @@ function mergeUsageInto(acc, cell) {
 	acc.calls += cell.calls;
 	acc.input += cell.input;
 	acc.output += cell.output;
+	acc.reasoning += cell.reasoning;
 	acc.cacheHit += cell.cacheHit;
 	acc.cacheMiss += cell.cacheMiss;
 	acc.cost += cell.cost;
@@ -1265,8 +1269,14 @@ function percentile(values, p) {
 	const idx = (sorted.length - 1) * p;
 	const lo = Math.floor(idx);
 	const hi = Math.ceil(idx);
-	if (lo === hi) return sorted[lo];
-	return sorted[lo] + (sorted[hi] - sorted[lo]) * (idx - lo);
+	if (lo === hi) {
+		const value = sorted[lo];
+		return value === void 0 ? 0 : value;
+	}
+	const a = sorted[lo];
+	const b = sorted[hi];
+	if (a === void 0 || b === void 0) return 0;
+	return a + (b - a) * (idx - lo);
 }
 /**
 * Create the incremental usage aggregator.
@@ -2083,7 +2093,7 @@ const SUBSCRIPTION_DISPLAY_NAMES = {
 	"openrouter": "OpenRouter"
 };
 /** 订阅类 provider id 判定：带 coding / agent-plan / token-plan 后缀，或已知订阅通道。 */
-const SUBSCRIPTION_ID_RE = /(?:^|-)(?:coding|agent[-_]?plan|token[-_]?plan)(?:$|-|_)|^(?:opencode|opencode-go|kimi-coding|zai-coding|minimax|minimax-token-plan|openrouter)/i;
+const SUBSCRIPTION_ID_RE = /* @__PURE__ */ new RegExp("(?:^|-)(?:coding|agent[-_]?plan|token[-_]?plan)(?:$|-|_)|^(?:opencode|opencode-go|kimi-coding|zai-coding|minimax|minimax-token-plan|openrouter)", "i");
 /** 是否是订阅类 provider id（如 kimi-coding、xiaomi-token-plan-cn）。 */
 function isSubscriptionProviderId(providerId) {
 	if (SUBSCRIPTION_ID_RE.test(providerId)) return true;
@@ -2582,6 +2592,11 @@ const PRICING_REFRESH_INTERVAL_MS = 360 * 60 * 1e3;
 const SUBSCRIPTION_CACHE_MS = 300 * 1e3;
 /** DeepSeek 余额查询的默认凭据引用（与 llm-deepseek 的默认引用一致）。 */
 const DEFAULT_BALANCE_API_KEY_ENV = "DEEPSEEK_API_KEY";
+/**
+* 本插件版本号：从包自身的 package.json 读取（单一来源），随 usage-stats
+* 下发，供「设置 → 插件信息卡」展示。发布版 lib/index.js 相对包根解析。
+*/
+const PACKAGE_VERSION = createRequire(import.meta.url)("../package.json").version ?? "0.0.0";
 /** 统计快照的落盘节流（毫秒）：前端 30 秒轮询，快照最多每 30 秒写一次。 */
 const SNAPSHOT_INTERVAL_MS = 3e4;
 /** Required services: the web server, the persisted session log store, and user settings. */
@@ -2913,8 +2928,9 @@ function apply(ctx, config = {}) {
 					...config.monthlyBudget === void 0 ? {} : { budget: config.monthlyBudget },
 					...config.lowBalanceThreshold === void 0 ? {} : { lowBalanceThreshold: config.lowBalanceThreshold }
 				};
-				const payload = Object.keys(injected).length === 0 ? stats : {
+				const payload = {
 					...stats,
+					pluginVersion: PACKAGE_VERSION,
 					...injected
 				};
 				persistSnapshot(payload);
@@ -2928,6 +2944,7 @@ function apply(ctx, config = {}) {
 				const doc = JSON.parse(text);
 				if (config.monthlyBudget !== void 0) doc["budget"] = config.monthlyBudget;
 				if (config.lowBalanceThreshold !== void 0) doc["lowBalanceThreshold"] = config.lowBalanceThreshold;
+				doc["pluginVersion"] = PACKAGE_VERSION;
 				res.end(JSON.stringify(doc));
 				return;
 			} catch {}

package/lib/types/aggregate.d.ts

@@ -42,6 +42,8 @@ export interface ModelUsage {
     cacheHit: number;
     cacheMiss: number;
     cost: number;
+    /** 输出中的 reasoning（思考）token；已包含在 `output` 内，单列用于结构展示。 */
+    reasoning: number;
     /** 该模型本次统计的所有调用是否都走订阅通道（coding/token plan）；混合通道不置位。 */
     plan?: boolean;
     /** 走官方渠道的调用数（DeepSeek 官方直连；其余为三方）。 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-ui-usage-billing",
   "description": "Usage billing dashboard for DeepSeek Harness: sidebar cost metrics plus a full dashboard modal, priced from a current multi-provider catalog with real usage aggregated from session logs.",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "publishConfig": {
     "access": "public"
   },