@kenz1117/dsh-ui-usage-billing 1.4.3 → 1.4.4

package/lib/index.js

@@ -198,7 +198,7 @@ let liveExtraModels;
 /**
 * 用户自定义模型别名（插件配置 `modelKeyAliases`，聚合启动时注入）：真实日志
 * model id → 计费目录键。优先级高于内置别名表——目录外的新模型无需等发版，
-* 配置一条别名即完成识别与计价（键必须是 MODEL_CATALOG 的既有 key）。
+* 配置一条别名即完成识别与计价（键必须是内置目录的既有 key）。
 */
 let userModelAliases;
 /**
@@ -332,208 +332,537 @@ function beijingMillisOfDay(timeMs) {
 	return ((timeMs + 8 * 36e5) % 864e5 + 864e5) % 864e5;
 }
 /**
-* 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.
+* 内置目录与别名表的运行时注入态：数据本体在 src/builtin-catalog.ts（仅随 node
+* 半构建发布）。宿主半区在插件 activate 时同步注入；客户端在 /api/billing/pricing
+* 首次响应时注入。未注入时目录为空——计价消费方走 UNSEEDED_OTHER 兜底（不产生
+* 费用），费率表渲染加载态，不视为错误。
 */
-/** DeepSeek 官方高峰时段说明（峰谷分时计费目录条目共用）。 */
-const DEEPSEEK_PEAK_HOURS = "09:00-12:00 / 14:00-18:00";
-const GEMINI_PEAK_HOURS = "Standard / Flex";
-const MODEL_CATALOG = [
-	{
-		key: "flash",
-		name: "DeepSeek V4.1 Flash",
-		provider: "DeepSeek",
-		colorVar: "ds-blue",
-		price: {
-			currency: "CNY",
-			input: 2,
-			cacheHit: .04,
-			output: 8,
-			offPeak: {
-				input: 1,
-				cacheHit: .02,
-				output: 4
-			}
-		},
-		peakHours: DEEPSEEK_PEAK_HOURS
-	},
-	{
-		key: "flash-vision-exp",
-		name: "DeepSeek V4 Flash Vision (Exp)",
-		provider: "DeepSeek",
-		colorVar: "ds-blue",
-		retired: true,
-		price: {
-			currency: "CNY",
-			input: 2,
-			cacheHit: .04,
-			output: 8,
-			offPeak: {
-				input: 1,
-				cacheHit: .02,
-				output: 4
-			}
-		},
-		peakHours: DEEPSEEK_PEAK_HOURS
-	},
-	{
-		key: "pro",
-		name: "DeepSeek V4 Pro",
-		provider: "DeepSeek",
-		colorVar: "dsw-static-deepseek-500",
-		price: {
-			currency: "CNY",
-			input: 9,
-			cacheHit: .3,
-			output: 27,
-			offPeak: {
-				input: 4.5,
-				cacheHit: .15,
-				output: 13.5
-			}
-		},
-		peakHours: DEEPSEEK_PEAK_HOURS
-	},
-	{
-		key: "glm",
-		name: "GLM-5.2",
-		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-600",
-		price: {
-			currency: "CNY",
-			input: 8,
-			cacheHit: 2,
-			output: 28
+let builtinCatalog = [];
+let builtinAliases = {};
+/**
+* 注入内置目录与别名表（两侧各调用一次：宿主 activate、客户端首个 pricing 响应）。
+* 重复注入整体替换并重建归一化索引。
+* @param catalog - 内置目录条目（BUILTIN_MODEL_CATALOG 全量）。
+* @param aliases - 内置别名表（BUILTIN_MODEL_KEY_ALIASES 全量）。
+*/
+function applyBuiltinCatalog(catalog, aliases) {
+	builtinCatalog = catalog;
+	builtinAliases = aliases;
+	canonIndexCache = void 0;
+}
+/** 内置目录当前快照：未注入为空数组（client 首帧前渲染加载态）。 */
+function modelCatalog() {
+	return builtinCatalog;
+}
+/** 内置别名表当前快照：未注入为空对象。 */
+function modelKeyAliases() {
+	return builtinAliases;
+}
+/** 未注入时的目录兜底条目：与内置 other 条目同价（零价，不计费）。 */
+const UNSEEDED_OTHER = {
+	key: "other",
+	name: "其他模型",
+	provider: "Custom",
+	colorVar: "dsw-static-neutral-bluish-500",
+	price: {
+		currency: "CNY",
+		input: 0,
+		cacheHit: 0,
+		cacheMiss: 0,
+		output: 0
+	}
+};
+/**
+* 模型 id 归一化：小写、去括号附注（如 `gpt5.6 luna(go)` 只看主体）、再去所有
+* 非字母数字分隔符（空格 / 横杠 / 点 / 下划线）。用于日志里的模型 id 与计费
+* 目录键做宽松匹配，提升「大小写/分隔符差异导致未收录」的识别率。
+* @param id - 原始模型 id（日志或目录键）。
+* @returns 归一化键（字母数字小写串）。
+*/
+function canonModelId(id) {
+	return String(id).toLowerCase().replace(/\([^)]*\)/g, "").replace(/[^a-z0-9]+/g, "");
+}
+/**
+* 目录常量键的归一化索引：归一化键 → 真实计费键。只索引静态来源（内置目录、
+* 别名表、dsh-spend 兜底键）；models.dev 补充条目是运行时注入，单独实时匹配。
+* 惰性构建：注入前目录为空，构建无意义；每次 applyBuiltinCatalog 后重建。
+*/
+let canonIndexCache;
+function canonIndex() {
+	if (canonIndexCache !== void 0) return canonIndexCache;
+	const map = /* @__PURE__ */ new Map();
+	const add = (candidate, target) => {
+		const canon = canonModelId(candidate);
+		if (canon !== "" && !map.has(canon)) map.set(canon, target);
+	};
+	for (const entry of builtinCatalog) add(entry.key, entry.key);
+	for (const [alias, key] of Object.entries(builtinAliases)) add(alias, key);
+	for (const rate of FALLBACK_RATES) add(rate.key, rate.key);
+	canonIndexCache = map;
+	return map;
+}
+/**
+* 解析真实日志模型 id → 计费目录键。先精确别名映射（既有行为）；未命中时做
+* 归一化匹配（忽略大小写/分隔符/括号附注），命中内置目录 / 别名目标 / 兜底键 /
+* models.dev 补充键即返回其真实键；完全未知时保持原样（回退 other，不计费）。
+* 供聚合层折叠与客户端渲染共用，两侧一致。
+* @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);
 		}
-	},
-	{
-		key: "glm-5.3",
-		name: "GLM-5.3",
-		provider: "智谱 AI",
-		colorVar: "ds-blue",
-		price: {
-			currency: "CNY",
-			input: 8,
-			cacheHit: 2,
-			output: 28
+	};
+	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] ?? modelKeyAliases()[candidate];
+	if (alias !== void 0) return alias;
+	const canon = canonModelId(candidate);
+	if (canon === "") return void 0;
+	const hit = canonIndex().get(canon);
+	if (hit !== void 0) return hit;
+	return (liveExtraModels ?? []).find((item) => canonModelId(item.key) === canon)?.key;
+}
+function resolveCatalogKey(id) {
+	const exact = userModelAliases?.[id] ?? modelKeyAliases()[id] ?? id;
+	if (exact === id) {
+		const canon = canonModelId(id);
+		if (canon !== "") {
+			const hit = canonIndex().get(canon);
+			if (hit !== void 0) return hit;
+			const extraHit = (liveExtraModels ?? []).find((item) => canonModelId(item.key) === canon);
+			if (extraHit !== void 0) return extraHit.key;
 		}
-	},
-	{
-		key: "glm-5.3-flash",
-		name: "GLM-5.3-Flash",
-		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-300",
-		price: {
-			currency: "CNY",
-			input: .8,
-			cacheHit: .23,
-			output: 2.8
-		},
-		promo: {
-			factor: .5,
-			endsAtMs: Date.UTC(2026, 8, 8, 16, 0, 0),
-			note: "限时 5 折"
+		for (const candidate of derivedKeyCandidates(id)) {
+			const hit = lookupCandidate(candidate);
+			if (hit !== void 0) return hit;
 		}
-	},
-	{
-		key: "glm-5.3-flashx",
-		name: "GLM-5.3-FlashX",
-		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-300",
+	}
+	return exact;
+}
+/** 取一个计费键的实时单价（实时覆盖 > dsh-spend 官方价兜底）。 */
+function livePriceOf(key) {
+	const resolved = resolveCatalogKey(key);
+	const live = livePrices?.[resolved];
+	if (live !== void 0) return live;
+	const fallback = FALLBACK_RATES.find((rate) => rate.key.toLowerCase() === resolved.toLowerCase());
+	if (fallback === void 0) return void 0;
+	return {
+		input: fallback.input,
+		cacheHit: fallback.cacheHit,
+		output: fallback.output
+	};
+}
+/** Lookup a model by its stats key; falls back to the generic `other` entry. */
+function modelOf(key) {
+	const resolved = resolveCatalogKey(key);
+	const found = modelCatalog().find((entry) => entry.key === resolved);
+	const extra = liveExtraModels?.find((item) => item.key === resolved);
+	const base = found ?? (extra !== void 0 ? extraEntryOf(extra) : modelCatalog().at(-1) ?? UNSEEDED_OTHER);
+	const live = livePriceOf(resolved);
+	if (live === void 0) return base;
+	return {
+		...base,
 		price: {
-			currency: "CNY",
-			input: 2,
-			cacheHit: .57,
-			output: 7
+			currency: "USD",
+			input: live.input,
+			cacheHit: live.cacheHit,
+			output: live.output
 		}
-	},
-	{
-		key: "glm-4.6",
-		name: "GLM-4.6",
-		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-400",
+	};
+}
+/** models.dev 补充条目转为目录条目：USD 直价（走汇率换算），无峰谷分档。 */
+function extraEntryOf(extra) {
+	return {
+		key: extra.key,
+		name: extra.name,
+		provider: extra.provider,
+		colorVar: "dsw-static-neutral-400",
 		price: {
-			currency: "CNY",
-			input: 4,
-			cacheHit: .8,
-			output: 16
+			currency: "USD",
+			input: extra.price.input,
+			cacheHit: extra.price.cacheHit,
+			output: extra.price.output
 		}
-	},
-	{
-		key: "glm-4.5-air",
-		name: "GLM-4.5-Air",
-		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-300",
+	};
+}
+/**
+* 模型是否可计价：内置目录、models.dev 补充、或 dsh-spend 官方价兜底命中。
+* 聚合层的计价闸门（目录外模型不产生费用，避免兜底档误估）。
+*/
+function isPriced(key) {
+	const resolved = resolveCatalogKey(key);
+	if (modelCatalog().some((entry) => entry.key === resolved)) return true;
+	if ((liveExtraModels ?? []).some((item) => item.key === resolved)) return true;
+	return FALLBACK_RATES.some((rate) => rate.key.toLowerCase() === resolved.toLowerCase());
+}
+/**
+* 促销在 nowMs 是否生效：factor 必须落在 (0,1) 区间，截止时刻及之后视为过期；
+* endsAtMs 缺省表示长期活动，在 factor 合法期间持续生效。
+* 导出供测试：纯函数。
+* @param promo - 待判定的促销窗口。
+* @param nowMs - 判定时刻（epoch ms）。
+*/
+function isPromoActive(promo, nowMs) {
+	const expired = promo.endsAtMs !== void 0 && nowMs >= promo.endsAtMs;
+	return Number.isFinite(nowMs) && !expired && promo.factor > 0 && promo.factor < 1;
+}
+/**
+* 把限时促销折入条目单价：生效期内返回 price 主档与 offPeak 逐档乘折扣系数的
+* 副本（某档在 promo.factors 有合法覆盖时用覆盖值，否则用 promo.factor），
+* 其余字段原样保留；不在促销期（过期/未开始/factor 非法）原样返回。
+* 幂等由调用方保证——计价与费率表显示各自只折一次，勿对已折价副本重复应用。
+* @param entry - 目录条目（price 保持刊例价口径）。
+* @param nowMs - 判定时刻（epoch ms）。
+*/
+function applyPromo(entry, nowMs) {
+	const { promo } = entry;
+	if (promo === void 0 || !isPromoActive(promo, nowMs)) return entry;
+	const factorOf = (field) => promo.factors?.[field] ?? promo.factor;
+	const scaled = (band) => ({
+		input: band.input * factorOf("input"),
+		cacheHit: band.cacheHit * factorOf("cacheHit"),
+		...band.cacheMiss !== void 0 ? { cacheMiss: band.cacheMiss * factorOf("cacheMiss") } : {},
+		output: band.output * factorOf("output")
+	});
+	return {
+		...entry,
 		price: {
-			currency: "CNY",
-			input: .8,
-			cacheHit: .16,
-			output: 2
+			...scaled(entry.price),
+			currency: entry.price.currency,
+			...entry.price.offPeak !== void 0 ? { offPeak: scaled(entry.price.offPeak) } : {}
 		}
-	},
+	};
+}
+/**
+* Price one band's token usage in CNY. The stats `input` field is the TOTAL
+* prompt tokens (cacheHit + cacheMiss), so billing splits it: the cache-hit
+* share prices at the hit rate and the remaining share at the miss rate.
+* Providers that report only disjoint buckets carry `cacheMiss` explicitly;
+* otherwise the miss share is derived as `input - cacheHit`. Only USD-priced
+* bands go through the exchange rate.
+*/
+function priceBandCost(band, buckets, currency) {
+	const miss = buckets.cacheMiss > 0 ? buckets.cacheMiss : Math.max(0, buckets.input - buckets.cacheHit);
+	const hit = Math.min(buckets.cacheHit, buckets.input);
+	const raw = (miss * (band.cacheMiss ?? band.input) + hit * band.cacheHit + buckets.output * band.output) / 1e6;
+	return currency === "USD" ? raw * currentRate() : raw;
+}
+/**
+* Estimate the CNY cost of one model's token usage, mixing the peak and
+* off-peak bands by the given peak share (flat-priced models cost the same in
+* both bands).
+*
+* 计费维度是「缓存命中价 × 时段价」的交叉：每个时段档内部分别按缓存命中
+* 价（cacheHit）与未命中价（input/cacheMiss）计价，两个时段档再按
+* peakShare 混合。时段定义以北京时间为准（如 DeepSeek V4 高峰
+* 09:00-12:00 / 14:00-18:00）。因聚合只有按日 token 量、没有请求级时间戳，
+* 时段只能按比例估算，而非逐请求判定。
+* @param entry - the catalog entry whose prices apply.
+* @param buckets - token usage counts.
+* @param peakShare - share of traffic in the peak band (0..1); defaults to {@link DEFAULT_PEAK_SHARE}.
+* @returns the estimated cost in CNY.
+*/
+function computeCost(entry, buckets, peakShare = DEFAULT_PEAK_SHARE, nowMs = Date.now()) {
+	const priced = applyPromo(entry, nowMs);
+	const peak = priceBandCost(priced.price, buckets, priced.price.currency);
+	const off = priced.price.offPeak === void 0 ? peak : priceBandCost(priced.price.offPeak, buckets, priced.price.currency);
+	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 计价模型已按当前汇率折算）。
+*/
+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);
+	const legacy = timeMs < PEAK_ERA_START_MS && entry.userPriced !== true ? LEGACY_DEEPSEEK_BANDS[entry.key] : void 0;
+	if (legacy !== void 0) return priceBandCost(legacy, buckets, "CNY");
+	const repriced = timeMs < FLASH_REPRICE_MS && entry.userPriced !== true ? FLASH_REPRICED_OFFPEAK[entry.key] : void 0;
+	if (repriced !== void 0) return priceBandCost((timeMs < WEEKEND_OFFPEAK_START_MS ? tariffV1At(timeMs) : tierAt(timeMs)) === "peak" ? {
+		input: repriced.input * 2,
+		cacheHit: repriced.cacheHit * 2,
+		output: repriced.output * 2
+	} : repriced, buckets, "CNY");
+	if (priced.price.offPeak === void 0) return priceBandCost(priced.price, buckets, priced.price.currency);
+	return priceBandCost((timeMs < WEEKEND_OFFPEAK_START_MS ? tariffV1At(timeMs) : tierAt(timeMs)) === "peak" ? priced.price : priced.price.offPeak, buckets, priced.price.currency);
+}
+/**
+* Format an amount with adaptive precision and the given currency symbol.
+* @param amount - the amount (CNY by default; pass `usd` for dollar display).
+* @param currency - display currency; default `cny`.
+*/
+function formatMoney(amount, currency = "cny") {
+	const value = Number(amount);
+	if (!Number.isFinite(value)) return currency === "cny" ? "¥0" : "$0";
+	const symbol = currency === "cny" ? "¥" : "$";
+	if (value <= 0) return `${symbol}0`;
+	if (value >= 1e3) return `${symbol}${value.toFixed(0)}`;
+	if (value >= 10) return `${symbol}${value.toFixed(1)}`;
+	if (value >= .1) return `${symbol}${value.toFixed(2)}`;
+	return `${symbol}${value.toFixed(3)}`;
+}
+/** Format a large token count with B/M/K suffix. */
+function formatTokens(value) {
+	if (value >= 1e9) return `${(value / 1e9).toFixed(2)}B`;
+	if (value >= 1e6) return `${(value / 1e6).toFixed(1)}M`;
+	if (value >= 1e3) return `${(value / 1e3).toFixed(0)}K`;
+	return String(value);
+}
+//#endregion
+//#region lib/types/builtin-catalog.js
+/**
+* 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.
+*/
+/** DeepSeek 官方高峰时段说明（峰谷分时计费目录条目共用）。 */
+const DEEPSEEK_PEAK_HOURS = "09:00-12:00 / 14:00-18:00";
+const GEMINI_PEAK_HOURS = "Standard / Flex";
+const BUILTIN_MODEL_CATALOG = [
 	{
-		key: "glm-4.7",
-		name: "GLM-4.7",
-		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-400",
+		key: "flash",
+		name: "DeepSeek V4.1 Flash",
+		provider: "DeepSeek",
+		colorVar: "ds-blue",
 		price: {
 			currency: "CNY",
-			input: 4,
-			cacheHit: 1,
-			output: 16
+			input: 2,
+			cacheHit: .04,
+			output: 8,
+			offPeak: {
+				input: 1,
+				cacheHit: .02,
+				output: 4
+			}
 		},
-		estimated: true
+		peakHours: DEEPSEEK_PEAK_HOURS
 	},
 	{
-		key: "glm-5-turbo",
-		name: "GLM-5-Turbo",
-		provider: "智谱 AI",
+		key: "flash-vision-exp",
+		name: "DeepSeek V4 Flash Vision (Exp)",
+		provider: "DeepSeek",
 		colorVar: "ds-blue",
+		retired: true,
 		price: {
 			currency: "CNY",
-			input: 5,
-			cacheHit: 1.2,
-			output: 22
-		}
+			input: 2,
+			cacheHit: .04,
+			output: 8,
+			offPeak: {
+				input: 1,
+				cacheHit: .02,
+				output: 4
+			}
+		},
+		peakHours: DEEPSEEK_PEAK_HOURS
 	},
 	{
-		key: "glm-5.1",
-		name: "GLM-5.1",
+		key: "pro",
+		name: "DeepSeek V4 Pro",
+		provider: "DeepSeek",
+		colorVar: "dsw-static-deepseek-500",
+		price: {
+			currency: "CNY",
+			input: 9,
+			cacheHit: .3,
+			output: 27,
+			offPeak: {
+				input: 4.5,
+				cacheHit: .15,
+				output: 13.5
+			}
+		},
+		peakHours: DEEPSEEK_PEAK_HOURS
+	},
+	{
+		key: "glm",
+		name: "GLM-5.2",
 		provider: "智谱 AI",
 		colorVar: "dsw-static-blue-600",
 		price: {
 			currency: "CNY",
-			input: 6,
-			cacheHit: 1.2,
-			output: 24
+			input: 8,
+			cacheHit: 2,
+			output: 28
 		}
 	},
 	{
-		key: "glm-5v-turbo",
-		name: "GLM-5V-Turbo",
+		key: "glm-5.3",
+		name: "GLM-5.3",
 		provider: "智谱 AI",
-		colorVar: "dsw-static-blue-300",
+		colorVar: "ds-blue",
 		price: {
 			currency: "CNY",
-			input: 5,
-			cacheHit: 1.2,
-			output: 22
+			input: 8,
+			cacheHit: 2,
+			output: 28
 		}
 	},
 	{
-		key: "qwen-3.8-max",
-		name: "Qwen3.8 Max",
+		key: "glm-5.3-flash",
+		name: "GLM-5.3-Flash",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-300",
+		price: {
+			currency: "CNY",
+			input: .8,
+			cacheHit: .23,
+			output: 2.8
+		},
+		promo: {
+			factor: .5,
+			endsAtMs: Date.UTC(2026, 8, 8, 16, 0, 0),
+			note: "限时 5 折"
+		}
+	},
+	{
+		key: "glm-5.3-flashx",
+		name: "GLM-5.3-FlashX",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-300",
+		price: {
+			currency: "CNY",
+			input: 2,
+			cacheHit: .57,
+			output: 7
+		}
+	},
+	{
+		key: "glm-4.6",
+		name: "GLM-4.6",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-400",
+		price: {
+			currency: "CNY",
+			input: 4,
+			cacheHit: .8,
+			output: 16
+		}
+	},
+	{
+		key: "glm-4.5-air",
+		name: "GLM-4.5-Air",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-300",
+		price: {
+			currency: "CNY",
+			input: .8,
+			cacheHit: .16,
+			output: 2
+		}
+	},
+	{
+		key: "glm-4.7",
+		name: "GLM-4.7",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-400",
+		price: {
+			currency: "CNY",
+			input: 4,
+			cacheHit: 1,
+			output: 16
+		},
+		estimated: true
+	},
+	{
+		key: "glm-5-turbo",
+		name: "GLM-5-Turbo",
+		provider: "智谱 AI",
+		colorVar: "ds-blue",
+		price: {
+			currency: "CNY",
+			input: 5,
+			cacheHit: 1.2,
+			output: 22
+		}
+	},
+	{
+		key: "glm-5.1",
+		name: "GLM-5.1",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-600",
+		price: {
+			currency: "CNY",
+			input: 6,
+			cacheHit: 1.2,
+			output: 24
+		}
+	},
+	{
+		key: "glm-5v-turbo",
+		name: "GLM-5V-Turbo",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-300",
+		price: {
+			currency: "CNY",
+			input: 5,
+			cacheHit: 1.2,
+			output: 22
+		}
+	},
+	{
+		key: "qwen-3.8-max",
+		name: "Qwen3.8 Max",
 		provider: "阿里通义",
 		colorVar: "dsw-static-blue-600",
 		price: {
@@ -1440,447 +1769,161 @@ const MODEL_CATALOG = [
 		provider: "月之暗面",
 		colorVar: "dsw-static-cyan-300",
 		price: {
-			currency: "CNY",
-			input: 8,
-			cacheHit: 1,
-			output: 58
-		}
-	},
-	{
-		key: "doubao-seed-2.0-code",
-		name: "Doubao Seed-2.0 Code",
-		provider: "字节豆包",
-		colorVar: "ds-red",
-		price: {
-			currency: "CNY",
-			input: 3.2,
-			cacheHit: .64,
-			output: 16
-		}
-	},
-	{
-		key: "doubao-seed-2.0-lite",
-		name: "Doubao Seed-2.0 Lite",
-		provider: "字节豆包",
-		colorVar: "dsw-static-red-300",
-		price: {
-			currency: "CNY",
-			input: .6,
-			cacheHit: .12,
-			output: 3.6
-		}
-	},
-	{
-		key: "other",
-		name: "其他模型",
-		provider: "Custom",
-		colorVar: "dsw-static-neutral-bluish-500",
-		price: {
-			currency: "CNY",
-			input: 0,
-			cacheHit: 0,
-			cacheMiss: 0,
-			output: 0
-		}
-	}
-];
-/**
-* 真实 provider model id → 计费目录键（`MODEL_CATALOG[].key`）的映射。未知 id
-* 原样保留并落回 `other`（未知模型不估算费用）。聚合层（aggregate.ts）在折叠时
-* 用同一张表把日志里的 model id 归并为目录键，客户端渲染（`modelOf`）也按它
-* 解析，两侧共用一份映射，避免同一模型两侧不一致导致「未收录」。
-*/
-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-flash": "flash",
-	"deepseek-v4-pro": "pro",
-	"glm-5.2": "glm",
-	"glm-4.5-air": "glm-4.5-air",
-	"glm-4.5air": "glm-4.5-air",
-	"glm-4.7": "glm-4.7",
-	"glm-5-turbo": "glm-5-turbo",
-	"glm-5.1": "glm-5.1",
-	"glm-5.3-flash": "glm-5.3-flash",
-	"glm-5.3-flashx": "glm-5.3-flashx",
-	"glm-5.3-flash-x": "glm-5.3-flashx",
-	"glm-5v-turbo": "glm-5v-turbo",
-	"glm-5v.1": "glm-5v-turbo",
-	"claude-opus-4-6": "claude-opus-4-6",
-	"claude-opus-4.6": "claude-opus-4-6",
-	"claude-sonnet-4-6": "claude-sonnet-4-6",
-	"claude-sonnet-4.6": "claude-sonnet-4-6",
-	"claude-haiku-4-5": "claude-haiku-4-5",
-	"claude-haiku-4.5": "claude-haiku-4-5",
-	"claude-opus-5": "claude-opus-5",
-	"claude-sonnet-5": "claude-sonnet-5",
-	"mistral-large-2512": "mistral-large-2512",
-	"mistral-large-3": "mistral-large-2512",
-	"mistral-small-2603": "mistral-small-2603",
-	"mistral-small-4": "mistral-small-2603",
-	"ministral-8b-latest": "ministral-8b-latest",
-	"ministral-8b": "ministral-8b-latest",
-	"command-a-03-2025": "command-a-03-2025",
-	"command-a": "command-a-03-2025",
-	"command-r-08-2024": "command-r-08-2024",
-	"command-r": "command-r-08-2024",
-	"hy3": "hunyuan",
-	"hy4-preview": "hunyuan-hy4-preview",
-	"hy4": "hunyuan-hy4-preview",
-	"hunyuan-hy4-preview": "hunyuan-hy4-preview",
-	"hunyuan-hy4": "hunyuan-hy4-preview",
-	"longcat-2.0": "longcat-2.0",
-	"longcat-2": "longcat-2.0",
-	"minicpm-v-4.5": "minicpm-v-4.5",
-	"minicpm-v-4.5-thinking": "minicpm-v-4.5",
-	"ernie-4.5": "ernie-4.5",
-	"ernie-4.5-300b": "ernie-4.5",
-	"dots-3-note-preview": "dots-3-note-preview",
-	"dots-3-note": "dots-3-note-preview",
-	"dots3-note-preview": "dots-3-note-preview",
-	"rednote-dots3": "dots-3-note-preview",
-	"doubao-seed-evolving": "doubao-seed-evolving",
-	"doubao-seed-evolve": "doubao-seed-evolving",
-	"doubao-seed-2.1-pro": "doubao-seed-2.1-pro",
-	"doubao-seed-2.1-pro-290000": "doubao-seed-2.1-pro",
-	"doubao-seed-2.1-turbo": "doubao-seed-2.1-turbo",
-	"doubao-seed-2-1-turbo": "doubao-seed-2.1-turbo",
-	"qwen3.8-max": "qwen-3.8-max",
-	"qwen3.8-flash": "qwen-3.8-flash",
-	"qwen3.7-max": "qwen-max",
-	"qwen3.6-max": "qwen3.6-max",
-	"qwen3.6-max-preview": "qwen3.6-max",
-	"qwen3-coder-plus": "qwen3-coder-plus",
-	"qwen3-coder": "qwen3-coder",
-	"qwen3-coder-480b": "qwen3-coder",
-	"glm-4.5-x": "glm-4.5-x",
-	"glm-4.5x": "glm-4.5-x",
-	"glm-5.2-fast": "glm-5.2-fast",
-	"glm-5.2f": "glm-5.2-fast",
-	"kimi-k3-fast": "kimi-k3-fast",
-	"kimi-k3f": "kimi-k3-fast",
-	"kimi-for-coding": "kimi-k2.8-preview",
-	"kimi-k2.7-code-fast": "kimi-k2.7-code-fast",
-	"kimi-k2.7-code-f": "kimi-k2.7-code-fast",
-	"kimi-k2.6-fast": "kimi-k2.6-fast",
-	"kimi-k2.6-turbo": "kimi-k2.6-turbo",
-	"kimi-k2-thinking-turbo": "kimi-k2-thinking-turbo",
-	"doubao-seed-2.0-code": "doubao-seed-2.0-code",
-	"doubao-seed-2-0-code": "doubao-seed-2.0-code",
-	"doubao-seed-2.0-lite": "doubao-seed-2.0-lite",
-	"doubao-seed-2-0-lite": "doubao-seed-2.0-lite",
-	"qwen-max": "qwen-max",
-	"hunyuan-t1": "hunyuan-t1",
-	"step-3.7-flash": "step",
-	"seed-2.0-mini": "doubao-mini",
-	"k3": "kimi-k3",
-	"kimi-k3": "kimi-k3",
-	"kimi-k2.8-preview": "kimi-k2.8-preview",
-	"kimi-k2.8": "kimi-k2.8-preview",
-	"kimi-k2-8-preview": "kimi-k2.8-preview",
-	"kimi-k2-8": "kimi-k2.8-preview",
-	"k2.8-preview": "kimi-k2.8-preview",
-	"k2.8": "kimi-k2.8-preview",
-	"minimax-m1": "minimax",
-	"minimax-m2": "minimax",
-	"minimax-m3": "minimax",
-	"minimax-m2.7": "minimax-m2.7",
-	"minimax-m2.7-highspeed": "minimax-m2.7-highspeed",
-	"minimax-m2.7-high-speed": "minimax-m2.7-highspeed",
-	"minimax-m2-7": "minimax-m2.7",
-	"minimax-m2-7-highspeed": "minimax-m2.7-highspeed",
-	"minimax-m2-7-high-speed": "minimax-m2.7-highspeed",
-	"gpt-6": "gpt-6-astra",
-	"gpt-6-astra": "gpt-6-astra"
-};
-/**
-* 模型 id 归一化：小写、去括号附注（如 `gpt5.6 luna(go)` 只看主体）、再去所有
-* 非字母数字分隔符（空格 / 横杠 / 点 / 下划线）。用于日志里的模型 id 与计费
-* 目录键做宽松匹配，提升「大小写/分隔符差异导致未收录」的识别率。
-* @param id - 原始模型 id（日志或目录键）。
-* @returns 归一化键（字母数字小写串）。
-*/
-function canonModelId(id) {
-	return String(id).toLowerCase().replace(/\([^)]*\)/g, "").replace(/[^a-z0-9]+/g, "");
-}
-/**
-* 目录常量键的归一化索引：归一化键 → 真实计费键。只索引静态来源（内置目录、
-* 别名表、dsh-spend 兜底键）；models.dev 补充条目是运行时注入，单独实时匹配。
-*/
-const CATALOG_CANON_INDEX = (() => {
-	const map = /* @__PURE__ */ new Map();
-	const add = (candidate, target) => {
-		const canon = canonModelId(candidate);
-		if (canon !== "" && !map.has(canon)) map.set(canon, target);
-	};
-	for (const entry of MODEL_CATALOG) add(entry.key, entry.key);
-	for (const [alias, key] of Object.entries(MODEL_KEY_ALIASES)) add(alias, key);
-	for (const rate of FALLBACK_RATES) add(rate.key, rate.key);
-	return map;
-})();
-/**
-* 解析真实日志模型 id → 计费目录键。先精确别名映射（既有行为）；未命中时做
-* 归一化匹配（忽略大小写/分隔符/括号附注），命中内置目录 / 别名目标 / 兜底键 /
-* models.dev 补充键即返回其真实键；完全未知时保持原样（回退 other，不计费）。
-* 供聚合层折叠与客户端渲染共用，两侧一致。
-* @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 = userModelAliases?.[id] ?? MODEL_KEY_ALIASES[id] ?? id;
-	if (exact === id) {
-		const canon = canonModelId(id);
-		if (canon !== "") {
-			const hit = CATALOG_CANON_INDEX.get(canon);
-			if (hit !== void 0) return hit;
-			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;
-}
-/** 取一个计费键的实时单价（实时覆盖 > dsh-spend 官方价兜底）。 */
-function livePriceOf(key) {
-	const resolved = resolveCatalogKey(key);
-	const live = livePrices?.[resolved];
-	if (live !== void 0) return live;
-	const fallback = FALLBACK_RATES.find((rate) => rate.key.toLowerCase() === resolved.toLowerCase());
-	if (fallback === void 0) return void 0;
-	return {
-		input: fallback.input,
-		cacheHit: fallback.cacheHit,
-		output: fallback.output
-	};
-}
-/** Lookup a model by its stats key; falls back to the generic `other` entry. */
-function modelOf(key) {
-	const resolved = resolveCatalogKey(key);
-	const found = MODEL_CATALOG.find((entry) => entry.key === resolved);
-	const extra = liveExtraModels?.find((item) => item.key === resolved);
-	const base = found ?? (extra !== void 0 ? extraEntryOf(extra) : (() => {
-		const fallback = MODEL_CATALOG.at(-1);
-		if (fallback !== void 0) return fallback;
-		throw new Error("MODEL_CATALOG must not be empty");
-	})());
-	const live = livePriceOf(resolved);
-	if (live === void 0) return base;
-	return {
-		...base,
-		price: {
-			currency: "USD",
-			input: live.input,
-			cacheHit: live.cacheHit,
-			output: live.output
-		}
-	};
-}
-/** models.dev 补充条目转为目录条目：USD 直价（走汇率换算），无峰谷分档。 */
-function extraEntryOf(extra) {
-	return {
-		key: extra.key,
-		name: extra.name,
-		provider: extra.provider,
-		colorVar: "dsw-static-neutral-400",
-		price: {
-			currency: "USD",
-			input: extra.price.input,
-			cacheHit: extra.price.cacheHit,
-			output: extra.price.output
-		}
-	};
-}
-/**
-* 模型是否可计价：内置目录、models.dev 补充、或 dsh-spend 官方价兜底命中。
-* 聚合层的计价闸门（目录外模型不产生费用，避免兜底档误估）。
-*/
-function isPriced(key) {
-	const resolved = resolveCatalogKey(key);
-	if (MODEL_CATALOG.some((entry) => entry.key === resolved)) return true;
-	if ((liveExtraModels ?? []).some((item) => item.key === resolved)) return true;
-	return FALLBACK_RATES.some((rate) => rate.key.toLowerCase() === resolved.toLowerCase());
-}
-/**
-* 促销在 nowMs 是否生效：factor 必须落在 (0,1) 区间，截止时刻及之后视为过期；
-* endsAtMs 缺省表示长期活动，在 factor 合法期间持续生效。
-* 导出供测试：纯函数。
-* @param promo - 待判定的促销窗口。
-* @param nowMs - 判定时刻（epoch ms）。
-*/
-function isPromoActive(promo, nowMs) {
-	const expired = promo.endsAtMs !== void 0 && nowMs >= promo.endsAtMs;
-	return Number.isFinite(nowMs) && !expired && promo.factor > 0 && promo.factor < 1;
-}
-/**
-* 把限时促销折入条目单价：生效期内返回 price 主档与 offPeak 逐档乘折扣系数的
-* 副本（某档在 promo.factors 有合法覆盖时用覆盖值，否则用 promo.factor），
-* 其余字段原样保留；不在促销期（过期/未开始/factor 非法）原样返回。
-* 幂等由调用方保证——计价与费率表显示各自只折一次，勿对已折价副本重复应用。
-* @param entry - 目录条目（price 保持刊例价口径）。
-* @param nowMs - 判定时刻（epoch ms）。
-*/
-function applyPromo(entry, nowMs) {
-	const { promo } = entry;
-	if (promo === void 0 || !isPromoActive(promo, nowMs)) return entry;
-	const factorOf = (field) => promo.factors?.[field] ?? promo.factor;
-	const scaled = (band) => ({
-		input: band.input * factorOf("input"),
-		cacheHit: band.cacheHit * factorOf("cacheHit"),
-		...band.cacheMiss !== void 0 ? { cacheMiss: band.cacheMiss * factorOf("cacheMiss") } : {},
-		output: band.output * factorOf("output")
-	});
-	return {
-		...entry,
+			currency: "CNY",
+			input: 8,
+			cacheHit: 1,
+			output: 58
+		}
+	},
+	{
+		key: "doubao-seed-2.0-code",
+		name: "Doubao Seed-2.0 Code",
+		provider: "字节豆包",
+		colorVar: "ds-red",
 		price: {
-			...scaled(entry.price),
-			currency: entry.price.currency,
-			...entry.price.offPeak !== void 0 ? { offPeak: scaled(entry.price.offPeak) } : {}
+			currency: "CNY",
+			input: 3.2,
+			cacheHit: .64,
+			output: 16
 		}
-	};
-}
-/**
-* Price one band's token usage in CNY. The stats `input` field is the TOTAL
-* prompt tokens (cacheHit + cacheMiss), so billing splits it: the cache-hit
-* share prices at the hit rate and the remaining share at the miss rate.
-* Providers that report only disjoint buckets carry `cacheMiss` explicitly;
-* otherwise the miss share is derived as `input - cacheHit`. Only USD-priced
-* bands go through the exchange rate.
-*/
-function priceBandCost(band, buckets, currency) {
-	const miss = buckets.cacheMiss > 0 ? buckets.cacheMiss : Math.max(0, buckets.input - buckets.cacheHit);
-	const hit = Math.min(buckets.cacheHit, buckets.input);
-	const raw = (miss * (band.cacheMiss ?? band.input) + hit * band.cacheHit + buckets.output * band.output) / 1e6;
-	return currency === "USD" ? raw * currentRate() : raw;
-}
-/**
-* Estimate the CNY cost of one model's token usage, mixing the peak and
-* off-peak bands by the given peak share (flat-priced models cost the same in
-* both bands).
-*
-* 计费维度是「缓存命中价 × 时段价」的交叉：每个时段档内部分别按缓存命中
-* 价（cacheHit）与未命中价（input/cacheMiss）计价，两个时段档再按
-* peakShare 混合。时段定义以北京时间为准（如 DeepSeek V4 高峰
-* 09:00-12:00 / 14:00-18:00）。因聚合只有按日 token 量、没有请求级时间戳，
-* 时段只能按比例估算，而非逐请求判定。
-* @param entry - the catalog entry whose prices apply.
-* @param buckets - token usage counts.
-* @param peakShare - share of traffic in the peak band (0..1); defaults to {@link DEFAULT_PEAK_SHARE}.
-* @returns the estimated cost in CNY.
-*/
-function computeCost(entry, buckets, peakShare = DEFAULT_PEAK_SHARE, nowMs = Date.now()) {
-	const priced = applyPromo(entry, nowMs);
-	const peak = priceBandCost(priced.price, buckets, priced.price.currency);
-	const off = priced.price.offPeak === void 0 ? peak : priceBandCost(priced.price.offPeak, buckets, priced.price.currency);
-	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 计价模型已按当前汇率折算）。
-*/
-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);
-	const legacy = timeMs < PEAK_ERA_START_MS && entry.userPriced !== true ? LEGACY_DEEPSEEK_BANDS[entry.key] : void 0;
-	if (legacy !== void 0) return priceBandCost(legacy, buckets, "CNY");
-	const repriced = timeMs < FLASH_REPRICE_MS && entry.userPriced !== true ? FLASH_REPRICED_OFFPEAK[entry.key] : void 0;
-	if (repriced !== void 0) return priceBandCost((timeMs < WEEKEND_OFFPEAK_START_MS ? tariffV1At(timeMs) : tierAt(timeMs)) === "peak" ? {
-		input: repriced.input * 2,
-		cacheHit: repriced.cacheHit * 2,
-		output: repriced.output * 2
-	} : repriced, buckets, "CNY");
-	if (priced.price.offPeak === void 0) return priceBandCost(priced.price, buckets, priced.price.currency);
-	return priceBandCost((timeMs < WEEKEND_OFFPEAK_START_MS ? tariffV1At(timeMs) : tierAt(timeMs)) === "peak" ? priced.price : priced.price.offPeak, buckets, priced.price.currency);
-}
+	},
+	{
+		key: "doubao-seed-2.0-lite",
+		name: "Doubao Seed-2.0 Lite",
+		provider: "字节豆包",
+		colorVar: "dsw-static-red-300",
+		price: {
+			currency: "CNY",
+			input: .6,
+			cacheHit: .12,
+			output: 3.6
+		}
+	},
+	{
+		key: "other",
+		name: "其他模型",
+		provider: "Custom",
+		colorVar: "dsw-static-neutral-bluish-500",
+		price: {
+			currency: "CNY",
+			input: 0,
+			cacheHit: 0,
+			cacheMiss: 0,
+			output: 0
+		}
+	}
+];
 /**
-* Format an amount with adaptive precision and the given currency symbol.
-* @param amount - the amount (CNY by default; pass `usd` for dollar display).
-* @param currency - display currency; default `cny`.
+* 真实 provider model id → 计费目录键（`MODEL_CATALOG[].key`）的映射。未知 id
+* 原样保留并落回 `other`（未知模型不估算费用）。聚合层（aggregate.ts）在折叠时
+* 用同一张表把日志里的 model id 归并为目录键，客户端渲染（`modelOf`）也按它
+* 解析，两侧共用一份映射，避免同一模型两侧不一致导致「未收录」。
 */
