pi-context-map 0.5.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.6.1] - 2026-06-15
+### Bug Fixes
+- **Fixed libuv assertion on Windows**: Removed `process.on('exit')` handler and `process.exit(0)` calls that left server handles open. Server now closes synchronously via `closeAllConnections()`.
+- **Synchronous stop()**: `isRunning` returns `false` immediately after `stop()` instead of after async callback.
+
+## [0.6.0] - 2026-06-15
+### Bug Fixes
+- **Fixed composition analysis**: Changed `role === "tool"` to `role === "toolResult"` to match Pi's actual message format. Tools and files now show correct percentages instead of 0%.
+- **File attachment detection**: Now detects images (type: "image") and file paths in user messages, not just assistant tool_use blocks.
+- **Compaction summary detection**: Improved detection of Pi compaction entries via `customType` field.
+
+### Features
+- **Session-unique reports**: Each report is saved with date, time, and session name (e.g., `2026-06-15_14-30-00_my-session.html`). Old reports are preserved for history.
+- **Auto-report path on session start**: New session gets a fresh report path automatically.
+
+## [0.5.1] - 2026-06-15
+### Bug Fixes
+- **Fixed toggle symbol**: Dark mode now correctly shows sun icon + "Light" label. Light mode shows moon icon + "Dark" label. Uses fresh DOM queries to survive SSE body replacement.
+- **Toggle moved to corner**: Button is now fixed in the top-right corner of the page, not inline with the live badge.
+- **Event delegation**: Theme toggle click handler uses event delegation so it survives SSE body replacement without re-binding.
+
 ## [0.5.0] - 2026-06-15
 ### Features
 - **Dark mode toggle**: Light/dark theme switcher in the report header. Preference saved to localStorage and restored on next load. Theme persists across SSE live updates.

package/extensions/analyzer.ts

@@ -1,7 +1,7 @@
 /**
  * ContextAnalyzer
- * Responsible for parsing Pi session messages to identify the active working set of files,
- * their token weights, and their temporal status. Uses the code-aware TokenCounter.
+ * Parses Pi session messages to identify the active working set of files,
+ * their token weights, and their temporal status.
  */
 import { TokenCounter } from "./token-counter";
 
