@kenz1117/dsh-ui-usage-billing 1.3.0 → 1.4.0

package/lib/index.js

@@ -60,6 +60,7 @@ const PLAN_KNOWLEDGE = {
 	"kimi-coding": { type: "code" },
 	"zai-coding-cn": { type: "code" },
 	"zai-coding": { type: "code" },
+	"commandcode": { type: "code" },
 	"qwen-token-plan": { type: "code" },
 	"qwen-token-plan-cn": { type: "code" },
 	"xiaomi-token-plan-ams": { type: "code" },
@@ -4694,6 +4695,8 @@ const EMPTY_SUBSCRIPTION_KEYS = {
 	opencodeApiKey: "",
 	minmaxApiKey: "",
 	openrouterApiKey: "",
+	anthropicApiKey: "",
+	commandcodeApiKey: "",
 	tencentCloudApi: "",
 	zaiRegion: "global"
 };
@@ -4720,11 +4723,12 @@ const SUBSCRIPTION_DISPLAY_NAMES = {
 	"minimax-token-plan-cn": "MiniMax Token Plan（国内）",
 	"minimax-cn": "MiniMax Token Plan（国内）",
 	"openrouter": "OpenRouter",
+	"commandcode": "CommandCode",
 	"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|grok)", "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|commandcode)", "i");
 /** 是否是订阅类 provider id（如 kimi-coding、xiaomi-token-plan-cn）。 */
 function isSubscriptionProviderId(providerId) {
 	if (SUBSCRIPTION_ID_RE.test(providerId)) return true;
@@ -4741,6 +4745,8 @@ const SUBSCRIPTION_ADAPTERS = {
 	"minimax-token-plan": { collect: collectMiniMax },
 	"minimax-token-plan-cn": { collect: collectMiniMax },
 	"openrouter": { collect: collectOpenRouter },
+	"anthropic": { collect: collectAnthropic },
+	"commandcode": { collect: collectCommandCode },
 	"tencent-token-plan": { collect: collectTencentTokenPlan }
 };
 /** 有额度适配器的 provider id 集合（识别用）。 */
@@ -5237,6 +5243,131 @@ async function collectOpenRouter(keys, config, timeoutMs) {
 		};
 	}
 }
