dsh-codearts 1.2.2 → 1.2.4

package/lib/index.d.mts

@@ -1296,12 +1296,40 @@ interface UsageTotals {
   promptTokens: number;
   completionTokens: number;
   totalTokens: number;
+  /**
+   * 命中上游 prompt 缓存的输入 token（OpenAI 兼容口径）。
+   *
+   * 上游若在 usage 帧里带 `prompt_tokens_details.cached_tokens`（也有平铺成
+   * `cached_tokens` / `cache_tokens` / `prompt_cache_hit_tokens` 的），这里才可能
+   * 是正数；不给就恒为 0。UI 据此决定显不显示「缓存」那一段 —— 不臆造。
+   * 它是 `promptTokens` 的**子集**，不是额外的输入量。
+   */
+  cachedTokens: number;
+  /**
+   * 其中属于「思考」的输出 token（OpenAI 兼容口径：`completion_tokens_details.reasoning_tokens`，
+   * 平铺成顶层 `reasoning_tokens` 的也认）。
+   *
+   * 推理模型（deepseek-v4.1-flash 这类）会把它单列出来，通常照样计费；不单独记就
+   * 只能看见一个偏大的「输出」。它是 `completionTokens` 的**子集**，不是额外的输出量。
+   * 上游不给就恒为 0。
+   */
+  reasoningTokens: number;
 }
 /** 上游 usage 帧里我们关心的字段。 */
 interface RawUsage {
   prompt_tokens?: unknown;
   completion_tokens?: unknown;
   total_tokens?: unknown;
+  /** OpenAI 兼容的嵌套写法：`prompt_tokens_details: { cached_tokens }`。 */
+  prompt_tokens_details?: unknown;
+  /** 平铺写法，几家兼容层各用各的名字，都认。 */
+  cached_tokens?: unknown;
+  cache_tokens?: unknown;
+  prompt_cache_hit_tokens?: unknown;
+  /** 推理模型的嵌套写法：`completion_tokens_details: { reasoning_tokens }`。 */
+  completion_tokens_details?: unknown;
+  /** 平铺的思考 token 别名。 */
+  reasoning_tokens?: unknown;
 }
 interface UsageSnapshot {
   /** 今天的合计。 */

package/lib/index.mjs

@@ -1,4 +1,4 @@
-import { A as CodeArtsCatalog, B as codeartsAccountsPath, C as isWelfareClaimedStatus, D as rateLimitFrame, E as prepareChatBody, F as isBenefitBlocked, H as startLogin, I as isBenefitModel, L as CodeArtsAccountStore, M as clearBenefitBlocked, N as creditRatioLabel, O as signedGet, P as filterEnabledModels, R as CodeArtsCredentialStore, S as isTpmLimit, T as pickDailyWelfareCampaign, V as codeartsAuthPath, _ as isIamTokenError, a as SNAP_HOST, b as isParamInvalidFrame, c as claimDailyWelfare, d as fetchCallerIdentity, f as fetchModels, g as isConcurrencyCap, h as firstFrameError, i as refreshCatalog, j as FALLBACK_CODEARTS_MODELS, k as upstreamErrorMessage, l as clearQueueStatus, m as fetchWelfareCampaigns, n as codeartsUsagePath, o as canonicalModel, p as fetchQueueStatus, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as degradeTokenCeiling, v as isModelNotAccessible, w as maxTokensCeilingFor, x as isQueueableRate, y as isNotMultimodal, z as MANUAL_ACCOUNT_ID } from "./usage-DztQaswb.mjs";
+import { A as upstreamErrorMessage, B as modelUnavailableReason, C as isWelfareClaimedStatus, D as prepareChatBody, E as pickDailyWelfareCampaign, F as filterEnabledModels, G as codeartsAuthPath, H as CodeArtsCredentialStore, I as forgetModelUnavailable, K as startLogin, L as isBenefitBlocked, M as FALLBACK_CODEARTS_MODELS, N as clearBenefitBlocked, O as rateLimitFrame, P as creditRatioLabel, R as isBenefitModel, S as isTpmLimit, T as modelUnavailableReasonText, U as MANUAL_ACCOUNT_ID, V as CodeArtsAccountStore, W as codeartsAccountsPath, _ as isIamTokenError, a as SNAP_HOST, b as isParamInvalidFrame, c as claimDailyWelfare, d as fetchCallerIdentity, f as fetchModels, g as isConcurrencyCap, h as firstFrameError, i as refreshCatalog, j as CodeArtsCatalog, k as signedGet, l as clearQueueStatus, m as fetchWelfareCampaigns, n as codeartsUsagePath, o as canonicalModel, p as fetchQueueStatus, r as discoverModels, s as chatStream, t as CodeArtsUsageTracker, u as degradeTokenCeiling, v as isModelNotAccessible, w as maxTokensCeilingFor, x as isQueueableRate, y as isNotMultimodal, z as markModelUnavailable } from "./usage-DGIuT79_.mjs";
 import { i as lazyApi, r as createProvider } from "./models-CgKCibpk.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomBytes, timingSafeEqual } from "node:crypto";
@@ -962,6 +962,13 @@ const recentShapes = [];
 function recentRequestShapes() {
 	return [...recentShapes].reverse();
 }
+const recentUsages = [];
+/** 探针只留最近 5 帧：够看形状，又不至于把内存堆成日志。 */
+const USAGE_PROBE_LIMIT = 5;
+/** 最近的 usage 原帧，最新在前。 */
+function recentUsageShapes() {
+	return [...recentUsages].reverse();
+}
 function noteRequestShape(raw, model) {
 	let parsed;
 	try {
@@ -1115,6 +1122,7 @@ function createCodeArtsShim(options) {
 					reader.releaseLock();
 					await result.stream.cancel().catch(() => {});
 					logger?.warn(`dsh-codearts: ${prepared.model} 首帧报上游错误（${detail.slice(0, 160)}）`);
+					if (isModelNotAccessible(detail)) markModelUnavailable(prepared.model, modelUnavailableReasonText(detail));
 					const kind = isIamTokenError(detail) ? "iam_stale" : isModelNotAccessible(detail) ? "not_found" : "client";
 					return {
 						prepared,
@@ -1405,7 +1413,16 @@ function createCodeArtsShim(options) {
 			if (payload === "" || payload === "[DONE]") continue;
 			try {
 				const parsed = JSON.parse(payload);
-				if (parsed.usage !== void 0 && parsed.usage !== null) usage.noteUsage(attribution.accountId, attribution.model, parsed.usage);
+				if (parsed.usage !== void 0 && parsed.usage !== null) {
+					usage.noteUsage(attribution.accountId, attribution.model, parsed.usage);
+					recentUsages.push({
+						at: Date.now(),
+						accountId: attribution.accountId,
+						model: attribution.model,
+						usage: parsed.usage
+					});
+					while (recentUsages.length > USAGE_PROBE_LIMIT) recentUsages.shift();
+				}
 			} catch {}
 		}
 	}
@@ -1437,6 +1454,13 @@ const CODEARTS_ACCOUNTS_PATH = "/api/codearts/accounts";
 const CODEARTS_CLAIM_PATH = "/api/codearts/claim";
 /** POST /api/codearts/refresh-models — 立刻重拉一次模型目录，并清掉「福利今日不可用」标记。 */
 const CODEARTS_REFRESH_MODELS_PATH = "/api/codearts/refresh-models";
+/**
+* POST /api/codearts/test-model — 用最小请求实测某个模型能不能调通。
+*
+* 存在理由：上游的模型清单会列出调不动的模型（`InferHub.ModelArts.81003.401`），
+* 刷新救不了；只有真发一次请求才知道。成功会清掉该模型的「异常」标记。
+*/
+const CODEARTS_TEST_MODEL_PATH = "/api/codearts/test-model";
 /** GET /api/codearts/queue — 上游排队位置（只在等开流期间有值，底部积分条旁边展示）。 */
 const CODEARTS_QUEUE_PATH = "/api/codearts/queue";
 /**
@@ -1463,6 +1487,7 @@ function selectionOf(models, enabled, writable) {
 			blocked: m.blocked,
 			ratio: m.ratio,
 			supportsImages: m.supportsImages,
+			...m.error === void 0 ? {} : { error: m.error },
 			enabled: restricted ? allowed.has(m.id) : true
 		})),
 		restricted,
@@ -1474,13 +1499,15 @@ function choicesOf(deps) {
 	return deps.models().map((m) => {
 		const benefit = isBenefitModel(m.id);
 		const ratio = creditRatioLabel(m.ratio, benefit);
+		const error = modelUnavailableReason(m.id);
 		return {
 			id: m.id,
 			name: m.name,
 			benefit,
 			blocked: isBenefitBlocked(m.id),
 			...ratio === void 0 ? {} : { ratio },
-			...m.supportsImages === true ? { supportsImages: true } : {}
+			...m.supportsImages === true ? { supportsImages: true } : {},
+			...error === void 0 ? {} : { error }
 		};
 	});
 }
@@ -1608,7 +1635,9 @@ function usageOf(deps) {
 		requests: 0,
 		promptTokens: 0,
 		completionTokens: 0,
-		totalTokens: 0
+		totalTokens: 0,
+		cachedTokens: 0,
+		reasoningTokens: 0
 	};
 	return {
 		today: snapshot?.today ?? noTotals,
@@ -1968,6 +1997,131 @@ function refreshModelsHandler(deps) {
 		}
 	};
 }
+/**
+* 逐账号发一次最小聊天，验证模型**真的能调用**（清单里有 ≠ 能调）。
+*
+* 只发一句 ping、max_tokens 16：目的是让上游过一遍权限与路由检查，不是拿内容。
+* 必须逐账号试 —— 池里的正常请求也是这么轮的；只测第一个号会把「这个号没权限」
+* 误报成「模型不可用」。
+*/
+async function probeModel(deps, id, signal) {
+	const ids = await deps.store.ids();
+	if (ids.length === 0) return {
+		ok: false,
+		message: "没有已登录的账号，请先在设置卡片登录。"
+	};
+	const raw = JSON.stringify({
+		model: id,
+		stream: true,
+		max_tokens: 16,
+		messages: [{
+			role: "user",
+			content: "ping"
+		}]
+	});
+	let last = "没有可用的账号";
+	for (const accountId of ids.slice(0, 3)) {
+		if (signal.aborted) break;
+		const credential = await deps.store.resolve(accountId);
+		if (credential === void 0) {
+			last = "凭据不可用，请重新登录";
+			continue;
+		}
+		const result = await chatStream(credential, prepareChatBody(raw), signal);
+		if (!result.ok) {
+			last = upstreamErrorMessage(result.message, result.status);
+			if (result.kind === "iam_stale") await deps.store.forceRefresh(accountId, credential.token).catch(() => void 0);
+			continue;
+		}
+		const reader = result.stream.getReader();
+		try {
+			for (let frame = 0; frame < 6; frame += 1) {
+				const next = await reader.read();
+				if (next.done) return {
+					ok: true,
+					message: "上游已响应",
+					accountId
+				};
+				const text = new TextDecoder().decode(next.value);
+				const error = firstFrameError(text);
+				if (error !== void 0) {
+					const detail = `${error.code}: ${error.message}`.replace(/^: /, "");
+					if (isModelNotAccessible(detail)) markModelUnavailable(id, modelUnavailableReasonText(detail));
+					return {
+						ok: false,
+						message: upstreamErrorMessage(detail),
+						accountId
+					};
+				}
+				if (text.includes("\"choices\"")) return {
+					ok: true,
+					message: "上游正常响应",
+					accountId
+				};
+			}
+			return {
+				ok: true,
+				message: "上游已开流",
+				accountId
+			};
+		} finally {
+			await reader.cancel().catch(() => void 0);
+		}
+	}
+	return {
+		ok: false,
+		message: last
+	};
+}
+/**
+* POST /api/codearts/test-model — 实测一个模型现在能不能调用。
+*
+* 成功会清掉它的「异常」标记（测试就是重新验证一次）；`81003.401` 会重新记上。
+* 失败也可能只是撞了并发上限/限流，所以除模型级错误外不动标记。
+*/
+function testModelHandler(deps) {
+	return async (req, res) => {
+		if (req.method !== "POST") {
+			json(res, 405, { error: "method not allowed" });
+			return;
+		}
+		if (!loopbackRequest(req)) {
+			json(res, 403, { error: "request-not-trusted" });
+			return;
+		}
+		let id = "";
+		try {
+			const body = JSON.parse(await readBody(req));
+			if (typeof body.id === "string") id = body.id.trim();
+		} catch {
+			json(res, 400, { error: "expected {\"id\": string}" });
+			return;
+		}
+		if (id === "") {
+			json(res, 400, { error: "expected {\"id\": string}" });
+			return;
+		}
+		if (!deps.models().some((model) => model.id === id)) {
+			json(res, 404, { error: `unknown model: ${id}` });
+			return;
+		}
+		const started = Date.now();
+		try {
+			const result = await probeModel(deps, id, AbortSignal.timeout(45e3));
+			if (result.ok) forgetModelUnavailable(id);
+			json(res, 200, {
+				...result,
+				ms: Date.now() - started
+			});
+		} catch (error) {
+			json(res, 200, {
+				ok: false,
+				message: safeMessage(error),
+				ms: Date.now() - started
+			});
+		}
+	};
+}
 /** GET /api/codearts/queue — 排队位置快照（无跟踪器/无排队时给空数组）。 */
 function queueHandler(deps) {
 	return async (req, res) => {
@@ -1993,7 +2147,10 @@ function debugHandler(deps) {
 			json(res, 403, { error: "request-not-trusted" });
 			return;
 		}
-		json(res, 200, { requests: deps.recentRequests?.() ?? [] });
+		json(res, 200, {
+			requests: deps.recentRequests?.() ?? [],
+			usages: deps.recentUsages?.() ?? []
+		});
 	};
 }
 /** Mount the status / models / token routes. */
@@ -2047,6 +2204,11 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 			path: CODEARTS_REFRESH_MODELS_PATH,
 			handler: refreshModelsHandler(deps)
 		});
+		const disposeTestModel = ctx.webServer.register({
+			kind: "exact",
+			path: CODEARTS_TEST_MODEL_PATH,
+			handler: testModelHandler(deps)
+		});
 		const disposeQueue = ctx.webServer.register({
 			kind: "exact",
 			path: CODEARTS_QUEUE_PATH,
@@ -2072,6 +2234,7 @@ function registerCodeArtsStatusRoute(ctx, deps) {
 			disposeAccounts();
 			disposeClaim();
 			disposeRefresh();
+			disposeTestModel();
 			disposeQueue();
 			disposeDock();
 			disposeDebug();
@@ -2339,6 +2502,7 @@ function apply(ctx, rawConfig) {
 		usage: () => usage.snapshot(),
 		queue: () => queue.snapshot(),
 		recentRequests: () => recentRequestShapes(),
+		recentUsages: () => recentUsageShapes(),
 		credits: (signal) => loadCredits(signal),
 		refreshCredits: (signal) => {
 			credits.invalidate();

package/lib/{usage-DztQaswb.mjs → usage-DGIuT79_.mjs}

@@ -207,6 +207,41 @@ function parseToken(json, dpopJWK, clientId, prev) {
 		dpopPrivateKey: dpopJWK
 	};
 }
+/**
+* 华为登录后浏览器落回本机回调的落地页。
+*
+* 这一页本身没有任何后续逻辑：`code` 在响应发出的同一时刻就已交给等待队列
+* （见 startLogin 里的 finish），token 交换完全在服务端做，页面关不关都不影响
+* 登录结果。它只是 redirect_uri 必然要渲染的一个落点 —— 华为侧没有「登录成功」
+* 页可停留，成功标志就是这一次 302 到 127.0.0.1。
+*
+* 卡片用 `window.open` 打开授权页，所以这个标签页能自己关掉；用户从卡片的
+* 手动链接打开、或浏览器拦脚本关窗时 close 会失败，1.2s 后把提示换成「可关闭」。
+*/
+const CALLBACK_HTML = `<!doctype html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<title>CodeArts 登录</title>
+<style>
+  html,body{height:100%}
+  body{margin:0;display:flex;align-items:center;justify-content:center;background:#fff;color:#1f2329;
+    font:15px/1.6 system-ui,-apple-system,"Segoe UI","PingFang SC","Microsoft YaHei",sans-serif}
+  p{margin:0;padding:24px;text-align:center}
+</style>
+</head>
+<body>
+<p id="msg">正在返回 DeepSeek Harness…</p>
+<script>
+  setTimeout(function () { try { window.close() } catch (e) {} }, 300)
+  setTimeout(function () {
+    var el = document.getElementById('msg')
+    if (el) el.textContent = 'CodeArts 登录成功，本页可关闭，请回到 DeepSeek Harness。'
+  }, 1200)
+<\/script>
+</body>
+</html>`;
 async function startLogin(cfg = defaultLoginConfig()) {
 	const ticketId = randomHex(16);
 	const { verifier, challenge, method } = pkce();
@@ -236,8 +271,11 @@ async function startLogin(cfg = defaultLoginConfig()) {
 			}
 			finish(code);
 			function finish(c) {
-				res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-				res.end("<h3>CodeArts 登录成功，可关闭此页面。</h3>");
+				res.writeHead(200, {
+					"Content-Type": "text/html; charset=utf-8",
+					"Cache-Control": "no-store"
+				});
+				res.end(CALLBACK_HTML);
 				if (c) for (const w of waiters.splice(0)) w(c);
 			}
 		});
@@ -1068,6 +1106,37 @@ function clearBenefitBlocked() {
 	benefitBlocked.clear();
 }
 /**
+* 今天被上游明确拒绝「模型不存在 / 本账号无权限」的模型（小写 id -> 原因）。
+*
+* 判据只有聊天回的 `InferHub.ModelArts.81003.401`。上游的模型发现**照样列出它**
+* （2026-11-02 实测 `deepseek-v4.1-flash` 两路都在清单里），所以刷新模型列表救不了 ——
+* 只能等上游修好，或第二天再看。这也是「刷新清单 ≠ 验证可调用」的落点。
+*
+* 与福利缺失标记同口径：**只标记，不替用户取消勾选**。多账号下这个错误只有在
+* 所有号都试过之后才会浮上来，所以按模型记全局（不按账号）。
+*/
+const unavailableModels = /* @__PURE__ */ new Map();
+/** 记一次「上游判定这个模型不可用」。 */
+function markModelUnavailable(id, reason) {
+	const key = id.trim().toLowerCase();
+	if (key !== "") unavailableModels.set(key, {
+		day: localDayKey(),
+		reason
+	});
+}
+/** 该模型今天是否已被上游判定不可用；是则返回原因（卡片悬浮显示）。 */
+function modelUnavailableReason(id) {
+	const key = id.trim().toLowerCase();
+	const entry = unavailableModels.get(key);
+	if (entry === void 0) return void 0;
+	if (entry.day === localDayKey()) return entry.reason;
+	unavailableModels.delete(key);
+}
+/** 单独清掉一个模型的不可用标记（手动测试成功后调）。 */
+function forgetModelUnavailable(id) {
+	unavailableModels.delete(id.trim().toLowerCase());
+}
+/**
 * 合并多路来源的模型清单（内置 / 限时福利 / agent-center）。
 *
 * 规则对齐 codearts2api 的 `MergeModels`：
@@ -1276,6 +1345,7 @@ var upstream_exports = /* @__PURE__ */ __exportAll({
 	isTpmLimit: () => isTpmLimit,
 	isWelfareClaimedStatus: () => isWelfareClaimedStatus,
 	maxTokensCeilingFor: () => maxTokensCeilingFor,
+	modelUnavailableReasonText: () => modelUnavailableReasonText,
 	pickDailyWelfareCampaign: () => pickDailyWelfareCampaign,
 	prepareChatBody: () => prepareChatBody,
 	rateLimitFrame: () => rateLimitFrame,
@@ -1671,6 +1741,12 @@ function isModelNotAccessible(message) {
 function isNotMultimodal(message) {
 	return message.includes("InferHub.001001020.406") || message.toLowerCase().includes("the request model is not multimodal");
 }
+/** 记进目录的原因文案（卡片「异常」Tag 的悬浮说明）。 */
+function modelUnavailableReasonText(detail) {
+	const trimmed = detail.trim();
+	const prefix = "上游判定该模型当前不可用（模型不存在或当前账号没有权限，换号也无效）";
+	return trimmed === "" ? prefix : `${prefix}：${trimmed}`;
+}
 /**
 * 从**首帧**（已转成 OpenAI 形状）里取出上游错误码与文本；没有错误返回 undefined。
 *
@@ -1815,6 +1891,7 @@ async function chatStream(credential, prepared, signal) {
 	if (!resp.ok) {
 		const text = await resp.text().catch(() => "");
 		if (isBenefitMissing("", text)) markBenefitBlocked(prepared.model);
+		if (isModelNotAccessible(text)) markModelUnavailable(prepared.model, modelUnavailableReasonText(text.slice(0, 200)));
 		return {
 			ok: false,
 			kind: classify(resp.status, text),
@@ -1874,6 +1951,8 @@ async function chatStream(credential, prepared, signal) {
 							}
 							if (ev.error_code && ev.error_code !== "0" && ev.error_code !== 0) {
 								if (isBenefitMissing(String(ev.error_code), String(ev.error_msg ?? ""))) markBenefitBlocked(model);
+								const errorDetail = `${String(ev.error_code)}: ${String(ev.error_msg ?? "upstream error")}`;
+								if (isModelNotAccessible(errorDetail)) markModelUnavailable(model, modelUnavailableReasonText(errorDetail));
 								controller.enqueue(openAIData({
 									choices: [{
 										delta: { content: "" },
@@ -2668,7 +2747,9 @@ function emptyTotals() {
 		requests: 0,
 		promptTokens: 0,
 		completionTokens: 0,
-		totalTokens: 0
+		totalTokens: 0,
+		cachedTokens: 0,
+		reasoningTokens: 0
 	};
 }
 function addTotals(into, add) {
@@ -2676,6 +2757,8 @@ function addTotals(into, add) {
 	into.promptTokens += add.promptTokens ?? 0;
 	into.completionTokens += add.completionTokens ?? 0;
 	into.totalTokens += add.totalTokens ?? 0;
+	into.cachedTokens += add.cachedTokens ?? 0;
+	into.reasoningTokens += add.reasoningTokens ?? 0;
 }
 function mergeTotals(into, from) {
 	addTotals(into, from);
@@ -2689,12 +2772,41 @@ function localDateKey(at = Date.now()) {
 function positiveInt(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
 }
-/** 从上游 usage 帧里取三个计数字段（缺哪个算 0，total 缺失时用 prompt+completion 兜底）。 */
+/**
+* 从上游 usage 帧里取缓存命中数。
+*
+* 位置见过两种：OpenAI 的 `prompt_tokens_details.cached_tokens`，以及兼容层直接
+* 平铺在顶层的几种别名。取第一个能读到的。缓存输入必然是输入的子集，所以比
+* `promptTokens` 还大的脏数据直接钳掉 —— 否则界面上会出现 >100% 的命中率。
+*/
+function cachedTokensOf(raw, promptTokens) {
+	if (promptTokens <= 0) return 0;
+	const cached = positiveInt(nestedField(raw.prompt_tokens_details, "cached_tokens") ?? raw.cached_tokens ?? raw.cache_tokens ?? raw.prompt_cache_hit_tokens);
+	return Math.min(cached, promptTokens);
+}
+/**
+* 从上游 usage 帧里取思考 token。
+*
+* 口径与 {@link cachedTokensOf} 对称：嵌套 `completion_tokens_details.reasoning_tokens`
+* 优先，顶层 `reasoning_tokens` 兜底，超过输出总量就钳掉（它含在输出里）。
+*/
+function reasoningTokensOf(raw, completionTokens) {
+	if (completionTokens <= 0) return 0;
+	const reasoning = positiveInt(nestedField(raw.completion_tokens_details, "reasoning_tokens") ?? raw.reasoning_tokens);
+	return Math.min(reasoning, completionTokens);
+}
+/** 读 `*_tokens_details` 这类嵌套对象里的一个字段；不是对象（或缺字段）给 undefined。 */
+function nestedField(details, key) {
+	return typeof details === "object" && details !== null ? details[key] : void 0;
+}
+/** 从上游 usage 帧里取计数（缺哪个算 0，total 缺失时用 prompt+completion 兜底）。 */
 function normalizeUsage(raw) {
 	if (raw === void 0) return {
 		promptTokens: 0,
 		completionTokens: 0,
-		totalTokens: 0
+		totalTokens: 0,
+		cachedTokens: 0,
+		reasoningTokens: 0
 	};
 	const promptTokens = positiveInt(raw.prompt_tokens);
 	const completionTokens = positiveInt(raw.completion_tokens);
@@ -2702,9 +2814,31 @@ function normalizeUsage(raw) {
 	return {
 		promptTokens,
 		completionTokens,
-		totalTokens: total > 0 ? total : promptTokens + completionTokens
+		totalTokens: total > 0 ? total : promptTokens + completionTokens,
+		cachedTokens: cachedTokensOf(raw, promptTokens),
+		reasoningTokens: reasoningTokensOf(raw, completionTokens)
+	};
+}
+/** 读一项累计值，缺字段（旧账本没有 cachedTokens / reasoningTokens）就按 0 补齐。 */
+function normalizeTotals(raw) {
+	return {
+		requests: positiveInt(raw?.requests),
+		promptTokens: positiveInt(raw?.promptTokens),
+		completionTokens: positiveInt(raw?.completionTokens),
+		totalTokens: positiveInt(raw?.totalTokens),
+		cachedTokens: positiveInt(raw?.cachedTokens),
+		reasoningTokens: positiveInt(raw?.reasoningTokens)
 	};
 }
+/** 整张「模型/账号 -> 累计」表补齐字段。 */
+function normalizeStore(store) {
+	const out = {};
+	for (const [key, totals] of Object.entries(store ?? {})) {
+		if (typeof totals !== "object" || totals === null) continue;
+		out[key] = normalizeTotals(totals);
+	}
+	return out;
+}
 /**
 * 用量账本。
 *
@@ -2743,8 +2877,8 @@ var CodeArtsUsageTracker = class {
 			if (parsed.version !== 1 || typeof parsed.days !== "object" || parsed.days === null) return;
 			for (const [date, day] of Object.entries(parsed.days)) {
 				if (typeof day !== "object" || day === null) continue;
-				const models = day.models ?? {};
-				const accounts = day.accounts ?? {};
+				const models = normalizeStore(day.models);
+				const accounts = normalizeStore(day.accounts);
 				this.days.set(date, {
 					models,
 					accounts
@@ -2864,4 +2998,4 @@ function sumOf(store) {
 	return out;
 }
 //#endregion
-export { CodeArtsCatalog as A, codeartsAccountsPath as B, isWelfareClaimedStatus as C, rateLimitFrame as D, prepareChatBody as E, isBenefitBlocked as F, startLogin as H, isBenefitModel as I, CodeArtsAccountStore as L, clearBenefitBlocked as M, creditRatioLabel as N, signedGet as O, filterEnabledModels as P, CodeArtsCredentialStore as R, isTpmLimit as S, pickDailyWelfareCampaign as T, codeartsAuthPath as V, isIamTokenError as _, SNAP_HOST as a, isParamInvalidFrame as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isConcurrencyCap as g, firstFrameError as h, refreshCatalog as i, FALLBACK_CODEARTS_MODELS as j, upstreamErrorMessage as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isModelNotAccessible as v, maxTokensCeilingFor as w, isQueueableRate as x, isNotMultimodal as y, MANUAL_ACCOUNT_ID as z };
+export { upstreamErrorMessage as A, modelUnavailableReason as B, isWelfareClaimedStatus as C, prepareChatBody as D, pickDailyWelfareCampaign as E, filterEnabledModels as F, codeartsAuthPath as G, CodeArtsCredentialStore as H, forgetModelUnavailable as I, startLogin as K, isBenefitBlocked as L, FALLBACK_CODEARTS_MODELS as M, clearBenefitBlocked as N, rateLimitFrame as O, creditRatioLabel as P, isBenefitModel as R, isTpmLimit as S, modelUnavailableReasonText as T, MANUAL_ACCOUNT_ID as U, CodeArtsAccountStore as V, codeartsAccountsPath as W, isIamTokenError as _, SNAP_HOST as a, isParamInvalidFrame as b, claimDailyWelfare as c, fetchCallerIdentity as d, fetchModels as f, isConcurrencyCap as g, firstFrameError as h, refreshCatalog as i, CodeArtsCatalog as j, signedGet as k, clearQueueStatus as l, fetchWelfareCampaigns as m, codeartsUsagePath as n, canonicalModel as o, fetchQueueStatus as p, discoverModels as r, chatStream as s, CodeArtsUsageTracker as t, degradeTokenCeiling as u, isModelNotAccessible as v, maxTokensCeilingFor as w, isQueueableRate as x, isNotMultimodal as y, markModelUnavailable as z };

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-codearts",
   "displayName": "DSH CodeArts Connect",
   "description": "把华为云 CodeArts 接入 DeepSeek Harness —— 内置 OAuth2 登录（PKCE + DPoP），登录后即可在 DSH 对话窗口使用 CodeArts 的模型。",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [