dsh-codearts 1.2.3 → 1.2.5

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 {
   /** 今天的合计。 */
@@ -1587,6 +1615,13 @@ interface Config {
   showCreditDock?: boolean;
   /** 等上游开流时那行「排队第 N 位」是否显示。缺省 = 显示。 */
   showQueueDock?: boolean;
+  /**
+   * 是否在 DSH 侧边栏的图标列里加一个 CodeArts 图标（点开在中间列显示整页版卡片）。
+   *
+   * 缺省 = **不显示**：图标列是全宿主共用的资源，每个插件都默认占一格很快就会挤满，
+   * 而「设置 → 插件」里本来就能看到同一张卡片，所以这一格交给用户自己决定要不要。
+   */
+  showSidebarPanel?: boolean;
 }
 declare const Config: z<Config>;
 declare function apply(ctx: Context, rawConfig: Config): void;

package/lib/index.mjs

@@ -1,4 +1,4 @@
-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-CzJjkqOp.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 {
@@ -1406,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 {}
 		}
 	}
@@ -1511,10 +1527,14 @@ function modelBadgesOf(models) {
 		};
 	});
 }
-/** 开关的默认值：没有 settings provider（或老配置没这两个键）时保持原有行为 —— 都显示。 */
+/**
+* 开关的默认值：没有 settings provider（或老配置没这两个键）时保持原有行为 ——
+* 底部两行都显示；侧边栏相反，缺省不开（那一格是所有插件共用的全局座位）。
+*/
 const DEFAULT_DOCK_FLAGS = {
 	credits: true,
-	queue: true
+	queue: true,
+	sidebar: false
 };
 /**
 * 把逐账号的领取结果汇总成一条：HTTP 层只看 ok，卡片看 results 逐号展示。
@@ -1619,7 +1639,9 @@ function usageOf(deps) {
 		requests: 0,
 		promptTokens: 0,
 		completionTokens: 0,
-		totalTokens: 0
+		totalTokens: 0,
+		cachedTokens: 0,
+		reasoningTokens: 0
 	};
 	return {
 		today: snapshot?.today ?? noTotals,
@@ -1743,9 +1765,13 @@ function dockHandler(deps) {
 			}
 			try {
 				const body = JSON.parse(await readBody(req));
-				const touched = ["credits", "queue"].filter((key) => body[key] !== void 0);
+				const touched = [
+					"credits",
+					"queue",
+					"sidebar"
+				].filter((key) => body[key] !== void 0);
 				if (touched.length === 0 || touched.some((key) => typeof body[key] !== "boolean")) {
-					json(res, 400, { error: "expected {\"credits\"?: boolean, \"queue\"?: boolean}" });
+					json(res, 400, { error: "expected {\"credits\"?: boolean, \"queue\"?: boolean, \"sidebar\"?: boolean}" });
 					return;
 				}
 				if (!await deps.setDock(Object.fromEntries(touched.map((key) => [key, body[key]])))) {
@@ -2129,7 +2155,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. */
@@ -2383,7 +2412,8 @@ function unwrapConfig(value) {
 const Config = z.object({
 	enabledModels: z.array(z.string()).description("Model ids offered in the model pickers (empty means every model)").volatile(),
 	showCreditDock: z.boolean().default(true).description("Show the remaining-credits line under the chat input box").volatile(),
-	showQueueDock: z.boolean().default(true).description("Show the upstream queue position under the chat input box").volatile()
+	showQueueDock: z.boolean().default(true).description("Show the upstream queue position under the chat input box").volatile(),
+	showSidebarPanel: z.boolean().default(false).description("Show a CodeArts icon in the DSH sidebar icon column, opening this page in the middle column").volatile()
 });
 function settingsCompatNamespace(ctx) {
 	return resolveSettingsNamespaceCompat(ctx, ctx.get("settings"), CODEARTS_SETTINGS_NS);
@@ -2458,14 +2488,16 @@ function apply(ctx, rawConfig) {
 	};
 	const dock = () => ({
 		credits: current().showCreditDock !== false,
-		queue: current().showQueueDock !== false
+		queue: current().showQueueDock !== false,
+		sidebar: current().showSidebarPanel === true
 	});
 	const setDock = async (patch) => {
 		const settings = ctx.get("settings");
 		if (settings === void 0) return false;
 		await settings.update(settingsCompatNamespace(ctx), {
 			...patch.credits === void 0 ? {} : { showCreditDock: patch.credits },
-			...patch.queue === void 0 ? {} : { showQueueDock: patch.queue }
+			...patch.queue === void 0 ? {} : { showQueueDock: patch.queue },
+			...patch.sidebar === void 0 ? {} : { showSidebarPanel: patch.sidebar }
 		});
 		return true;
 	};
@@ -2481,6 +2513,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-CzJjkqOp.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);
 			}
 		});
@@ -2709,7 +2747,9 @@ function emptyTotals() {
 		requests: 0,
 		promptTokens: 0,
 		completionTokens: 0,
-		totalTokens: 0
+		totalTokens: 0,
+		cachedTokens: 0,
+		reasoningTokens: 0
 	};
 }
 function addTotals(into, add) {
@@ -2717,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);
@@ -2730,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);
@@ -2743,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;
+}
 /**
 * 用量账本。
 *
@@ -2784,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

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.3",
+  "version": "1.2.5",
   "packageManager": "pnpm@11.24.0",
   "author": "elegant01",
   "keywords": [