+/** Parse one Anthropic usage window (`utilization` is already 0–100). */
+function anthropicWindow(value, kind) {
+	if (value === null || typeof value !== "object") return null;
+	const record = value;
+	const utilization = numberOrNull$1(record.utilization ?? record.used_percentage);
+	if (utilization === null) return null;
+	const usedPercent = round1$1(clampPercent$1(utilization) ?? 0);
+	const resetsAt = toIso(record.resets_at ?? record.reset_at);
+	return {
+		kind,
+		usedPercent,
+		remainingPercent: round1$1(100 - usedPercent),
+		...resetsAt === null ? {} : { resetsAt }
+	};
+}
+/**
+* 解析 Anthropic OAuth 用量响应（GET https://api.anthropic.com/api/oauth/usage）。
+* 形如 `{ five_hour: { utilization, resets_at }, seven_day: {...}, seven_day_sonnet: {...} }`：
+* `utilization` 为 0–100 百分数，`resets_at` 为 unix 秒。子配额窗口
+* （`seven_day_sonnet` / `five_hour_opus` 等单模型系列限额）只描述一个模型分支，
+* 与主窗口量纲相同但口径更窄，整体丢弃，避免面板百分比被分支配额覆盖。
+* 导出供测试：纯函数。
+* @param body - 接口响应 JSON。
+* @returns 窗口列表（5 小时 → session、7 天 → weekly）；无可用窗口时为 []。
+*/
+function parseAnthropicUsage(body) {
+	const doc = body ?? {};
+	return [anthropicWindow(doc.five_hour, "session"), anthropicWindow(doc.seven_day, "weekly")].filter((hit) => hit !== null);
+}
+/** Collect the Claude Pro/Max subscription usage via the OAuth usage endpoint. */
+async function collectAnthropic(keys, config, timeoutMs) {
+	const token = keys.anthropicApiKey.trim();
+	const base = config.baseUrl ?? "https://api.anthropic.com";
+	const displayName = "Claude (Anthropic)";
+	if (token === "") return {
+		provider: config.provider,
+		displayName,
+		status: "not-configured",
+		windows: [],
+		hint: "需 Claude Code 登录态（~/.claude/.credentials.json 自动读取）或 OAuth token；普通 sk-ant- 按量 API key 查不了订阅用量"
+	};
+	try {
+		const windows = parseAnthropicUsage(await requestJson(`${base}/api/oauth/usage`, { headers: {
+			authorization: `Bearer ${token}`,
+			accept: "application/json"
+		} }, timeoutMs));
+		return {
+			provider: config.provider,
+			displayName,
+			status: windows.length > 0 ? "ok" : "invalid-response",
+			windows
+		};
+	} catch (error) {
+		return {
+			provider: config.provider,
+			displayName,
+			status: statusOf$1(error),
+			windows: []
+		};
+	}
+}
+/** Parse one CommandCode window row (`used/cap`, `resetAt` is epoch ms). */
+function commandcodeWindow(value, kind) {
+	if (value === null || typeof value !== "object") return null;
+	const record = value;
+	const used = numberOrNull$1(record.used);
+	const cap = numberOrNull$1(record.cap ?? record.limit ?? record.total);
+	if (used === null || cap === null || cap <= 0 || used < 0) return null;
+	const usedPercent = round1$1(clampPercent$1(used / cap * 100) ?? 0);
+	const resetsAt = toIso(record.resetAt ?? record.reset_at ?? record.resetsAt);
+	return {
+		kind,
+		usedPercent,
+		remainingPercent: round1$1(100 - usedPercent),
+		...resetsAt === null ? {} : { resetsAt }
+	};
+}
+/**
+* 解析 CommandCode（commandcode.ai）额度响应
+* （GET https://api.commandcode.ai/alpha/billing/credits）。形如
+* `{ windowLimits: { fiveHour: { used, cap, resetAt }, weekly: {...} }, credits: { monthlyCredits } }`：
+* 窗口按 used/cap 算已用%（resetAt 为 epoch 毫秒）；monthlyCredits 是月度
+* Credits 余额池（1 credit ≈ $1 用量），无总量字段、算不出百分比，不产出窗口。
+* 导出供测试：纯函数。
+* @param body - 接口响应 JSON。
+* @returns 窗口列表（5 小时 → session、周 → weekly）；无可用窗口时为 []。
+*/
+function parseCommandCodeCredits(body) {
+	const limits = (body ?? {}).windowLimits;
+	if (limits === null || typeof limits !== "object" || Array.isArray(limits)) return [];
+	const record = limits;
+	return [commandcodeWindow(record.fiveHour ?? record.five_hour, "session"), commandcodeWindow(record.weekly ?? record.week, "weekly")].filter((hit) => hit !== null);
+}
+/** Collect the CommandCode quota (5h/weekly windows + monthly credits). */
+async function collectCommandCode(keys, config, timeoutMs) {
+	const apiKey = keys.commandcodeApiKey.trim();
+	const base = config.baseUrl ?? "https://api.commandcode.ai";
+	const displayName = SUBSCRIPTION_DISPLAY_NAMES["commandcode"] ?? "CommandCode";
+	if (apiKey === "") return {
+		provider: config.provider,
+		displayName,
+		status: "not-configured",
+		windows: [],
+		hint: "需 commandcode.ai 的 API key（user_ 前缀）；可在 llm-pi-ai 给 commandcode 路由配 apiKeyEnv"
+	};
+	try {
+		const windows = parseCommandCodeCredits(await requestJson(`${base}/alpha/billing/credits`, { headers: {
+			authorization: `Bearer ${apiKey}`,
+			accept: "application/json"
+		} }, timeoutMs));
+		return {
+			provider: config.provider,
+			displayName,
+			status: windows.length > 0 ? "ok" : "invalid-response",
+			windows
+		};
+	} catch (error) {
+		return {
+			provider: config.provider,
+			displayName,
+			status: statusOf$1(error),
+			windows: []
+		};
+	}
+}
 /**
 * 腾讯云 Token Plan（TokenHub 管控面）订阅额度。凭据是云 API 密钥对
 * `<SecretId>:<SecretKey>`（与余额面板同源、同格式），链路与 balance.ts 的
@@ -5722,6 +5853,9 @@ const usageBillingSettingsNs = validateSettingsNamespace(BILLING_SETTINGS_NAMESP
 const UsageBillingSettingsSchema = z.object({ [ENABLE_USAGE_STATS_TOOL_FIELD]: z.boolean().default(false) });
 /** 实时定价的后台刷新间隔（毫秒）：汇率/模型价低频变化，6 小时一次足够。 */
 const PRICING_REFRESH_INTERVAL_MS = 360 * 60 * 1e3;
