pi-extensions 0.1.22 → 0.1.23

package/.github/workflows/skill-apply-optimize.yml

@@ -0,0 +1,19 @@
+name: Apply Skill Optimization
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  apply:
+    if: >-
+      github.event.issue.pull_request &&
+      contains(github.event.comment.body, '/apply-optimize')
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: tesslio/skill-review-and-optimize@d81583861aaf29d1da7f10e6539efef4e27b0dd5
+        with:
+          mode: 'apply'

package/.github/workflows/skill-review.yml

@@ -0,0 +1,17 @@
+name: Skill Review & Optimize
+on:
+  pull_request:
+    paths: ['**/SKILL.md']
+
+jobs:
+  review:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: tesslio/skill-review-and-optimize@d81583861aaf29d1da7f10e6539efef4e27b0dd5
+        with:
+          optimize: 'true'
+          tessl-token: ${{ secrets.TESSL_API_TOKEN }}

package/extending-pi/SKILL.md

@@ -1,30 +1,61 @@
 ---
 name: extending-pi
-description: Guide for extending Pi — decide between skills, extensions, prompt templates, themes, context files, or custom models, then create and package them. Use when someone wants to extend Pi, add capabilities, create a skill, build an extension, or make a Pi package.
+description: Guide for extending Pi — decide between skills, extensions, prompt templates, themes, context files, or custom models, then scaffold files, configure manifests, and package them. Use when someone wants to extend Pi, add capabilities, create a skill, build an extension, make a Pi package, scaffold extension files, or configure a manifest.json.
 ---
 
 # Extending Pi
 
-Help the user decide what to build and where to find guidance.
+Help the user decide what to build, scaffold the right files, and point to detailed guidance.
 
 ## What to build
 
-| Goal | Build a… | Where |
-|------|----------|-------|
-| Teach Pi a workflow or how to use a tool/API/CLI | **Skill** | Read `skill-creator/SKILL.md` for detailed guidance |
-| Give Pi a new tool, command, or runtime behavior | **Extension** | Read Pi docs: `docs/extensions.md` |
-| Reuse a prompt pattern with variables | **Prompt template** | Read Pi docs: `docs/prompt-templates.md` |
-| Set project-wide coding guidelines | **Context file** | `AGENTS.md` in project root or `.pi/agent/` — just markdown |
-| Change Pi's appearance | **Theme** | Read Pi docs: `docs/themes.md` |
-| Add a model or provider | **Custom model** | Read Pi docs: `docs/models.md` (JSON) or `docs/custom-provider.md` (extension) |
-| Share any of the above | **Package** | Read Pi docs: `docs/packages.md` |
+| Goal | Build a… | Key files to create | Where |
+|------|----------|-------------------|-------|
+| Teach Pi a workflow or how to use a tool/API/CLI | **Skill** | `SKILL.md` with YAML frontmatter + markdown body | Read `skill-creator/SKILL.md` for detailed guidance |
+| Give Pi a new tool, command, or runtime behavior | **Extension** | `manifest.json` + `src/index.ts` entry point | Read Pi docs: `docs/extensions.md` |
+| Reuse a prompt pattern with variables | **Prompt template** | `.md` file with `{{variable}}` placeholders | Read Pi docs: `docs/prompt-templates.md` |
+| Set project-wide coding guidelines | **Context file** | `AGENTS.md` in project root or `.pi/agent/` — just markdown | No extra docs needed |
+| Change Pi's appearance | **Theme** | `theme.json` with color and font definitions | Read Pi docs: `docs/themes.md` |
+| Add a model or provider | **Custom model** | `models.json` or extension with provider registration | Read Pi docs: `docs/models.md` (JSON) or `docs/custom-provider.md` (extension) |
+| Share any of the above | **Package** | `manifest.json` with dependencies and entry points | Read Pi docs: `docs/packages.md` |
 
 ## Skill vs Extension — the fuzzy boundary
 
-If `bash` + instructions can do it, prefer a **skill** (simpler, no code to maintain). If you need event hooks, typed tools, UI components, or policy enforcement, use an **extension**.
+If `bash` + instructions can do it, prefer a **Skill** (simpler, no code to maintain). If you need event hooks, typed tools, UI components, or policy enforcement, use an **Extension**.
 
 Examples:
 - "Pi should know our deploy process" → **Skill** (workflow instructions)
 - "Pi should confirm before `rm -rf`" → **Extension** (event interception)
 - "Pi should use Brave Search" → **Skill** (instructions + CLI scripts)
 - "Pi should have a structured `db_query` tool" → **Extension** (registerTool)
+
+## Minimal working examples
+
+**Skill** — place in `.pi/skills/my-skill/SKILL.md`:
+```markdown
+---
+name: my-skill
+description: Does X when the user asks to Y.
+---
+# My Skill
+Step 1: ...
+Step 2: ...
+```
+
+**Extension** — create `manifest.json` + `src/index.ts`:
+```json
+{ "name": "my-extension", "version": "0.1.0", "entry": "src/index.ts" }
+```
+```typescript
+import { registerTool } from "@anthropic/pi-sdk";
+registerTool("my_tool", { description: "..." }, async (input) => { /* ... */ });
+```
+
+## Quick-start steps
+
+1. **Pick the artifact type** from the table above.
+2. **Scaffold the files** — create the key files using the minimal examples above.
+3. **Validate locally**:
+   - Skills: place `SKILL.md` in `.pi/skills/<name>/` and invoke the skill — if it doesn't trigger, check that `name` and `description` in frontmatter are set correctly.
+   - Extensions: run `pi ext install .` — if it fails with "missing entry", verify the `entry` path in `manifest.json` points to an existing file.
+4. **Package and share** — follow `docs/packages.md` to bundle and publish.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-extensions",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "license": "MIT",
   "private": false,
   "keywords": [
@@ -15,15 +15,11 @@
       "./arcade/tetris.ts",
       "./arcade/mario-not/mario-not.ts",
       "./code-actions/index.ts",
-      "./control/control.ts",
       "./files-widget/index.ts",
       "./raw-paste/index.ts",
       "./ralph-wiggum/index.ts",
-      "./review/review.ts",
-      "./relaunch/index.ts",
       "./tab-status/tab-status.ts",
-      "./usage-extension/index.ts",
-      "./ready-status/ready-status.ts"
+      "./usage-extension/index.ts"
     ],
     "skills": [
       "./extending-pi/SKILL.md",

package/usage-extension/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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/usage-extension/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
 
@@ -65,6 +65,15 @@ In Pi, run:
 
 Use `Tab` or `←`/`→` to switch between periods.
 
+### Count Modes
+
+| Mode | Definition |
+|------|------------|
+| **Deduped** | Default. Deduplicates copied assistant history across branched session files |
+| **Raw** | Counts every assistant message found in every session file |
+
+Both modes scan nested session files recursively, so subagent runs are included.
+
 ### Timezone
 
 Time periods are calculated in the local timezone where Pi runs. If you want to override it, set the `TZ` environment variable (IANA timezone, e.g. `TZ=UTC` or `TZ=America/New_York`) before launching Pi.
@@ -87,6 +96,9 @@ Time periods are calculated in the local timezone where Pi runs. If you want to
 | Key | Action |
 |-----|--------|
 | `Tab` / `←` `→` | Switch time period |
+| `m` | Cycle count mode |
+| `d` | Switch to deduped mode |
+| `r` | Switch to raw mode |
 | `↑` `↓` | Select provider |
 | `Enter` / `Space` | Expand/collapse provider to show models |
 | `q` / `Esc` | Close |
@@ -111,7 +123,11 @@ 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.
+
+In **Deduped** mode, assistant messages duplicated across branched session files are deduplicated by timestamp + total tokens (matching the extension's previous behavior and keeping totals comparable with earlier releases).
+
+In **Raw** mode, every assistant message found in every session file is counted.
 
 Respects the `PI_CODING_AGENT_DIR` environment variable if set.
 

package/usage-extension/index.ts

@@ -3,6 +3,7 @@
  *
  * Shows an inline view with usage stats grouped by provider.
  * - Tab cycles: Today → This Week → All Time
+ * - D toggles deduped view, R toggles raw view, M cycles both
  * - Arrow keys navigate providers
  * - Enter expands/collapses to show models
  */
@@ -56,6 +57,8 @@ interface UsageData {
 }
 
 type TabName = "today" | "thisWeek" | "allTime";
+type UsageCountMode = "deduped" | "raw";
+type UsageDataByMode = Record<UsageCountMode, UsageData>;
 
 // =============================================================================
 // Column Configuration
@@ -96,31 +99,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,16 +134,23 @@ interface SessionMessage {
 	timestamp: number;
 }
 
+interface ParsedSessionFile {
+	sessionId: string;
+	rawMessages: SessionMessage[];
+	dedupedMessages: 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;
 		const lines = content.trim().split("\n");
-		const messages: SessionMessage[] = [];
+		const rawMessages: SessionMessage[] = [];
+		const dedupedMessages: SessionMessage[] = [];
 		let sessionId = "";
 
 		for (let i = 0; i < lines.length; i++) {
@@ -169,14 +175,7 @@ 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
-						const totalTokens = input + output + cacheRead + cacheWrite;
-						const hash = `${timestamp}:${totalTokens}`;
-						if (seenHashes.has(hash)) continue;
-						seenHashes.add(hash);
-
-						messages.push({
+						const sessionMessage: SessionMessage = {
 							provider: msg.provider,
 							model: msg.model,
 							cost: msg.usage.cost?.total || 0,
@@ -185,7 +184,16 @@ async function parseSessionFile(
 							cacheRead,
 							cacheWrite,
 							timestamp,
-						});
+						};
+						rawMessages.push(sessionMessage);
+
+						// 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;
+						seenHashes.add(hash);
+						dedupedMessages.push(sessionMessage);
 					}
 				}
 			} catch {
@@ -193,7 +201,7 @@ async function parseSessionFile(
 			}
 		}
 
-		return sessionId ? { sessionId, messages } : null;
+		return sessionId ? { sessionId, rawMessages, dedupedMessages } : null;
 	} catch {
 		return null;
 	}
@@ -232,7 +240,74 @@ function emptyTimeFilteredStats(): TimeFilteredStats {
 	};
 }
 