@@ -13,7 +13,7 @@ export interface FileOp {
 
 export interface FileContext {
 	path: string;
-	weight: number; // Estimated tokens
+	weight: number;
 	lastOp: FileOp;
 	status: "active" | "stale" | "legacy";
 }
@@ -34,11 +34,6 @@ export interface ContextComposition {
 }
 
 export class ContextAnalyzer {
-	/**
-	 * Analyze session messages to produce a structured ContextComposition.
-	 * @param messages The full session conversation history.
-	 * @param currentTurn The current turn number.
-	 */
 	public analyzeByType(
 		messages: any[],
 		currentTurn: number,
@@ -51,66 +46,117 @@ export class ContextAnalyzer {
 		let fileTokens = 0;
 		let summaryTokens = 0;
 
-		messages.forEach((msg, index) => {
+		for (let index = 0; index < messages.length; index++) {
+			const msg = messages[index];
 			const turn = index + 1;
+			const role = msg.role || "";
+			const msgType = msg.type || "";
 
-			// 1. Categorize and count
-			if (msg.role === "system") {
-				systemTokens += TokenCounter.countMessage(msg);
-				return;
-			}
-
-			if (msg.role === "tool") {
-				toolTokens += TokenCounter.countMessage(msg);
-				return;
-			}
-
-			// Detect compaction summaries (Pi uses customType or specific role)
+			// 1. Compaction summaries
 			if (
-				msg.role === "compaction" ||
-				msg.type === "compaction" ||
+				role === "compaction" ||
+				msgType === "compaction" ||
+				msg.customType === "compaction" ||
 				msg.compactionEntry
 			) {
 				summaryTokens += TokenCounter.countMessage(msg);
-				return;
+				continue;
 			}
 
-			if (msg.role === "user" || msg.role === "assistant") {
-				historyTokens += TokenCounter.countMessage(msg);
-			} else {
-				// Default to history
+			// 2. System messages
+			if (role === "system" || msgType === "system") {
+				systemTokens += TokenCounter.countMessage(msg);
+				continue;
+			}
+
+			// 3. Tool results (Pi uses "toolResult")
+			if (role === "toolResult" || role === "tool") {
+				toolTokens += TokenCounter.countMessage(msg);
+				continue;
+			}
+
+			// 4. User messages — track file attachments
+			if (role === "user") {
 				historyTokens += TokenCounter.countMessage(msg);
+				if (Array.isArray(msg.content)) {
+					for (const block of msg.content) {
+						if (block.type === "image" || block.type === "image_url") {
+							const p = block.source?.url || block.image_url?.url || "[image]";
+							const w = TokenCounter.count(JSON.stringify(block));
+							fileTokens += w;
+							if (!fileRegistry.has(p)) {
+								fileRegistry.set(p, {
+									path: p,
+									weight: w,
+									lastOp: {
+										type: "read",
+										turn,
+										timestamp: msg.timestamp || Date.now(),
+									},
+									status: this.calculateStatus(turn, currentTurn),
+								});
+							}
+						}
+						if (block.type === "text" && typeof block.text === "string") {
+							const matches = block.text.match(
+								/(?:\/|[A-Z]:\\)[\w./\\-]+\.\w+/g,
+							);
+							if (matches) {
+								for (const m of matches) {
+									if (!fileRegistry.has(m)) {
+										fileRegistry.set(m, {
+											path: m,
+											weight: TokenCounter.count(m),
+											lastOp: {
+												type: "read",
+												turn,
+												timestamp: msg.timestamp || Date.now(),
+											},
+											status: this.calculateStatus(turn, currentTurn),
+										});
+									}
+								}
+							}
+						}
+					}
+				}
+				continue;
 			}
 
-			// 2. File tracking (only on assistant tool_use blocks)
-			if (msg.role === "assistant" && Array.isArray(msg.content)) {
-				for (const block of msg.content) {
-					if (block.type === "tool_use") {
-						const input = block.input as Record<string, any>;
-						const path = this.extractPath(block.name, input);
-
-						if (path) {
-							const opType = this.getOpType(block.name);
-							const result = this.findToolResult(messages, index, block.id);
-							const content = result?.content || "";
-							const weight = TokenCounter.count(String(content));
-							fileTokens += weight;
-
-							fileRegistry.set(path, {
-								path,
-								weight,
-								lastOp: {
-									type: opType,
-									turn,
-									timestamp: msg.timestamp || Date.now(),
-								},
-								status: this.calculateStatus(turn, currentTurn),
-							});
+			// 5. Assistant messages — track tool_use blocks
+			if (role === "assistant") {
+				historyTokens += TokenCounter.countMessage(msg);
+				if (Array.isArray(msg.content)) {
+					for (const block of msg.content) {
+						if (block.type === "tool_use") {
+							const input = block.input as Record<string, any>;
+							const p = this.extractPath(block.name, input);
+							if (p) {
+								const opType = this.getOpType(block.name);
+								const result = this.findToolResult(messages, index, block.id);
+								const content = result?.content || "";
+								const w = TokenCounter.count(String(content));
+								fileTokens += w;
+								fileRegistry.set(p, {
+									path: p,
+									weight: w,
+									lastOp: {
+										type: opType,
+										turn,
+										timestamp: msg.timestamp || Date.now(),
+									},
+									status: this.calculateStatus(turn, currentTurn),
+								});
+							}
 						}
 					}
 				}
+				continue;
 			}
-		});
+
+			// 6. Everything else
+			historyTokens += TokenCounter.countMessage(msg);
+		}
 
 		const totalTokens =
 			systemTokens + toolTokens + historyTokens + fileTokens + summaryTokens;
@@ -182,7 +228,10 @@ export class ContextAnalyzer {
 		toolId: string,
 	): any {
 		for (let i = toolTurnIndex + 1; i < messages.length; i++) {
-			if (messages[i].role === "tool" && messages[i].tool_call_id === toolId) {
+			if (
+				messages[i].role === "toolResult" &&
+				messages[i].tool_call_id === toolId
+			) {
 				return messages[i];
 			}
 			if (messages[i].role === "assistant") break;

package/extensions/generator.ts

@@ -17,7 +17,8 @@ export class ReportGenerator {
 		contextWindow: number = 128_000,
 	): string {
 		const total = composition.total.tokens;
-		const usagePercent = total > 0 ? Math.round((total / contextWindow) * 100) : 0;
+		const usagePercent =
+			total > 0 ? Math.round((total / contextWindow) * 100) : 0;
 
 		const fileCards = composition.files_detail
 			.map(
@@ -503,14 +504,12 @@ h2:first-of-type { margin-top: 48px; }
 <div class="container">
 
 <header>
-			<div style="display:flex;align-items:center;gap:12px;margin-bottom:20px;flex-wrap:wrap;">
-				<div class="live-badge"><span class="dot"></span>Live</div>
-				<button id="themeToggle" style="display:inline-flex;align-items:center;gap:6px;padding:6px 14px;border:1px solid var(--hairline);border-radius:20px;background:var(--surface);color:var(--ink-secondary);font:inherit;font-size:12px;font-weight:500;cursor:pointer;transition:all 0.2s;white-space:nowrap;" aria-label="Toggle theme">
-					<svg id="themeIconSun" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display:none;"><circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/><line x1="1" y1="12" x2="3" y2="12"/><line x1="21" y1="12" x2="23" y2="12"/><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/></svg>
-					<svg id="themeIconMoon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/></svg>
-					<span id="themeLabel">Dark</span>
-				</button>
-			</div>
+			<button id="themeToggle" style="position:fixed;top:24px;right:24px;z-index:100;display:inline-flex;align-items:center;gap:6px;padding:8px 16px;border:1px solid var(--hairline);border-radius:20px;background:var(--surface);color:var(--ink-secondary);font:inherit;font-size:12px;font-weight:500;cursor:pointer;transition:all 0.2s;box-shadow:0 2px 8px rgba(0,0,0,0.08);" aria-label="Toggle theme">
+				<svg id="themeIconSun" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display:none;"><circle cx="12" cy="12" r="5"/><line x1="12" y1="1" x2="12" y2="3"/><line x1="12" y1="21" x2="12" y2="23"/><line x1="4.22" y1="4.22" x2="5.64" y2="5.64"/><line x1="18.36" y1="18.36" x2="19.78" y2="19.78"/><line x1="1" y1="12" x2="3" y2="12"/><line x1="21" y1="12" x2="23" y2="12"/><line x1="4.22" y1="19.78" x2="5.64" y2="18.36"/><line x1="18.36" y1="5.64" x2="19.78" y2="4.22"/></svg>
+				<svg id="themeIconMoon" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"/></svg>
+				<span id="themeLabel">Dark</span>
+			</button>
+			<div class="live-badge"><span class="dot"></span>Live</div>
 			<h1>Context Profiler</h1>
 	<p class="subtitle">Session context window breakdown with actionable recommendations</p>
 
@@ -623,20 +622,23 @@ h2:first-of-type { margin-top: 48px; }
 	update();
 
 	// Theme toggle
-	var toggle = document.getElementById('themeToggle');
-	var label = document.getElementById('themeLabel');
-	var sunIcon = document.getElementById('themeIconSun');
-	var moonIcon = document.getElementById('themeIconMoon');
 	function applyTheme(t) {
 		document.documentElement.setAttribute('data-theme', t);
 		localStorage.setItem('context-map-theme', t);
-		if (label) label.textContent = t === 'dark' ? 'Light' : 'Dark';
-		if (sunIcon) sunIcon.style.display = t === 'dark' ? '' : 'none';
-		if (moonIcon) moonIcon.style.display = t === 'dark' ? 'none' : '';
+		// Query fresh each time (DOM may have been replaced by SSE)
+		var lbl = document.getElementById('themeLabel');
+		var sun = document.getElementById('themeIconSun');
+		var moon = document.getElementById('themeIconMoon');
+		if (lbl) lbl.textContent = t === 'dark' ? 'Light' : 'Dark';
+		if (sun) sun.style.display = t === 'dark' ? '' : 'none';
+		if (moon) moon.style.display = t === 'dark' ? 'none' : '';
 	}
 	var saved = localStorage.getItem('context-map-theme');
 	applyTheme(saved || 'light');
-	if (toggle) toggle.addEventListener('click', function() {
+	// Use event delegation on document so clicks survive body replacement
+	document.addEventListener('click', function(e) {
+		var btn = e.target.closest('#themeToggle');
+		if (!btn) return;
 		var cur = document.documentElement.getAttribute('data-theme');
 		applyTheme(cur === 'dark' ? 'light' : 'dark');
 	});
@@ -673,15 +675,7 @@ h2:first-of-type { margin-top: 48px; }
 					}
 					// Restore theme after body replacement
 					applyTheme(currentTheme);
-					// Re-bind new theme toggle button
-					var newToggle = document.getElementById('themeToggle');
-					if (newToggle) {
-						newToggle.addEventListener('click', function() {
-							var cur = document.documentElement.getAttribute('data-theme');
-							applyTheme(cur === 'dark' ? 'light' : 'dark');
-						});
-					}
-					// Re-bind new file search/filter
+					// Re-bind file search/filter (direct listeners, not delegated)
 					var ns = document.getElementById('fileSearch');
 					var nf = document.getElementById('fileFilter');
 					if (ns) ns.addEventListener('input', update);

package/extensions/index.ts

@@ -1,7 +1,7 @@
 /**
  * pi-context-map
  * Professional Context Profiler for Pi.
- * v0.4.1 — Fixes session.messages crash, tool registration signature, adds tests.
+ * v0.5.1 — Dynamic context window, dark mode, session-unique reports.
  */
 
 import type {
@@ -14,46 +14,55 @@ import { ReportGenerator } from "./generator";
 import { InsightEngine } from "./insights";
 import { LiveReportServer } from "./live-server";
 import * as path from "node:path";
+import * as fs from "node:fs";
 import * as os from "node:os";
 
-const REPORT_PATH = path.join(
-	os.homedir(),
-	".pi",
-	"context-map",
-	"report.html",
-);
+function makeReportPath(sessionName?: string): string {
+	const dir = path.join(os.homedir(), ".pi", "context-map");
+	if (!fs.existsSync(dir)) {
+		fs.mkdirSync(dir, { recursive: true });
+	}
+	const now = new Date();
+	const date = now.toISOString().split("T")[0];
+	const time = now.toTimeString().split(" ")[0].replace(/:/g, "-");
+	const safe = (sessionName || "session").replace(/[^\w.-]/g, "_").slice(0, 40);
+	const filename = `${date}_${time}_${safe}.html`;
+	return path.join(dir, filename);
+}
 
 export default async function piContextMap(pi: ExtensionAPI): Promise<void> {
 	const analyzer = new ContextAnalyzer();
 	const liveServer = new LiveReportServer();
 
-	// Accumulate messages from events — this is the correct way to access
-	// session messages in Pi. (pi as any).session?.messages does NOT exist.
 	let sessionMessages: AgentMessage[] = [];
 	let currentTurn = 0;
-	let contextWindow = 128_000; // fallback, updated from Pi system
+	let contextWindow = 128_000;
+	let currentReportPath = makeReportPath();
 
-	// Capture messages and context info before each LLM call
+	// Capture messages and context window from Pi system
 	pi.on("context", (event: any, ctx: any) => {
 		if (event?.messages && Array.isArray(event.messages)) {
 			sessionMessages = event.messages;
 		}
-		// Fetch actual context window from Pi system
 		try {
 			const usage = ctx?.getContextUsage?.();
 			if (usage?.contextWindow && usage.contextWindow > 0) {
 				contextWindow = usage.contextWindow;
 			}
 		} catch {
-			// Ignore — keep fallback
+			// Keep fallback
 		}
 	});
 
-	// Track turns
 	pi.on("turn_start", () => {
 		currentTurn++;
 	});
 
+	// Update report path when session changes
+	pi.on("session_start", () => {
+		currentReportPath = makeReportPath();
+	});
+
 	async function runAnalysis(): Promise<{
 		composition: ReturnType<typeof analyzer.analyzeByType>;
 		insights: ReturnType<typeof InsightEngine.generate>;
@@ -68,30 +77,25 @@ export default async function piContextMap(pi: ExtensionAPI): Promise<void> {
 			contextWindow,
 		);
 
-		// Write to disk
 		try {
-			const fs = await import("node:fs");
-			const dir = path.dirname(REPORT_PATH);
+			const dir = path.dirname(currentReportPath);
 			if (!fs.existsSync(dir)) {
 				fs.mkdirSync(dir, { recursive: true });
 			}
-			fs.writeFileSync(REPORT_PATH, html, "utf8");
+			fs.writeFileSync(currentReportPath, html, "utf8");
 		} catch (err: any) {
 			console.error(`[pi-context-map] Failed to write report: ${err.message}`);
 		}
 
-		// Push to live server if running
 		if (liveServer.isRunning) {
-			liveServer.update(html, REPORT_PATH);
+			liveServer.update(html, currentReportPath);
 		}
 
-		return { composition, insights, reportPath: REPORT_PATH };
+		return { composition, insights, reportPath: currentReportPath };
 	}
 
-	// Start live server
 	const serverUrl = await liveServer.start();
 
-	// Register /context-map command
 	pi.registerCommand("context-map", {
 		description:
 			"Generate a visual context map with actionable insights. Use 'stop' to terminate the live server.",
@@ -129,7 +133,6 @@ export default async function piContextMap(pi: ExtensionAPI): Promise<void> {
 		},
 	});
 
-	// Register the tool for agent use
 	pi.registerTool({
 		name: "context-map",
 		label: "Context Map",
@@ -146,7 +149,7 @@ export default async function piContextMap(pi: ExtensionAPI): Promise<void> {
 			_ctx: any,
 		) {
 			try {
-				const { composition, insights } = await runAnalysis();
+				const { composition, insights, reportPath } = await runAnalysis();
 				const usagePercent =
 					composition.total.tokens > 0
 						? Math.round((composition.total.tokens / contextWindow) * 100)
@@ -166,7 +169,8 @@ export default async function piContextMap(pi: ExtensionAPI): Promise<void> {
 						...insights.map(
 							(i) => `[${i.severity.toUpperCase()}] ${i.title}: ${i.message}`,
 						),
-						serverUrl ? `Live report: ${serverUrl}` : "",
+						`Report: ${reportPath}`,
+						serverUrl ? `Live: ${serverUrl}` : "",
 					]
 						.filter(Boolean)
 						.join("\n"),
@@ -181,41 +185,34 @@ export default async function piContextMap(pi: ExtensionAPI): Promise<void> {
 		},
 	});
 
-	// Auto-warning on high context before compaction
 	pi.on("session_before_compact", (_event: any, ctx: any) => {
 		const tokens = _event?.preparation?.tokensBefore;
 		if (tokens && tokens > 100_000) {
 			ctx.ui.notify(
-				`High context load detected (${(tokens / 1000).toFixed(1)}k tokens). Try /context-map to see what's consuming space.`,
+				`High context load (${(tokens / 1000).toFixed(1)}k tokens). Try /context-map to see what's consuming space.`,
 				"info",
 			);
 		}
 	});
 
-	// Auto-refresh after each assistant message if server is running
 	pi.on("message_end", async (_event: any) => {
 		if (_event?.message?.role === "assistant" && liveServer.isRunning) {
 			try {
 				await runAnalysis();
 			} catch {
-				// Silently ignore auto-refresh failures
+				// Ignore auto-refresh failures
 			}
 		}
 	});
 
-	// Graceful shutdown
 	pi.on("session_shutdown", () => {
 		liveServer.stop();
 	});
 
-	// Kill server when process exits
-	process.on("exit", () => liveServer.stop());
 	process.on("SIGINT", () => {
 		liveServer.stop();
-		process.exit(0);
 	});
 	process.on("SIGTERM", () => {
 		liveServer.stop();
-		process.exit(0);
 	});
 }

package/extensions/live-server.ts

@@ -94,18 +94,19 @@ export class LiveReportServer {
 		for (const client of this.clients) {
 			try {
 				client.end();
-			} catch (err) {
-				// Ignore errors on close
+			} catch {
+				// Ignore
 			}
 		}
 		this.clients.clear();
 
-		// Close the server
-		this.server.close((err) => {
-			if (err) {
-				console.error(`[pi-context-map] Error closing server: ${err.message}`);
-			}
-		});
+		// Force-close all connections synchronously (Node 18.2+)
+		if (typeof this.server.closeAllConnections === "function") {
+			this.server.closeAllConnections();
+		}
+
+		// Close server and reset state synchronously
+		this.server.close();
 		this.server = null;
 		this.port = 0;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-context-map",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Professional context profiler for Pi that visualizes the session context window, token distribution, and integrates with Nexus packages for actionable insights.",
   "keywords": [
     "pi-package",