@kenz1117/dsh-ui-usage-billing 1.4.29 → 1.4.30

package/lib/index.js

@@ -2301,6 +2301,9 @@ const BUILTIN_MODEL_KEY_ALIASES = {
 	"deepseek-v4.1-flash": "flash",
 	"deepseek-v4.1-flash-expires-on-0910": "flash",
 	"deepseek-flash": "flash",
+	"deepseek/deepseek-v4.1-flash": "flash",
+	"deepseek/deepseek-flash": "flash",
+	"deepseek/deepseek-v4-pro": "pro",
 	"deepseek-v4-pro": "pro",
 	"glm-5.2": "glm",
 	"glm-4.5-air": "glm-4.5-air",
@@ -2491,6 +2494,29 @@ const DEFAULT_SUBSCRIPTION_PROVIDERS = [
 function isOfficialProvider(provider) {
 	return /^deepseek(?:-[a-z0-9-]+)?$/i.test(provider.trim());
 }
+/**
+* 已知的「第三方插件注册 adapter」通道名单：这些 provider 由别的插件经
+* `ctx.llm.registerAdapter` 注册，**不经 llm-pi-ai 路由表**，因此
+* {@link siteRefOf} 的路由查询必然 miss。与订阅豁免（issue #37 的 grok
+* build）同构：显式列出、不做「猜通道」的通用发现——猜错会把来源不明的
+* 路由也归位成可计价通道，违背 issue #82「支出主体无法核实不计价」的初衷。
+*
+* 收录语义：这些通道的支出主体是可核实的（WorkBuddy = 腾讯 WorkBuddy
+* 桌面 App 账号），计费用模型官方目录价折算 Token 成本，与积分制解耦。
+* 它们**不是** DeepSeek 官方渠道——{@link isOfficialProvider} 与
+* {@link officialChannelOf} 都不会因本名单把调用算进官方口径。
+*/
+const KNOWN_ADAPTER_PROVIDERS = /* @__PURE__ */ new Set(["workbuddy", "workbuddy-ai"]);
+/**
+* 一个 provider 是否命中已知 adapter 通道名单。判定与 {@link isOfficialProvider}
+* 同姿态：trim + 大小写不敏感——dsh-workbuddy-connect 注册的是小写 id
+*（`workbuddy` / `workbuddy-ai`），宿主不强制 route 小写，按大小写归一化可避免
+* 日志里出现大小写变体时静默落回 unknown 桶。路由表命中仍优先于本名单
+*（见 {@link siteRefOf}），用户自配的大小写变体走配置路径。
+*/
+function isKnownAdapterProvider(provider) {
+	return KNOWN_ADAPTER_PROVIDERS.has(provider.trim().toLowerCase());
+}
 /** DeepSeek 官方直连端点的归一化 origin（`siteOriginOf` 口径）：有 baseURL 的路由只有它算官方。 */
 const OFFICIAL_DEEPSEEK_ORIGIN = "https://api.deepseek.com";
 /**
@@ -2527,8 +2553,10 @@ function siteOriginOf(baseURL) {
 *   网关）按 `direct` 归位——unknown 一刀切会把官方直连的费用堆进「未知路由」组、
 *   且不算官方渠道（回归修复）；订阅豁免命中的通道（显式 `subscriptionProviders`
 *   配置或判定函数）同样按 `direct` 归位——订阅管理类插件注册的通道不经路由表，
-*   unknown 桶既掩盖归属又按 token 误计费（issue #37 的 grok build）；其余配置外
-*   名称保留 unknown（无法核实通道）。
+*   unknown 桶既掩盖归属又按 token 误计费（issue #37 的 grok build）；已知的第三方
+*   插件注册 adapter 通道（{@link KNOWN_ADAPTER_PROVIDERS}，如 workbuddy）同样按
+*   `direct` 归位——支出主体可核实、按模型官方目录价计 Token 成本，unknown 桶会让
+*   费用恒为 0；其余配置外名称保留 unknown（无法核实通道）。
 * @param provider - 会话日志里的 provider 路由名（request/header 的 `config.provider`）。
 * @param routes - 当前 provider 路由视图（来自 llm-pi-ai providers）。
 * @param opts - `subscription`：该调用是否已被订阅豁免判定命中。
@@ -2554,6 +2582,10 @@ function siteRefOf(provider, routes, opts = {}) {
 		kind: "direct",
 		provider
 	};
+	if (isKnownAdapterProvider(provider)) return {
+		kind: "direct",
+		provider
+	};
 	return {
 		kind: "unknown",
 		provider
@@ -3419,6 +3451,15 @@ function createUsageAggregator(persistence, options = {}) {
 	const searchEstimate = options.searchCallEstimateCny ?? .02;
 	const foldFingerprint = configFingerprint(subscriptionMatcher, officialProviderIds, routeAliases, searchEstimate);
 	const FOLD_CHUNK_EVENTS = 8e3;
+	/** 惰性失效（价目表时序）：账本/缓存行若以「当时不可计价」的模型落盘，
+	*  而价目表现在能计价了，该行必须重折——否则显示层按实时价算出的
+	*  「目录价预估」与服务端 cost=0 并存，出现「明细比总额高」的双口径
+	*  （真机复现：预热折叠早于 models.dev 价目表注入，step-5-preview
+	*  折叠时刻 cost=0、渲染时刻 ≈¥38）。复用判定据此刻检查：不走配置指纹
+	*  （价目表不进指纹，否则 6h 一次的价格刷新会让全部历史行全量重折），
+	*  也不 bump FOLD_VERSION（那是归账语义版本，价目表时序不是语义变更）。
+	*  价目表变化后未受影响行（无 unpriced 模型）依旧零读取复用。 */
+	const foldNeedsReprice = (fold) => fold.unpricedModels.some((key) => isPriced(key));
 	/** 把一份（全量或增量）折叠结果登记进 durable ledger；内容无变化时不落盘。 */
 	const recordLedger = (id, cwd, stamp, fold) => {
 		if (options.ledger === void 0) return;
@@ -3426,12 +3467,12 @@ function createUsageAggregator(persistence, options = {}) {
 			id,
 			...cwd === void 0 ? {} : { cwd },
 			...stamp === null ? {} : { stamp },
-			foldVersion: 20,
+			foldVersion: 21,
 			fingerprint: foldFingerprint,
 			fold: serializeFold(fold)
 		};
 		const row = ledger.get(id);
-		if (row === void 0 || row.stamp !== entry.stamp || row.cwd !== entry.cwd || row.foldVersion !== entry.foldVersion || row.fingerprint !== entry.fingerprint || stamp === null && JSON.stringify(row.fold) !== JSON.stringify(entry.fold)) {
+		if (row === void 0 || row.stamp !== entry.stamp || row.cwd !== entry.cwd || row.foldVersion !== entry.foldVersion || row.fingerprint !== entry.fingerprint || stamp === null && JSON.stringify(row.fold) !== JSON.stringify(entry.fold) || stamp !== null && foldNeedsReprice(row.fold)) {
 			ledger.set(id, entry);
 			ledgerNeedsSave = true;
 		}
@@ -3518,22 +3559,10 @@ function createUsageAggregator(persistence, options = {}) {
 				if (!ledger.has(id)) noLedgerUnreadable += 1;
 				continue;
 			}
-			const hit = cache.get(id);
-			if (hit !== void 0 && stamp !== null && hit.stamp === stamp) {
-				cache.delete(id);
-				cache.set(id, hit);
-				folds.push({
-					id,
-					...meta.cwd === void 0 ? {} : { cwd: meta.cwd },
-					fold: hit.fold
-				});
-				included.add(id);
-				continue;
-			}
 			try {
 				const cwd = meta.cwd;
 				const ledgerRow = ledger.get(id);
-				if (ledgerRow !== void 0 && ledgerRow.stamp !== void 0 && stamp !== null && ledgerRow.stamp === stamp && (ledgerRow.foldVersion ?? 1) === 20 && ledgerRow.fingerprint === foldFingerprint) {
+				if (ledgerRow !== void 0 && ledgerRow.stamp !== void 0 && stamp !== null && ledgerRow.stamp === stamp && (ledgerRow.foldVersion ?? 1) === 21 && ledgerRow.fingerprint === foldFingerprint && !foldNeedsReprice(ledgerRow.fold)) {
 					const fold = deserializeFold(ledgerRow.fold);
 					folds.push({
 						id,
@@ -3543,8 +3572,20 @@ function createUsageAggregator(persistence, options = {}) {
 					included.add(id);
 					continue;
 				}
+				const hit = cache.get(id);
+				if (hit !== void 0 && stamp !== null && hit.stamp === stamp && ![...hit.fold.unpricedModels].some((key) => isPriced(key))) {
+					cache.delete(id);
+					cache.set(id, hit);
+					folds.push({
+						id,
+						...meta.cwd === void 0 ? {} : { cwd: meta.cwd },
+						fold: hit.fold
+					});
+					included.add(id);
+					continue;
+				}
 				const previous = cache.get(id);
-				if (previous?.machine !== void 0 && previous.lastSeq !== void 0) {
+				if (previous?.machine !== void 0 && previous.lastSeq !== void 0 && ![...previous.fold.unpricedModels].some((key) => isPriced(key))) {
 					const from = previous.lastSeq + 1;
 					const { events, inheritedEventCount } = await persistence.readFrom(meta.id, sessionLogOffsetOf(from));
 					const after = await stampOf(meta);
@@ -3621,7 +3662,7 @@ function createUsageAggregator(persistence, options = {}) {
 			for (const entry of ledger.values()) {
 				if (included.has(entry.id)) continue;
 				try {
-					const stale = (entry.foldVersion ?? 1) < 20 || entry.fingerprint !== foldFingerprint;
+					const stale = (entry.foldVersion ?? 1) < 21 || entry.fingerprint !== foldFingerprint;
 					folds.push({
 						id: entry.id,
 						...entry.cwd === void 0 ? {} : { cwd: entry.cwd },
@@ -7456,11 +7497,25 @@ function apply(ctx, config = {}) {
 	});
 	let live = { source: "builtin" };
 	let pricingSyncedAt = 0;
+	/** 价目表代际：extraModels 的 key 集合稳定序列化。fetchLivePricing 每次都重建
+	*  数组（引用必不同），引用比较恒真会退化成「每次刷新都跑一轮 reprice」；
+	*  key 集合变化才代表真的出现了「此前未收录、现在可计价」的模型。 */
+	const priceGenerationOf = (snapshot) => (snapshot.extraModels ?? []).map((model) => model.key).sort().join(",");
+	let priceGeneration = priceGenerationOf(live);
 	const refreshPricing = async () => {
 		live = await fetchLivePricing();
 		pricingSyncedAt = Date.now();
 		applyLivePricing(live);
 		pricingBodyCache = void 0;
+		const nextGeneration = priceGenerationOf(live);
+		if (nextGeneration !== priceGeneration) {
+			priceGeneration = nextGeneration;
+			aggregator.aggregate().then(() => {
+				console.info("[usage-billing] repriced folds after pricing refresh; ledger aligned with live catalog");
+			}).catch((error) => {
+				console.warn("[usage-billing] reprice fold after pricing refresh failed; next aggregate retries:", error);
+			});
+		}
 	};
 	let pricingBodyCache;
 	const pricingBody = () => {

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": "1.4.29",
+  "version": "1.4.30",
   "keywords": [
     "deepseek-harness",
     "deepseek",