@gamegeek-saikel/dsh-cost-meter 0.1.1 → 0.1.2

package/README.md

@@ -43,7 +43,7 @@ Chat costs in DeepSeek pricing change over time (list prices, USD→CNY exchange
 |---|---|
 | Cost anchoring | Append-only pricebook snapshots; step cost computed once at the event's own time |
 | Price sources | Manual override > official pricing page > built-in fallback > OpenRouter (fallback only, USD→CNY) > none |
-| Peak pricing | 2026-08-17 00:00 Beijing rollout; peak 09:00–12:00 / 14:00–18:00 Beijing, off-peak half price |
+| Peak pricing | 2026-08-17 00:00 Beijing rollout; peak/off-peak windows parsed from each page's own schedule (the zh and en pages may differ; fallback 09:00–12:00 / 14:00–18:00 Beijing), off-peak half price |
 | Cost formula | Uncached input + cache reads (hit rate) + cache writes (billed at uncached input rate) + output, per 1M tokens, CNY |
 | Account balance | Official `GET /user/balance`, cached 60 s, single in-flight request, trust-fenced route |
 | Subagent support | BFS over the live agent tree; conversation totals = main session + descendants |
@@ -71,7 +71,7 @@ The pricebook (`src/pricebook.ts`) is the durable price source, persisted on the
 
 - **Priority chain** — per canonical model key (`provider/model`, bare model, or the `flash`/`pro` pricing key for DeepSeek-family models): manual override > official page > built-in fallback > OpenRouter (fallback only, USD→CNY, cache reads at the configured discount) > none.
 - **Snapshot selection** — `snapshotForTime` picks the newest snapshot with `effectiveAt <= event time` (pre-install sessions anchor to the first snapshot once).
-- **Peak/off-peak** — before the 2026-08-17 rollout all steps price at the single list price; after it, the band is chosen by Beijing time (peak 09:00–12:00 / 14:00–18:00, everything else off-peak).
+- **Peak/off-peak** — before the 2026-08-17 rollout all steps price at the single list price; after it, the band is chosen by the EVENT's own time against the schedule of the pricebook's own page (the zh and en pages each parse their own peak windows, falling back to Beijing 09:00–12:00 / 14:00–18:00, everything else off-peak). Each step's band is anchored once at fold time, so the per-reply cards and chips always show the band that round was billed at — never the band of the moment you are looking.
 - **Immutable ledger** — the `sessionCost` projection (`src/session-cost-projection.ts`) folds `request/header` (model) and usage-carrying events into per-step rows; a second usage sample for the same (turn, step) replaces the first (same-step finalization, not a re-price), with O(1) incremental totals.
 
 ## Project Structure

package/README.zh-CN.md

@@ -43,7 +43,7 @@ DeepSeek 的价格随时间变化（官方价目表、USD→CNY 汇率、以及
 |---|---|
 | 成本锚定 | 只追加价格簿快照；步成本在事件自身时刻只计算一次 |
 | 价格来源 | 手动覆盖 > 官方价格页 > 内置回退 > OpenRouter（仅回退，USD→CNY）> 无 |
-| 峰值定价 | 2026-08-17 00:00 北京生效；高峰 09:00–12:00 / 14:00–18:00（北京），闲时为半价 |
+| 峰值定价 | 2026-08-17 00:00 北京生效；高峰/闲时窗口按各页面自己的时段表解析（中英文页面可能不同，缺省 09:00–12:00 / 14:00–18:00 北京），闲时为半价 |
 | 成本公式 | 未命中输入 + 缓存命中（命中价）+ 缓存写入（按未命中输入价计）+ 输出，每百万 tokens，CNY |
 | 账户余额 | 官方 `GET /user/balance`，缓存 60 秒，单飞请求，路由带信任围栏 |
 | 子代理支持 | 沿活跃代理树 BFS；对话总花费 = 主会话 + 全部后代 |
@@ -71,7 +71,7 @@ DeepSeek 的价格随时间变化（官方价目表、USD→CNY 汇率、以及
 
 - **优先级链**——按规范模型键（`provider/model`、裸模型名，或 DeepSeek 系模型的 `flash`/`pro` 定价键）：手动覆盖 > 官方页面 > 内置回退 > OpenRouter（仅回退，USD→CNY，缓存读按配置折扣）> 无。
 - **快照选取**——`snapshotForTime` 取 `effectiveAt <= 事件时间` 的最新快照（安装前的会话一次性锚到首个快照）。
-- **峰值/闲时**——2026-08-17 上线前所有步按单一价目计费；上线后按北京时间选档（高峰 09:00–12:00 / 14:00–18:00，其余闲时）。
+- **峰值/闲时**——2026-08-17 上线前所有步按单一价目计费；上线后按事件自身时刻与该价格簿页面的时段表选档（中英文页面各自解析自己的高峰窗口，抓取失败时回退到北京 09:00–12:00 / 14:00–18:00，其余闲时）。每步的档位在折叠时锚定一次，逐回复卡片与回复小标签永远显示该轮对话当时被计价的档位，而不是查看时刻的档位。
 - **不可变账本**——`sessionCost` 投影（`src/session-cost-projection.ts`）把 `request/header`（模型）与携带用量的事件折叠为逐步记录；同一 (turn, step) 的第二次用量样本**替换**第一条（同一步终结，而非重新计价），总计以 O(1) 增量维护。
 
 ## 项目结构

package/lib/client.js

@@ -155,6 +155,14 @@ window.__ModuleLoader__.load({
 		//#region src/pricing.ts
 		/** Official peak-pricing rollout: 2026-08-17 00:00 Beijing time (UTC+8). */
 		const PEAK_PRICING_START_MS = Date.UTC(2026, 7, 16, 16, 0, 0);
+		/**
+		* Built-in fallback zh peak schedule: the official announcement's windows in
+		* Beijing time (peak 09:00-12:00 / 14:00-18:00, everything else off-peak).
+		*/
+		const PEAK_SCHEDULE_ZH = {
+			timezone: "Asia/Shanghai",
+			ranges: [[9, 12], [14, 18]]
+		};
 		/** Built-in fallback USD prices from the English pricing page. */
 		const FALLBACK_CURRENT_USD = {
 			flash: {
@@ -170,20 +178,22 @@ window.__ModuleLoader__.load({
 		};
 		({ ...FALLBACK_CURRENT_USD.flash }), { ...FALLBACK_CURRENT_USD.pro };
 		/**
-		* Whether the current moment is a peak-pricing hour in Beijing time:
-		* 09:00-12:00 and 14:00-18:00 (peak); everything else is off-peak.
+		* Whether the given instant is a peak-pricing hour under one schedule: the
+		* zh fallback is Beijing time 09:00-12:00 and 14:00-18:00; each pricebook
+		* passes the schedule parsed from its own (zh or en) pricing page.
 		* @param now - the instant to classify.
+		* @param schedule - the peak-hour schedule to classify against.
 		* @returns true during peak hours.
 		*/
-		function isPeakHour(now = /* @__PURE__ */ new Date()) {
+		function isPeakHour(now = /* @__PURE__ */ new Date(), schedule = PEAK_SCHEDULE_ZH) {
 			const parts = new Intl.DateTimeFormat("en-US", {
-				timeZone: "Asia/Shanghai",
+				timeZone: schedule.timezone,
 				hour: "numeric",
 				hour12: false
 			}).formatToParts(now);
 			const hour = Number(parts.find((part) => part.type === "hour")?.value);
 			if (Number.isNaN(hour)) return false;
-			return hour >= 9 && hour < 12 || hour >= 14 && hour < 18;
+			return schedule.ranges.some(([start, end]) => hour >= start && hour < end);
 		}
 		//#endregion
 		//#region src/client/cost-math.ts
@@ -238,10 +248,18 @@ window.__ModuleLoader__.load({
 			if (subagents === void 0 || subagents.length === 0) return main;
 			return sumTotals([main, ...subagents.map((entry) => entry.totals)]);
 		}
-		/** The price band in effect at one instant (mirror of the host helper). */
-		function bandForTime(time) {
+		/**
+		* The price band in effect at one instant (mirror of the host helper). The
+		* schedule defaults to the zh fallback; live readouts pass the schedule of
+		* the pricebook they display (the zh and en pages may state different
+		* windows).
+		* @param time - epoch millis.
+		* @param schedule - the peak-hour schedule to classify against.
+		* @returns the band.
+		*/
+		function bandForTime(time, schedule = PEAK_SCHEDULE_ZH) {
 			if (time < PEAK_PRICING_START_MS) return "single";
-			return isPeakHour(new Date(time)) ? "peak" : "offPeak";
+			return isPeakHour(new Date(time), schedule) ? "peak" : "offPeak";
 		}
 		/** The bucket of one model's entry for one band (mirror of the host helper). */
 		function bucketOf(modelPrice, band) {
@@ -270,10 +288,10 @@ window.__ModuleLoader__.load({
 			}
 		}
 		/** Resolve one model's bucket at one instant from a snapshot. */
-		function bucketAt(snapshot, provider, model, time) {
+		function bucketAt(snapshot, provider, model, time, schedule = PEAK_SCHEDULE_ZH) {
 			const entry = modelPriceOf(snapshot, provider, model);
 			if (entry === void 0) return void 0;
-			return bucketOf(entry, bandForTime(time));
+			return bucketOf(entry, bandForTime(time, schedule));
 		}
 		/**
 		* The peak-to-off-peak price multiplier for one model's entry, when the
@@ -720,7 +738,7 @@ window.__ModuleLoader__.load({
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ol", {
 						className: CostView_module_css_default.stepList,
 						children: rows.map((step) => {
-							const stepBand = bandForTime(Date.now());
+							const stepBand = step.band ?? bandForTime(step.time);
 							const stepRatio = peakOffPeakMultiplier(response?.pricebook?.current ?? null, step.provider, step.model);
 							const stepBandLabel = stepBand === "peak" ? stepRatio === null ? t("band.peak") : t("price.peakRatio", { multiplier: formatMultiplier(stepRatio) }) : stepBand === "offPeak" ? stepRatio === null ? t("band.offPeak") : t("price.offPeakRatio", { multiplier: formatMultiplier(1 / stepRatio) }) : null;
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
@@ -853,7 +871,7 @@ window.__ModuleLoader__.load({
 				});
 			}
 			const amount = `${currencySymbol(currency)}${formatMoney(ledger.cost)}`;
-			const band = bandForTime(Date.now());
+			const band = ledger.band ?? bandForTime(ledger.time);
 			const ratio = peakOffPeakMultiplier(response?.pricebook?.current ?? null, ledger.provider, ledger.model);
 			const bandLabel = band === "peak" ? ratio === null ? t("band.peak") : t("price.peakRatio", { multiplier: formatMultiplier(ratio) }) : band === "offPeak" ? ratio === null ? t("band.offPeak") : t("price.offPeakRatio", { multiplier: formatMultiplier(1 / ratio) }) : null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
@@ -968,13 +986,14 @@ window.__ModuleLoader__.load({
 			const projection = cost;
 			const model = projection?.model ?? null;
 			const snapshot = response?.pricebook.current ?? null;
+			const schedule = response?.pricebook.schedule;
 			const subagents = response?.subagents;
 			const combined = combineTotals(projection?.totals, subagents);
 			const subSpend = subagentSpend(subagents);
 			const symbol = currencySymbol(currency);
 			const estimate = (0, react.useMemo)(() => {
 				if (!running || projection === void 0) return null;
-				const bucket = bucketAt(snapshot ?? void 0, model?.provider, model?.model ?? "unknown", Date.now());
+				const bucket = bucketAt(snapshot ?? void 0, model?.provider, model?.model ?? "unknown", Date.now(), schedule);
 				if (bucket === void 0) return null;
 				const stepEstimate = estimateCost(bucket, pressure?.projectedTokens ?? pressure?.pressureTokens ?? 0, cacheReadRatioOf(projection.steps), blocksOutputTokens(partial?.blocks));
 				return (combined?.cost ?? 0) + stepEstimate;
@@ -983,6 +1002,7 @@ window.__ModuleLoader__.load({
 				projection,
 				combined,
 				snapshot,
+				schedule,
 				model,
 				pressure,
 				partial,
@@ -994,7 +1014,7 @@ window.__ModuleLoader__.load({
 			const last = projection?.steps.length !== void 0 && projection.steps.length > 0 ? projection.steps[projection.steps.length - 1] : void 0;
 			const sourceKey = snapshot?.source ?? null;
 			const source = sourceKey === null ? t("source.none") : t(`source.${sourceKey}`);
-			const band = bandForTime(Date.now());
+			const band = bandForTime(Date.now(), schedule);
 			const peakRatio = peakOffPeakMultiplier(snapshot ?? void 0, model?.provider, model?.model ?? "unknown");
 			const bandLabel = band === "peak" ? peakRatio === null ? t("band.peak") : t("price.peakRatio", { multiplier: formatMultiplier(peakRatio) }) : band === "offPeak" ? peakRatio === null ? t("band.offPeak") : t("price.offPeakRatio", { multiplier: formatMultiplier(1 / peakRatio) }) : null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {