@tmustier/pi-usage-extension 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.5 - 2026-04-09
+- Keep recursive subagent session scanning in `/usage`
+- Remove the deduped/raw mode toggle and keep the deduped view as the default behavior
+
+## 0.1.4 - 2026-04-09
+- Scan session files recursively so nested subagent runs are included in `/usage`
+- Add deduped vs raw counting modes to compare copied branch history against raw file totals
+
 ## 0.1.3 - 2026-02-03
 - Add preview image metadata for the extension listing.
 

package/README.md

@@ -7,7 +7,7 @@ A Pi extension that displays aggregated usage statistics across all sessions.
 ## Compatibility
 
 - **Pi version:** 0.42.4+
-- **Last updated:** 2026-01-13
+- **Last updated:** 2026-04-09
 
 ## Installation
 
@@ -111,7 +111,9 @@ The "Cache" column combines both read and write tokens.
 
 ## Data Source
 
-Statistics are parsed from session files in `~/.pi/agent/sessions/`. Each session is a JSONL file containing message entries with usage data. Assistant messages duplicated across branched session files are deduplicated by timestamp + total tokens (matching ccusage).
+Statistics are parsed recursively from session files in `~/.pi/agent/sessions/`, including nested subagent runs such as `run-0/` directories. Each session is a JSONL file containing message entries with usage data.
+
+Assistant messages duplicated across branched session files are deduplicated by timestamp + total tokens, matching the extension's previous behavior while still including recursive subagent sessions.
 
 Respects the `PI_CODING_AGENT_DIR` environment variable if set.
 

package/index.ts

@@ -96,31 +96,27 @@ function getSessionsDir(): string {
 	return join(agentDir, "sessions");
 }
 
-async function getAllSessionFiles(signal?: AbortSignal): Promise<string[]> {
-	const sessionsDir = getSessionsDir();
-	const files: string[] = [];
-
+async function collectSessionFilesRecursively(dir: string, files: string[], signal?: AbortSignal): Promise<void> {
 	try {
-		const cwdDirs = await readdir(sessionsDir, { withFileTypes: true });
-		for (const dir of cwdDirs) {
-			if (signal?.aborted) return files;
-			if (!dir.isDirectory()) continue;
-			const cwdPath = join(sessionsDir, dir.name);
-			try {
-				const sessionFiles = await readdir(cwdPath);
-				for (const file of sessionFiles) {
-					if (file.endsWith(".jsonl")) {
-						files.push(join(cwdPath, file));
-					}
-				}
-			} catch {
-				// Skip directories we can't read
+		const entries = await readdir(dir, { withFileTypes: true });
+		for (const entry of entries) {
+			if (signal?.aborted) return;
+			const entryPath = join(dir, entry.name);
+			if (entry.isDirectory()) {
+				await collectSessionFilesRecursively(entryPath, files, signal);
+			} else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
+				files.push(entryPath);
 			}
 		}
 	} catch {
-		// Return empty if we can't read sessions dir
+		// Skip directories we can't read
 	}
+}
 
+async function getAllSessionFiles(signal?: AbortSignal): Promise<string[]> {
+	const files: string[] = [];
+	await collectSessionFilesRecursively(getSessionsDir(), files, signal);
+	files.sort();
 	return files;
 }
 
@@ -135,11 +131,16 @@ interface SessionMessage {
 	timestamp: number;
 }
 
+interface ParsedSessionFile {
+	sessionId: string;
+	messages: SessionMessage[];
+}
+
 async function parseSessionFile(
 	filePath: string,
 	seenHashes: Set<string>,
 	signal?: AbortSignal
-): Promise<{ sessionId: string; messages: SessionMessage[] } | null> {
+): Promise<ParsedSessionFile | null> {
 	try {
 		const content = await readFile(filePath, "utf8");
 		if (signal?.aborted) return null;
@@ -169,8 +170,8 @@ async function parseSessionFile(
 						const fallbackTs = entry.timestamp ? new Date(entry.timestamp).getTime() : 0;
 						const timestamp = msg.timestamp || (Number.isNaN(fallbackTs) ? 0 : fallbackTs);
 
-						// Deduplicate by timestamp + total tokens (same as ccusage)
-						// Session files contain many duplicate entries
+						// Deduplicate copied history across branched session files.
+						// Keep the existing ccusage-style hash so current totals remain comparable.
 						const totalTokens = input + output + cacheRead + cacheWrite;
 						const hash = `${timestamp}:${totalTokens}`;
 						if (seenHashes.has(hash)) continue;
@@ -232,6 +233,73 @@ function emptyTimeFilteredStats(): TimeFilteredStats {
 	};
 }
 
+function emptyUsageData(): UsageData {
+	return {
+		today: emptyTimeFilteredStats(),
+		thisWeek: emptyTimeFilteredStats(),
+		allTime: emptyTimeFilteredStats(),
+	};
+}
+
+function getPeriodsForTimestamp(timestamp: number, todayMs: number, weekStartMs: number): TabName[] {
+	const periods: TabName[] = ["allTime"];
+	if (timestamp >= todayMs) periods.push("today");
+	if (timestamp >= weekStartMs) periods.push("thisWeek");
+	return periods;
+}
+
+function addMessagesToUsageData(
+	data: UsageData,
+	sessionId: string,
+	messages: SessionMessage[],
+	todayMs: number,
+	weekStartMs: number
+): void {
+	const sessionContributed = { today: false, thisWeek: false, allTime: false };
+
+	for (const msg of messages) {
+		const periods = getPeriodsForTimestamp(msg.timestamp, todayMs, weekStartMs);
+		const tokens = {
+			// Total = input + output only. cacheRead/cacheWrite are tracked separately.
+			// cacheRead tokens were already counted when first sent, so including them
+			// would double-count and massively inflate totals (cache hits repeat every message).
+			total: msg.input + msg.output,
+			input: msg.input,
+			output: msg.output,
+			cache: msg.cacheRead + msg.cacheWrite,
+		};
+
+		for (const period of periods) {
+			const stats = data[period];
+
+			let providerStats = stats.providers.get(msg.provider);
+			if (!providerStats) {
+				providerStats = emptyProviderStats();
+				stats.providers.set(msg.provider, providerStats);
+			}
+
+			let modelStats = providerStats.models.get(msg.model);
+			if (!modelStats) {
+				modelStats = emptyModelStats();
+				providerStats.models.set(msg.model, modelStats);
+			}
+
+			modelStats.sessions.add(sessionId);
+			accumulateStats(modelStats, msg.cost, tokens);
+
+			providerStats.sessions.add(sessionId);
+			accumulateStats(providerStats, msg.cost, tokens);
+
+			accumulateStats(stats.totals, msg.cost, tokens);
+			sessionContributed[period] = true;
+		}
+	}
+
+	if (sessionContributed.today) data.today.totals.sessions++;
+	if (sessionContributed.thisWeek) data.thisWeek.totals.sessions++;
+	if (sessionContributed.allTime) data.allTime.totals.sessions++;
+}
+
 async function collectUsageData(signal?: AbortSignal): Promise<UsageData | null> {
 	const startOfToday = new Date();
 	startOfToday.setHours(0, 0, 0, 0);
@@ -245,15 +313,11 @@ async function collectUsageData(signal?: AbortSignal): Promise<UsageData | null>
 	startOfWeek.setHours(0, 0, 0, 0);
 	const weekStartMs = startOfWeek.getTime();
 
-	const data: UsageData = {
-		today: emptyTimeFilteredStats(),
-		thisWeek: emptyTimeFilteredStats(),
-		allTime: emptyTimeFilteredStats(),
-	};
+	const data = emptyUsageData();
 
 	const sessionFiles = await getAllSessionFiles(signal);
 	if (signal?.aborted) return null;
-	const seenHashes = new Set<string>(); // Deduplicate across all files
+	const seenHashes = new Set<string>();
 
 	for (const filePath of sessionFiles) {
 		if (signal?.aborted) return null;
@@ -261,59 +325,7 @@ async function collectUsageData(signal?: AbortSignal): Promise<UsageData | null>
 		if (signal?.aborted) return null;
 		if (!parsed) continue;
 
-		const { sessionId, messages } = parsed;
-		const sessionContributed = { today: false, thisWeek: false, allTime: false };
-
-		for (const msg of messages) {
-			if (signal?.aborted) return null;
-			const periods: TabName[] = ["allTime"];
-			if (msg.timestamp >= todayMs) periods.push("today");
-			if (msg.timestamp >= weekStartMs) periods.push("thisWeek");
-
-			const tokens = {
-				// Total = input + output only. cacheRead/cacheWrite are tracked separately.
-				// cacheRead tokens were already counted when first sent, so including them
-				// would double-count and massively inflate totals (cache hits repeat every message).
-				total: msg.input + msg.output,
-				input: msg.input,
-				output: msg.output,
-				cache: msg.cacheRead + msg.cacheWrite,
-			};
-
-			for (const period of periods) {
-				const stats = data[period];
-
-				// Get or create provider stats
-				let providerStats = stats.providers.get(msg.provider);
-				if (!providerStats) {
-					providerStats = emptyProviderStats();
-					stats.providers.set(msg.provider, providerStats);
-				}
-
-				// Get or create model stats
-				let modelStats = providerStats.models.get(msg.model);
-				if (!modelStats) {
-					modelStats = emptyModelStats();
-					providerStats.models.set(msg.model, modelStats);
-				}
-
-				// Accumulate stats at all levels
-				modelStats.sessions.add(sessionId);
-				accumulateStats(modelStats, msg.cost, tokens);
-
-				providerStats.sessions.add(sessionId);
-				accumulateStats(providerStats, msg.cost, tokens);
-
-				accumulateStats(stats.totals, msg.cost, tokens);
-
-				sessionContributed[period] = true;
-			}
-		}
-
-		// Count unique sessions per period
-		if (sessionContributed.today) data.today.totals.sessions++;
-		if (sessionContributed.thisWeek) data.thisWeek.totals.sessions++;
-		if (sessionContributed.allTime) data.allTime.totals.sessions++;
+		addMessagesToUsageData(data, parsed.sessionId, parsed.messages, todayMs, weekStartMs);
 
 		await new Promise<void>((resolve) => setImmediate(resolve));
 	}
@@ -463,7 +475,7 @@ class UsageComponent {
 			const label = TAB_LABELS[tab];
 			return tab === this.activeTab ? th.fg("accent", `[${label}]`) : th.fg("dim", ` ${label} `);
 		}).join("  ");
-		return [tabs, ""];
+		return [tabs, th.fg("dim", "Dedupes copied branched-history messages. Recursive subagent sessions included."), ""];
 	}
 
 	private renderHeader(): string[] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-usage-extension",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Usage statistics dashboard for Pi sessions.",
   "license": "MIT",
   "author": "Thomas Mustier",