@kenz1117/dsh-ui-usage-billing 1.1.13 → 1.2.0

package/lib/index.js

@@ -2,10 +2,12 @@ import { createRequire } from "node:module";
 import { mkdir, readFile, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
+import { SessionLogOffset } from "@deepseek-ai/dsh-session/types";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import z from "@deepseek-ai/schemastery";
+import { createHash, createHmac } from "node:crypto";
 //#region lib/types/client/plan-knowledge.js
 /**
 * Plan-knowledge reference (adapted from dsh-spend's `knowledge.js`, MIT):
@@ -192,6 +194,20 @@ let liveRate;
 let livePrices;
 let liveExtraModels;
 /**
+* 用户自定义模型别名（插件配置 `modelKeyAliases`，聚合启动时注入）：真实日志
+* model id → 计费目录键。优先级高于内置别名表——目录外的新模型无需等发版，
+* 配置一条别名即完成识别与计价（键必须是 MODEL_CATALOG 的既有 key）。
+*/
+let userModelAliases;
+/**
+* 注入用户自定义模型别名（node 半区在插件启动时调用一次）。纯内存状态：
+* 聚合折叠与客户端渲染共用同一份（两侧一致性由同一注入点保证）。
+* @param aliases - `model id → 目录键` 映射；undefined/空 = 清除，回退内置表。
+*/
+function applyUserModelAliases(aliases) {
+	userModelAliases = aliases !== void 0 && Object.keys(aliases).length > 0 ? aliases : void 0;
+}
+/**
 * Apply the node half's live pricing snapshot. Absent fields keep the
 * built-in catalog and rate; callers never fabricate values.
 * @param pricing - the `/api/billing/pricing` response.
@@ -316,6 +332,7 @@ function isBeijingWeekend(timeMs) {
 */
 /** DeepSeek 官方高峰时段说明（峰谷分时计费目录条目共用）。 */
 const DEEPSEEK_PEAK_HOURS = "09:00-12:00 / 14:00-18:00";
+const GEMINI_PEAK_HOURS = "Standard / Flex";
 const MODEL_CATALOG = [
 	{
 		key: "flash",
@@ -974,7 +991,7 @@ const MODEL_CATALOG = [
 				output: 6
 			}
 		},
-		peakHours: "Standard / Flex",
+		peakHours: GEMINI_PEAK_HOURS,
 		tierSemantics: "latency"
 	},
 	{
@@ -993,7 +1010,7 @@ const MODEL_CATALOG = [
 				output: 3.75
 			}
 		},
-		peakHours: "Standard / Flex",
+		peakHours: GEMINI_PEAK_HOURS,
 		tierSemantics: "latency"
 	},
 	{
@@ -1405,6 +1422,7 @@ const MODEL_KEY_ALIASES = {
 	"deepseek-v4-flash": "flash",
 	"deepseek-v4-flash-vision-exp": "flash-vision-exp",
 	"deepseek-v4.1-flash": "flash",
+	"deepseek-v4.1-flash-expires-on-0910": "flash",
 	"deepseek-v4-pro": "pro",
 	"glm-5.2": "glm",
 	"glm-4.5-air": "glm-4.5-air",
@@ -1433,6 +1451,7 @@ const MODEL_KEY_ALIASES = {
 	"command-a": "command-a-03-2025",
 	"command-r-08-2024": "command-r-08-2024",
 	"command-r": "command-r-08-2024",
+	"hy3": "hunyuan",
 	"longcat-2.0": "longcat-2.0",
 	"longcat-2": "longcat-2.0",
 	"minicpm-v-4.5": "minicpm-v-4.5",
@@ -1521,8 +1540,49 @@ const CATALOG_CANON_INDEX = (() => {
 * @param id - 真实模型 id（日志里出现的形式）。
 * @returns 计费目录键。
 */
+/**
+* 由一个未知模型 id 派生候选 id（仅当直接查全部未命中时才尝试）：
+* - 剥离组织前缀（`deepseek/deepseek-v4-flash` → `deepseek-v4-flash`）；
+* - 剥离尾部纯数字段（`deepseek-v4-flash-202605` / `-0731` → `deepseek-v4-flash`，
+*   覆盖 TokenHub / 官方按日期滚动的快照 id）；
+* - 两者组合派生。目录键本身（如 `mistral-large-2512`、`command-a-03-2025`）
+*   在直接查就已命中，永不进入派生分支，不受剥段影响。
+*/
+function derivedKeyCandidates(id) {
+	const out = [];
+	const push = (value) => {
+		if (value !== "" && !out.includes(value)) out.push(value);
+	};
+	const stripTrailingDigits = (value) => {
+		let base = value;
+		for (;;) {
+			const next = base.replace(/[-_]\d{3,}$/u, "");
+			if (next === base || next === "") return;
+			base = next;
+			push(base);
+		}
+	};
+	const slash = id.lastIndexOf("/");
+	if (slash > 0 && slash < id.length - 1) {
+		const bare = id.slice(slash + 1);
+		push(bare);
+		stripTrailingDigits(bare);
+	}
+	stripTrailingDigits(id);
+	return out;
+}
+/** 查一个候选 id（用户别名 → 内置别名 → 目录归一化 → models.dev 补充）；未命中返回 undefined。 */
+function lookupCandidate(candidate) {
+	const alias = userModelAliases?.[candidate] ?? MODEL_KEY_ALIASES[candidate];
+	if (alias !== void 0) return alias;
+	const canon = canonModelId(candidate);
+	if (canon === "") return void 0;
+	const hit = CATALOG_CANON_INDEX.get(canon);
+	if (hit !== void 0) return hit;
+	return (liveExtraModels ?? []).find((item) => canonModelId(item.key) === canon)?.key;
+}
 function resolveCatalogKey(id) {
-	const exact = MODEL_KEY_ALIASES[id] ?? id;
+	const exact = userModelAliases?.[id] ?? MODEL_KEY_ALIASES[id] ?? id;
 	if (exact === id) {
 		const canon = canonModelId(id);
 		if (canon !== "") {
@@ -1531,6 +1591,10 @@ function resolveCatalogKey(id) {
 			const extraHit = (liveExtraModels ?? []).find((item) => canonModelId(item.key) === canon);
 			if (extraHit !== void 0) return extraHit.key;
 		}
+		for (const candidate of derivedKeyCandidates(id)) {
+			const hit = lookupCandidate(candidate);
+			if (hit !== void 0) return hit;
+		}
 	}
 	return exact;
 }
@@ -1666,24 +1730,31 @@ function computeCost(entry, buckets, peakShare = DEFAULT_PEAK_SHARE, nowMs = Dat
 	return peak * peakShare + off * (1 - peakShare);
 }
 /**
+* v1 峰谷档判定（峰谷开闸起、周末全谷分界止）：不豁免周末——该时段官方
+* 高峰时段为每天 9-12 / 14-18（周六日同样计峰）。仅用于历史事件计费；
+* 「当前时刻」的档位（提醒/时段条/费率展示）一律走 {@link tierAt} 现行规则。
+*/
+function tariffV1At(timeMs) {
+	return isPeakHour((new Date(timeMs).getUTCHours() + 8) % 24) ? "peak" : "offPeak";
+}
+/**
 * 按调用时刻精确判定高峰/空闲档并计价（P0-1：替代固定比例混合）。时刻未知
 * （null/NaN，理论不发生在真实事件流）时回退 {@link DEFAULT_PEAK_SHARE} 混合，
 * 保持旧语义不低估。平档模型（无 offPeak）两个时段同价。限时促销与峰谷档
 * 同口径：按事件时刻判定该笔流量当时享受的单价。
+*
+* 历史正确性（按变更节点分段适用规则，不统一套现行价重算历史）：
+* - 早于 {@link PEAK_ERA_START_MS} 的事件按当时官方基础价
+*   （{@link LEGACY_DEEPSEEK_BANDS}）计费；
+* - 峰谷开闸至 {@link WEEKEND_OFFPEAK_START_MS} 之间按 v1 规则（周末不豁免，
+*   周六日 9-12 / 14-18 计峰）；
+* - 周末全谷分界起按现行规则（{@link tierAt}，周六日全天低谷）。
 * @param entry - the catalog entry whose prices apply.
 * @param buckets - token usage counts.
 * @param timeMs - the call's wall-clock time (epoch ms); null falls back to the peak-share mix.
 * @param peakShare - fallback mix used only when `timeMs` is missing.
 * @returns the estimated cost in CNY（USD 计价模型已按当前汇率折算）。
 */
-/**
-* v1 峰谷档判定（峰谷开闸起、周末全谷分界止）：不豁免周末——该时段官方
-* 高峰时段为每天 9-12 / 14-18（周六日同样计峰）。仅用于历史事件计费；
-* 「当前时刻」的档位（提醒/时段条/费率展示）一律走 {@link tierAt} 现行规则。
-*/
-function tariffV1At(timeMs) {
-	return isPeakHour((new Date(timeMs).getUTCHours() + 8) % 24) ? "peak" : "offPeak";
-}
 function computeCostAt(entry, buckets, timeMs, peakShare = DEFAULT_PEAK_SHARE) {
 	if (timeMs === null || timeMs === void 0 || !Number.isFinite(timeMs)) return computeCost(entry, buckets, peakShare);
 	const priced = applyPromo(entry, timeMs);
@@ -1737,9 +1808,9 @@ function formatTokens(value) {
 /**
 * 走订阅套餐（coding / token plan / opencode 订阅）的 provider id：这些通道的
 * 调用按套餐计费，不再按 token 计费，因此即使模型 id 与计费表撞名也一律豁免。
-* 与 pi-ai 内置提供方对齐（含各地区变体：qwen/xiaomi 的 token-plan、opencode 与
-* opencode-go、zai-coding-cn）；部署可在 plugin config 的 `subscriptionProviders`
-* 中覆盖。
+* 此列表保留为显式配置的参考基线；聚合层缺省改用与订阅卡一致的
+* `isSubscriptionProviderId` 判定（覆盖本列表与全部 `*-token-plan` / `*-coding` 变体），
+* 部署仍可在 plugin config 的 `subscriptionProviders` 中显式覆盖。
 */
 const DEFAULT_SUBSCRIPTION_PROVIDERS = [
 	"kimi-coding",
@@ -1750,7 +1821,9 @@ const DEFAULT_SUBSCRIPTION_PROVIDERS = [
 	"qwen-token-plan-cn",
 	"xiaomi-token-plan-ams",
 	"xiaomi-token-plan-cn",
-	"xiaomi-token-plan-sgp"
+	"xiaomi-token-plan-sgp",
+	"tencent-token-plan",
+	"grok"
 ];
 /**
 * 官方渠道 provider id 判定：`deepseek` 前缀（DeepSeek 官方直连）视为官方，
@@ -1760,6 +1833,26 @@ const DEFAULT_SUBSCRIPTION_PROVIDERS = [
 function isOfficialProvider(provider) {
 	return /^deepseek(?:-[a-z0-9-]+)?$/i.test(provider.trim());
 }
+/** DeepSeek 官方直连端点的归一化 origin（`siteOriginOf` 口径）：有 baseURL 的路由只有它算官方。 */
+const OFFICIAL_DEEPSEEK_ORIGIN = "https://api.deepseek.com";
+/**
+* 官方渠道判定（通道优先）：显式 `officialProviderIds` 配置最优先；否则看站点归组——
+* 有 baseURL 的路由只有 origin 为 DeepSeek 官方域才算官方（修复：名为 `deepseek-*`
+* 的中转/网关路由曾被按 id 前缀误判为官方，腾讯网关的 DeepSeek 全被计成官方渠道）；
+* 直连路由（配置在册、无 baseURL）与路由表查不到的未知名都退回按 provider id
+* 前缀判定——宿主内置的官方直连不经 llm-pi-ai 路由，其 provider 名不在路由表中，
+* 按 unknown 一刀切会把它错杀成三方（回归修复）；配置外的同名网关残留可用
+* `routeAliases` 显式归位到真实通道。
+*/
+function officialChannelOf(provider, ref, officialProviderIds) {
+	if (officialProviderIds !== void 0) return officialProviderIds.has(provider);
+	if (ref.kind === "site") return ref.origin === OFFICIAL_DEEPSEEK_ORIGIN;
+	return isOfficialProvider(provider);
+}
+/** 一个 provider 是否走订阅套餐计费（豁免按 token 计价）。 */
+function isSubscriptionCall(subscription, provider) {
+	return typeof subscription === "function" ? subscription(provider) : subscription.has(provider);
+}
 /** 由 baseURL 归一化出站点 origin（协议 + 主机 + 端口）；解析失败回退原值。 */
 function siteOriginOf(baseURL) {
 	try {
@@ -1772,11 +1865,17 @@ function siteOriginOf(baseURL) {
 * 把一个 provider 路由归类为站点引用。判定顺序（与路由在 provider 配置里的状态一致）：
 * - 路由存在于当前配置且配了 baseURL → 中转站 `site`（按 origin 归组，同站多 key 合并）；
 * - 路由存在于当前配置但无 baseURL → 厂商直连 `direct`；
-* - 路由不在当前配置里 → `unknown`（改过名 / 删除过，是「读不到」而非「直连」）。
+* - 路由不在当前配置里：内置官方直连（`deepseek` / `deepseek-*` 形态，不经 llm-pi-ai
+*   网关）按 `direct` 归位——unknown 一刀切会把官方直连的费用堆进「未知路由」组、
+*   且不算官方渠道（回归修复）；订阅豁免命中的通道（显式 `subscriptionProviders`
+*   配置或判定函数）同样按 `direct` 归位——订阅管理类插件注册的通道不经路由表，
+*   unknown 桶既掩盖归属又按 token 误计费（issue #37 的 grok build）；其余配置外
+*   名称保留 unknown（无法核实通道）。
 * @param provider - 会话日志里的 provider 路由名（request/header 的 `config.provider`）。
 * @param routes - 当前 provider 路由视图（来自 llm-pi-ai providers）。
+* @param opts - `subscription`：该调用是否已被订阅豁免判定命中。
 */
-function siteRefOf(provider, routes) {
+function siteRefOf(provider, routes, opts = {}) {
 	const view = routes[provider];
 	if (view !== void 0) {
 		if (view.baseURL !== void 0) return {
@@ -1789,6 +1888,14 @@ function siteRefOf(provider, routes) {
 			provider
 		};
 	}
+	if (isOfficialProvider(provider)) return {
+		kind: "direct",
+		provider
+	};
+	if (opts.subscription === true) return {
+		kind: "direct",
+		provider
+	};
 	return {
 		kind: "unknown",
 		provider
@@ -1955,7 +2062,8 @@ function serializeFold(fold) {
 		turns: fold.turns,
 		perf: fold.perf,
 		roles: fold.roles,
-		lastActive: fold.lastActive
+		lastActive: fold.lastActive,
+		...fold.title !== void 0 ? { title: fold.title } : {}
 	};
 }
 /** Restore a JSON-safe ledger fold into the in-memory Map/Set representation. */
@@ -1974,7 +2082,8 @@ function deserializeFold(fold) {
 		turns: fold.turns,
 		perf: fold.perf,
 		roles: fold.roles,
-		lastActive: fold.lastActive
+		lastActive: fold.lastActive,
+		...fold.title !== void 0 ? { title: fold.title } : {}
 	};
 }
 /** Runtime boundary for a user-editable/corrupt ledger file. Invalid rows are ignored. */
@@ -2097,13 +2206,16 @@ function freshFold() {
 * @param fold - 累计目标（原地修改）。
 * @param machine - 折叠状态机：进入时为上一批次末态，返回时为本批次末态。
 * @param events - 本批次事件（日志顺序）。
-* @param subscriptionProviders - provider ids billed through subscription plans.
-* @param officialProviderIds - 官方直连 provider 集合（undefined = 按 deepseek 前缀判定）。
+* @param subscriptionProviders - 订阅套餐匹配器（显式集合或判定函数）。
+* @param officialProviderIds - 官方直连 provider 集合（undefined = 按 {@link officialChannelOf} 通道判定）。
 * @param routes - 当前 provider 路由视图（中转站归组）。
 * @param searchCallEstimateCny - 联网搜索请求的单次费用估算（人民币元）。
-* @param seedLength - fork 血缘边界（seq 低于它的事件是父会话种子，跳过）。
+* @param seedLength - fork 血缘边界（seq 低于它的事件是父会话种子，跳过）；
+*   来源为存储元数据的 `inheritedEventCount`。
+* @param routeAliases - 历史路由别名（旧路由名 → 当前路由名），改名/删除路由的
+*   历史用量按别名归位，不再落「未知路由」桶。
 */
-function foldInto(fold, machine, events, subscriptionProviders, officialProviderIds, routes, searchCallEstimateCny, seedLength) {
+function foldInto(fold, machine, events, subscriptionProviders, officialProviderIds, routes, searchCallEstimateCny, seedLength, routeAliases = {}) {
 	let key = machine.key;
 	let subscription = machine.subscription;
 	let official = machine.official;
@@ -2150,11 +2262,13 @@ function foldInto(fold, machine, events, subscriptionProviders, officialProvider
 			continue;
 		}
 		if (event.type === "request/header") {
-			const { model, provider } = event.data.header.config;
+			const { model, provider: rawProvider } = event.data.header.config;
+			const provider = routeAliases[rawProvider] ?? rawProvider;
 			key = resolveCatalogKey(model);
-			subscription = subscriptionProviders.has(provider);
-			official = officialProviderIds === void 0 ? isOfficialProvider(provider) : officialProviderIds.has(provider);
-			siteBucket = siteBucketKey(siteRefOf(provider, routes));
+			subscription = isSubscriptionCall(subscriptionProviders, provider);
+			const siteRef = siteRefOf(provider, routes, { subscription });
+			official = officialChannelOf(provider, siteRef, officialProviderIds);
+			siteBucket = siteBucketKey(siteRef);
 			if (lastOpenStepKey !== void 0) {
 				const stepState = steps.get(lastOpenStepKey);
 				if (stepState !== void 0 && stepState.requestTime === void 0) stepState.requestTime = event.time;
@@ -2207,10 +2321,12 @@ function foldInto(fold, machine, events, subscriptionProviders, officialProvider
 		if (usage === void 0) continue;
 		const source = event.data.message?.source;
 		if (source?.kind === "model" && typeof source.provider === "string" && typeof source.model === "string") {
+			const provider = routeAliases[source.provider] ?? source.provider;
 			key = resolveCatalogKey(source.model);
-			subscription = subscriptionProviders.has(source.provider);
-			official = officialProviderIds === void 0 ? isOfficialProvider(source.provider) : officialProviderIds.has(source.provider);
-			siteBucket = siteBucketKey(siteRefOf(source.provider, routes));
+			subscription = isSubscriptionCall(subscriptionProviders, provider);
+			const siteRef = siteRefOf(provider, routes, { subscription });
+			official = officialChannelOf(provider, siteRef, officialProviderIds);
+			siteBucket = siteBucketKey(siteRef);
 		}
 		const modelKey = key;
 		const day = dayStamp(event.time);
@@ -2338,14 +2454,29 @@ function percentile(values, p) {
 	return a + (b - a) * (idx - lo);
 }
 /**
+* 聚合配置指纹：影响折叠语义的全部配置（订阅豁免、官方名单、路由别名、搜索估值）
+* 的稳定序列化。账本行的复用判定携带该指纹——用户改配置后（如为 grok build 加
+* 订阅豁免），历史账本行立即失效并全量重折，配置变更即时生效（issue #37）。
+* 判定函数无法序列化，统一记为 `fn`（任何函数形态互视为同一指纹）。
+*/
+function configFingerprint(subscriptionMatcher, officialProviderIds, routeAliases, searchEstimate) {
+	return [
+		typeof subscriptionMatcher === "function" ? "fn" : [...subscriptionMatcher].sort().join(","),
+		officialProviderIds === void 0 ? "" : [...officialProviderIds].sort().join(","),
+		Object.keys(routeAliases).sort().map((key) => `${key}=${routeAliases[key]}`).join(","),
+		String(searchEstimate)
+	].join("|");
+}
+/**
 * Create the incremental usage aggregator.
 * @param persistence - the session persistence service.
 * @param options - aggregation tuning (e.g. subscription-plan providers).
 * @returns the aggregator holding the per-session fold cache.
 */
 function createUsageAggregator(persistence, options = {}) {
-	const subscriptionProviders = new Set(options.subscriptionProviders ?? DEFAULT_SUBSCRIPTION_PROVIDERS);
+	const subscriptionMatcher = options.subscriptionProviders === void 0 ? new Set(DEFAULT_SUBSCRIPTION_PROVIDERS) : new Set(options.subscriptionProviders);
 	const officialProviderIds = options.officialProviderIds === void 0 ? void 0 : new Set(options.officialProviderIds);
+	const routeAliases = options.routeAliases ?? {};
 	const maxCacheSessions = options.maxCacheSessions ?? 400;
 	const cache = /* @__PURE__ */ new Map();
 	const ledger = /* @__PURE__ */ new Map();
@@ -2360,6 +2491,7 @@ function createUsageAggregator(persistence, options = {}) {
 	/** 每次聚合取最新的 provider 路由视图（中转站零配置发现）；缺省按空处理（全部未知路由）。 */
 	const routesOf = () => options.resolveRoutes?.() ?? {};
 	const searchEstimate = options.searchCallEstimateCny ?? .02;
+	const foldFingerprint = configFingerprint(subscriptionMatcher, officialProviderIds, routeAliases, searchEstimate);
 	const FOLD_CHUNK_EVENTS = 8e3;
 	/** 把一份（全量或增量）折叠结果登记进 durable ledger；内容无变化时不落盘。 */
 	const recordLedger = (id, cwd, stamp, fold) => {
@@ -2368,11 +2500,12 @@ function createUsageAggregator(persistence, options = {}) {
 			id,
 			...cwd === void 0 ? {} : { cwd },
 			...stamp === null ? {} : { stamp },
-			foldVersion: 8,
+			foldVersion: 13,
+			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 || 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)) {
 			ledger.set(id, entry);
 			ledgerNeedsSave = true;
 		}
@@ -2392,9 +2525,15 @@ function createUsageAggregator(persistence, options = {}) {
 			console.warn("[usage-billing] failed to load durable usage ledger; rebuilding from current sessions:", error);
 		}
 	};
-	/** 失效键：日志文件的 mtime+size；拿不到（后端无 locate / 文件丢失 / locate 抛错）时返回 null，
-	*  让调用方每次重折。locate 调用也纳入 try，避免单个会话的 locate 异常把整份聚合拖垮。 */
+	/** 失效键：宿主 0.1.3+ 走 adapter 暴露的 revision 令牌；0.1.2 形状退回
+	* 日志文件 mtime+size（经 locate，拿不到或抛错时返回 null 让调用方重折）。
+	* locate/stat 调用纳入 try，避免单个会话的异常把整份聚合拖垮。 */
 	const stampOf = async (meta) => {
+		if (persistence.stampOf !== void 0) try {
+			return await persistence.stampOf(meta.id);
+		} catch {
+			return null;
+		}
 		try {
 			const location = persistence.locate?.(meta);
 			if (location === void 0) return null;
@@ -2458,7 +2597,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) === 8) {
+				if (ledgerRow !== void 0 && ledgerRow.stamp !== void 0 && stamp !== null && ledgerRow.stamp === stamp && (ledgerRow.foldVersion ?? 1) === 13 && ledgerRow.fingerprint === foldFingerprint) {
 					const fold = deserializeFold(ledgerRow.fold);
 					folds.push({
 						id,
@@ -2471,7 +2610,7 @@ function createUsageAggregator(persistence, options = {}) {
 				const previous = cache.get(id);
 				if (previous?.machine !== void 0 && previous.lastSeq !== void 0) {
 					const from = previous.lastSeq + 1;
-					const { events } = await persistence.readFrom(meta.id, from);
+					const { events, inheritedEventCount } = await persistence.readFrom(meta.id, SessionLogOffset(from));
 					const after = await stampOf(meta);
 					if (stamp !== null && after !== stamp) {
 						cache.delete(id);
@@ -2482,10 +2621,9 @@ function createUsageAggregator(persistence, options = {}) {
 						cache.delete(id);
 						continue;
 					}
-					foldInto(previous.fold, previous.machine, events, subscriptionProviders, officialProviderIds, routesOf(), searchEstimate, meta.seedLength ?? 0);
+					foldInto(previous.fold, previous.machine, events, subscriptionMatcher, officialProviderIds, routesOf(), searchEstimate, inheritedEventCount, routeAliases);
 					refreshTurns(previous.fold, previous.machine);
-					const last = events[events.length - 1];
-					previous.lastSeq = typeof last.seq === "number" ? last.seq : previous.lastSeq;
+					previous.lastSeq = events[events.length - 1]?.seq ?? previous.lastSeq;
 					previous.stamp = stamp;
 					cache.delete(id);
 					cache.set(id, previous);
@@ -2498,13 +2636,13 @@ function createUsageAggregator(persistence, options = {}) {
 					recordLedger(id, cwd, stamp, previous.fold);
 					continue;
 				}
-				const { events } = await persistence.readFrom(meta.id, 0);
+				const { events, inheritedEventCount } = await persistence.readFrom(meta.id, SessionLogOffset(0));
 				const after = await stampOf(meta);
 				if (stamp !== null && after !== stamp) continue;
 				const fold = freshFold();
 				const machine = freshMachine();
 				for (let start = 0; start < events.length; start += FOLD_CHUNK_EVENTS) {
-					foldInto(fold, machine, events.slice(start, start + FOLD_CHUNK_EVENTS), subscriptionProviders, officialProviderIds, routesOf(), searchEstimate, meta.seedLength ?? 0);
+					foldInto(fold, machine, events.slice(start, start + FOLD_CHUNK_EVENTS), subscriptionMatcher, officialProviderIds, routesOf(), searchEstimate, inheritedEventCount, routeAliases);
 					if (start + FOLD_CHUNK_EVENTS < events.length) await new Promise((resolve) => {
 						setImmediate(resolve);
 					});
@@ -2541,7 +2679,7 @@ function createUsageAggregator(persistence, options = {}) {
 			for (const entry of ledger.values()) {
 				if (included.has(entry.id)) continue;
 				try {
-					const stale = (entry.foldVersion ?? 1) < 8;
+					const stale = (entry.foldVersion ?? 1) < 13 || entry.fingerprint !== foldFingerprint;
 					folds.push({
 						id: entry.id,
 						...entry.cwd === void 0 ? {} : { cwd: entry.cwd },
@@ -2577,7 +2715,7 @@ function createUsageAggregator(persistence, options = {}) {
 			outputCost: 0
 		};
 		const perfModel = /* @__PURE__ */ new Map();
-		const perfHour = /* @__PURE__ */ new Map();
+		const perfHourModel = /* @__PURE__ */ new Map();
 		for (const { id: sessionId, cwd, fold, staleLedger } of folds) {
 			mergeUsageInto(total, fold.total);
 			roles.userChars += fold.roles.userChars;
@@ -2608,13 +2746,18 @@ function createUsageAggregator(persistence, options = {}) {
 				if (sample.tps !== void 0) modelAccum.tps.push(sample.tps);
 				if (sample.latencyMs !== void 0) modelAccum.latencies.push(sample.latencyMs);
 				if (sample.estimated) modelAccum.estimated += 1;
-				let hourAccum = perfHour.get(sample.hour);
+				let hourModels = perfHourModel.get(sample.hour);
+				if (hourModels === void 0) {
+					hourModels = /* @__PURE__ */ new Map();
+					perfHourModel.set(sample.hour, hourModels);
+				}
+				let hourAccum = hourModels.get(sample.model);
 				if (hourAccum === void 0) {
 					hourAccum = {
 						ttfts: [],
 						tps: []
 					};
-					perfHour.set(sample.hour, hourAccum);
+					hourModels.set(sample.model, hourAccum);
 				}
 				hourAccum.ttfts.push(sample.ttftMs);
 				if (sample.tps !== void 0) hourAccum.tps.push(sample.tps);
@@ -2674,14 +2817,14 @@ function createUsageAggregator(persistence, options = {}) {
 				latencyAvg: acc.latencies.length === 0 ? 0 : mean(acc.latencies),
 				estimatedSamples: acc.estimated
 			}])),
-			byHour: Object.fromEntries([...perfHour].map(([hour, acc]) => [hour, {
+			byHourModel: Object.fromEntries([...perfHourModel].map(([hour, models]) => [hour, Object.fromEntries([...models].map(([model, acc]) => [model, {
 				samples: acc.ttfts.length,
 				ttftAvg: mean(acc.ttfts),
 				...acc.tps.length === 0 ? {} : { tpsAvg: mean(acc.tps) }
-			}]))
+			}]))]))
 		};
 		lastDoc = {
-			version: 3,
+			version: 4,
 			updatedAt: now,
 			source: "session-logs",
 			timezone: hostTimeZone(),
@@ -2804,6 +2947,186 @@ function createCooldownGate(options = {}) {
 	};
 }
 //#endregion
+//#region lib/types/tc3.js
+/**
+* Tencent Cloud TokenHub control-plane access (cloud API 3.0, TC3-HMAC-SHA256).
+*
+* Shared by two surfaces that read the same Token Plan:
+* - `balance.ts` — the balance row (absolute remaining quota);
+* - `subscriptions.ts` — the subscription card (monthly window + plan name).
+*
+* Credentials are a cloud API key pair (`<SecretId>:<SecretKey>`), NOT the
+* TokenHub inference key. Field names on the control plane are not fully
+* stable, so parsing stays defensive (semantic-key scanning).
+*/
+/** TokenHub 管控面 API 端点（cloud.tencent.cn/document/api/1823/132270）。 */
+const TOKENHUB_HOST = "tokenhub.tencentcloudapi.com";
+/** 云 API 3.0 产品名与版本（签名的 service 段与请求头都必须一致）。 */
+const TOKENHUB_SERVICE = "tokenhub";
+const TOKENHUB_VERSION = "2026-03-22";
+/** 请求地域：管控面对地域不敏感，取默认国内地域（文档地域列表含 ap-guangzhou）。 */
+const TOKENHUB_REGION = "ap-guangzhou";
+/** 管控面调用超时（毫秒）：余额与订阅面板共用同一预算。 */
+const TOKENHUB_TIMEOUT_MS = 8e3;
+/** 腾讯云凭据引用值格式：`<SecretId>:<SecretKey>`（分隔符取首个冒号）。 */
+function parseTencentCredential(value) {
+	const sep = value.indexOf(":");
+	if (sep === -1) return void 0;
+	const secretId = value.slice(0, sep).trim();
+	const secretKey = value.slice(sep + 1).trim();
+	if (secretId === "" || secretKey === "") return void 0;
+	return {
+		secretId,
+		secretKey
+	};
+}
+/**
+* 构造云 API 3.0 TC3-HMAC-SHA256 签名（官方签名方法 v3）。导出供测试：纯函数，
+* 输入确定则签名确定。Action 不参与签名——它走 `X-TC-Action` 请求头。
+* @param secretId - 云 API SecretId。
+* @param secretKey - 云 API SecretKey。
+* @param payload - 已序列化的请求体（含 Action/Version/Region 公共参数）。
+* @param timestamp - 签名时间戳（秒）。
+* @returns Authorization 头的值。
+*/
+function tc3Authorization(secretId, secretKey, payload, timestamp) {
+	const date = (/* @__PURE__ */ new Date(timestamp * 1e3)).toISOString().slice(0, 10);
+	const canonicalRequest = `POST\n/\n\n${`content-type:application/json; charset=utf-8\nhost:${TOKENHUB_HOST}\n`}\ncontent-type;host\n${createHash("sha256").update(payload).digest("hex")}`;
+	const hashedCanonical = createHash("sha256").update(canonicalRequest).digest("hex");
+	const stringToSign = `TC3-HMAC-SHA256\n${String(timestamp)}\n${date}/${TOKENHUB_SERVICE}/tc3_request\n${hashedCanonical}`;
+	const kDate = createHmac("sha256", date).update(secretKey).digest();
+	const kService = createHmac("sha256", kDate).update(TOKENHUB_SERVICE).digest();
+	const kSigning = createHmac("sha256", kService).update("tc3_request").digest();
+	const signature = createHmac("sha256", kSigning).update(stringToSign).digest("hex");
+	return `TC3-HMAC-SHA256 Credential=${secretId}/${date}/${TOKENHUB_SERVICE}/tc3_request, SignedHeaders=content-type;host, Signature=${signature}`;
+}
+/**
+* 调用一次 TokenHub 管控面接口：TC3 签名 + 超时保护，返回响应 JSON 的 `Response`。
+* 业务错误（Response.Error）与 HTTP 层错误都带 `code` 抛出，调用方按
+* unauthorized / unreachable / invalid 归类。
+*/
+async function callTokenHub(secretId, secretKey, action, params) {
+	const payload = JSON.stringify({
+		Action: action,
+		Version: TOKENHUB_VERSION,
+		Region: TOKENHUB_REGION,
+		...params
+	});
+	const timestamp = Math.floor(Date.now() / 1e3);
+	const controller = new AbortController();
+	const timer = setTimeout(() => controller.abort(), TOKENHUB_TIMEOUT_MS);
+	try {
+		const response = await fetch(`https://${TOKENHUB_HOST}/`, {
+			method: "POST",
+			headers: {
+				"content-type": "application/json; charset=utf-8",
+				host: TOKENHUB_HOST,
+				"x-tc-action": action.toLowerCase(),
+				"x-tc-version": TOKENHUB_VERSION,
+				"x-tc-region": TOKENHUB_REGION,
+				"x-tc-timestamp": String(timestamp),
+				authorization: tc3Authorization(secretId, secretKey, payload, timestamp)
+			},
+			body: payload,
+			signal: controller.signal
+		});
+		if (response.status === 401 || response.status === 403) throw Object.assign(/* @__PURE__ */ new Error("unauthorized"), { code: "unauthorized" });
+		if (!response.ok) throw Object.assign(/* @__PURE__ */ new Error(`HTTP ${String(response.status)}`), {
+			httpStatus: response.status,
+			code: "unreachable"
+		});
+		const inner = (await response.json()).Response;
+		if (inner === void 0) throw Object.assign(/* @__PURE__ */ new Error("no Response envelope"), { code: "invalid" });
+		if (inner.Error !== void 0 && inner.Error !== null) {
+			const err = inner.Error;
+			const code = err.Code === "AuthFailure.SignatureFailure" || err.Code === "AuthFailure.SecretIdNotFound" ? "unauthorized" : "unreachable";
+			throw Object.assign(new Error(String(err.Code ?? "api-error")), { code });
+		}
+		return inner;
+	} finally {
+		clearTimeout(timer);
+	}
+}
+/** 数字归一化：上游可能给字符串数字；非有限数返回 undefined。 */
+function toNumber$1(value) {
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	if (typeof value === "string") {
+		const parsed = Number(value);
+		return Number.isFinite(parsed) ? parsed : void 0;
+	}
+}
+/**
+* 在套餐余量对象里防御性提取「剩余额度」：官方 SubPackageBalance/PackageInfo
+* 的字段名未稳定公开（issue #18 调研期），按语义键名扫描——命中 remaining /
+* balance / left 语义键直接用；命中 total 与 used 则相减推导。数字一律经
+* {@link toNumber} 归一化（上游可能给字符串）。
+* 导出供测试：纯函数。
+* @param source - 套餐详情里的余量对象（PackageInfo / SubPackageBalance 等）。
+* @returns 剩余额度（上游单位，通常为 token 数或元）；提取不到返回 undefined。
+*/
+function pickRemainingQuota(source) {
+	if (source === null || typeof source !== "object") return void 0;
+	const numeric = Object.entries(source).filter(([, v]) => v !== null && toNumber$1(v) !== void 0);
+	const byKey = (needles) => {
+		for (const [key, value] of numeric) {
+			const lower = key.toLowerCase();
+			if (needles.some((n) => lower.includes(n))) {
+				const num = toNumber$1(value);
+				if (num !== void 0 && num >= 0) return num;
+			}
+		}
+	};
+	const remaining = byKey([
+		"remain",
+		"balance",
+		"left",
+		"available"
+	]);
+	if (remaining !== void 0) return remaining;
+	const total = byKey(["total"]);
+	const used = byKey(["used", "consume"]);
+	if (total !== void 0 && used !== void 0) return Math.max(0, total - used);
+}
+/**
+* 防御性提取「总额度」：语义键 total / limit / quota。与
+* {@link pickRemainingQuota} 配对使用——两者都能取到时订阅卡才能算出
+* 已用百分比窗口；只有剩余值时窗口保持为空（绝不猜总额度）。
+* 注意排除键名：`RemainingQuota` / `UsedQuota` 这类键同样含 quota 子串，
+* 必须先剔除剩余 / 已用语义，否则会把剩余值误当总额度（有单测守卫）。
+* @param source - 套餐详情里的额度对象（PackageInfo / SubPackageBalance 等）。
+*/
+function pickTotalQuota(source) {
+	if (source === null || typeof source !== "object") return void 0;
+	const forbidden = [
+		"remain",
+		"used",
+		"consume",
+		"left",
+		"available",
+		"balance"
+	];
+	for (const [key, value] of Object.entries(source)) {
+		const lower = key.toLowerCase();
+		if (!lower.includes("total") && !lower.includes("limit") && !lower.includes("quota")) continue;
+		if (forbidden.some((marker) => lower.includes(marker))) continue;
+		const num = toNumber$1(value);
+		if (num !== void 0 && num > 0) return num;
+	}
+}
+/** 套餐列表里提取第一个启用套餐的 TeamId：集合字段名做候选兼容。 */
+function firstEnabledTeamId(inner) {
+	const candidates = inner.TeamSet ?? inner.TokenPlanSet ?? inner.PlanSet;
+	if (!Array.isArray(candidates)) return void 0;
+	for (const item of candidates) {
+		if (item === null || typeof item !== "object") continue;
+		const row = item;
+		if (row.TeamId === void 0 && row.PlanId === void 0) continue;
+		if (row.Status !== void 0 && row.Status !== "enable") continue;
+		const id = row.TeamId ?? row.PlanId;
+		if (typeof id === "string" && id !== "") return id;
+	}
+}
+//#endregion
 //#region lib/types/balance.js
 /**
 * Account-balance queries for the billing dashboard.
@@ -2848,13 +3171,6 @@ const XAI_CREDITS_URL = "https://api.x.ai/v1/billing/credits";
 /** 智谱 GLM（大模型国内域）官方余额接口（open.bigmodel.cn/api/paas/v4/balance）。 */
 const ZHIPU_BALANCE_URL = "https://open.bigmodel.cn/api/paas/v4/balance";
 /** 数字归一化：接口返回的余额是字符串（如 `"110.00"`），统一转 number。 */
-function toNumber$1(value) {
-	if (typeof value === "number" && Number.isFinite(value)) return value;
-	if (typeof value === "string") {
-		const parsed = Number(value);
-		return Number.isFinite(parsed) ? parsed : void 0;
-	}
-}
 /**
 * Fetch a Bearer-protected balance endpoint and normalize the HTTP outcome into
 * a shared {@link ProviderBalance} row. Each provider supplies its own
@@ -3139,6 +3455,26 @@ const QUERIERS = [
 		route: "tokendance-space",
 		displayName: "TokenDance",
 		querier: queryTokenDance
+	},
+	{
+		route: "tencent-tokenhub",
+		displayName: "腾讯云 TokenHub",
+		querier: queryTencentTokenPlan
+	},
+	{
+		route: "tokenhub",
+		displayName: "腾讯云 TokenHub",
+		querier: queryTencentTokenPlan
+	},
+	{
+		route: "tencent",
+		displayName: "腾讯云 TokenHub",
+		querier: queryTencentTokenPlan
+	},
+	{
+		route: "tencentcloud",
+		displayName: "腾讯云 TokenHub",
+		querier: queryTencentTokenPlan
 	}
 ];
 /**
@@ -3171,6 +3507,77 @@ async function queryBalances(ctx, providers) {
 		return querier(ctx, env);
 	}));
 }
+/**
+* 查询腾讯云 TokenHub Token Plan 套餐余量。凭据值格式 `<SecretId>:<SecretKey>`
+* （云 API 密钥，非 TokenHub 推理 key）。链路：套餐列表取 TeamId → 套餐详情读
+* 主额度包余量。管控面字段名未完全稳定，解析按语义键防御提取。
+* @param ctx - host context carrying the credentials seam.
+* @param apiKeyEnv - credential reference resolving the `<SecretId>:<SecretKey>` pair.
+*/
+async function queryTencentTokenPlan(ctx, apiKeyEnv) {
+	const provider = "腾讯云 TokenHub";
+	const hit = await ctx.credentials.resolve(credentialRef(apiKeyEnv));
+	if (hit === void 0) return {
+		provider,
+		displayName: provider,
+		error: "unconfigured"
+	};
+	if (!balanceGate.check(provider)) return {
+		provider,
+		displayName: provider,
+		error: "unreachable"
+	};
+	const credential = parseTencentCredential(hit.value);
+	if (credential === void 0) return {
+		provider,
+		displayName: provider,
+		error: "unauthorized"
+	};
+	const doRequest = async () => {
+		const teamId = firstEnabledTeamId(await callTokenHub(credential.secretId, credential.secretKey, "DescribeTokenPlanList", {}));
+		if (teamId === void 0) return {
+			provider,
+			displayName: provider,
+			error: "invalid"
+		};
+		const detail = await callTokenHub(credential.secretId, credential.secretKey, "DescribeTokenPlan", { TeamId: teamId });
+		const remaining = pickRemainingQuota(detail.PackageInfo) ?? pickRemainingQuota(detail);
+		if (remaining === void 0) {
+			console.warn(`[usage-billing] balance response drifted for ${provider}: no remaining-quota field parsed`);
+			return {
+				provider,
+				displayName: provider,
+				error: "invalid"
+			};
+		}
+		const plan = typeof detail.Name === "string" ? detail.Name : void 0;
+		const exhausted = detail.StopReason === "EXHAUSTED";
+		return {
+			provider,
+			displayName: provider,
+			currency: "CNY",
+			totalBalance: remaining,
+			...plan !== void 0 ? { plan } : {},
+			...exhausted ? { isAvailable: false } : {}
+		};
+	};
+	try {
+		const row = await withRetry(doRequest, {
+			retries: 1,
+			baseDelayMs: 250,
+			maxDelayMs: 2e3
+		});
+		balanceGate.success(provider);
+		return row;
+	} catch (error) {
+		balanceGate.fail(provider);
+		return {
+			provider,
+			displayName: provider,
+			error: error.code === "unauthorized" ? "unauthorized" : "unreachable"
+		};
+	}
+}
 /** 点路径取值：`data.total_available` → 逐层下钻；任一缺失返回 undefined。 */
 function getPath(data, path) {
 	let cursor = data;
@@ -3987,6 +4394,7 @@ const EMPTY_SUBSCRIPTION_KEYS = {
 	opencodeApiKey: "",
 	minmaxApiKey: "",
 	openrouterApiKey: "",
+	tencentCloudApi: "",
 	zaiRegion: "global"
 };
 /** 订阅类 provider 的显示名（未命中的回退为 id 本身）。 */
@@ -4011,10 +4419,12 @@ const SUBSCRIPTION_DISPLAY_NAMES = {
 	"minimax-token-plan": "MiniMax Token Plan",
 	"minimax-token-plan-cn": "MiniMax Token Plan（国内）",
 	"minimax-cn": "MiniMax Token Plan（国内）",
-	"openrouter": "OpenRouter"
+	"openrouter": "OpenRouter",
+	"tencent-token-plan": "腾讯云 Token Plan",
+	"grok": "Grok（X Premium）"
 };
 /** 订阅类 provider id 判定：带 coding / agent-plan / token-plan 后缀，或已知订阅通道。 */
-const SUBSCRIPTION_ID_RE = /* @__PURE__ */ new RegExp("(?:^|-)(?:coding|agent[-_]?plan|token[-_]?plan)(?:$|-|_)|^(?:opencode|opencode-go|kimi-coding|zai-coding|minimax|minimax-cn|minimax-token-plan|minimax-token-plan-cn|openrouter)", "i");
+const SUBSCRIPTION_ID_RE = /* @__PURE__ */ new RegExp("(?:^|-)(?:coding|agent[-_]?plan|token[-_]?plan)(?:$|-|_)|^(?:opencode|opencode-go|kimi-coding|zai-coding|minimax|minimax-cn|minimax-token-plan|minimax-token-plan-cn|openrouter|grok)", "i");
 /** 是否是订阅类 provider id（如 kimi-coding、xiaomi-token-plan-cn）。 */
 function isSubscriptionProviderId(providerId) {
 	if (SUBSCRIPTION_ID_RE.test(providerId)) return true;
@@ -4030,7 +4440,8 @@ const SUBSCRIPTION_ADAPTERS = {
 	"minimax-cn": { collect: collectMiniMax },
 	"minimax-token-plan": { collect: collectMiniMax },
 	"minimax-token-plan-cn": { collect: collectMiniMax },
-	"openrouter": { collect: collectOpenRouter }
+	"openrouter": { collect: collectOpenRouter },
+	"tencent-token-plan": { collect: collectTencentTokenPlan }
 };
 /** 有额度适配器的 provider id 集合（识别用）。 */
 const ADAPTER_PROVIDER_IDS = new Set(Object.keys(SUBSCRIPTION_ADAPTERS));
@@ -4527,6 +4938,48 @@ async function collectOpenRouter(keys, config, timeoutMs) {
 	}
 }
 /**
+* 腾讯云 Token Plan（TokenHub 管控面）订阅额度。凭据是云 API 密钥对
+* `<SecretId>:<SecretKey>`（与余额面板同源、同格式），链路与 balance.ts 的
+* TokenHub 查询一致：DescribeTokenPlanList 取 TeamId → DescribeTokenPlan 读
+* 主额度包。管控面字段名未完全稳定：剩余与总额度都能取到才产出百分比窗口，
+* 只有剩余值时窗口留空（绝不猜总额度），plan 名照常展示。
+*/
+async function collectTencentTokenPlan(keys, _config, _timeoutMs) {
+	const provider = "tencent-token-plan";
+	const displayName = SUBSCRIPTION_DISPLAY_NAMES[provider] ?? provider;
+	const hint = "凭据需为腾讯云云 API 密钥对（SecretId:SecretKey，控制台访问管理获取），非 TokenHub 推理 key";
+	const quota = (partial) => ({
+		provider,
+		displayName,
+		windows: [],
+		hint,
+		...partial
+	});
+	if (keys.tencentCloudApi === "") return quota({ status: "not-configured" });
+	const credential = parseTencentCredential(keys.tencentCloudApi);
+	if (credential === void 0) return quota({ status: "unauthorized" });
+	try {
+		const teamId = firstEnabledTeamId(await callTokenHub(credential.secretId, credential.secretKey, "DescribeTokenPlanList", {}));
+		if (teamId === void 0) return quota({ status: "invalid-response" });
+		const detail = await callTokenHub(credential.secretId, credential.secretKey, "DescribeTokenPlan", { TeamId: teamId });
+		const remaining = pickRemainingQuota(detail.PackageInfo) ?? pickRemainingQuota(detail);
+		const total = pickTotalQuota(detail.PackageInfo) ?? pickTotalQuota(detail);
+		const plan = typeof detail.Name === "string" ? detail.Name : void 0;
+		return quota({
+			status: "ok",
+			windows: remaining !== void 0 && total !== void 0 && total > 0 ? [{
+				kind: "monthly",
+				usedPercent: round1$1(clampPercent$1((1 - remaining / total) * 100) ?? 0),
+				remainingPercent: round1$1(clampPercent$1(remaining / total * 100) ?? 0),
+				remaining
+			}] : [],
+			...plan !== void 0 ? { plan } : {}
+		});
+	} catch (error) {
+		return quota({ status: statusOf$1(error) });
+	}
+}
+/**
 * Collect quota for the given plans concurrently (adapter-backed plans only;
 * identified plans without an adapter are surfaced by the caller as "no
 * quota API" rows).
@@ -5085,6 +5538,10 @@ const SUBSCRIPTION_KEY_SOURCES = [
 	{
 		provider: "openrouter",
 		key: "openrouterApiKey"
+	},
+	{
+		provider: "tencent-token-plan",
+		key: "tencentCloudApi"
 	}
 ];
 /** 读 llm-pi-ai 设置的 `providers` 字典（`<route> → { apiKeyEnv?, baseURL?, displayName? }`）。
@@ -5208,6 +5665,44 @@ async function readOpenCodeToken() {
 	return "";
 }
 /**
+* 宿主 persistence 形状适配。宿主 0.1.3 起 SessionPersistence 改为
+* SessionHandle 模型（open(id,'read') 后经 handle.read(offset) 读，fork 边界
+* 挂在 handle.inheritedEventCount，list 返回 {header, revision} 快照行，
+* 0.1.2 的 readFrom/locate 消失）。这里按结构探测把两种宿主形状都收敛为
+* 聚合层期望的 0.1.2 面貌：0.1.2 直接带 readFrom 的原样直通；0.1.3 的
+* 读取转为 open → handle.read，revision 令牌经 stampOf 暴露给增量缓存。
+* 候选时刻的运行时对象是宿主注入的外部形状，结构断言即 durable 收窄点。
+* 导出供测试：纯函数（不触 ctx）。
+*/
+function adaptSessionPersistence(raw) {
+	if (typeof raw?.readFrom === "function") return raw;
+	const host = raw;
+	const revisions = /* @__PURE__ */ new Map();
+	return {
+		list: async () => {
+			const snapshots = await host.list();
+			revisions.clear();
+			for (const snapshot of snapshots) revisions.set(String(snapshot.header.id), String(snapshot.revision));
+			return snapshots.map((snapshot) => snapshot.header);
+		},
+		readFrom: async (id, fromSeq) => {
+			const handle = await host.open(id, "read");
+			try {
+				const events = await handle.read(fromSeq);
+				return {
+					meta: handle.header,
+					fromSeq: SessionLogOffset(fromSeq),
+					inheritedEventCount: SessionLogOffset(handle.inheritedEventCount),
+					events
+				};
+			} finally {
+				await handle[Symbol.asyncDispose]?.();
+			}
+		},
+		stampOf: async (id) => revisions.get(String(id)) ?? null
+	};
+}
+/**
 * Host plugin body: serve real aggregated usage to the browser dashboard.
 * @param ctx - host context carrying webServer and sessionPersistence.
 * @param config - optional statsPath override.
@@ -5237,8 +5732,10 @@ function apply(ctx, config = {}) {
 		}).catch(() => {});
 	};
 	const workspaceTitleResolver = buildWorkspaceTitleResolver(ctx);
-	const aggregator = createUsageAggregator(ctx.sessionPersistence, {
+	applyUserModelAliases(config.modelKeyAliases);
+	const aggregator = createUsageAggregator(adaptSessionPersistence(ctx.sessionPersistence), {
 		...config.subscriptionProviders === void 0 ? {} : { subscriptionProviders: config.subscriptionProviders },
+		...config.routeAliases === void 0 ? {} : { routeAliases: config.routeAliases },
 		resolveRoutes: () => readPiAiProviderRoutes(ctx.settings),
 		...workspaceTitleResolver === void 0 ? {} : { resolveWorkspaceTitle: workspaceTitleResolver },
 		...config.searchCallEstimateCny === void 0 ? {} : { searchCallEstimateCny: config.searchCallEstimateCny },
@@ -5764,4 +6261,4 @@ function apply(ctx, config = {}) {
 	}), "usage-billing: usage-stats route");
 }
 //#endregion
-export { apply, createFileUsageLedgerStore, guardLoopback, inject, readPiAiProviderRoutes, resolveSubscriptionKeys };
+export { adaptSessionPersistence, apply, createFileUsageLedgerStore, guardLoopback, inject, readPiAiProviderRoutes, resolveSubscriptionKeys };