dsh-xdpool 2.6.2 → 2.6.3

package/CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 本项目的所有重要变更都会记录在此文件。
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
+## 2.6.3 — 修掉 2.6.2 装上后插件起不来的问题
+
+> 2.6.2 从 npm 安装后，插件导入失败（`Cannot find package '@earendil-works/pi-ai'`），
+> 于是它的所有 web 路由都没注册 —— 积分接口 404，用量面板空白，并显示
+> 「网关尚未上报 token 数」。这句话把问题指向了网关，实际是插件自己没加载起来。
+
+### 缺 7 个 peer 依赖
+
+2.6.2 有 7 个 peerDependency（`cordis`、`dsh-llm`、`dsh-llm-pi-ai`、`dsh-credentials`、
+`dsh-settings`、`schemastery`、`pi-ai`），这些由宿主提供。手动复制目录时它们从宿主的
+`node_modules` 可见；改用包管理器安装后，解析链断了。
+
+现在 `postinstall` 会把这些包从宿主链接进 profile，版本与宿主完全一致，不额外占用空间。
+装完自带一次导入自检，失败会直接把原因写进日志，而不是等用户看到空白面板才发现。
+
+### 今日用量的三个缺陷
+
+**日期用了 UTC**：`toISOString()` 取的是 UTC 日期，在 UTC+8 意味着凌晨 0–8 点算成前一天。
+现在按本地日历取值。
+
+**`days: 1` 实际覆盖两天**：窗口下界原先减了整个 `days`，于是「今日」包含了昨天。
+改成 `days - 1`，标签与口径一致。
+
+**重启后归零**：`UsageRecorder` 只存内存，重启即空。现在启动时从渠道包的持久账本
+（保留 90 天）回填当天用量 —— 那些数据一直在磁盘上，只是从没被读回来。
+回填是尽力而为的：读不到只损失重启前的数字，不影响插件。
+
 ## 2.6.2 — 积分统计、账号备份、输入框积分显示
 
 > 这一版把「用了多少积分」「还剩多少」「账号怎么搬走」三件事做完了，并修掉了几个把正确数据说错的地方。

package/lib/client.js

@@ -13460,7 +13460,7 @@ window.__ModuleLoader__.load({
 		*
 		* @module dsh-xdpool/version
 		*/
-		const POOL_VERSION = "2.6.2";
+		const POOL_VERSION = "2.6.3";
 		//#endregion
 		//#region src/client/PoolCard.tsx
 		/**

package/lib/index.d.ts

@@ -2987,6 +2987,28 @@ declare class UsageRecorder {
   size(): number;
   /** Forget every retained call. */
   reset(): void;
+  /**
+   * Refill today's samples from the pack's own ledger.
+   *
+   * WHY THIS EXISTS
+   *
+   * `samples` is process memory, so every restart emptied the usage panel and the pool
+   * card — "网关尚未上报 token 数" after a restart was not the gateway declining to
+   * answer, it was this recorder having forgotten. The pack, meanwhile, persists a 90-day
+   * day-aggregated ledger on disk, so the same period was already recorded and simply not
+   * read.
+   *
+   * Called ONCE at startup, before the first request. It REPLACES rather than appends:
+   * whatever is in memory at that moment is either empty (a fresh process) or belongs to
+   * the same ledger entries, and adding both would double every figure.
+   *
+   * The rows are synthesised at DAY granularity — one `UsageCall` per (channel, model) with
+   * the day's totals — because that is the resolution the ledger keeps. Per-call timestamps
+   * are not recoverable, so the panel's "recent calls" list stays empty after a restart
+   * while its totals are right; inventing timestamps to fill the list would be worse than
+   * an empty list.
+   */
+  backfill(calls: readonly UsageCall[]): void;
   /** Aggregate the retained window. */
   summary(): UsageSummary;
   /**

package/lib/index.js

@@ -11862,6 +11862,31 @@ var UsageRecorder = class {
 	reset() {
 		this.samples = [];
 	}
+	/**
+	* Refill today's samples from the pack's own ledger.
+	*
+	* WHY THIS EXISTS
+	*
+	* `samples` is process memory, so every restart emptied the usage panel and the pool
+	* card — "网关尚未上报 token 数" after a restart was not the gateway declining to
+	* answer, it was this recorder having forgotten. The pack, meanwhile, persists a 90-day
+	* day-aggregated ledger on disk, so the same period was already recorded and simply not
+	* read.
+	*
+	* Called ONCE at startup, before the first request. It REPLACES rather than appends:
+	* whatever is in memory at that moment is either empty (a fresh process) or belongs to
+	* the same ledger entries, and adding both would double every figure.
+	*
+	* The rows are synthesised at DAY granularity — one `UsageCall` per (channel, model) with
+	* the day's totals — because that is the resolution the ledger keeps. Per-call timestamps
+	* are not recoverable, so the panel's "recent calls" list stays empty after a restart
+	* while its totals are right; inventing timestamps to fill the list would be worse than
+	* an empty list.
+	*/
+	backfill(calls) {
+		this.samples = [];
+		for (const call of calls) this.record(call);
+	}
 	/** Aggregate the retained window. */
 	summary() {
 		const rows = /* @__PURE__ */ new Map();
@@ -21172,10 +21197,25 @@ function numberOf(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
 /** `2026-11-07` minus N days, as the same string shape. */
+/**
+* A `YYYY-MM-DD` key for `days` ago, in the LOCAL calendar.
+*
+* Not `toISOString()`: that is UTC, and the ledger's day keys are whatever the machine's
+* clock says when the pack writes them — i.e. local. Mixing the two shifts the window by
+* the UTC offset, so a user in UTC+8 reading "today" between midnight and 08:00 was shown
+* the previous day's totals. The bug is invisible for most of the day and wrong for
+* exactly the hours someone checks whether a long run has spent much.
+*
+* Built from local parts rather than by subtracting milliseconds, because a DST boundary
+* would otherwise land on the wrong day.
+*/
 function daysAgoKey(days, now = /* @__PURE__ */ new Date()) {
 	const copy = new Date(now.getTime());
-	copy.setUTCDate(copy.getUTCDate() - days);
-	return copy.toISOString().slice(0, 10);
+	copy.setDate(copy.getDate() - days);
+	const year = copy.getFullYear();
+	const month = String(copy.getMonth() + 1).padStart(2, "0");
+	const day = String(copy.getDate()).padStart(2, "0");
+	return `${String(year)}-${month}-${day}`;
 }
 /** Split `mode|channel|account|model`, refusing anything that is not four parts. */
 function parseLedgerKey(key) {
@@ -21224,7 +21264,15 @@ async function readCreditSpend(input) {
 	}
 	const daysNode = parsed.days;
 	if (daysNode === null || typeof daysNode !== "object") return empty;
-	const earliest = input.days === void 0 ? void 0 : daysAgoKey(input.days, input.now);
+	/**
+	* `days: 1` means TODAY ALONE, not "today plus yesterday".
+	*
+	* The old arithmetic subtracted the window size before taking the bound
+	* (`daysAgoKey(days)`), so a one-day window covered today AND yesterday: a strip labelled
+	* "today" reported a figure that included yesterday evening's work. `days - 1` makes the
+	* label true — one day back from today is the start of today.
+	*/
+	const earliest = input.days === void 0 ? void 0 : daysAgoKey(Math.max(0, input.days - 1), input.now);
 	const acc = /* @__PURE__ */ new Map();
 	let unreadable = 0;
 	let gatewayRequests = 0;
@@ -21292,6 +21340,86 @@ async function readCreditSpend(input) {
 		empty: !sawAnyDay
 	};
 }
+/**
+* Refill a `UsageRecorder` with TODAY's totals from the pack ledger.
+*
+* The recorder keeps process memory only, so every restart emptied the usage panel and the
+* pool card printed "the gateway reported no token counts" — an accusation aimed at the
+* gateway for something this plugin had forgotten. The pack already persists a 90-day
+* ledger, so the same period was on disk the whole time.
+*
+* Day granularity on purpose: the ledger aggregates per (channel, account, model) per day
+* and keeps no per-call timestamps, so one `UsageCall` is synthesised per row carrying the
+* day's totals. That makes the TOTALS correct after a restart while the panel's
+* recent-calls list stays empty — inventing timestamps to fill a list would be worse than
+* an empty list.
+*
+* Returns how many rows were restored, so a startup note can say whether it worked.
+*/
+async function backfillUsageFromLedger(home, recorder, logger) {
+	let text;
+	try {
+		text = await readFile(join(home, LEDGER_FILE), "utf8");
+	} catch {
+		return 0;
+	}
+	let parsed;
+	try {
+		parsed = JSON.parse(text);
+	} catch {
+		logger?.warn?.("dsh-xdpool: token ledger is not readable JSON; usage starts empty");
+		return 0;
+	}
+	const daysNode = parsed.days;
+	if (daysNode === null || typeof daysNode !== "object") return 0;
+	const today = daysKey(/* @__PURE__ */ new Date());
+	const day = daysNode[today];
+	if (day === null || day === void 0 || typeof day !== "object") return 0;
+	const calls = [];
+	for (const [key, raw] of Object.entries(day)) {
+		const named = parseLedgerKey(key);
+		if (named === void 0 || named.mode !== POOL_MODE) continue;
+		if (raw === null || typeof raw !== "object") continue;
+		const entry = raw;
+		const requests = numberOf(entry.requests);
+		const input = numberOf(entry.inputTokens);
+		const cache = numberOf(entry.cacheReadTokens);
+		const output = numberOf(entry.outputTokens);
+		calls.push({
+			channel: named.channel,
+			region: named.channel === "workbuddy" ? "global" : named.channel === "buddy" ? "cn" : "",
+			model: named.model,
+			account: "",
+			turnId: `backfill:${today}:${named.channel}:${named.model}`,
+			at: startOfLocalDay(/* @__PURE__ */ new Date()).getTime(),
+			ok: requests > numberOf(entry.errors),
+			usage: {
+				inputTokens: input,
+				outputTokens: output,
+				cachedTokens: cache,
+				reasoningTokens: numberOf(entry.reasoningTokens)
+			}
+		});
+	}
+	if (calls.length === 0) return 0;
+	recorder.reset();
+	for (const call of calls) recorder.record(call);
+	logger?.info?.(`dsh-xdpool: restored ${String(calls.length)} usage row(s) for ${today} from the ledger`);
+	return calls.length;
+}
+/** Local `YYYY-MM-DD`, matching how the pack names its day buckets. */
+function daysKey(now) {
+	const year = now.getFullYear();
+	const month = String(now.getMonth() + 1).padStart(2, "0");
+	const day = String(now.getDate()).padStart(2, "0");
+	return `${String(year)}-${month}-${day}`;
+}
+/** Midnight at the start of `now`'s local day. */
+function startOfLocalDay(now) {
+	const copy = new Date(now.getTime());
+	copy.setHours(0, 0, 0, 0);
+	return copy;
+}
 //#endregion
 //#region src/relay.ts
 /**
@@ -23301,6 +23429,21 @@ function apply(ctx, config = {}) {
 			recordStartupNote(`registration FAILED: ${describeError(error)}`);
 			return;
 		}
+		/**
+		* Refill today's usage from the pack's ledger before anything is served.
+		*
+		* `UsageRecorder` holds process memory, so a restart used to empty the usage panel
+		* and the pool card — the card then printed "网关尚未上报 token 数", which was never
+		* true: nothing had asked yet. The pack keeps a 90-day ledger on disk, so the same
+		* day was already recorded and simply not read back.
+		*
+		* Best-effort and fire-and-forget: a ledger that cannot be read costs the panel its
+		* pre-restart totals, never the plugin. It is deliberately not awaited — the first
+		* request must not wait on a file read.
+		*/
+		backfillUsageFromLedger(dshHome(), usageRecorder, ctx.logger).catch((error) => {
+			ctx.logger.warn?.("dsh-xdpool: usage backfill failed", error);
+		});
 		if (stopped) return;
 		core.pool.scan().then((accounts) => {
 			ctx.logger.info?.(`dsh-xdpool: ${accounts.length} WorkBuddy account(s) in rotation`);

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-xdpool",
   "displayName": "DSH XD Pool",
   "description": "One DSH model pool for every free quota you have: merge all locally signed-in WorkBuddy accounts with auto-failover, sign in to 13 vendors by QR/web, aggregate 76 vendors' free tiers, plus a usage dashboard, model routing, a local OpenAI-compatible gateway and a points-automation suite.",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "license": "MIT",
   "author": "XDTrees",
   "homepage": "https://github.com/XDTrees/dsh-xdpool#readme",