Harden usage breakdown persist and overview UI

Co-authored-by: Gao Yu <gaoyu06@users.noreply.github.com>

Author: cursoragent

src/lib/OverviewPanel.svelte

@@ -19,7 +19,8 @@
 		.sort((a, b) => (a[0] < b[0] ? 1 : -1))
 		.slice(0, DETAIL_DAYS);
 	const dayValues = days.map(([, d]) => d);
-	const agentLabels = collectAgentLabels(dayValues);
+	// days is newest-first; merge oldest-first so the latest ACP name wins.
+	const agentLabels = collectAgentLabels([...dayValues].reverse());
 
 	let dim = $state<UsageDimension>('prov');
 

src/lib/usageStats.test.ts

@@ -62,6 +62,33 @@ describe('recordUsage', () => {
 		expect(m.getDailyUsage()).toEqual({});
 	});
 
+	it('ignores invalid token counts without poisoning valid totals', async () => {
+		const m = await fresh();
+		m.recordUsage(Number.NaN, 4, { provider: 'openai', model: 'gpt-6', agent: 'codex' });
+		m.recordUsage(Number.POSITIVE_INFINITY, -2, {
+			provider: 'invalid',
+			model: 'invalid',
+			agent: 'invalid'
+		});
+		const day = m.getDailyUsage()[m.dayKey(new Date())];
+		expect(day).toEqual({
+			in: 0,
+			out: 4,
+			prov: { openai: { in: 0, out: 4 } },
+			models: { 'gpt-6': { in: 0, out: 4 } },
+			agents: { codex: { in: 0, out: 4 } }
+		});
+	});
+
+	it('records keys that match object prototype properties', async () => {
+		const m = await fresh();
+		m.recordUsage(10, 1, { provider: 'constructor', model: '__proto__', agent: 'toString' });
+		const day = m.getDailyUsage()[m.dayKey(new Date())];
+		expect(Object.entries(day.prov!)).toEqual([['constructor', { in: 10, out: 1 }]]);
+		expect(Object.entries(day.models!)).toEqual([['__proto__', { in: 10, out: 1 }]]);
+		expect(Object.entries(day.agents!)).toEqual([['toString', { in: 10, out: 1 }]]);
+	});
+
 	it('stores agent display labels for stable keys', async () => {
 		const m = await fresh();
 		m.recordUsage(10, 1, { agent: 'acp:gemini-cli', agentLabel: 'Gemini CLI' });
@@ -110,12 +137,26 @@ describe('load compatibility', () => {
 			'jucode-usage-daily': JSON.stringify({
 				'not-a-day': { in: 99, out: 99 },
 				'2026-1-2': { in: 99, out: 99 },
-				'2026-01-02': { in: 'x', out: 5, models: { m1: { in: 'y', out: 1 } } }
+				'2026-01-02': {
+					in: '1e400',
+					out: 5,
+					models: {
+						m1: { in: 'y', out: 1 },
+						'  ': { in: 20, out: 2 },
+						invalid: { in: 'Infinity', out: -1 }
+					},
+					agentLabels: { ' acp:x ': ' New name ', '': 'junk', 'acp:y': '   ' }
+				}
 			})
 		});
 		const usage = m.getDailyUsage();
 		expect(Object.keys(usage)).toEqual(['2026-01-02']);
-		expect(usage['2026-01-02']).toEqual({ in: 0, out: 5, models: { m1: { in: 0, out: 1 } } });
+		expect(usage['2026-01-02']).toEqual({
+			in: 0,
+			out: 5,
+			models: { m1: { in: 0, out: 1 } },
+			agentLabels: { 'acp:x': 'New name' }
+		});
 	});
 
 	it('starts empty when the stored JSON is corrupt', async () => {

src/lib/usageStats.ts

@@ -35,6 +35,22 @@ export interface UsageMeta {
 let cache: Record<string, DayUsage> | null = null;
 let saveTimer: ReturnType<typeof setTimeout> | null = null;
 
+function tokenCount(v: unknown): number {
+	const n = typeof v === 'number' || typeof v === 'string' ? Number(v) : 0;
+	return Number.isFinite(n) && n >= 0 ? n : 0;
+}
+
+function ownUsage(map: Record<string, DimUsage>, key: string): DimUsage {
+	if (Object.prototype.hasOwnProperty.call(map, key)) return map[key];
+	const usage = { in: 0, out: 0 };
+	Object.defineProperty(map, key, { value: usage, enumerable: true, configurable: true, writable: true });
+	return usage;
+}
+
+function setOwnLabel(map: Record<string, string>, key: string, label: string) {
+	Object.defineProperty(map, key, { value: label, enumerable: true, configurable: true, writable: true });
+}
+
 export function dayKey(d: Date): string {
 	const m = `${d.getMonth() + 1}`.padStart(2, '0');
 	const day = `${d.getDate()}`.padStart(2, '0');
@@ -44,9 +60,17 @@ export function dayKey(d: Date): string {
 function readDim(v: unknown): Record<string, DimUsage> | undefined {
 	if (!v || typeof v !== 'object') return undefined;
 	const out: Record<string, DimUsage> = {};
-	for (const [k, e] of Object.entries(v as Record<string, Partial<DimUsage> | null>))
-		out[k] = { in: Number(e?.in) || 0, out: Number(e?.out) || 0 };
-	return out;
+	for (const [rawKey, e] of Object.entries(v as Record<string, Partial<DimUsage> | null>)) {
+		const key = rawKey.trim();
+		if (!key) continue;
+		const inTokens = tokenCount(e?.in);
+		const outTokens = tokenCount(e?.out);
+		if (!inTokens && !outTokens) continue;
+		const usage = ownUsage(out, key);
+		usage.in += inTokens;
+		usage.out += outTokens;
+	}
+	return Object.keys(out).length ? out : undefined;
 }
 
 function load(): Record<string, DayUsage> {
@@ -59,17 +83,21 @@ function load(): Record<string, DayUsage> {
 			for (const [k, v] of Object.entries(parsed)) {
 				const d = v as Partial<DayUsage> | null;
 				if (!/^\d{4}-\d{2}-\d{2}$/.test(k)) continue;
-				const day: DayUsage = { in: Number(d?.in) || 0, out: Number(d?.out) || 0 };
+				const day: DayUsage = { in: tokenCount(d?.in), out: tokenCount(d?.out) };
 				const prov = readDim(d?.prov);
 				if (prov) day.prov = prov;
 				const models = readDim(d?.models);
 				if (models) day.models = models;
 				const agents = readDim(d?.agents);
 				if (agents) day.agents = agents;
 				if (d?.agentLabels && typeof d.agentLabels === 'object') {
-					day.agentLabels = {};
-					for (const [ak, al] of Object.entries(d.agentLabels))
-						if (typeof al === 'string' && al) day.agentLabels[ak] = al;
+					const labels: Record<string, string> = {};
+					for (const [rawKey, rawLabel] of Object.entries(d.agentLabels)) {
+						const key = rawKey.trim();
+						const label = typeof rawLabel === 'string' ? rawLabel.trim() : '';
+						if (key && label) setOwnLabel(labels, key, label);
+					}
+					if (Object.keys(labels).length) day.agentLabels = labels;
 				}
 				cache[k] = day;
 			}
@@ -98,24 +126,26 @@ function persist() {
 /** 空白/缺失的 key 归入 'other' 桶。 */
 function bump(map: Record<string, DimUsage>, key: string | undefined, inT: number, outT: number): string {
 	const k = key?.trim() || 'other';
-	const e = (map[k] ??= { in: 0, out: 0 });
+	const e = ownUsage(map, k);
 	e.in += inT;
 	e.out += outT;
 	return k;
 }
 
 export function recordUsage(inTokens: number, outTokens: number, meta?: UsageMeta) {
-	if (!inTokens && !outTokens) return;
+	const inT = tokenCount(inTokens);
+	const outT = tokenCount(outTokens);
+	if (!inT && !outT) return;
 	const map = load();
 	const k = dayKey(new Date());
 	const d = (map[k] ??= { in: 0, out: 0 });
-	d.in += inTokens;
-	d.out += outTokens;
-	bump((d.prov ??= {}), meta?.provider, inTokens, outTokens);
-	bump((d.models ??= {}), meta?.model, inTokens, outTokens);
-	const agentKey = bump((d.agents ??= {}), meta?.agent, inTokens, outTokens);
+	d.in += inT;
+	d.out += outT;
+	bump((d.prov ??= {}), meta?.provider, inT, outT);
+	bump((d.models ??= {}), meta?.model, inT, outT);
+	const agentKey = bump((d.agents ??= {}), meta?.agent, inT, outT);
 	const label = meta?.agentLabel?.trim();
-	if (label && agentKey !== 'other') (d.agentLabels ??= {})[agentKey] = label;
+	if (label && agentKey !== 'other') setOwnLabel((d.agentLabels ??= {}), agentKey, label);
 	persist();
 }
 
@@ -130,7 +160,7 @@ export function sumDimension(days: DayUsage[], dim: UsageDimension): [string, Di
 		const m = d[dim];
 		if (!m) continue;
 		for (const [k, v] of Object.entries(m)) {
-			const e = (acc[k] ??= { in: 0, out: 0 });
+			const e = ownUsage(acc, k);
 			e.in += v.in;
 			e.out += v.out;
 		}
@@ -141,7 +171,10 @@ export function sumDimension(days: DayUsage[], dim: UsageDimension): [string, Di
 /** 汇总各天记录到的 agent 展示名（后出现的覆盖先出现的）。 */
 export function collectAgentLabels(days: DayUsage[]): Record<string, string> {
 	const out: Record<string, string> = {};
-	for (const d of days) if (d.agentLabels) Object.assign(out, d.agentLabels);
+	for (const d of days) {
+		if (!d.agentLabels) continue;
+		for (const [key, label] of Object.entries(d.agentLabels)) setOwnLabel(out, key, label);
+	}
 	return out;
 }