@kenz1117/dsh-ui-usage-billing 1.4.15 → 1.4.17

package/lib/index.js

@@ -431,6 +431,37 @@ function canonIndex() {
 	return map;
 }
 /**
+* models.dev 补充条目的索引（归一化键 / 精确键各一份）：补充列表可达数千条，
+* 聚合折叠每条事件都查一次（此前是逐元素跑正则归一化的线性扫描），索引把
+* 单次查询降到 O(1)。惰性构建，`applyLivePricing` 替换数组后按引用失效重建。
+*/
+let extraIndexSource;
+let extraCanonCache;
+let extraKeyCache;
+function buildExtraIndex() {
+	if (extraIndexSource === liveExtraModels) return;
+	const byCanon = /* @__PURE__ */ new Map();
+	const byKey = /* @__PURE__ */ new Map();
+	for (const item of liveExtraModels ?? []) {
+		if (!byKey.has(item.key)) byKey.set(item.key, item);
+		const canon = canonModelId(item.key);
+		if (canon !== "" && !byCanon.has(canon)) byCanon.set(canon, item);
+	}
+	extraIndexSource = liveExtraModels;
+	extraCanonCache = byCanon;
+	extraKeyCache = byKey;
+}
+/** 补充条目的归一化键索引（宽松匹配日志模型 id）。 */
+function extraModelByCanon() {
+	buildExtraIndex();
+	return extraCanonCache ?? /* @__PURE__ */ new Map();
+}
+/** 补充条目的精确键索引（目录键直查）。 */
+function extraModelByKey() {
+	buildExtraIndex();
+	return extraKeyCache ?? /* @__PURE__ */ new Map();
+}
+/**
 * 解析真实日志模型 id → 计费目录键。先精确别名映射（既有行为）；未命中时做
 * 归一化匹配（忽略大小写/分隔符/括号附注），命中内置目录 / 别名目标 / 兜底键 /
 * models.dev 补充键即返回其真实键；完全未知时保持原样（回退 other，不计费）。
@@ -477,7 +508,7 @@ function lookupCandidate(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;
+	return extraModelByCanon().get(canon)?.key;
 }
 function resolveCatalogKey(id) {
 	const exact = userModelAliases?.[id] ?? modelKeyAliases()[id] ?? id;
@@ -486,7 +517,7 @@ function resolveCatalogKey(id) {
 		if (canon !== "") {
 			const hit = canonIndex().get(canon);
 			if (hit !== void 0) return hit;
-			const extraHit = (liveExtraModels ?? []).find((item) => canonModelId(item.key) === canon);
+			const extraHit = extraModelByCanon().get(canon);
 			if (extraHit !== void 0) return extraHit.key;
 		}
 		for (const candidate of derivedKeyCandidates(id)) {
@@ -513,10 +544,11 @@ function livePriceOf(key) {
 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 extra = extraModelByKey().get(resolved);
+	const base = found ?? (extra !== void 0 ? extraEntryOf(extra) : modelCatalog().find((entry) => entry.key === "other") ?? UNSEEDED_OTHER);
 	const live = livePriceOf(resolved);
 	if (live === void 0) return base;
+	if (base.price.offPeak !== void 0) return base;
 	return {
 		...base,
 		price: {
@@ -549,7 +581,7 @@ function extraEntryOf(extra) {
 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;
+	if (extraModelByKey().has(resolved)) return true;
 	return FALLBACK_RATES.some((rate) => rate.key.toLowerCase() === resolved.toLowerCase());
 }
 /**
@@ -663,6 +695,11 @@ function computeCostAt(entry, buckets, timeMs, peakShare = DEFAULT_PEAK_SHARE) {
 		output: repriced.output * 2
 	} : repriced, buckets, "CNY");
 	if (priced.price.offPeak === void 0) return priceBandCost(priced.price, buckets, priced.price.currency);
+	if (entry.tierSemantics === "latency") {
+		const peak = priceBandCost(priced.price, buckets, priced.price.currency);
+		const off = priceBandCost(priced.price.offPeak, buckets, priced.price.currency);
+		return peak * peakShare + off * (1 - peakShare);
+	}
 	return priceBandCost((timeMs < WEEKEND_OFFPEAK_START_MS ? tariffV1At(timeMs) : tierAt(timeMs)) === "peak" ? priced.price : priced.price.offPeak, buckets, priced.price.currency);
 }
 /**
@@ -2334,6 +2371,30 @@ function siteBucketKey(ref) {
 	if (ref.kind === "direct") return `direct:${ref.provider}`;
 	return "unknown";
 }
+/**
+* 站点桶按范围求和（usage_stats 工具的 bySite/relay 口径）：bySite 全量累计；
+* relay 只计中转站桶（`site:<origin>` 键）——`direct:*` 与 `unknown` 不计入，
+* 否则 relay 总额与 all 相同，中转站费用被高估。
+*/
+function sumSiteBuckets(bySite, range) {
+	let cost = 0;
+	let calls = 0;
+	let input = 0;
+	let output = 0;
+	for (const [bucket, usage] of Object.entries(bySite)) {
+		if (range === "relay" && !bucket.startsWith("site:")) continue;
+		cost += usage.cost;
+		calls += usage.calls;
+		input += usage.input;
+		output += usage.output;
+	}
+	return {
+		cost,
+		calls,
+		input,
+		output
+	};
+}
 /** Zeroed usage accumulator. */
 function emptyUsage() {
 	return {
@@ -2358,8 +2419,11 @@ function emptyUsage() {
 * @param subscription - whether the call went through a subscription plan; such calls never cost money.
 * @param timeMs - the call's wall-clock time (epoch ms); drives peak/off-peak pricing.
 * @param official - whether the call went through the official DeepSeek channel (vs a third-party relay).
+* @param pricedCost - 调用方预算好的本次费用（同一条消息折叠进多个桶时计价结果相同，
+*   逐桶重算会让最热路径付出 N 倍常数）；提供时跳过内部的计价闸门与计算，
+*   调用方保证其已按 `!subscription && isPriced(key)` 判定。
 */
-function foldUsage(acc, usage, key, subscription, timeMs, official = false) {
+function foldUsage(acc, usage, key, subscription, timeMs, official = false, pricedCost) {
 	const cacheHit = usage.cacheReadTokens ?? 0;
 	const cacheMiss = usage.inputTokens + (usage.cacheWriteTokens ?? 0);
 	acc.calls += 1;
@@ -2370,6 +2434,11 @@ function foldUsage(acc, usage, key, subscription, timeMs, official = false) {
 	acc.cacheMiss += cacheMiss;
 	if ((usage.cacheWriteTokens ?? 0) > 0) acc.cacheWrite = (acc.cacheWrite ?? 0) + (usage.cacheWriteTokens ?? 0);
 	if (official) acc.officialCalls += 1;
+	if (pricedCost !== void 0) {
+		acc.cost += pricedCost;
+		if (official) acc.officialCost += pricedCost;
+		return;
+	}
 	if (!subscription && isPriced(key)) {
 		const thisCost = computeCostAt(modelOf(key), {
 			input: cacheHit + cacheMiss,
@@ -2925,14 +2994,22 @@ function foldInto(fold, machine, events, subscriptionProviders, officialProvider
 		}
 		const modelKey = key;
 		const day = dayStamp(event.time);
-		if (!subscription && !isPriced(modelKey)) fold.unpricedModels.add(modelKey);
-		foldUsage(fold.total, usage, modelKey, subscription, event.time, official);
-		foldUsage(usageCell(fold.byModel, modelKey), usage, modelKey, subscription, event.time, official);
-		foldUsage(usageCell(fold.byDay, day), usage, modelKey, subscription, event.time, official);
-		foldUsage(modelDayCell(fold.byDayModels, day, modelKey), usage, modelKey, subscription, event.time, official);
-		foldUsage(modelDaySiteCell(fold.byDayModelsSite, day, modelKey, siteBucket), usage, modelKey, subscription, event.time, official);
-		foldUsage(usageCell(fold.bySite, siteBucket), usage, modelKey, subscription, event.time, official);
-		foldUsage(usageCell(fold.byTier, tierAt(event.time)), usage, modelKey, subscription, event.time, official);
+		const priced = !subscription && isPriced(modelKey);
+		if (!subscription && !priced) fold.unpricedModels.add(modelKey);
+		const entry = priced ? modelOf(modelKey) : void 0;
+		const thisCost = entry === void 0 ? void 0 : computeCostAt(entry, {
+			input: (usage.cacheReadTokens ?? 0) + usage.inputTokens + (usage.cacheWriteTokens ?? 0),
+			cacheHit: usage.cacheReadTokens ?? 0,
+			cacheMiss: usage.inputTokens + (usage.cacheWriteTokens ?? 0),
+			output: usage.outputTokens
+		}, event.time);
+		foldUsage(fold.total, usage, modelKey, subscription, event.time, official, thisCost);
+		foldUsage(usageCell(fold.byModel, modelKey), usage, modelKey, subscription, event.time, official, thisCost);
+		foldUsage(usageCell(fold.byDay, day), usage, modelKey, subscription, event.time, official, thisCost);
+		foldUsage(modelDayCell(fold.byDayModels, day, modelKey), usage, modelKey, subscription, event.time, official, thisCost);
+		foldUsage(modelDaySiteCell(fold.byDayModelsSite, day, modelKey, siteBucket), usage, modelKey, subscription, event.time, official, thisCost);
+		foldUsage(usageCell(fold.bySite, siteBucket), usage, modelKey, subscription, event.time, official, thisCost);
+		foldUsage(usageCell(fold.byTier, tierAt(event.time)), usage, modelKey, subscription, event.time, official, thisCost);
 		if (subscription) fold.planCalls.set(modelKey, (fold.planCalls.get(modelKey) ?? 0) + 1);
 		const turn = event.data.turn ?? -1;
 		const state = turnState(turns, turn);
@@ -2941,23 +3018,16 @@ function foldInto(fold, machine, events, subscriptionProviders, officialProvider
 		state.output += usage.outputTokens;
 		state.cacheHit += usage.cacheReadTokens ?? 0;
 		state.cacheMiss += usage.inputTokens + (usage.cacheWriteTokens ?? 0);
-		if (!subscription && isPriced(modelKey)) {
-			const buckets = {
-				input: (usage.cacheReadTokens ?? 0) + usage.inputTokens + (usage.cacheWriteTokens ?? 0),
-				cacheHit: usage.cacheReadTokens ?? 0,
-				cacheMiss: usage.inputTokens + (usage.cacheWriteTokens ?? 0),
-				output: usage.outputTokens
-			};
-			const fullCost = computeCostAt(modelOf(modelKey), buckets, event.time);
-			state.cost += fullCost;
-			const outputCost = computeCostAt(modelOf(modelKey), {
+		if (thisCost !== void 0 && entry !== void 0) {
+			state.cost += thisCost;
+			const outputCost = computeCostAt(entry, {
 				input: 0,
 				cacheHit: 0,
 				cacheMiss: 0,
 				output: usage.outputTokens
 			}, event.time);
 			fold.roles.outputCost += outputCost;
-			fold.roles.inputCost += fullCost - outputCost;
+			fold.roles.inputCost += thisCost - outputCost;
 		}
 		if (state.startedAt === Number.MAX_SAFE_INTEGER) state.startedAt = event.time;
 		const stepNum = event.data.step;
@@ -4206,7 +4276,7 @@ async function queryTencentTokenPlan(ctx, apiKeyEnv) {
 	if (credential === void 0) return {
 		provider,
 		displayName: provider,
-		error: "unauthorized"
+		error: "unconfigured"
 	};
 	const doRequest = async () => {
 		const teamId = firstEnabledTeamId(await callTokenHub(credential.secretId, credential.secretKey, "DescribeTokenPlanList", {}));
@@ -4954,12 +5024,7 @@ async function fetchRateFrom(sources) {
 	}
 }
 async function fetchRate() {
-	for (const source of RATE_SOURCES) {
-		const text = await fetchText(source.url);
-		if (text === null) continue;
-		const value = source.parse(text);
-		if (value !== void 0 && Number.isFinite(value) && value > 0) return value;
-	}
+	return fetchRateFrom(RATE_SOURCES);
 }
 /** OpenRouter model rows with usable USD unit prices, or undefined on failure. */
 async function fetchRouterModels() {
@@ -4986,13 +5051,15 @@ async function fetchRouterModels() {
 	}
 	return models;
 }
-/** Match one catalog key's candidates: exact id first, then a single strong substring hit. */
+/** Match one catalog key's candidates: exact id first, then per-hint unique strong substring. */
 function matchRouterModel(hints, models) {
 	const exact = models.find((model) => hints.some((hint) => model.id === hint));
 	if (exact !== void 0) return exact;
-	const strong = models.filter((model) => hints.some((hint) => hint.length >= 8 && model.id.includes(hint)));
-	if (strong.length !== 1) return void 0;
-	return strong[0];
+	for (const hint of hints) {
+		if (hint.length < 8) continue;
+		const strong = models.filter((model) => model.id.includes(hint));
+		if (strong.length === 1) return strong[0];
+	}
 }
 /** Map router matches onto catalog keys; undefined when nothing matched. */
 function buildPrices(models) {
@@ -5192,10 +5259,38 @@ const subscriptionGate = createCooldownGate({
 	failures: 3,
 	cooldownMs: 6e4
 });
+/**
+* 解析 OpenCode 客户端凭据文档（~/.local/share/opencode/auth.json）里的
+* OpenCode Go token。两种形态都收：
+* - 平铺：`{"token": "..."}` / `{"key": "..."}` / `{"apiKey": "..."}` / 裸字符串；
+* - 按 provider 分桶（实测形态）：`{"opencode-go": {"type": "api", "key": "..."}}`，
+*   桶序 opencode-go → opencode → zen 即优先序。
+* 识别不出返回空串，绝不抛错——这只是一次便利回退。
+*/
+function parseOpenCodeAuthDocument(document) {
+	if (typeof document === "string" && document.trim() !== "") return document.trim();
+	if (document === null || typeof document !== "object") return "";
+	const record = document;
+	const topToken = record["token"] ?? record["key"] ?? record["apiKey"];
+	if (typeof topToken === "string" && topToken !== "") return topToken;
+	for (const bucket of [
+		"opencode-go",
+		"opencode",
+		"zen"
+	]) {
+		const entry = record[bucket];
+		if (entry === null || typeof entry !== "object") continue;
+		const entryRecord = entry;
+		const bucketToken = entryRecord["key"] ?? entryRecord["token"] ?? entryRecord["apiKey"];
+		if (typeof bucketToken === "string" && bucketToken !== "") return bucketToken;
+	}
+	return "";
+}
 /** 空凭据：全部未配置时的初始值。 */
 const EMPTY_SUBSCRIPTION_KEYS = {
 	kimiApiKey: "",
 	zaiApiKey: "",
+	zaiCnApiKey: "",
 	opencodeApiKey: "",
 	minmaxApiKey: "",
 	openrouterApiKey: "",
@@ -5242,6 +5337,7 @@ function isSubscriptionProviderId(providerId) {
 const SUBSCRIPTION_ADAPTERS = {
 	"kimi-coding": { collect: collectKimi },
 	"zai-coding-cn": { collect: collectZai },
+	"zai-coding": { collect: collectZai },
 	"opencode": { collect: collectOpenCodeGo },
 	"opencode-go": { collect: collectOpenCodeGo },
 	"minimax": { collect: collectMiniMax },
@@ -5269,7 +5365,8 @@ function identifySubscriptionPlans(providers) {
 			provider: id,
 			displayName: SUBSCRIPTION_DISPLAY_NAMES[id] ?? id,
 			adapter: ADAPTER_PROVIDER_IDS.has(id),
-			...id === "zai-coding-cn" ? { region: "bigmodel-cn" } : {}
+			...id === "zai-coding-cn" ? { region: "bigmodel-cn" } : {},
+			...id === "zai-coding" ? { region: "global" } : {}
 		});
 	}
 	return out;
@@ -5498,13 +5595,28 @@ function parseZai(quotaBody, subscriptionBody) {
 		].filter((hit) => hit !== null)
 	};
 }
+/**
+* Z.ai 用 HTTP 200 包裹业务错误（实测假 key 回 `{"code":401,"msg":...,"success":false}`），
+* 只看 HTTP 层会把鉴权失败误报成 invalid-response。这里识别信封错误并归类；
+* 非 success=false 的信封（含缺字段的旧形态）交回常规解析。
+*/
+function zaiEnvelopeStatus(body) {
+	if (body === null || typeof body !== "object") return void 0;
+	const record = body;
+	if (record["success"] !== false) return void 0;
+	const code = numberOrNull$1(record["code"]);
+	if (code === 401 || code === 403) return "unauthorized";
+	if (code === 429) return "rate-limited";
+}
 /** Collect the Z.ai Coding Plan quota. */
 async function collectZai(keys, config, timeoutMs) {
-	const apiKey = keys.zaiApiKey.trim();
-	const host = (config.region ?? keys.zaiRegion ?? "global") === "bigmodel-cn" ? "https://open.bigmodel.cn" : "https://api.z.ai";
+	const region = config.region ?? keys.zaiRegion ?? "global";
+	const apiKey = (region === "bigmodel-cn" ? keys.zaiCnApiKey : keys.zaiApiKey).trim();
+	const host = region === "bigmodel-cn" ? "https://open.bigmodel.cn" : "https://api.z.ai";
+	const displayName = region === "bigmodel-cn" ? "Z.ai Coding Plan（国内）" : "Z.ai Coding Plan";
 	if (apiKey === "") return {
 		provider: config.provider,
-		displayName: "Z.ai Coding Plan",
+		displayName,
 		status: "not-configured",
 		windows: []
 	};
@@ -5514,14 +5626,22 @@ async function collectZai(keys, config, timeoutMs) {
 			accept: "application/json"
 		} };
 		const quota = await requestJson(`${host}/api/monitor/usage/quota/limit`, init, timeoutMs);
+		const envelope = zaiEnvelopeStatus(quota);
+		if (envelope !== void 0) return {
+			provider: config.provider,
+			displayName,
+			status: envelope,
+			windows: []
+		};
 		let subscription = null;
 		try {
 			subscription = await requestJson(`${host}/api/biz/subscription/list`, init, timeoutMs);
+			if (zaiEnvelopeStatus(subscription) !== void 0) subscription = null;
 		} catch {}
 		const parsed = parseZai(quota, subscription);
 		return {
 			provider: config.provider,
-			displayName: "Z.ai Coding Plan",
+			displayName,
 			plan: parsed.plan,
 			status: parsed.windows.length > 0 ? "ok" : "invalid-response",
 			windows: parsed.windows
@@ -5529,7 +5649,7 @@ async function collectZai(keys, config, timeoutMs) {
 	} catch (error) {
 		return {
 			provider: config.provider,
-			displayName: "Z.ai Coding Plan",
+			displayName,
 			status: statusOf$1(error),
 			windows: []
 		};
@@ -6325,22 +6445,35 @@ function isLoopbackPeer(req) {
 *  拒绝 `127.0.0.1.attacker.com` 这类以 `127.` 开头但解析到外部的 DNS rebinding 域名：
 *  只用 `startsWith('127.')` 会被它穿透，必须精确匹配回环 IP 的字面量。 */
 /**
-* 信任主机名归一化：去空白、去端口、转小写，丢弃空项。与请求侧
-* `host.split(':')[0].toLowerCase()` 同口径，因此匹配忽略大小写与端口。
+* Host 头/名单条目的主机名部分：IPv6 字面量带方括号（`[::1]:3080`），整体去括号；
+* 裸 IPv6（多个冒号、无方括号）整体是字面量；其余按首个冒号去端口。统一小写。
+* （此前一律 `split(':')[0]`：`[::1]:3080` 截成 `[`，IPv6 回环请求被误拒，
+* trustedHosts 也配不进去——fail-closed 无安全暴露，但本机 IPv6 场景功能失效。）
+*/
+function hostNameOf(host) {
+	const trimmed = host.trim();
+	const bracket = /^\[([0-9a-fA-F:]+)\](?::\d+)?$/.exec(trimmed);
+	if (bracket !== null) return (bracket[1] ?? "").toLowerCase();
+	if ((trimmed.match(/:/g) ?? []).length > 1) return trimmed.toLowerCase();
+	return trimmed.split(":")[0]?.toLowerCase() ?? "";
+}
+/**
+* 信任主机名归一化：去空白、去端口、转小写，丢弃空项（IPv6 经 {@link hostNameOf}
+* 去方括号）。与请求侧 Host 头解析同口径，因此匹配忽略大小写与端口。
 * @param hosts - 配置里的原始名单。
 * @returns 归一化后的主机名集合（空集 = 与历史版本行为一致）。
 */
 function normalizeTrustedHosts(hosts) {
 	if (hosts === void 0) return /* @__PURE__ */ new Set();
-	const names = hosts.filter((host) => typeof host === "string").map((host) => host.trim().split(":")[0]?.toLowerCase() ?? "").filter((host) => host !== "");
+	const names = hosts.filter((host) => typeof host === "string").map((host) => hostNameOf(host)).filter((host) => host !== "");
 	return new Set(names);
 }
 function isLoopbackHost(req, trustedHosts = /* @__PURE__ */ new Set()) {
 	const host = req.headers.host;
 	if (host === void 0 || host === "") return true;
-	const name = host.split(":")[0];
-	if (name === "localhost" || name === "::1" || name !== void 0 && /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(name)) return true;
-	return name !== void 0 && trustedHosts.has(name.toLowerCase());
+	const name = hostNameOf(host);
+	if (name === "localhost" || name === "::1" || /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(name)) return true;
+	return name !== "" && trustedHosts.has(name);
 }
 /** 校验 Origin 头是否回环（写操作用，防止跨站表单/fetch 改写设置）。Origin 缺失
 *  （curl 或同源 fetch 不带）视为放行，交给下方的 Content-Type 校验兜底；Origin 存在
@@ -6348,7 +6481,8 @@ function isLoopbackHost(req, trustedHosts = /* @__PURE__ */ new Set()) {
 function isLoopbackOrigin(origin) {
 	if (origin === void 0 || origin === "") return true;
 	try {
-		const host = new URL(origin).hostname;
+		const raw = new URL(origin).hostname;
+		const host = raw.startsWith("[") && raw.endsWith("]") ? raw.slice(1, -1) : raw;
 		return host === "localhost" || host === "::1" || /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(host);
 	} catch {
 		return false;
@@ -6516,6 +6650,10 @@ const SUBSCRIPTION_KEY_SOURCES = [
 	},
 	{
 		provider: "zai-coding-cn",
+		key: "zaiCnApiKey"
+	},
+	{
+		provider: "zai-coding",
 		key: "zaiApiKey"
 	},
 	{
@@ -6655,7 +6793,7 @@ async function resolveSubscriptionKeys(settings, credentials) {
 			if (resolved?.value !== void 0 && resolved.value !== "") keys[key] = resolved.value;
 		} catch {}
 	}
-	if (providers?.["zai-coding-cn"]?.apiKeyEnv !== void 0 && keys.zaiApiKey !== "") keys.zaiRegion = "bigmodel-cn";
+	if (providers?.["zai-coding-cn"]?.apiKeyEnv !== void 0 && keys.zaiCnApiKey !== "") keys.zaiRegion = "bigmodel-cn";
 	if (keys.opencodeApiKey === "") keys.opencodeApiKey = await readOpenCodeToken();
 	keys.anthropicApiKey = await readClaudeOAuthToken();
 	if (keys.anthropicApiKey !== "") {
@@ -6678,13 +6816,7 @@ async function resolveSubscriptionKeys(settings, credentials) {
 /** 读本机 OpenCode 客户端的凭据 token；取不到返回空串（安静退回）。 */
 async function readOpenCodeToken() {
 	try {
-		const auth = JSON.parse(await readFile(join(homedir(), ".local", "share", "opencode", "auth.json"), "utf8"));
-		if (typeof auth === "string" && auth !== "") return auth;
-		if (auth !== null && typeof auth === "object") {
-			const record = auth;
-			const token = record.token ?? record.key ?? record.apiKey;
-			if (typeof token === "string" && token !== "") return token;
-		}
+		return parseOpenCodeAuthDocument(JSON.parse(await readFile(join(homedir(), ".local", "share", "opencode", "auth.json"), "utf8")));
 	} catch {}
 	return "";
 }
@@ -6964,26 +7096,10 @@ function apply(ctx, config = {}) {
 						input: stats.total.input,
 						output: stats.total.output
 					};
-					if (args.range === "bySite" || args.range === "relay") {
-						const bySite = stats.bySite ?? {};
-						let cost = 0;
-						let calls = 0;
-						let input = 0;
-						let output = 0;
-						for (const usage of Object.values(bySite)) {
-							cost += usage.cost;
-							calls += usage.calls;
-							input += usage.input;
-							output += usage.output;
-						}
-						return {
-							range: args.range,
-							cost,
-							calls,
-							input,
-							output
-						};
-					}
+					if (args.range === "bySite" || args.range === "relay") return {
+						range: args.range,
+						...sumSiteBuckets(stats.bySite ?? {}, args.range)
+					};
 					if (args.range === "today") {
 						const day = stats.byDay[dayStamp(Date.now())];
 						return day === void 0 ? zero : {
@@ -7137,7 +7253,8 @@ function apply(ctx, config = {}) {
 				]) if (row.error === "unauthorized") warnAuthOnce("balance", row.provider, row.displayName);
 				const official = balances.find((row) => row.provider === "deepseek");
 				let reconcile;
-				if (official !== void 0 && official.totalBalance !== void 0) {
+				const reconcilable = official !== void 0 && official.totalBalance !== void 0 && (official.currency === void 0 || official.currency.toUpperCase() === "CNY");
+				if (official !== void 0 && reconcilable) {
 					const now = Date.now();
 					const today = dayStamp(now);
 					let todayOfficialCost = 0;
@@ -7145,12 +7262,14 @@ function apply(ctx, config = {}) {
 						todayOfficialCost = (await aggregator.aggregate()).byDay[today]?.officialCost ?? 0;
 					} catch {}
 					const result = reconcileBalanceDelta(reconcileRef, official, todayOfficialCost, today, now);
+					const refChanged = result.ref !== null && result.ref !== reconcileRef;
 					reconcileRef = result.ref;
 					if (result.event !== null && result.event.kind !== "flat") reconcile = {
 						...result.event,
-						provider: official.displayName
+						provider: official.displayName,
+						...official.currency === void 0 ? {} : { currency: official.currency }
 					};
-					if (result.ref !== null) persistReconcileRef();
+					if (refChanged) persistReconcileRef();
 				}
 				const doc = {
 					balances: [
@@ -7176,17 +7295,17 @@ function apply(ctx, config = {}) {
 		path: "/api/billing/usage-tool",
 		handler: async (req, res) => {
 			if (!guardLoopback(req, res, trustedHosts)) return;
+			if (req.method !== "GET" && req.method !== "POST") {
+				res.writeHead(405, { "content-type": "application/json; charset=utf-8" });
+				res.end(JSON.stringify({ error: "method not allowed" }));
+				return;
+			}
 			res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
 			const enabled = usageSettingsScope?.get().enableUsageStatsTool ?? false;
 			if (req.method === "GET") {
 				res.end(JSON.stringify({ enabled }));
 				return;
 			}
-			if (req.method !== "POST") {
-				res.writeHead(405, { "content-type": "application/json; charset=utf-8" });
-				res.end(JSON.stringify({ error: "method not allowed" }));
-				return;
-			}
 			if (!isLoopbackOrigin(req.headers.origin)) {
 				res.writeHead(403, { "content-type": "application/json; charset=utf-8" });
 				res.end(JSON.stringify({ error: "forbidden: loopback only" }));

package/lib/types/aggregate.d.ts

@@ -85,6 +85,22 @@ export declare function siteRefOf(provider: string, routes: Readonly<Record<stri
 }): SiteRef;
 /** 站点桶的稳定 key：`site:<origin>` 与 `direct:<provider>` 分开，`unknown` 单一桶。 */
 export declare function siteBucketKey(ref: SiteRef): string;
+/**
+ * 站点桶按范围求和（usage_stats 工具的 bySite/relay 口径）：bySite 全量累计；
+ * relay 只计中转站桶（`site:<origin>` 键）——`direct:*` 与 `unknown` 不计入，
+ * 否则 relay 总额与 all 相同，中转站费用被高估。
+ */
+export declare function sumSiteBuckets(bySite: Readonly<Record<string, {
+    cost: number;
+    calls: number;
+    input: number;
+    output: number;
+}>>, range: 'bySite' | 'relay'): {
+    cost: number;
+    calls: number;
+    input: number;
+    output: number;
+};
 /** Aggregation tuning options. */
 export interface AggregateOptions {
     /** 订阅制 provider id 列表；缺省按订阅卡同款 id 判定（`isSubscriptionProviderId`）。 */
@@ -155,8 +171,11 @@ export declare function emptyUsage(): ModelUsage;
  * @param subscription - whether the call went through a subscription plan; such calls never cost money.
  * @param timeMs - the call's wall-clock time (epoch ms); drives peak/off-peak pricing.
  * @param official - whether the call went through the official DeepSeek channel (vs a third-party relay).
+ * @param pricedCost - 调用方预算好的本次费用（同一条消息折叠进多个桶时计价结果相同，
+ *   逐桶重算会让最热路径付出 N 倍常数）；提供时跳过内部的计价闸门与计算，
+ *   调用方保证其已按 `!subscription && isPriced(key)` 判定。
  */
-export declare function foldUsage(acc: ModelUsage, usage: TokenUsage, key: string, subscription: boolean, timeMs: number, official?: boolean): void;
+export declare function foldUsage(acc: ModelUsage, usage: TokenUsage, key: string, subscription: boolean, timeMs: number, official?: boolean, pricedCost?: number): void;
 /**
  * 联网搜索辅助请求的单次费用估算默认值（人民币元）。DeepSeek 官方对搜索请求
  * （web_search 服务端工具注入上下文）照常计费，实测每次约 0.01~0.03 元，取中值；

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

@@ -478,6 +478,9 @@ export declare function formatUnitPrice(price: number, currency?: 'CNY' | 'USD'
  * @returns 换算到目标币种的单价；同币种或汇率不可用时原值。
  */
 export declare function convertUnitPrice(price: number, native: 'CNY' | 'USD', target: CostCurrency, rate: number): number;
+/** 本地时区日期戳 `YYYY-MM-DD`（与服务端 aggregate.ts 的 dayStamp 同口径）；
+ *  触发卡/热力图/Token 面板共用一个实现（此前三处各抄一份）。 */
+export declare function localDayStamp(time?: number): string;
 /** Format a large token count with B/M/K suffix. */
 export declare function formatTokens(value: number): string;
 /** Format a percentage. */

package/lib/types/index.d.ts

@@ -27,12 +27,9 @@ interface SettingsReader {
         value: unknown;
     }[];
 }
-/** 校验 Host 头是本机回环（精确 127.0.0.0/8 / ::1 / localhost 或空，供 curl 不带 Host 的极简请求）。
- *  拒绝 `127.0.0.1.attacker.com` 这类以 `127.` 开头但解析到外部的 DNS rebinding 域名：
- *  只用 `startsWith('127.')` 会被它穿透，必须精确匹配回环 IP 的字面量。 */
 /**
- * 信任主机名归一化：去空白、去端口、转小写，丢弃空项。与请求侧
- * `host.split(':')[0].toLowerCase()` 同口径，因此匹配忽略大小写与端口。
+ * 信任主机名归一化：去空白、去端口、转小写，丢弃空项（IPv6 经 {@link hostNameOf}
+ * 去方括号）。与请求侧 Host 头解析同口径，因此匹配忽略大小写与端口。
  * @param hosts - 配置里的原始名单。
  * @returns 归一化后的主机名集合（空集 = 与历史版本行为一致）。
  */

package/lib/types/reconcile.d.ts

@@ -31,6 +31,8 @@ export interface ReconcileEvent {
     kind: ReconcileKind;
     /** 余额提供商显示名（如 DeepSeek）；仅 `ok`/`drift`。 */
     provider?: string;
+    /** 余额币种（CNY / USD）；仅 `ok`/`drift` 且上游标注币种时携带，供界面标注金额单位。 */
+    currency?: string;
     /** 按余额差反推的当日消费（CNY/USD 按余额币种）；仅 `ok`/`drift`。 */
     spent?: number;
     /** 本地账本当日的官方渠道费用；仅 `ok`/`drift`。 */

package/lib/types/subscriptions.d.ts

@@ -16,8 +16,10 @@ import type { SubscriptionPlanConfig, SubscriptionQuota, SubscriptionWindow } fr
 export interface SubscriptionKeys {
     /** Kimi For Coding API key。 */
     kimiApiKey: string;
-    /** Z.ai API key。 */
+    /** Z.ai Coding Plan API key（国际域 api.z.ai）。 */
     zaiApiKey: string;
+    /** Z.ai（智谱国内域）Coding Plan API key——国内 / 国际是两个平台，key 不通用（不同于 MiniMax 的同 key 双域）。 */
+    zaiCnApiKey: string;
     /** OpenCode Go API key。 */
     opencodeApiKey: string;
     /** MiniMax Token Plan API key。 */
@@ -33,6 +35,15 @@ export interface SubscriptionKeys {
     /** Z.ai 区域（global / bigmodel-cn）。 */
     zaiRegion: 'global' | 'bigmodel-cn';
 }
+/**
+ * 解析 OpenCode 客户端凭据文档（~/.local/share/opencode/auth.json）里的
+ * OpenCode Go token。两种形态都收：
+ * - 平铺：`{"token": "..."}` / `{"key": "..."}` / `{"apiKey": "..."}` / 裸字符串；
+ * - 按 provider 分桶（实测形态）：`{"opencode-go": {"type": "api", "key": "..."}}`，
+ *   桶序 opencode-go → opencode → zen 即优先序。
+ * 识别不出返回空串，绝不抛错——这只是一次便利回退。
+ */
+export declare function parseOpenCodeAuthDocument(document: unknown): string;
 /** 空凭据：全部未配置时的初始值。 */
 export declare const EMPTY_SUBSCRIPTION_KEYS: SubscriptionKeys;
 /** 已识别的一个订阅套餐（用户在 llm-pi-ai 里配置了 key 的订阅类 provider）。 */
@@ -43,7 +54,7 @@ export interface IdentifiedSubscriptionPlan {
     displayName: string;
     /** 是否有额度查询适配器。 */
     adapter: boolean;
-    /** 适配器区域覆盖（zai-coding-cn → bigmodel-cn）。 */
+    /** 适配器区域覆盖：两个 Z.ai 路由各自固定区域，互不跟随 keys.zaiRegion。 */
     region?: 'global' | 'bigmodel-cn';
 }
 /** 是否是订阅类 provider id（如 kimi-coding、xiaomi-token-plan-cn）。 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-ui-usage-billing",
   "description": "Usage billing dashboard for DeepSeek Harness: sidebar cost metrics plus a full dashboard modal, priced from a current multi-provider catalog with real usage aggregated from session logs.",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "keywords": [
     "deepseek-harness",
     "deepseek",