dsh-token-total 1.0.3 → 1.0.4

package/lib/index.js

@@ -80,6 +80,7 @@ function aggregateSamples(samples, filter, granularity = "day") {
 	const from = filter.from;
 	const to = filter.to;
 	const buckets = bucketsInRange(from, to, granularity);
+	const all = [...samples];
 	const out = {
 		from,
 		to,
@@ -116,7 +117,8 @@ function aggregateSamples(samples, filter, granularity = "day") {
 	const bucketTurns = /* @__PURE__ */ new Map();
 	const bucketCacheHit = /* @__PURE__ */ new Map();
 	const bucketCacheMiss = /* @__PURE__ */ new Map();
-	for (const sample of samples) {
+	const modelAlias = aliasQualifiedModels(new Set(all.map((sample) => modelKeyOf(sample))));
+	for (const sample of all) {
 		const bucket = bucketOf(sample, from, to, granularity);
 		if (bucket === null) continue;
 		if (sample.turn) {
@@ -142,9 +144,9 @@ function aggregateSamples(samples, filter, granularity = "day") {
 		out.cacheHit += sample.cacheReadTokens;
 		const missSide = sample.inputTokens + sample.cacheWriteTokens;
 		out.cacheMiss += missSide;
-		const modelRef = sample.model && sample.model !== "" ? sample.model : "(unknown)";
-		const provider = providerOf(modelRef);
-		const model = normalizeModelName(sample.modelName?.trim() || modelNameOf(modelRef));
+		const provider = providerOf(sample.model && sample.model !== "" ? sample.model : "(unknown)");
+		const modelBase = modelKeyOf(sample);
+		const model = modelAlias.get(modelBase) ?? modelBase;
 		const sources = modelProviders.get(model) ?? /* @__PURE__ */ new Set();
 		sources.add(provider);
 		modelProviders.set(model, sources);
@@ -219,6 +221,47 @@ function aggregateSamples(samples, filter, granularity = "day") {
 	}
 	return out;
 }
+/** The aggregation key of one sample: the resolved display name when the
+*  host resolved one, else the bare model ref — normalized like every
+*  display name so the key is stable across routes and refreshes. */
+function modelKeyOf(sample) {
+	const modelRef = sample.model && sample.model !== "" ? sample.model : "(unknown)";
+	return normalizeModelName(sample.modelName?.trim() || modelNameOf(modelRef));
+}
+/**
+* Qualified-name aliases: "workbuddy-ai-plugin/deepseek-v4.1-flash" and
+* "deepseek-v4.1-flash" are the same model reached through a routing
+* namespace, so a name containing "/" merges onto the LONGEST suffix after a
+* "/" that is itself a model key in this dataset (chains like a/b/c → b/c → c
+* resolve transitively). The merge is dataset-relative on purpose: a slash
+* that names no bare model in the data ("GPT/6.1 sol" beside "gpt-6.1-sol")
+* is a genuinely different name and stays its own row — see the
+* distinct-slashes case in tests/model-aggregation.test.mjs.
+*/
+function aliasQualifiedModels(names) {
+	const alias = /* @__PURE__ */ new Map();
+	for (const name of names) {
+		if (!name.includes("/")) continue;
+		const parts = name.split("/");
+		for (let i = 1; i < parts.length; i++) {
+			const suffix = parts.slice(i).join("/");
+			if (names.has(suffix)) {
+				alias.set(name, suffix);
+				break;
+			}
+		}
+	}
+	for (const name of [...alias.keys()]) {
+		let target = alias.get(name);
+		const seen = /* @__PURE__ */ new Set([name]);
+		while (alias.has(target) && !seen.has(target)) {
+			seen.add(target);
+			target = alias.get(target);
+		}
+		alias.set(name, target);
+	}
+	return alias;
+}
 function modelsSorted(totals, cache, sources, splits) {
 	const out = [];
 	for (const [model, tokens] of totals) {

package/lib/types/client/format.d.ts

@@ -25,10 +25,14 @@ export declare function localDay(offsetDays: number): string;
 /** 0 = Monday … 6 = Sunday (GitHub-style heatmap rows). */
 export declare function indexOfDay(day: string): number;
 export declare function shortDay(day: string): string;
-/** X-axis label for a trend bucket key. Day mode keeps the short date; hour
- *  mode names the day at 00:00 (so a three-day span keeps its day boundaries
- *  readable) and the hour everywhere else. */
-export declare function bucketAxisLabel(key: string, granularity: 'day' | 'hour'): string;
+/** X-axis label for a trend bucket key. `mode` is what the axis READS AS,
+ *  chosen by the caller from the window it covers:
+ *  - 'hour' — a single-day hourly span (今日): the date is constant, so the
+ *    axis shows the bare clock ("8:00");
+ *  - 'day' — anything spanning several days (3天 hourly, any daily range):
+ *    the axis shows the short date ("10/22"); on multi-day hourly spans one
+ *    label marks each day. The tooltip still carries the full date + hour. */
+export declare function bucketAxisLabel(key: string, mode: 'day' | 'hour'): string;
 /** Tooltip title for a trend bucket key: the date in day mode, date + hour
  *  in hour mode. */
 export declare function bucketTitle(key: string, granularity: 'day' | 'hour'): string;

package/lib/types/client/locales.d.ts

@@ -7,7 +7,7 @@
 /** The locale namespace this plugin owns. */
 export declare const LOCALE_NS = "tokenTotal";
 /** The typed translator key union for the panel's locale seat. */
-export type TokenTotalKey = 'nav' | 'back' | 'range' | 'rangePreset.today' | 'rangePreset.3' | 'rangePreset.7' | 'rangePreset.30' | 'rangePreset.90' | 'rangeCustom' | 'from' | 'to' | 'refresh' | 'loading' | 'tokens' | 'tokensHint' | 'tokensUnit' | 'inputTokens' | 'outputTokens' | 'cacheTokens' | 'cachedTokens' | 'sessions' | 'requests' | 'requestsFailed' | 'activeDays' | 'cacheRate' | 'cacheRateHint' | 'cacheHitRate' | 'hitRateLegend' | 'topModel' | 'topModelHint' | 'heatmap' | 'heatLess' | 'heatMore' | 'dailyTrend' | 'hourlyTrend' | 'trendLimited' | 'usageRanking' | 'byModel' | 'byProvider' | 'tokensColumn' | 'cacheRateColumn' | 'providerModels' | 'other' | 'total' | 'percent' | 'asOf' | 'empty' | 'stats.counts' | 'stats.tokensPerSecond' | 'stats.cacheHit' | 'stats.cacheMiss' | 'stats.dialog.title' | 'stats.dialog.usageTitle' | 'stats.dialog.llmTime' | 'stats.dialog.toolTime' | 'stats.dialog.ttft' | 'stats.dialog.speed' | 'stats.dialog.main' | 'stats.dialog.subagents' | 'stats.dialog.subagentCount' | 'stats.dialog.treeTotal' | 'message.turnUsage.count' | 'message.turnUsage.cacheHit' | 'message.turnUsage.input' | 'message.turnUsage.cacheRead' | 'message.turnUsage.cacheWrite' | 'message.turnUsage.output';
+export type TokenTotalKey = 'nav' | 'back' | 'range' | 'rangePreset.today' | 'rangePreset.3' | 'rangePreset.7' | 'rangePreset.30' | 'rangePreset.90' | 'rangeCustom' | 'from' | 'to' | 'refresh' | 'loading' | 'tokens' | 'tokensHint' | 'tokensUnit' | 'inputTokens' | 'outputTokens' | 'cacheTokens' | 'cachedTokens' | 'sessions' | 'requests' | 'requestsFailed' | 'activeDays' | 'cacheRate' | 'cacheRateHint' | 'cacheHitRate' | 'hitRateLegend' | 'topModel' | 'topModelHint' | 'heatmap' | 'heatLess' | 'heatMore' | 'dow.mon' | 'dow.tue' | 'dow.wed' | 'dow.thu' | 'dow.fri' | 'dow.sat' | 'dow.sun' | 'month.jan' | 'month.feb' | 'month.mar' | 'month.apr' | 'month.may' | 'month.jun' | 'month.jul' | 'month.aug' | 'month.sep' | 'month.oct' | 'month.nov' | 'month.dec' | 'dailyTrend' | 'hourlyTrend' | 'trendLimited' | 'usageRanking' | 'byModel' | 'byProvider' | 'tokensColumn' | 'cacheRateColumn' | 'providerModels' | 'other' | 'total' | 'percent' | 'asOf' | 'empty' | 'stats.counts' | 'stats.tokensPerSecond' | 'stats.cacheHit' | 'stats.cacheMiss' | 'stats.dialog.title' | 'stats.dialog.usageTitle' | 'stats.dialog.llmTime' | 'stats.dialog.toolTime' | 'stats.dialog.ttft' | 'stats.dialog.speed' | 'stats.dialog.main' | 'stats.dialog.subagents' | 'stats.dialog.subagentCount' | 'stats.dialog.treeTotal' | 'message.turnUsage.count' | 'message.turnUsage.cacheHit' | 'message.turnUsage.input' | 'message.turnUsage.cacheRead' | 'message.turnUsage.cacheWrite' | 'message.turnUsage.output';
 export declare const en: Record<TokenTotalKey, string>;
 export declare const zh: Record<TokenTotalKey, string>;
 export declare const zhTW: Record<TokenTotalKey, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-token-total",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "DSH web plugin: token 用量统计看板 + 单会话（主智能体 + 子智能体）用量统计。提供今日/近3天/近7天/近1月/近3月/自定义筛选、六个汇总卡片、活跃热力图、缓存命中率折线与分模型柱状图、按模型/按供应商 Top5 列表。",
   "icon": "./icon.svg",
   "type": "module",