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

package/lib/index.js

@@ -5192,10 +5192,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 +5270,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 +5298,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 +5528,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 +5559,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 +5582,7 @@ async function collectZai(keys, config, timeoutMs) {
 	} catch (error) {
 		return {
 			provider: config.provider,
-			displayName: "Z.ai Coding Plan",
+			displayName,
 			status: statusOf$1(error),
 			windows: []
 		};
@@ -6516,6 +6569,10 @@ const SUBSCRIPTION_KEY_SOURCES = [
 	},
 	{
 		provider: "zai-coding-cn",
+		key: "zaiCnApiKey"
+	},
+	{
+		provider: "zai-coding",
 		key: "zaiApiKey"
 	},
 	{
@@ -6655,7 +6712,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 +6735,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 "";
 }

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.16",
   "keywords": [
     "deepseek-harness",
     "deepseek",