pi-extensions 0.1.21 → 0.1.23

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",

package/weather/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## 0.1.1 - 2026-02-12
+- Added an embedded demo GIF in the README that links to the MP4 demo hosted on GitHub.
+- Kept demo media out of npm installs while improving README preview on GitHub/npm.
+
+## 0.1.0 - 2026-02-12
+- Initial release of `/weather` weather widget extension.
+- Added native Rust bridge (`native/weathr-bridge`) with automatic shell fallback.
+- Added ANSI color preservation in the weather widget output.
+- Fixed shell fallback PTY bootstrap under Bun by binding `script` stdin to `/dev/null` (avoids socket `tcgetattr` errors without stealing ESC input from Pi).
+- `/weather-config` now warns when `location.auto=true` (which overrides manual latitude/longitude).
+- Added optional dependency support for platform prebuilt native bridge packages (`@tmustier/pi-weather-bridge-*`).
+- Added release automation workflow for publishing native bridge platform packages (`.github/workflows/weather-native-bridge.yml`).
+- `/weather` now renders in the main custom UI area (above the editor) instead of centered overlay mode.
+- Added `/weather-config` command and isolated config at `~/.pi/weather-widget/weathr/config.toml`.

package/weather/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Thomas Mustier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/weather/README.md

@@ -0,0 +1,132 @@
+# Weather Widget Extension
+
+Run the [weathr](https://github.com/veirt/weathr) terminal weather app inside Pi via `/weather`.
+
+It opens in the main widget area above the input box (same interaction style as `/snake`), supports live weather + simulation flags, keeps controls inside Pi, and preserves ANSI colors.
+
+The extension prefers a Rust N-API bridge (`native/weathr-bridge`) and falls back to a shell bridge if native isn't built.
+
+## Demo
+
+[![Weather widget demo](https://raw.githubusercontent.com/tmustier/pi-extensions/main/weather/assets/weather-demo.gif)](https://raw.githubusercontent.com/tmustier/pi-extensions/main/weather/assets/weather-demo.mp4)
+
+[Open MP4 demo directly](https://raw.githubusercontent.com/tmustier/pi-extensions/main/weather/assets/weather-demo.mp4)
+
+_Demo media is loaded from GitHub links and kept out of npm installs (package `files` whitelist + repo `.npmignore`)._
+
+## Install
+
+### Pi package manager
+
+```bash
+pi install npm:@tmustier/pi-weather
+```
+
+```bash
+pi install git:github.com/tmustier/pi-extensions
+```
+
+Then filter to just this extension in `~/.pi/agent/settings.json`:
+
+```json
+{
+  "packages": [
+    {
+      "source": "git:github.com/tmustier/pi-extensions",
+      "extensions": ["weather/index.ts"]
+    }
+  ]
+}
+```
+
+### Local clone
+
+```bash
+ln -s ~/pi-extensions/weather ~/.pi/agent/extensions/weather
+```
+
+Or add to `~/.pi/agent/settings.json`:
+
+```json
+{
+  "extensions": ["~/pi-extensions/weather"]
+}
+```
+
+## Commands
+
+- `/weather` — open live weather widget
+- `/weather rain` — shortcut for `--simulate rain`
+- `/weather --simulate snow --night`
+- `/weather-config` — edit widget config (`config.toml`)
+
+While open:
+- `Esc` or `Q` closes the widget
+- `R` restarts the weather process
+
+## Requirements
+
+- `weathr` installed and available on PATH (or in `~/.cargo/bin/weathr`)
+- `script` command available (macOS default, `util-linux` on Linux)
+
+Install weathr:
+
+```bash
+cargo install weathr
+```
+
+Build the native Rust bridge locally (optional, for development):
+
+```bash
+cd ~/pi-extensions/weather
+npm run build:native
+```
+
+Requires Rust + Node.
+
+For npm users, the extension can load prebuilt optional packages (`@tmustier/pi-weather-bridge-*`) when published.
+
+Troubleshooting:
+
+- The extension auto-falls back to shell mode if native bridge has no output.
+- If no matching prebuilt native package is installed for your platform, it falls back to shell mode.
+- It explicitly unsets `NO_COLOR` for the weather child process and sets `COLORTERM=truecolor` when missing.
+- Shell fallback binds `script` stdin to `/dev/null` (avoids Bun socket `tcgetattr` issues while preserving ANSI color output and ESC handling in Pi).
+- Force shell mode manually:
+
+```bash
+PI_WEATHER_NATIVE=0 pi
+```
+
+## Config Location
+
+The extension uses an isolated config home:
+
+- `~/.pi/weather-widget/weathr/config.toml`
+
+Use `/weather-config` to edit it.
+
+> If you set custom `latitude`/`longitude`, also set `location.auto = false` or `weathr` will keep auto-detecting your location.
+
+## Publishing native prebuilt packages
+
+To ship `weathr-bridge` without requiring Rust at install time:
+
+- Run GitHub Actions workflow `.github/workflows/weather-native-bridge.yml` (manual `workflow_dispatch`).
+- The workflow builds prebuilt `.node` files per target, syncs them into `native/weathr-bridge/npm/*`, and publishes `@tmustier/pi-weather-bridge-*` platform packages.
+- Then publish `@tmustier/pi-weather` (this extension) so consumers pick up the matching optional dependency versions.
+- Keep versions in sync (`weather/package.json`, `native/weathr-bridge/package.json`, and `native/weathr-bridge/npm/*/package.json`).
+
+Manual fallback (if not using the workflow):
+
+```bash
+cd ~/pi-extensions/weather
+npm run native:prepare-packages
+# build / download per-target pi_weather_bridge.<target>.node files into native/weathr-bridge/artifacts
+npm run native:sync-artifacts
+npm run native:publish-packages
+```
+
+## Changelog
+
+See `CHANGELOG.md`.