dsh-codearts 1.2.4 → 1.2.6

package/lib/index.d.mts

@@ -1347,6 +1347,24 @@ interface UsageSnapshot {
   byAccountToday: Record<string, UsageTotals>;
   /** 账本覆盖的天数（便于「数据从哪天开始」的说明）。 */
   days: number;
+  /**
+   * 最近 {@link TREND_DAYS} 天（含今天，按日期升序）的每日合计；没账目的日子补 0。
+   *
+   * 补 0 而不是跳过：横轴要固定 7 格，否则「昨天没跑」和「昨天丢了」看不出区别。
+   */
+  recentDays: {
+    date: string;
+    totals: UsageTotals;
+  }[];
+  /**
+   * 今天 0 点到 23 点的逐小时合计（固定 24 项，还没到的钟点补 0）。
+   *
+   * 命中率曲线用它 —— 一次长会话把命中率拉低、隔一小时又回来，按天的粒度看不见。
+   */
+  todayByHour: {
+    hour: number;
+    totals: UsageTotals;
+  }[];
   /** 最近一次记账时间（epoch ms）。 */
   lastAt?: number;
 }
@@ -1385,10 +1403,21 @@ declare class CodeArtsUsageTracker {
   noteRequest(accountId: string, model: string, at?: number): void;
   /** 记一次 usage 帧。 */
   noteUsage(accountId: string, model: string, raw: RawUsage | undefined, at?: number): void;
-  /** 丢弃保留期之外的天（按日期键比较即可，YYYY-MM-DD 是字典序）。 */
+  /** 一天里的逐小时桶，第一次写的时候才建（老账本没有这个键）。 */
+  private hoursOf;
+  /**
+   * 丢弃保留期之外的天（按日期键比较即可，YYYY-MM-DD 是字典序）。
+   *
+   * 顺带把两天之前的**小时桶**清掉：逐小时数据只有「今天按小时」在画，留着只是
+   * 让 60 天的账本多出一个数量级的体积。
+   */
   private prune;
   /** 当前快照（卡片与 CLI 都读它）。 */
   snapshot(at?: number): UsageSnapshot;
+  /** 最近 TREND_DAYS 天的每日合计（按日期升序，缺账目的日子补 0）。 */
+  private recentDaysOf;
+  /** 今天 0 点起的 24 个钟点（还没到的小时补 0，横轴才有固定的 24 格）。 */
+  private todayByHourOf;
   private scheduleSave;
   /** 立即落盘（关停时调用，别丢最后几秒的账）。 */
   flush(): Promise<void>;
@@ -1615,6 +1644,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-DGIuT79_.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-4B0o-CQN.mjs";
 import { i as lazyApi, r as createProvider } from "./models-CgKCibpk.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomBytes, timingSafeEqual } from "node:crypto";
@@ -1527,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 逐号展示。
@@ -1646,6 +1650,8 @@ function usageOf(deps) {
 		byModelToday: snapshot?.byModelToday ?? [],
 		byAccountToday: snapshot?.byAccountToday ?? {},
 		days: snapshot?.days ?? 0,
+		recentDays: snapshot?.recentDays ?? [],
+		todayByHour: snapshot?.todayByHour ?? [],
 		...snapshot?.lastAt === void 0 ? {} : { lastAt: snapshot.lastAt },
 		slots: slotsOf(deps)
 	};
@@ -1761,9 +1767,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]])))) {
@@ -2404,7 +2414,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);
@@ -2479,14 +2490,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;
 	};

package/lib/{usage-DGIuT79_.mjs → usage-4B0o-CQN.mjs}

