@kenz1117/dsh-ui-usage-billing 1.0.43 → 1.0.44

package/lib/index.js

@@ -247,19 +247,24 @@ const WEEKEND_OFFPEAK_START_MS = Date.parse("2026-08-22T16:00:00Z");
 const FLASH_REPRICE_MS = Date.parse("2026-09-10T04:00:00Z");
 /**
 * flash 系调价前的官方谷档价（CNY / 1M tokens）：{@link FLASH_REPRICE_MS}
-* 之前的 flash / flash-vision-exp 事件按此回算（峰档 = 谷档 × 2）。
+* 之前的 flash / flash-vision-exp 事件按此回算（峰档 = 谷档 × 2）。pro 的
+* 同表条目是 V4 Pro 峰谷时代刊例（谷 4.5/0.15/13.5）：官方公告自
+* {@link FLASH_REPRICE_MS} 起 V4 Pro 请求全部路由至 V4.1 Flash 并按其单价
+* 计费（V4.1 Pro 上线前），故分界前回算 V4 Pro 刊例、分界后走目录的 Flash 价。
 * 用户价 = 实付价，与 legacy 口径相同地跳过本表。
 */
+const FLASH_PRE_REPRICE_BAND = {
+	input: 1.5,
+	cacheHit: .05,
+	output: 4.5
+};
 const FLASH_REPRICED_OFFPEAK = {
-	flash: {
-		input: 1.5,
-		cacheHit: .05,
-		output: 4.5
-	},
-	"flash-vision-exp": {
-		input: 1.5,
-		cacheHit: .05,
-		output: 4.5
+	flash: FLASH_PRE_REPRICE_BAND,
+	"flash-vision-exp": FLASH_PRE_REPRICE_BAND,
+	pro: {
+		input: 4.5,
+		cacheHit: .15,
+		output: 13.5
 	}
 };
 /**
@@ -325,6 +330,8 @@ function isBeijingWeekend(timeMs) {
 * splits peak (09:00-12:00 / 14:00-18:00 Beijing) at 2x the off-peak rate
 * from 2026-08-17, and Gemini's Flex tier discounts spare-capacity traffic.
 */
+/** DeepSeek 官方高峰时段说明（峰谷分时计费目录条目共用）。 */
+const DEEPSEEK_PEAK_HOURS = "09:00-12:00 / 14:00-18:00";
 const MODEL_CATALOG = [
 	{
 		key: "flash",
@@ -342,7 +349,7 @@ const MODEL_CATALOG = [
 				output: 4
 			}
 		},
-		peakHours: "09:00-12:00 / 14:00-18:00"
+		peakHours: DEEPSEEK_PEAK_HOURS
 	},
 	{
 		key: "flash-vision-exp",
@@ -360,7 +367,7 @@ const MODEL_CATALOG = [
 				output: 4
 			}
 		},
-		peakHours: "09:00-12:00 / 14:00-18:00"
+		peakHours: DEEPSEEK_PEAK_HOURS
 	},
 	{
 		key: "pro",
@@ -369,16 +376,16 @@ const MODEL_CATALOG = [
 		colorVar: "dsw-static-deepseek-500",
 		price: {
 			currency: "CNY",
-			input: 9,
-			cacheHit: .3,
-			output: 27,
+			input: 2,
+			cacheHit: .04,
+			output: 8,
 			offPeak: {
-				input: 4.5,
-				cacheHit: .15,
-				output: 13.5
+				input: 1,
+				cacheHit: .02,
+				output: 4
 			}
 		},
-		peakHours: "09:00-12:00 / 14:00-18:00"
+		peakHours: DEEPSEEK_PEAK_HOURS
 	},
 	{
 		key: "glm",
@@ -1413,6 +1420,7 @@ const MODEL_CATALOG = [
 const MODEL_KEY_ALIASES = {
 	"deepseek-v4-flash": "flash",
 	"deepseek-v4-flash-vision-exp": "flash-vision-exp",
+	"deepseek-v4.1-flash": "flash",
 	"deepseek-v4-pro": "pro",
 	"glm-5.2": "glm",
 	"glm-4.5-air": "glm-4.5-air",
@@ -2490,7 +2498,7 @@ function createUsageAggregator(persistence, options = {}) {
 			id,
 			...cwd === void 0 ? {} : { cwd },
 			...stamp === null ? {} : { stamp },
-			foldVersion: 11,
+			foldVersion: 12,
 			fingerprint: foldFingerprint,
 			fold: serializeFold(fold)
 		};
@@ -2587,7 +2595,7 @@ function createUsageAggregator(persistence, options = {}) {
 			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) === 11 && ledgerRow.fingerprint === foldFingerprint) {
+				if (ledgerRow !== void 0 && ledgerRow.stamp !== void 0 && stamp !== null && ledgerRow.stamp === stamp && (ledgerRow.foldVersion ?? 1) === 12 && ledgerRow.fingerprint === foldFingerprint) {
 					const fold = deserializeFold(ledgerRow.fold);
 					folds.push({
 						id,
@@ -2669,7 +2677,7 @@ function createUsageAggregator(persistence, options = {}) {
 			for (const entry of ledger.values()) {
 				if (included.has(entry.id)) continue;
 				try {
-					const stale = (entry.foldVersion ?? 1) < 11 || entry.fingerprint !== foldFingerprint;
+					const stale = (entry.foldVersion ?? 1) < 12 || entry.fingerprint !== foldFingerprint;
 					folds.push({
 						id: entry.id,
 						...entry.cwd === void 0 ? {} : { cwd: entry.cwd },
@@ -5745,13 +5753,7 @@ function apply(ctx, config = {}) {
 		const now = Date.now();
 		if (now - lastSnapshotAt < SNAPSHOT_INTERVAL_MS) return;
 		lastSnapshotAt = now;
-		const payload = JSON.stringify({
-			...doc,
-			_writer: {
-				pid: process.pid,
-				at: now
-			}
-		});
+		const payload = JSON.stringify(doc);
 		(async () => {
 			try {
 				const existing = await readFile(snapshotPath, "utf8");
@@ -5775,13 +5777,67 @@ function apply(ctx, config = {}) {
 		} catch {}
 		return null;
 	};
-	(async () => {
-		try {
-			const text = await readFile(snapshotPath, "utf8");
-			const writer = JSON.parse(text)._writer;
-			if (writer?.pid !== void 0 && writer.pid !== process.pid && writer.at !== void 0 && Date.now() - writer.at < 6e4) console.warn(`[usage-billing] 检测到另一实例（pid ${writer.pid}）正在提供用量统计，双实例可能导致提醒重复。`);
-		} catch {}
-	})();
+	const notifyClaimsPath = `${snapshotPath}.notify-claims.json`;
+	const notifyClaims = {
+		loaded: false,
+		keys: []
+	};
+	ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: "/api/billing/notify-claim",
+		handler: async (req, res) => {
+			if (!guardLoopback(req, res)) return;
+			if (req.method !== "POST") {
+				res.writeHead(405, { "content-type": "application/json; charset=utf-8" });
+				res.end(JSON.stringify({ error: "method not allowed" }));
+				return;
+			}
+			if (!isLoopbackOrigin(req.headers.origin) || !(req.headers["content-type"] ?? "").toLowerCase().includes("application/json")) {
+				res.writeHead(403, { "content-type": "application/json; charset=utf-8" });
+				res.end(JSON.stringify({ error: "forbidden: loopback only" }));
+				return;
+			}
+			try {
+				let body = "";
+				for await (const chunk of req) {
+					body += String(chunk);
+					if (body.length > 2048) {
+						res.end(JSON.stringify({ error: "body too large" }));
+						return;
+					}
+				}
+				const parsed = JSON.parse(body === "" ? "{}" : body);
+				if (typeof parsed.key !== "string" || parsed.key === "" || parsed.key.length > 200) {
+					res.writeHead(400, { "content-type": "application/json; charset=utf-8" });
+					res.end(JSON.stringify({ error: "invalid key" }));
+					return;
+				}
+				if (!notifyClaims.loaded) {
+					notifyClaims.loaded = true;
+					try {
+						const stored = JSON.parse(await readFile(notifyClaimsPath, "utf8"));
+						if (Array.isArray(stored.keys)) notifyClaims.keys = stored.keys.filter((k) => typeof k === "string");
+					} catch {}
+				}
+				if (notifyClaims.keys.includes(parsed.key)) {
+					res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+					res.end(JSON.stringify({ claimed: false }));
+					return;
+				}
+				notifyClaims.keys.push(parsed.key);
+				if (notifyClaims.keys.length > 400) notifyClaims.keys = notifyClaims.keys.slice(-200);
+				writeFileAtomic(notifyClaimsPath, JSON.stringify({ keys: notifyClaims.keys }), {
+					mode: 384,
+					dirMode: 448
+				}).catch(() => {});
+				res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+				res.end(JSON.stringify({ claimed: true }));
+			} catch {
+				res.writeHead(400, { "content-type": "application/json; charset=utf-8" });
+				res.end(JSON.stringify({ error: "invalid" }));
+			}
+		}
+	}), "usage-billing: notify-claim route");
 	ctx.inject(["settings"], (sctx) => {
 		const scope = sctx.settings.register(usageBillingSettingsNs, UsageBillingSettingsSchema, { base: { enableUsageStatsTool: config.enableUsageStatsTool ?? false } });
 		usageSettingsScope = scope;

package/lib/types/aggregate.d.ts

@@ -478,7 +478,7 @@ export interface UsageLedgerDocument {
  * 会话费用只剩最近一段，issue #29）。
  * 持久账本行据此区分新旧算法：日志已删/不可读而只能沿用旧行时，UI 标注置信度提示。
  */
-export declare const FOLD_VERSION = 11;
+export declare const FOLD_VERSION = 12;
 /**
  * 一次性账本迁移：id 唯一，apply 在加载边界对原始文档执行，已应用过的跳过。
  * 未来账本/schema 字段变更（重命名、拆桶、语义调整）时，在此追加一条迁移并

package/lib/types/client/UsageBilling.d.ts

@@ -84,6 +84,15 @@ export declare function projectMonthCost(byDay: Record<string, {
  * @returns 重估后的文档；无用户价或缺 byDayModels 时原样返回。
  */
 export declare function recostWithUserPrices(stats: UsageStats): UsageStats;
+/**
+ * 跨实例提醒认领后发系统通知（issue #44）：多实例（CLI + 桌面等）合法共存，
+ * 各自轮询会重复弹通知。两级去重——进程内 Set 挡同进程的并发/重渲染（trigger
+ * 与仪表盘是两个组件实例，effect 同周期并发时本地 store 标记读到的还是旧值）；
+ * 跨进程走宿主认领端点（先到先得），另一实例刚发过则跳过。端点不可达（旧版本/
+ * 网络故障）时放行，退化为原有 per-客户端去重。通知构造失败（平台限制）静默。
+ * Set 导出供测试重置（模块级状态会跨用例泄漏）。
+ */
+export declare const notifiedKeys: Set<string>;
 /** 近 7 天费用序列（含今天，缺日补 0）：触发卡 hover 速览的迷你柱数据源。
  * 导出供测试：纯函数（日期取本地时区）。 */
 export declare function activeDaysOf(byDay: Record<string, {

package/lib/types/client/pricing.d.ts

@@ -307,21 +307,6 @@ export interface ModelEntry {
     /** 该条目当前按用户自定义单价计价（设置面板可维护）；费率表标注「自定义」。 */
     userPriced?: boolean;
 }
-/**
- * Built-in catalog of current mainstream models as of 2026-08-16, priced from
- * each provider's official price page. Domestic providers are OpenAI-API
- * compatible and publish RMB prices directly; overseas providers publish USD
- * and convert through the exchange rate at estimate time. Retired models
- * (GPT-4o family, Gemini 2.x, GLM-4.x-lite, older Qwen) are deliberately
- * absent, as are Anthropic Claude models (their native API is not
- * OpenAI-compatible, so the harness cannot drive them directly). DeepSeek
- * keys match the harness stats file so real usage prices from the catalog;
- * unknown keys fall back to `other`.
- *
- * Time-of-day billing (peak/off-peak) is now real: DeepSeek V4 officially
- * splits peak (09:00-12:00 / 14:00-18:00 Beijing) at 2x the off-peak rate
- * from 2026-08-17, and Gemini's Flex tier discounts spare-capacity traffic.
- */
 export declare const MODEL_CATALOG: readonly ModelEntry[];
 /**
  * 真实 provider model id → 计费目录键（`MODEL_CATALOG[].key`）的映射。未知 id

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.0.43",
+  "version": "1.0.44",
   "keywords": [
     "deepseek-harness",
     "deepseek",