-async function collectUsageData(signal?: AbortSignal): Promise<UsageData | null> {
+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<UsageDataByMode | null> {
 	const startOfToday = new Date();
 	startOfToday.setHours(0, 0, 0, 0);
 	const todayMs = startOfToday.getTime();
@@ -245,15 +320,14 @@ 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: UsageDataByMode = {
+		deduped: emptyUsageData(),
+		raw: 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 +335,8 @@ 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.raw, parsed.sessionId, parsed.rawMessages, todayMs, weekStartMs);
+		addMessagesToUsageData(data.deduped, parsed.sessionId, parsed.dedupedMessages, todayMs, weekStartMs);
 
 		await new Promise<void>((resolve) => setImmediate(resolve));
 	}
@@ -372,9 +395,17 @@ const TAB_LABELS: Record<TabName, string> = {
 
 const TAB_ORDER: TabName[] = ["today", "thisWeek", "allTime"];
 
+const MODE_LABELS: Record<UsageCountMode, string> = {
+	deduped: "Deduped",
+	raw: "Raw",
+};
+
+const MODE_ORDER: UsageCountMode[] = ["deduped", "raw"];
+
 class UsageComponent {
 	private activeTab: TabName = "allTime";
-	private data: UsageData;
+	private activeMode: UsageCountMode = "deduped";
+	private data: UsageDataByMode;
 	private selectedIndex = 0;
 	private expanded = new Set<string>();
 	private providerOrder: string[] = [];
@@ -382,7 +413,7 @@ class UsageComponent {
 	private requestRender: () => void;
 	private done: () => void;
 
-	constructor(theme: Theme, data: UsageData, requestRender: () => void, done: () => void) {
+	constructor(theme: Theme, data: UsageDataByMode, requestRender: () => void, done: () => void) {
 		this.theme = theme;
 		this.requestRender = requestRender;
 		this.done = done;
@@ -390,14 +421,25 @@ class UsageComponent {
 		this.updateProviderOrder();
 	}
 
+	private getActiveStats(): TimeFilteredStats {
+		return this.data[this.activeMode][this.activeTab];
+	}
+
 	private updateProviderOrder(): void {
-		const stats = this.data[this.activeTab];
+		const stats = this.getActiveStats();
 		this.providerOrder = Array.from(stats.providers.entries())
 			.sort((a, b) => b[1].cost - a[1].cost)
 			.map(([name]) => name);
 		this.selectedIndex = Math.min(this.selectedIndex, Math.max(0, this.providerOrder.length - 1));
 	}
 
+	private cycleMode(step: 1 | -1): void {
+		const idx = MODE_ORDER.indexOf(this.activeMode);
+		this.activeMode = MODE_ORDER[(idx + step + MODE_ORDER.length) % MODE_ORDER.length]!;
+		this.updateProviderOrder();
+		this.requestRender();
+	}
+
 	handleInput(data: string): void {
 		if (matchesKey(data, "escape") || matchesKey(data, "q")) {
 			this.done();
@@ -414,6 +456,20 @@ class UsageComponent {
 			this.activeTab = TAB_ORDER[(idx - 1 + TAB_ORDER.length) % TAB_ORDER.length]!;
 			this.updateProviderOrder();
 			this.requestRender();
+		} else if (matchesKey(data, "m")) {
+			this.cycleMode(1);
+		} else if (matchesKey(data, "d")) {
+			if (this.activeMode !== "deduped") {
+				this.activeMode = "deduped";
+				this.updateProviderOrder();
+				this.requestRender();
+			}
+		} else if (matchesKey(data, "r")) {
+			if (this.activeMode !== "raw") {
+				this.activeMode = "raw";
+				this.updateProviderOrder();
+				this.requestRender();
+			}
 		} else if (matchesKey(data, "up")) {
 			if (this.selectedIndex > 0) {
 				this.selectedIndex--;
@@ -445,6 +501,7 @@ class UsageComponent {
 		return [
 			...this.renderTitle(),
 			...this.renderTabs(),
+			...this.renderModes(),
 			...this.renderHeader(),
 			...this.renderRows(),
 			...this.renderTotals(),
@@ -463,7 +520,19 @@ class UsageComponent {
 			const label = TAB_LABELS[tab];
 			return tab === this.activeTab ? th.fg("accent", `[${label}]`) : th.fg("dim", ` ${label} `);
 		}).join("  ");
-		return [tabs, ""];
+		return [tabs];
+	}
+
+	private renderModes(): string[] {
+		const th = this.theme;
+		const modes = MODE_ORDER.map((mode) => {
+			const label = MODE_LABELS[mode];
+			return mode === this.activeMode ? th.fg("accent", `[${label}]`) : th.fg("dim", ` ${label} `);
+		}).join("  ");
+		const note = this.activeMode === "deduped"
+			? "Dedupes copied branched-history messages. Recursive subagent sessions included."
+			: "Counts raw message totals from all session files. Recursive subagent sessions included.";
+		return [modes, th.fg("dim", note), ""];
 	}
 
 	private renderHeader(): string[] {
@@ -504,7 +573,7 @@ class UsageComponent {
 
 	private renderRows(): string[] {
 		const th = this.theme;
-		const stats = this.data[this.activeTab];
+		const stats = this.getActiveStats();
 		const lines: string[] = [];
 
 		if (this.providerOrder.length === 0) {
@@ -542,7 +611,7 @@ class UsageComponent {
 
 	private renderTotals(): string[] {
 		const th = this.theme;
-		const stats = this.data[this.activeTab];
+		const stats = this.getActiveStats();
 
 		let totalRow = padRight(th.bold("Total"), NAME_COL_WIDTH);
 		for (const col of DATA_COLUMNS) {
@@ -554,7 +623,7 @@ class UsageComponent {
 	}
 
 	private renderHelp(): string[] {
-		return [this.theme.fg("dim", "[Tab/←→] period  [↑↓] select  [Enter] expand  [q] close")];
+		return [this.theme.fg("dim", "[Tab/←→] period  [m/d/r] count mode  [↑↓] select  [Enter] expand  [q] close")];
 	}
 
 	invalidate(): void {}
@@ -573,7 +642,7 @@ export default function (pi: ExtensionAPI) {
 				return;
 			}
 
-			const data = await ctx.ui.custom<UsageData | null>((tui, theme, _kb, done) => {
+			const data = await ctx.ui.custom<UsageDataByMode | null>((tui, theme, _kb, done) => {
 				const loader = new CancellableLoader(
 					tui,
 					(s: string) => theme.fg("accent", s),
@@ -581,7 +650,7 @@ export default function (pi: ExtensionAPI) {
 					"Loading Usage..."
 				);
 				let finished = false;
-				const finish = (value: UsageData | null) => {
+				const finish = (value: UsageDataByMode | null) => {
 					if (finished) return;
 					finished = true;
 					loader.dispose();

package/usage-extension/package.json

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