-function formatMoney(amount, currency = "cny") {
-	const value = Number(amount);
-	if (!Number.isFinite(value)) return currency === "cny" ? "¥0" : "$0";
-	const symbol = currency === "cny" ? "¥" : "$";
-	if (value <= 0) return `${symbol}0`;
-	if (value >= 1e3) return `${symbol}${value.toFixed(0)}`;
-	if (value >= 10) return `${symbol}${value.toFixed(1)}`;
-	if (value >= .1) return `${symbol}${value.toFixed(2)}`;
-	return `${symbol}${value.toFixed(3)}`;
-}
-/** Format a large token count with B/M/K suffix. */
-function formatTokens(value) {
-	if (value >= 1e9) return `${(value / 1e9).toFixed(2)}B`;
-	if (value >= 1e6) return `${(value / 1e6).toFixed(1)}M`;
-	if (value >= 1e3) return `${(value / 1e3).toFixed(0)}K`;
-	return String(value);
-}
+const BUILTIN_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-flash": "flash",
+	"deepseek-v4-pro": "pro",
+	"glm-5.2": "glm",
+	"glm-4.5-air": "glm-4.5-air",
+	"glm-4.5air": "glm-4.5-air",
+	"glm-4.7": "glm-4.7",
+	"glm-5-turbo": "glm-5-turbo",
+	"glm-5.1": "glm-5.1",
+	"glm-5.3-flash": "glm-5.3-flash",
+	"glm-5.3-flashx": "glm-5.3-flashx",
+	"glm-5.3-flash-x": "glm-5.3-flashx",
+	"glm-5v-turbo": "glm-5v-turbo",
+	"glm-5v.1": "glm-5v-turbo",
+	"claude-opus-4-6": "claude-opus-4-6",
+	"claude-opus-4.6": "claude-opus-4-6",
+	"claude-sonnet-4-6": "claude-sonnet-4-6",
+	"claude-sonnet-4.6": "claude-sonnet-4-6",
+	"claude-haiku-4-5": "claude-haiku-4-5",
+	"claude-haiku-4.5": "claude-haiku-4-5",
+	"claude-opus-5": "claude-opus-5",
+	"claude-sonnet-5": "claude-sonnet-5",
+	"mistral-large-2512": "mistral-large-2512",
+	"mistral-large-3": "mistral-large-2512",
+	"mistral-small-2603": "mistral-small-2603",
+	"mistral-small-4": "mistral-small-2603",
+	"ministral-8b-latest": "ministral-8b-latest",
+	"ministral-8b": "ministral-8b-latest",
+	"command-a-03-2025": "command-a-03-2025",
+	"command-a": "command-a-03-2025",
+	"command-r-08-2024": "command-r-08-2024",
+	"command-r": "command-r-08-2024",
+	"hy3": "hunyuan",
+	"hy4-preview": "hunyuan-hy4-preview",
+	"hy4": "hunyuan-hy4-preview",
+	"hunyuan-hy4-preview": "hunyuan-hy4-preview",
+	"hunyuan-hy4": "hunyuan-hy4-preview",
+	"longcat-2.0": "longcat-2.0",
+	"longcat-2": "longcat-2.0",
+	"minicpm-v-4.5": "minicpm-v-4.5",
+	"minicpm-v-4.5-thinking": "minicpm-v-4.5",
+	"ernie-4.5": "ernie-4.5",
+	"ernie-4.5-300b": "ernie-4.5",
+	"dots-3-note-preview": "dots-3-note-preview",
+	"dots-3-note": "dots-3-note-preview",
+	"dots3-note-preview": "dots-3-note-preview",
+	"rednote-dots3": "dots-3-note-preview",
+	"doubao-seed-evolving": "doubao-seed-evolving",
+	"doubao-seed-evolve": "doubao-seed-evolving",
+	"doubao-seed-2.1-pro": "doubao-seed-2.1-pro",
+	"doubao-seed-2.1-pro-290000": "doubao-seed-2.1-pro",
+	"doubao-seed-2.1-turbo": "doubao-seed-2.1-turbo",
+	"doubao-seed-2-1-turbo": "doubao-seed-2.1-turbo",
+	"qwen3.8-max": "qwen-3.8-max",
+	"qwen3.8-flash": "qwen-3.8-flash",
+	"qwen3.7-max": "qwen-max",
+	"qwen3.6-max": "qwen3.6-max",
+	"qwen3.6-max-preview": "qwen3.6-max",
+	"qwen3-coder-plus": "qwen3-coder-plus",
+	"qwen3-coder": "qwen3-coder",
+	"qwen3-coder-480b": "qwen3-coder",
+	"glm-4.5-x": "glm-4.5-x",
+	"glm-4.5x": "glm-4.5-x",
+	"glm-5.2-fast": "glm-5.2-fast",
+	"glm-5.2f": "glm-5.2-fast",
+	"kimi-k3-fast": "kimi-k3-fast",
+	"kimi-k3f": "kimi-k3-fast",
+	"kimi-for-coding": "kimi-k2.8-preview",
+	"kimi-k2.7-code-fast": "kimi-k2.7-code-fast",
+	"kimi-k2.7-code-f": "kimi-k2.7-code-fast",
+	"kimi-k2.6-fast": "kimi-k2.6-fast",
+	"kimi-k2.6-turbo": "kimi-k2.6-turbo",
+	"kimi-k2-thinking-turbo": "kimi-k2-thinking-turbo",
+	"doubao-seed-2.0-code": "doubao-seed-2.0-code",
+	"doubao-seed-2-0-code": "doubao-seed-2.0-code",
+	"doubao-seed-2.0-lite": "doubao-seed-2.0-lite",
+	"doubao-seed-2-0-lite": "doubao-seed-2.0-lite",
+	"qwen-max": "qwen-max",
+	"hunyuan-t1": "hunyuan-t1",
+	"step-3.7-flash": "step",
+	"seed-2.0-mini": "doubao-mini",
+	"k3": "kimi-k3",
+	"kimi-k3": "kimi-k3",
+	"kimi-k2.8-preview": "kimi-k2.8-preview",
+	"kimi-k2.8": "kimi-k2.8-preview",
+	"kimi-k2-8-preview": "kimi-k2.8-preview",
+	"kimi-k2-8": "kimi-k2.8-preview",
+	"k2.8-preview": "kimi-k2.8-preview",
+	"k2.8": "kimi-k2.8-preview",
+	"minimax-m1": "minimax",
+	"minimax-m2": "minimax",
+	"minimax-m3": "minimax",
+	"minimax-m2.7": "minimax-m2.7",
+	"minimax-m2.7-highspeed": "minimax-m2.7-highspeed",
+	"minimax-m2.7-high-speed": "minimax-m2.7-highspeed",
+	"minimax-m2-7": "minimax-m2.7",
+	"minimax-m2-7-highspeed": "minimax-m2.7-highspeed",
+	"minimax-m2-7-high-speed": "minimax-m2.7-highspeed",
+	"gpt-6": "gpt-6-astra",
+	"gpt-6-astra": "gpt-6-astra"
+};
 //#endregion
 //#region lib/types/aggregate.js
 /**
@@ -4668,7 +4711,7 @@ const FIRST_PARTY_PRICE_SOURCES = new Set([
 */
 function buildExtraModels(data) {
 	if (data === null || typeof data !== "object") return [];
-	const catalogKeys = new Set([...MODEL_CATALOG.map((entry) => entry.key.toLowerCase()), ...Object.keys(MODEL_KEY_ALIASES).map((key) => MODEL_KEY_ALIASES[key]?.toLowerCase() ?? key.toLowerCase())]);
+	const catalogKeys = new Set([...BUILTIN_MODEL_CATALOG.map((entry) => entry.key.toLowerCase()), ...Object.keys(BUILTIN_MODEL_KEY_ALIASES).map((key) => BUILTIN_MODEL_KEY_ALIASES[key]?.toLowerCase() ?? key.toLowerCase())]);
 	const offers = /* @__PURE__ */ new Map();
 	const familyVendorVotes = /* @__PURE__ */ new Map();
 	for (const [providerId, providerDoc] of Object.entries(data)) {
@@ -4679,7 +4722,7 @@ function buildExtraModels(data) {
 		const providerName = providerDoc.name;
 		const providerDisplay = MODELS_DEV_PROVIDERS[providerKey] ?? (typeof providerName === "string" && providerName !== "" ? providerName : providerId);
 		for (const [modelId, modelDoc] of Object.entries(models)) {
-			const catalogKey = (MODEL_KEY_ALIASES[modelId] ?? modelId).toLowerCase();
+			const catalogKey = (BUILTIN_MODEL_KEY_ALIASES[modelId] ?? modelId).toLowerCase();
 			if (catalogKeys.has(catalogKey)) continue;
 			const key = catalogKey;
 			if (modelDoc === null || typeof modelDoc !== "object") continue;
@@ -6375,6 +6418,7 @@ function apply(ctx, config = {}) {
 		}).catch(() => {});
 	};
 	const workspaceTitleResolver = buildWorkspaceTitleResolver(ctx);
+	applyBuiltinCatalog(BUILTIN_MODEL_CATALOG, BUILTIN_MODEL_KEY_ALIASES);
 	applyUserModelAliases(config.modelKeyAliases);
 	const aggregator = createUsageAggregator(adaptSessionPersistence(ctx.sessionPersistence), {
 		...config.subscriptionProviders === void 0 ? {} : { subscriptionProviders: config.subscriptionProviders },
@@ -6651,6 +6695,17 @@ function apply(ctx, config = {}) {
 		live = await fetchLivePricing();
 		pricingSyncedAt = Date.now();
 		applyLivePricing(live);
+		pricingBodyCache = void 0;
+	};
+	let pricingBodyCache;
+	const pricingBody = () => {
+		if (pricingBodyCache === void 0) pricingBodyCache = JSON.stringify({
+			...live,
+			syncedAt: pricingSyncedAt,
+			catalog: BUILTIN_MODEL_CATALOG,
+			aliases: BUILTIN_MODEL_KEY_ALIASES
+		});
+		return pricingBodyCache;
 	};
 	pricingReady = refreshPricing();
 	ctx.effect(() => {
@@ -6667,10 +6722,7 @@ function apply(ctx, config = {}) {
 		handler: async (req, res) => {
 			if (!guardLoopback(req, res, trustedHosts)) return;
 			res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
-			res.end(JSON.stringify({
-				...live,
-				syncedAt: pricingSyncedAt
-			}));
+			res.end(pricingBody());
 		}
 	}), "usage-billing: pricing route");
 	ctx.effect(() => ctx.webServer.register({
@@ -6695,10 +6747,7 @@ function apply(ctx, config = {}) {
 			}
 			await refreshPricing();
 			res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
-			res.end(JSON.stringify({
-				...live,
-				syncedAt: pricingSyncedAt
-			}));
+			res.end(pricingBody());
 		}
 	}), "usage-billing: pricing refresh route");
 	let balanceCache = {