+/** 历史回放预热的延迟：等宿主启动高峰（插件加载 / 路由挂载）过去再全量折叠，
+*  避免抢启动期的 CPU；纯延迟不阻塞任何请求，面板提前打开也只会提前聚合。 */
+const WARMUP_DELAY_MS = 3e3;
 /** 订阅套餐额度缓存时长（毫秒）：上游配额 API 低频变化，5 分钟足够。 */
 const SUBSCRIPTION_CACHE_MS = 300 * 1e3;
 const BALANCE_CACHE_MS = 300 * 1e3;
@@ -5874,6 +6008,10 @@ const SUBSCRIPTION_KEY_SOURCES = [
 		provider: "openrouter",
 		key: "openrouterApiKey"
 	},
+	{
+		provider: "commandcode",
+		key: "commandcodeApiKey"
+	},
 	{
 		provider: "tencent-token-plan",
 		key: "tencentCloudApi"
@@ -5981,6 +6119,19 @@ async function resolveSubscriptionKeys(settings, credentials) {
 	}
 	if (providers?.["zai-coding-cn"]?.apiKeyEnv !== void 0 && keys.zaiApiKey !== "") keys.zaiRegion = "bigmodel-cn";
 	if (keys.opencodeApiKey === "") keys.opencodeApiKey = await readOpenCodeToken();
+	keys.anthropicApiKey = await readClaudeOAuthToken();
+	if (keys.anthropicApiKey !== "") {
+		const identified = identifySubscriptionPlans(providers);
+		if (!identified.some((plan) => plan.provider === "anthropic")) identified.push({
+			provider: "anthropic",
+			displayName: "Claude (Anthropic)",
+			adapter: true
+		});
+		return {
+			keys,
+			identified
+		};
+	}
 	return {
 		keys,
 		identified: identifySubscriptionPlans(providers)
@@ -6000,6 +6151,17 @@ async function readOpenCodeToken() {
 	return "";
 }
 /**
+* 从本机 Claude Code 登录态自动发现 Anthropic OAuth access token；取不到返回
+* 空串（安静退回）。与 OpenCode auth.json 兜底同款姿态：只是一次便利，绝不报错。
+*/
+async function readClaudeOAuthToken() {
+	try {
+		const token = JSON.parse(await readFile(join(homedir(), ".claude", ".credentials.json"), "utf8"))?.claudeAiOauth?.accessToken;
+		if (typeof token === "string" && token !== "") return token;
+	} catch {}
+	return "";
+}
+/**
 * 宿主 persistence 形状适配。宿主 0.1.3 起 SessionPersistence 改为
 * SessionHandle 模型（open(id,'read') 后经 handle.read(offset) 读，fork 边界
 * 挂在 handle.inheritedEventCount，list 返回 {header, revision} 快照行，
@@ -6080,6 +6242,16 @@ function apply(ctx, config = {}) {
 	ctx.effect(() => () => {
 		aggregator.flush();
 	}, "usage-billing: ledger flush on dispose");
+	const warmupTimer = setTimeout(() => {
+		aggregator.aggregate().then(() => {
+			console.info("[usage-billing] historical replay warmed up; ledger ready");
+		}).catch((error) => {
+			console.warn("[usage-billing] historical replay warmup failed; will fold on first dashboard request:", error);
+		});
+	}, WARMUP_DELAY_MS);
+	ctx.effect(() => () => {
+		clearTimeout(warmupTimer);
+	}, "usage-billing: historical replay warmup timer");
 	const candidates = [
 		config.statsPath,
 		process.env.DSH_USAGE_STATS,
@@ -6328,8 +6500,10 @@ function apply(ctx, config = {}) {
 		});
 	});
 	let live = { source: "builtin" };
+	let pricingSyncedAt = 0;
 	const refreshPricing = async () => {
 		live = await fetchLivePricing();
+		pricingSyncedAt = Date.now();
 		applyLivePricing(live);
 	};
 	refreshPricing();
@@ -6347,9 +6521,40 @@ function apply(ctx, config = {}) {
 		handler: async (req, res) => {
 			if (!guardLoopback(req, res)) return;
 			res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
-			res.end(JSON.stringify(live));
+			res.end(JSON.stringify({
+				...live,
+				syncedAt: pricingSyncedAt
+			}));
 		}
 	}), "usage-billing: pricing route");
+	ctx.effect(() => ctx.webServer.register({
+		kind: "exact",
+		path: "/api/billing/pricing/refresh",
+		handler: async (req, res) => {
+			if (!guardLoopback(req, res)) 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" }));
+				return;
+			}
+			if (!(req.headers["content-type"] ?? "").toLowerCase().includes("application/json")) {
+				res.writeHead(415, { "content-type": "application/json; charset=utf-8" });
+				res.end(JSON.stringify({ error: "unsupported content-type" }));
+				return;
+			}
+			await refreshPricing();
+			res.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+			res.end(JSON.stringify({
+				...live,
+				syncedAt: pricingSyncedAt
+			}));
+		}
+	}), "usage-billing: pricing refresh route");
 	let balanceCache = {
 		at: 0,
 		doc: { balances: [] }

package/lib/types/pricing-shared.d.ts

@@ -27,6 +27,8 @@ export interface LivePricing {
      * 内置目录未收录」的模型也能计价并出现在费率表。
      */
     extraModels?: readonly ExtraModelPrice[];
+    /** 上次价格目录同步完成的本机时间戳（毫秒）；0 = 尚未完成过任何一次同步。 */
+    syncedAt?: number;
 }
 /** models.dev 补充的目录外模型价（USD / 1M tokens）。 */
 export interface ExtraModelPrice {

package/lib/types/subscriptions.d.ts

@@ -24,6 +24,10 @@ export interface SubscriptionKeys {
     minmaxApiKey: string;
     /** OpenRouter API key（credits 已用%）。 */
     openrouterApiKey: string;
+    /** Anthropic Claude Pro/Max OAuth access token。 */
+    anthropicApiKey: string;
+    /** CommandCode API key（user_* 前缀）。 */
+    commandcodeApiKey: string;
     /** 腾讯云云 API 密钥对（`<SecretId>:<SecretKey>`，管控面用，非 TokenHub 推理 key）。 */
     tencentCloudApi: string;
     /** Z.ai 区域（global / bigmodel-cn）。 */
@@ -67,6 +71,28 @@ export declare function parseMiniMaxRemains(body: unknown): SubscriptionWindow[]
  * @returns 窗口列表;无有效额度时为 []。
  */
 export declare function parseOpenRouterCredits(body: unknown): SubscriptionWindow[];
+/**
+ * 解析 Anthropic OAuth 用量响应（GET https://api.anthropic.com/api/oauth/usage）。
+ * 形如 `{ five_hour: { utilization, resets_at }, seven_day: {...}, seven_day_sonnet: {...} }`：
+ * `utilization` 为 0–100 百分数，`resets_at` 为 unix 秒。子配额窗口
+ * （`seven_day_sonnet` / `five_hour_opus` 等单模型系列限额）只描述一个模型分支，
+ * 与主窗口量纲相同但口径更窄，整体丢弃，避免面板百分比被分支配额覆盖。
+ * 导出供测试：纯函数。
+ * @param body - 接口响应 JSON。
+ * @returns 窗口列表（5 小时 → session、7 天 → weekly）；无可用窗口时为 []。
+ */
+export declare function parseAnthropicUsage(body: unknown): SubscriptionWindow[];
+/**
+ * 解析 CommandCode（commandcode.ai）额度响应
+ * （GET https://api.commandcode.ai/alpha/billing/credits）。形如
+ * `{ windowLimits: { fiveHour: { used, cap, resetAt }, weekly: {...} }, credits: { monthlyCredits } }`：
+ * 窗口按 used/cap 算已用%（resetAt 为 epoch 毫秒）；monthlyCredits 是月度
+ * Credits 余额池（1 credit ≈ $1 用量），无总量字段、算不出百分比，不产出窗口。
+ * 导出供测试：纯函数。
+ * @param body - 接口响应 JSON。
+ * @returns 窗口列表（5 小时 → session、周 → weekly）；无可用窗口时为 []。
+ */
+export declare function parseCommandCodeCredits(body: unknown): SubscriptionWindow[];
 /**
  * Collect quota for the given plans concurrently (adapter-backed plans only;
  * identified plans without an adapter are surfaced by the caller as "no

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.3.0",
+  "version": "1.4.0",
   "keywords": [
     "deepseek-harness",
     "deepseek",