@selesai/code 0.13.13 → 0.13.15

package/dist/extensions/pi-zentui/test/format.test.ts

@@ -0,0 +1,927 @@
+import { visibleWidth } from "@earendil-works/pi-tui";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import {
+	__resetUsageTotalsCacheForTests,
+	__usageTotalsAggregationPassCount,
+	buildCacheReadLabel,
+	buildCacheWriteLabel,
+	buildContextDisplayLabel,
+	buildContextGauge,
+	buildCostLabel,
+	buildSessionDurationLabel,
+	buildTokenLabel,
+	contextColorTier,
+	formatCount,
+	formatCwdLabel,
+	formatGitBranchText,
+	formatGitCommitSegment,
+	formatGitMetricsSegment,
+	formatOsLabel,
+	formatPackageVersionSegment,
+	getUsageTotals,
+	invalidateUsageTotalsCache,
+} from "../extensions/zentui/format";
+import {
+	ASCII_DEFAULT_ICONS,
+	NERD_DEFAULT_ICONS,
+	OS_PLATFORM_ICONS_ASCII,
+	OS_PLATFORM_ICONS_NERD,
+} from "../extensions/zentui/icons";
+
+const cacheHitIcon = "󰆼";
+
+type TestUsage = {
+	input?: unknown;
+	output?: unknown;
+	cacheRead?: unknown;
+	cacheWrite?: unknown;
+	cost?: { total?: unknown } | null;
+};
+
+function makeUsage(
+	input: unknown,
+	output: unknown,
+	cost: unknown,
+	cacheRead: unknown = 0,
+	cacheWrite: unknown = 0,
+): TestUsage {
+	return { input, output, cacheRead, cacheWrite, cost: { total: cost } };
+}
+
+function makeAssistantEntry(
+	input: number,
+	output: number,
+	cost: number,
+	cacheRead = 0,
+	cacheWrite = 0,
+) {
+	return makeMessageUsageEntry("assistant", makeUsage(input, output, cost, cacheRead, cacheWrite));
+}
+
+function makeMessageUsageEntry(role: string, usage: TestUsage | undefined, extra: Record<string, unknown> = {}) {
+	return { type: "message", message: { role, usage, ...extra } };
+}
+
+function makeReconcileEntry(provider: string, responseId: string, cost: number) {
+	return {
+		type: "custom",
+		customType: "cost-reconcile",
+		id: `reconcile-${provider}-${responseId}`,
+		data: { version: 1, provider, model: "test-model", responseId, cost, reconciledAt: 0 },
+	};
+}
+
+function makeSummaryUsageEntry(
+	type: "compaction" | "branch_summary",
+	usage: TestUsage | undefined,
+) {
+	return { type, usage };
+}
+
+function makeSessionContext(entries: unknown[], branch = entries) {
+	return {
+		sessionManager: {
+			getBranch: () => branch,
+			getEntries: () => entries,
+		},
+	};
+}
+
+describe("usage formatting", () => {
+	it("formats counts at compact decimal boundaries", () => {
+		expect(formatCount(0)).toBe("0");
+		expect(formatCount(999)).toBe("999");
+		expect(formatCount(1_000)).toBe("1.0k");
+		expect(formatCount(1_100)).toBe("1.1k");
+		expect(formatCount(9_999)).toBe("10.0k");
+		expect(formatCount(10_000)).toBe("10k");
+		expect(formatCount(27_000)).toBe("27k");
+		expect(formatCount(123_456)).toBe("123k");
+		expect(formatCount(999_999)).toBe("1000k");
+		expect(formatCount(1_000_000)).toBe("1.0M");
+		expect(formatCount(3_100_000)).toBe("3.1M");
+		expect(formatCount(44_000_000)).toBe("44M");
+		expect(formatCount(Number.MAX_SAFE_INTEGER)).toBe("9007199255M");
+	});
+
+	it("uses all session entries for totals instead of only the active branch", () => {
+		const branchEntry = makeAssistantEntry(100, 10, 1);
+		const freshTreeEntry = makeAssistantEntry(2_000_000, 100_000, 25);
+		const ctx = makeSessionContext([branchEntry, freshTreeEntry], [branchEntry]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals).toEqual({
+			input: 2_000_100,
+			output: 100_010,
+			cacheRead: 0,
+			cacheWrite: 0,
+			latestCacheHitRate: 0,
+			cost: 26,
+		});
+		expect(buildTokenLabel(totals, cacheHitIcon)).toBe("↑2.0M ↓100k");
+		expect(buildCostLabel(totals)).toBe("$26.000");
+	});
+
+	it("prefers reconciled gateway cost over the rate-card estimate", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0.42), {
+			provider: "openrouter",
+			responseId: "gen-abc123",
+		});
+		const reconcile = makeReconcileEntry("openrouter", "gen-abc123", 0.0123);
+		const ctx = makeSessionContext([assistant, reconcile]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.0123);
+		expect(buildCostLabel(totals)).toBe("$0.0123");
+	});
+
+	it("keeps the rate-card estimate when no reconcile entry exists", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0.42), {
+			provider: "openrouter",
+			responseId: "gen-abc123",
+		});
+		const ctx = makeSessionContext([assistant]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.42);
+	});
+
+	it("reconcile entries do not double-count when the estimate is zero", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0), {
+			provider: "openrouter",
+			responseId: "gen-abc123",
+		});
+		const reconcile = makeReconcileEntry("openrouter", "gen-abc123", 0.0123);
+		const ctx = makeSessionContext([assistant, reconcile]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.0123);
+	});
+
+	it("shows sub-cent reconciled costs without rounding to zero", () => {
+		const assistant = makeMessageUsageEntry("assistant", makeUsage(1_000, 500, 0), {
+			provider: "tokenin",
+			responseId: "chatcmpl-873",
+		});
+		const reconcile = makeReconcileEntry("tokenin", "chatcmpl-873", 0.00033601652);
+		const ctx = makeSessionContext([assistant, reconcile]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cost).toBe(0.00033601652);
+		expect(buildCostLabel(totals)).toBe("$0.000336");
+	});
+
+	it("formats cache atoms independently and omits zero totals", () => {
+		expect(buildCacheReadLabel(1_200)).toBe("R1.2k");
+		expect(buildCacheWriteLabel(300)).toBe("W300");
+		expect(buildCacheReadLabel(0)).toBe("");
+		expect(buildCacheWriteLabel(0)).toBe("");
+	});
+
+	it("keeps token and cost labels compact", () => {
+		const totals = { input: 3_100_000, output: 197_000, cacheRead: 0, cacheWrite: 0, cost: 41.957 };
+		const tokenLabel = buildTokenLabel(totals, cacheHitIcon);
+
+		expect(tokenLabel).toBe("↑3.1M ↓197k");
+		expect(tokenLabel).not.toContain("R");
+		expect(tokenLabel).not.toContain("W");
+		expect(buildCostLabel(totals)).toBe("$41.957");
+	});
+
+	it("shows latest prompt cache hit rate icon without R/W totals", () => {
+		const totals = {
+			input: 100,
+			output: 10,
+			cacheRead: 800,
+			cacheWrite: 100,
+			latestCacheHitRate: 80,
+			cost: 1,
+		};
+		const tokenLabel = buildTokenLabel(totals, cacheHitIcon);
+
+		expect(tokenLabel).toBe("↑100 ↓10 󰆼 80.0%");
+		expect(tokenLabel).not.toContain("CH");
+		expect(tokenLabel).not.toContain("R");
+		expect(tokenLabel).not.toContain("W");
+	});
+
+	it("uses custom and empty cache hit icons", () => {
+		const totals = {
+			input: 100,
+			output: 10,
+			cacheRead: 800,
+			cacheWrite: 100,
+			latestCacheHitRate: 80,
+			cost: 1,
+		};
+
+		expect(buildTokenLabel(totals, "CH")).toBe("↑100 ↓10 CH 80.0%");
+		expect(buildTokenLabel(totals, "")).toBe("↑100 ↓10 80.0%");
+	});
+
+	it("uses the latest assistant message for prompt cache hit rate", () => {
+		const firstEntry = makeAssistantEntry(100, 10, 1, 900, 0);
+		const latestEntry = makeAssistantEntry(200, 20, 2, 300, 500);
+		const ctx = makeSessionContext([firstEntry, latestEntry], [firstEntry]);
+
+		const totals = getUsageTotals(ctx as never);
+
+		expect(totals.cacheRead).toBe(1200);
+		expect(totals.cacheWrite).toBe(500);
+		expect(totals.latestCacheHitRate).toBe(30);
+		expect(buildTokenLabel(totals, cacheHitIcon)).toBe("↑300 ↓30 󰆼 30.0%");
+	});
+
+	it("aggregates assistant, tool-result LLM, compaction, and branch-summary usage", () => {
+		const entries = [
+			makeMessageUsageEntry("assistant", makeUsage(10, 2, 0.1, 30, 8)),
+			makeMessageUsageEntry("toolResult", makeUsage(20, 4, 0.2, 40, 9)),
+			makeSummaryUsageEntry("compaction", makeUsage(30, 6, 0.3, 50, 10)),
+			makeSummaryUsageEntry("branch_summary", makeUsage(40, 8, 0.4, 60, 11)),
+		];
+
+		const totals = getUsageTotals(makeSessionContext(entries) as never);
+
+		expect(totals).toEqual({
+			input: 100,
+			output: 20,
+			cacheRead: 180,
+			cacheWrite: 38,
+			latestCacheHitRate: 62.5,
+			cost: 1,
+		});
+		expect(buildTokenLabel(totals, cacheHitIcon)).toBe("↑100 ↓20 󰆼 62.5%");
+		expect(buildCostLabel(totals)).toBe("$1.000");
+	});
+
+	it("selects only one usage location and ignores unsupported entry shapes", () => {
+		const hybridMessage = {
+			...makeMessageUsageEntry("assistant", makeUsage(1, 2, 0.1)),
+			usage: makeUsage(100, 200, 10),
+		};
+		const hybridCompaction = {
+			...makeSummaryUsageEntry("compaction", makeUsage(3, 4, 0.2)),
+			message: { role: "assistant", usage: makeUsage(300, 400, 20) },
+		};
+		const entries = [
+			hybridMessage,
+			hybridCompaction,
+			makeMessageUsageEntry("user", makeUsage(1_000, 1_000, 30)),
+			{ type: "custom", usage: makeUsage(2_000, 2_000, 40) },
+		];
+
+		expect(getUsageTotals(makeSessionContext(entries) as never)).toEqual({
+			input: 4,
+			output: 6,
+			cacheRead: 0,
+			cacheWrite: 0,
+			latestCacheHitRate: 0,
+			cost: 0.30000000000000004,
+		});
+	});
+
+	it("normalizes missing, zero, and malformed optional numbers independently", () => {
+		const entries = [
+			makeMessageUsageEntry("assistant", {
+				input: "10",
+				output: -1,
+				cacheRead: Number.NaN,
+				cacheWrite: Number.POSITIVE_INFINITY,
+				cost: { total: Number.NEGATIVE_INFINITY },
+			}),
+			makeMessageUsageEntry("toolResult", {
+				input: 5,
+				output: 0,
+				cacheRead: 7,
+				cacheWrite: -2,
+				cost: null,
+			}),
+			makeSummaryUsageEntry("compaction", {}),
+			makeSummaryUsageEntry("branch_summary", undefined),
+		];
+
+		const totals = getUsageTotals(makeSessionContext(entries) as never);
+
+		expect(totals).toEqual({
+			input: 5,
+			output: 0,
+			cacheRead: 7,
+			cacheWrite: 0,
+			latestCacheHitRate: undefined,
+			cost: 0,
+		});
+		for (const value of [
+			totals.input,
+			totals.output,
+			totals.cacheRead,
+			totals.cacheWrite,
+			totals.cost,
+		]) {
+			expect(Number.isFinite(value)).toBe(true);
+			expect(value).toBeGreaterThanOrEqual(0);
+		}
+	});
+
+	it("adds distinct duplicate-looking persisted entries without deduplication", () => {
+		const entries = [
+			makeAssistantEntry(10, 2, 0.1),
+			makeAssistantEntry(10, 2, 0.1),
+			makeMessageUsageEntry("toolResult", makeUsage(10, 2, 0.1)),
+		];
+
+		expect(getUsageTotals(makeSessionContext(entries) as never)).toMatchObject({
+			input: 30,
+			output: 6,
+			cost: 0.30000000000000004,
+		});
+	});
+
+	it("saturates huge aggregates and calculates huge prompt rates without overflow", () => {
+		const entries = [
+			makeAssistantEntry(
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+			),
+			makeAssistantEntry(
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+				Number.MAX_VALUE,
+			),
+		];
+
+		const totals = getUsageTotals(makeSessionContext(entries) as never);
+
+		expect(totals).toMatchObject({
+			input: Number.MAX_VALUE,
+			output: Number.MAX_VALUE,
+			cacheRead: Number.MAX_VALUE,
+			cacheWrite: Number.MAX_VALUE,
+			cost: Number.MAX_VALUE,
+		});
+		expect(totals.latestCacheHitRate).toBeCloseTo(100 / 3);
+		expect(Number.isFinite(totals.latestCacheHitRate ?? Number.NaN)).toBe(true);
+		expect(buildTokenLabel(totals, cacheHitIcon)).toBe(
+			`↑1.797693134862316e+302M ↓1.797693134862316e+302M ${cacheHitIcon} 33.3%`,
+		);
+		expect(buildCostLabel(totals)).toBe(`$${Number.MAX_VALUE.toFixed(3)}`);
+		expect(buildTokenLabel(totals, cacheHitIcon)).not.toMatch(/Infinity|NaN/);
+		expect(buildCostLabel(totals)).not.toMatch(/Infinity|NaN/);
+	});
+
+	it("falls back to the active branch when getEntries is unavailable", () => {
+		const ctx = { sessionManager: { getBranch: () => [makeAssistantEntry(12, 3, 0.4)] } };
+
+		expect(getUsageTotals(ctx as never)).toMatchObject({ input: 12, output: 3, cost: 0.4 });
+	});
+});
+
+describe("buildSessionDurationLabel", () => {
+	const FIXED_NOW = 1_700_000_000_000;
+	beforeEach(() => {
+		vi.useFakeTimers();
+		vi.setSystemTime(FIXED_NOW);
+	});
+	afterEach(() => {
+		vi.useRealTimers();
+	});
+
+	it("formats seconds only", () => {
+		expect(buildSessionDurationLabel(FIXED_NOW - 45_000)).toBe("45s");
+	});
+
+	it("formats minutes and seconds", () => {
+		expect(buildSessionDurationLabel(FIXED_NOW - (2 * 60 + 13) * 1000)).toBe("2m 13s");
+	});
+
+	it("formats hours and minutes", () => {
+		expect(buildSessionDurationLabel(FIXED_NOW - (1 * 3600 + 5 * 60) * 1000)).toBe("1h 5m");
+	});
+
+	it("clamps zero and negative elapsed to 0s", () => {
+		expect(buildSessionDurationLabel(FIXED_NOW)).toBe("0s");
+		expect(buildSessionDurationLabel(FIXED_NOW + 10_000)).toBe("0s");
+	});
+});
+
+describe("formatOsLabel", () => {
+	it("honors a custom icons.os over platform defaults", () => {
+		expect(formatOsLabel("X", "auto", "darwin")).toBe("X");
+		expect(formatOsLabel("X", "ascii", "linux")).toBe("X");
+	});
+
+	it("maps platform icons when using the mode default os glyph", () => {
+		expect(formatOsLabel(NERD_DEFAULT_ICONS.os, "auto", "linux")).toBe(
+			OS_PLATFORM_ICONS_NERD.linux,
+		);
+		expect(formatOsLabel(ASCII_DEFAULT_ICONS.os, "ascii", "darwin")).toBe(
+			OS_PLATFORM_ICONS_ASCII.darwin,
+		);
+	});
+});
+
+describe("formatCwdLabel", () => {
+	const home = "/Users/me";
+
+	it("defaults to basename and preserves current behavior", () => {
+		expect(formatCwdLabel("/Users/me/Projects/zentui", "")).toBe("zentui");
+		expect(formatCwdLabel("/Users/me/Projects/zentui/", "")).toBe("zentui");
+		expect(formatCwdLabel("/", "")).toBe("/");
+		expect(formatCwdLabel("C:\\Users\\me\\zentui", "")).toBe("zentui");
+		expect(formatCwdLabel("/tmp/project", "󰝰")).toBe("󰝰 project");
+	});
+
+	it("renders full paths with home contracted to ~", () => {
+		expect(formatCwdLabel("/Users/me/Projects/zentui", "", { mode: "full", home })).toBe(
+			"~/Projects/zentui",
+		);
+		expect(formatCwdLabel("/Users/me", "", { mode: "full", home })).toBe("~");
+		expect(formatCwdLabel("/tmp/project", "", { mode: "full", home })).toBe("/tmp/project");
+		expect(formatCwdLabel("/", "", { mode: "full", home })).toBe("/");
+		expect(
+			formatCwdLabel("C:\\Users\\me\\Projects\\zentui", "", {
+				mode: "full",
+				home: "C:\\Users\\me",
+			}),
+		).toBe("~/Projects/zentui");
+		// Prefix-safe: /Users/me2 must not match home /Users/me
+		expect(formatCwdLabel("/Users/me2/Projects", "", { mode: "full", home })).toBe(
+			"/Users/me2/Projects",
+		);
+	});
+
+	it("truncates full paths to trailing directory depth (Starship-style)", () => {
+		expect(
+			formatCwdLabel("/Users/me/Projects/foo/bar", "", {
+				mode: "full",
+				home,
+				depth: 2,
+			}),
+		).toBe("…/foo/bar");
+		expect(
+			formatCwdLabel("/var/log/nginx/access", "", {
+				mode: "full",
+				home,
+				depth: 2,
+			}),
+		).toBe("…/nginx/access");
+		expect(
+			formatCwdLabel("C:\\a\\b\\c\\d", "", {
+				mode: "full",
+				home,
+				depth: 2,
+			}),
+		).toBe("…/c/d");
+		expect(
+			formatCwdLabel("/Users/me/Projects/zentui", "", {
+				mode: "full",
+				home,
+				depth: 5,
+			}),
+		).toBe("~/Projects/zentui");
+		expect(
+			formatCwdLabel("/Users/me/Projects/zentui", "", {
+				mode: "full",
+				home,
+				depth: 1,
+			}),
+		).toBe("…/zentui");
+		expect(formatCwdLabel("/Users/me", "", { mode: "full", home, depth: 2 })).toBe("~");
+		expect(formatCwdLabel("/", "", { mode: "full", home, depth: 2 })).toBe("/");
+		expect(formatCwdLabel("//", "", { mode: "full", home, depth: 2 })).toBe("/");
+		expect(formatCwdLabel("//", "")).toBe("/");
+		expect(
+			formatCwdLabel("/Users/me/Projects/zentui", "", {
+				mode: "full",
+				home,
+				depth: 0,
+			}),
+		).toBe("~/Projects/zentui");
+		// depth is ignored for basename
+		expect(
+			formatCwdLabel("/Users/me/Projects/zentui", "", {
+				mode: "basename",
+				depth: 2,
+			}),
+		).toBe("zentui");
+		expect(
+			formatCwdLabel("/Users/me/Projects/zentui", "󰝰", {
+				mode: "full",
+				home,
+				depth: 1,
+			}),
+		).toBe("󰝰 …/zentui");
+	});
+
+	it("renders safe repository-relative paths and falls back to unlimited full paths", () => {
+		const repositoryRoot = "/Users/me/Projects/zentui";
+		expect(
+			formatCwdLabel(`${repositoryRoot}/extensions/zentui`, "", {
+				mode: "repository",
+				repositoryRoot,
+				home,
+				depth: 0,
+			}),
+		).toBe("extensions/zentui");
+		expect(
+			formatCwdLabel(repositoryRoot, "", { mode: "repository", repositoryRoot, home, depth: 2 }),
+		).toBe(".");
+		expect(
+			formatCwdLabel(`${repositoryRoot}/packages/core/src`, "", {
+				mode: "repository",
+				repositoryRoot,
+				home,
+				depth: 2,
+			}),
+		).toBe("…/core/src");
+		expect(
+			formatCwdLabel("C:\\repo\\extensions\\zentui\\", "", {
+				mode: "repository",
+				repositoryRoot: "C:\\repo\\",
+				depth: 0,
+			}),
+		).toBe("extensions/zentui");
+		expect(
+			formatCwdLabel("/Users/me/Projects/other/src", "", {
+				mode: "repository",
+				repositoryRoot,
+				home,
+				depth: 1,
+			}),
+		).toBe("~/Projects/other/src");
+		expect(
+			formatCwdLabel(`${repositoryRoot}/extensions`, "", {
+				mode: "repository",
+				home,
+				depth: 1,
+			}),
+		).toBe("~/Projects/zentui/extensions");
+	});
+});
+
+describe("formatGitBranchText", () => {
+	it("preserves full, under-limit, and exactly-at-limit branch names", () => {
+		expect(formatGitBranchText("feature/long-name", "full")).toBe("feature/long-name");
+		expect(formatGitBranchText("main", 10)).toBe("main");
+		expect(formatGitBranchText("1234567890", 10)).toBe("1234567890");
+	});
+
+	it("includes the ellipsis inside the configured visible width", () => {
+		expect(formatGitBranchText("feature", 4)).toBe("fea…");
+		expect(formatGitBranchText("feature", 1)).toBe("…");
+		const unicode = formatGitBranchText("你好世界", 5);
+		expect(unicode).toBe("你好…");
+		expect(visibleWidth(unicode)).toBe(5);
+	});
+});
+
+describe("context helpers", () => {
+	it("classifies context color tiers from thresholds", () => {
+		expect(contextColorTier(10, { warning: 50, error: 80 })).toBe("normal");
+		expect(contextColorTier(50, { warning: 50, error: 80 })).toBe("warning");
+		expect(contextColorTier(80, { warning: 50, error: 80 })).toBe("error");
+		expect(contextColorTier(null)).toBe("normal");
+	});
+
+	it("builds stable-width gauges and style labels", () => {
+		expect(buildContextGauge(0, 10)).toHaveLength(10);
+		expect(buildContextGauge(100, 10)).toHaveLength(10);
+		expect(buildContextGauge(50, 10, true)).toBe("#####-----");
+		expect(buildContextDisplayLabel({ percent: 42, contextWindow: 128_000, style: "text" })).toBe(
+			"42.0%/128k",
+		);
+		expect(
+			buildContextDisplayLabel({ percent: 42, contextWindow: 128_000, style: "gauge" }),
+		).toMatch(/^\[.{10}\]$/);
+		expect(
+			buildContextDisplayLabel({
+				percent: 42,
+				contextWindow: 128_000,
+				style: "text+gauge",
+			}),
+		).toMatch(/^\[.{10}\] 42\.0%\/128k$/);
+		expect(buildContextDisplayLabel({ percent: null, contextWindow: 128_000 })).toBe("?/128k");
+		expect(buildContextDisplayLabel({ percent: Number.NaN, contextWindow: 128_000 })).toBe(
+			"?/128k",
+		);
+		expect(buildContextDisplayLabel({ percent: null, contextWindow: undefined })).toBe("--");
+	});
+});
+
+describe("getUsageTotals caching", () => {
+	it("reuses totals without another aggregation pass and recomputes after invalidate", () => {
+		__resetUsageTotalsCacheForTests();
+
+		const entries = [makeAssistantEntry(10, 1, 0.1)];
+		const ctx = makeSessionContext(entries) as never;
+
+		const first = getUsageTotals(ctx);
+		const second = getUsageTotals(ctx);
+		expect(second).toBe(first);
+		expect(__usageTotalsAggregationPassCount()).toBe(1);
+
+		entries.push(makeAssistantEntry(20, 2, 0.2));
+		const third = getUsageTotals(ctx);
+		expect(third.input).toBe(30);
+		expect(__usageTotalsAggregationPassCount()).toBe(2);
+
+		invalidateUsageTotalsCache();
+		const fourth = getUsageTotals(ctx);
+		expect(fourth).toEqual(third);
+		expect(fourth).not.toBe(third);
+		expect(__usageTotalsAggregationPassCount()).toBe(3);
+	});
+
+	it("recomputes when relevant middle usage changes with unchanged endpoints", () => {
+		__resetUsageTotalsCacheForTests();
+		const entries = [
+			makeAssistantEntry(1, 1, 0.1),
+			makeMessageUsageEntry("toolResult", makeUsage(2, 2, 0.2)),
+			makeSummaryUsageEntry("compaction", makeUsage(3, 3, 0.3)),
+		];
+		const ctx = makeSessionContext(entries) as never;
+		expect(getUsageTotals(ctx).input).toBe(6);
+
+		entries[1] = makeMessageUsageEntry("toolResult", makeUsage(20, 2, 0.2));
+
+		expect(getUsageTotals(ctx).input).toBe(24);
+		expect(__usageTotalsAggregationPassCount()).toBe(2);
+	});
+
+	it.each([
+		["assistant", () => makeMessageUsageEntry("assistant", makeUsage(1, 1, 0.1))],
+		["tool result", () => makeMessageUsageEntry("toolResult", makeUsage(1, 1, 0.1))],
+		["compaction", () => makeSummaryUsageEntry("compaction", makeUsage(1, 1, 0.1))],
+		["branch summary", () => makeSummaryUsageEntry("branch_summary", makeUsage(1, 1, 0.1))],
+	])("invalidates for appended and changed %s usage", (_label, makeEntry) => {
+		__resetUsageTotalsCacheForTests();
+		const entries: unknown[] = [makeAssistantEntry(10, 1, 1)];
+		const ctx = makeSessionContext(entries) as never;
+		const initial = getUsageTotals(ctx);
+
+		entries.push(makeEntry());
+		const appended = getUsageTotals(ctx);
+		expect(appended).not.toBe(initial);
+		expect(appended.input).toBe(11);
+
+		const entry = entries[1] as { message?: { usage?: TestUsage }; usage?: TestUsage };
+		const usage = entry.message?.usage ?? entry.usage;
+		if (usage) usage.input = 5;
+		const changed = getUsageTotals(ctx);
+		expect(changed).not.toBe(appended);
+		expect(changed.input).toBe(15);
+		expect(__usageTotalsAggregationPassCount()).toBe(3);
+	});
+});
+
+describe("formatGitMetricsSegment", () => {
+	const makeTheme = (): { fg: (color: string, text: string) => string } => ({
+		fg: (_color, text) => text,
+	});
+
+	it("returns empty when metrics are missing", () => {
+		expect(
+			formatGitMetricsSegment(
+				makeTheme(),
+				undefined,
+				{ onlyNonzero: true },
+				"terminal",
+				"bold green",
+				"bold red",
+			),
+		).toBe("");
+		expect(
+			formatGitMetricsSegment(
+				makeTheme(),
+				null,
+				{ onlyNonzero: true },
+				"terminal",
+				"bold green",
+				"bold red",
+			),
+		).toBe("");
+	});
+
+	it("renders both added and deleted", () => {
+		const out = formatGitMetricsSegment(
+			makeTheme(),
+			{ added: 12, deleted: 3 },
+			{ onlyNonzero: false },
+			"terminal",
+			"bold green",
+			"bold red",
+		);
+		expect(out).toContain("+12");
+		expect(out).toContain("−3");
+	});
+
+	it("omits each zero component independently when onlyNonzero", () => {
+		// 0 added → only show deleted.
+		expect(
+			formatGitMetricsSegment(
+				makeTheme(),
+				{ added: 0, deleted: 5 },
+				{ onlyNonzero: true },
+				"terminal",
+				"bold green",
+				"bold red",
+			),
+		).not.toContain("+0");
+		expect(
+			formatGitMetricsSegment(
+				makeTheme(),
+				{ added: 0, deleted: 5 },
+				{ onlyNonzero: true },
+				"terminal",
+				"bold green",
+				"bold red",
+			),
+		).toContain("−5");
+		// 0 deleted → only show added.
+		expect(
+			formatGitMetricsSegment(
+				makeTheme(),
+				{ added: 7, deleted: 0 },
+				{ onlyNonzero: true },
+				"terminal",
+				"bold green",
+				"bold red",
+			),
+		).toContain("+7");
+	});
+
+	it("hides entirely at 0/0 when onlyNonzero", () => {
+		expect(
+			formatGitMetricsSegment(
+				makeTheme(),
+				{ added: 0, deleted: 0 },
+				{ onlyNonzero: true },
+				"terminal",
+				"bold green",
+				"bold red",
+			),
+		).toBe("");
+	});
+});
+
+describe("formatGitCommitSegment", () => {
+	const makeTheme = (): { fg: (color: string, text: string) => string } => ({
+		fg: (_color, text) => text,
+	});
+	const FULL = "a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2";
+
+	it("returns empty when commit info or oid is missing", () => {
+		expect(
+			formatGitCommitSegment(
+				makeTheme(),
+				undefined,
+				{ hashLength: 7, onlyDetached: true, showTag: true },
+				"terminal",
+				"bold green",
+			),
+		).toBe("");
+		expect(
+			formatGitCommitSegment(
+				makeTheme(),
+				{ oid: null, detached: false, tag: null },
+				{ hashLength: 7, onlyDetached: true, showTag: true },
+				"terminal",
+				"bold green",
+			),
+		).toBe("");
+	});
+
+	it("shows short hash on detached HEAD", () => {
+		const out = formatGitCommitSegment(
+			makeTheme(),
+			{ oid: FULL, detached: true, tag: null },
+			{ hashLength: 7, onlyDetached: true, showTag: true },
+			"terminal",
+			"bold green",
+		);
+		expect(out).toContain("a1b2c3d");
+	});
+
+	it("hides hash on a normal branch when onlyDetached is true", () => {
+		const out = formatGitCommitSegment(
+			makeTheme(),
+			{ oid: FULL, detached: false, tag: null },
+			{ hashLength: 7, onlyDetached: true, showTag: true },
+			"terminal",
+			"bold green",
+		);
+		expect(out).toBe("");
+	});
+
+	it("hides the whole segment (including tag) on a branch when onlyDetached is true", () => {
+		const out = formatGitCommitSegment(
+			makeTheme(),
+			{ oid: FULL, detached: false, tag: "v1.0.0" },
+			{ hashLength: 7, onlyDetached: true, showTag: true },
+			"terminal",
+			"bold green",
+		);
+		expect(out).toBe("");
+		expect(out).not.toContain("v1.0.0");
+	});
+
+	it("shows hash on a normal branch when onlyDetached is false", () => {
+		const out = formatGitCommitSegment(
+			makeTheme(),
+			{ oid: FULL, detached: false, tag: null },
+			{ hashLength: 7, onlyDetached: false, showTag: false },
+			"terminal",
+			"bold green",
+		);
+		expect(out).toContain("a1b2c3d");
+	});
+
+	it("appends exact-match tag when present", () => {
+		const out = formatGitCommitSegment(
+			makeTheme(),
+			{ oid: FULL, detached: true, tag: "v1.2.3" },
+			{ hashLength: 7, onlyDetached: true, showTag: true },
+			"terminal",
+			"bold green",
+		);
+		expect(out).toContain("a1b2c3d");
+		expect(out).toContain("v1.2.3");
+	});
+
+	it("hides tag when showTag is false", () => {
+		const out = formatGitCommitSegment(
+			makeTheme(),
+			{ oid: FULL, detached: true, tag: "v1.2.3" },
+			{ hashLength: 7, onlyDetached: true, showTag: false },
+			"terminal",
+			"bold green",
+		);
+		expect(out).not.toContain("v1.2.3");
+	});
+});
+
+describe("formatPackageVersionSegment", () => {
+	const makeTheme = (): { fg: (color: string, text: string) => string } => ({
+		// Identity wrapper: prefix text with the requested color token so we can
+		// assert Starship style strings are routed correctly.
+		fg: (color, text) => `[${color}]${text}[/${color}]`,
+	});
+
+	it("returns empty when no package is present", () => {
+		expect(formatPackageVersionSegment(makeTheme(), undefined, "terminal", "nerd", "", "208")).toBe(
+			"",
+		);
+	});
+
+	it("renders the Starship `is <glyph> <version>` shape", () => {
+		const out = formatPackageVersionSegment(
+			makeTheme(),
+			{ ecosystem: "nodejs", version: "1.2.3" },
+			"terminal",
+			"nerd",
+			"",
+			"208",
+		);
+		expect(out).toContain("is");
+		expect(out).toContain("\u{f487}");
+		expect(out).toContain("1.2.3");
+		// Starship `package` default color 208 → ANSI 256-color code 38;5;208.
+		expect(out).toContain("38;5;208");
+	});
+
+	it("falls back to the ASCII package label in ASCII mode", () => {
+		const out = formatPackageVersionSegment(
+			makeTheme(),
+			{ ecosystem: "nodejs", version: "1.2.3" },
+			"terminal",
+			"ascii",
+			"",
+			"208",
+		);
+		expect(out).toContain("is");
+		expect(out).toContain("pkg");
+		expect(out).not.toContain("\u{f487}");
+	});
+
+	it("honors a configured package icon override", () => {
+		const out = formatPackageVersionSegment(
+			makeTheme(),
+			{ ecosystem: "nodejs", version: "1.2.3" },
+			"terminal",
+			"nerd",
+			"#", // custom override wins over mode default
+			"208",
+		);
+		expect(out).toContain("#");
+		expect(out).not.toContain("\u{f487}");
+	});
+});