@@ -2769,6 +2769,14 @@ function localDateKey(at = Date.now()) {
 	const p = (n) => String(n).padStart(2, "0");
 	return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`;
 }
+/** 本地小时键 `00`..`23`（同样按本地时间切，跨零点的那一小时不会错位）。 */
+function localHourKey(at = Date.now()) {
+	return localHourKeyOfHour(new Date(at).getHours());
+}
+/** 0..23 -> `00`..`23`（小时桶的键）。 */
+function localHourKeyOfHour(hour) {
+	return String(hour).padStart(2, "0");
+}
 function positiveInt(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
 }
@@ -2879,9 +2887,14 @@ var CodeArtsUsageTracker = class {
 				if (typeof day !== "object" || day === null) continue;
 				const models = normalizeStore(day.models);
 				const accounts = normalizeStore(day.accounts);
-				this.days.set(date, {
+				const hours = day.hours;
+				this.days.set(date, hours === void 0 ? {
 					models,
 					accounts
+				} : {
+					models,
+					accounts,
+					hours: normalizeStore(hours)
 				});
 			}
 			this.prune(this.now());
@@ -2915,6 +2928,7 @@ var CodeArtsUsageTracker = class {
 		const day = this.day(localDateKey(at));
 		addTotals(this.bucket(day.models, model), { requests: 1 });
 		addTotals(this.bucket(day.accounts, accountId), { requests: 1 });
+		addTotals(this.bucket(this.hoursOf(day), localHourKey(at)), { requests: 1 });
 		this.lastAt = at;
 		this.prune(at);
 		this.scheduleSave();
@@ -2926,15 +2940,28 @@ var CodeArtsUsageTracker = class {
 		const day = this.day(localDateKey(at));
 		addTotals(this.bucket(day.models, model), usage);
 		addTotals(this.bucket(day.accounts, accountId), usage);
+		addTotals(this.bucket(this.hoursOf(day), localHourKey(at)), usage);
 		this.lastAt = at;
 		this.prune(at);
 		this.scheduleSave();
 	}
-	/** 丢弃保留期之外的天（按日期键比较即可，YYYY-MM-DD 是字典序）。 */
+	/** 一天里的逐小时桶，第一次写的时候才建（老账本没有这个键）。 */
+	hoursOf(day) {
+		day.hours ??= {};
+		return day.hours;
+	}
+	/**
+	* 丢弃保留期之外的天（按日期键比较即可，YYYY-MM-DD 是字典序）。
+	*
+	* 顺带把两天之前的**小时桶**清掉：逐小时数据只有「今天按小时」在画，留着只是
+	* 让 60 天的账本多出一个数量级的体积。
+	*/
 	prune(at) {
 		if (this.days.size === 0) return;
 		const cutoff = localDateKey(at - 5184e6);
-		for (const date of [...this.days.keys()]) if (date < cutoff) this.days.delete(date);
+		const hourCutoff = localDateKey(at - 1728e5);
+		for (const [date, day] of [...this.days.entries()]) if (date < cutoff) this.days.delete(date);
+		else if (date < hourCutoff && day.hours !== void 0) delete day.hours;
 	}
 	/** 当前快照（卡片与 CLI 都读它）。 */
 	snapshot(at = this.now()) {
@@ -2961,9 +2988,36 @@ var CodeArtsUsageTracker = class {
 			})).sort((a, b) => b.totals.totalTokens - a.totals.totalTokens || (a.id < b.id ? -1 : 1)),
 			byAccountToday: Object.fromEntries(Object.entries(today?.accounts ?? {}).map(([id, totals]) => [id, { ...totals }])),
 			days: this.days.size,
+			recentDays: this.recentDaysOf(at),
+			todayByHour: this.todayByHourOf(today, at),
 			...this.lastAt === void 0 ? {} : { lastAt: this.lastAt }
 		};
 	}
+	/** 最近 TREND_DAYS 天的每日合计（按日期升序，缺账目的日子补 0）。 */
+	recentDaysOf(at) {
+		const out = [];
+		for (let back = 6; back >= 0; back -= 1) {
+			const date = localDateKey(at - back * 864e5);
+			const day = this.days.get(date);
+			out.push({
+				date,
+				totals: day === void 0 ? emptyTotals() : sumOf(day.models)
+			});
+		}
+		return out;
+	}
+	/** 今天 0 点起的 24 个钟点（还没到的小时补 0，横轴才有固定的 24 格）。 */
+	todayByHourOf(today, at) {
+		const hours = today?.hours ?? {};
+		const currentHour = new Date(at).getHours();
+		return Array.from({ length: 24 }, (_, hour) => {
+			const totals = hours[localHourKeyOfHour(hour)];
+			return {
+				hour,
+				totals: hour > currentHour || totals === void 0 ? emptyTotals() : { ...totals }
+			};
+		});
+	}
 	scheduleSave() {
 		if (this.path === void 0) return;
 		if (this.saveTimer !== void 0) return;

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