@oh-my-pi/pi-coding-agent 3.14.0 → 3.15.1

package/CHANGELOG.md

@@ -2,6 +2,95 @@
 
 ## [Unreleased]
 
+## [3.15.1] - 2026-01-05
+
+### Added
+
+- Added 65 new built-in color themes including dark variants (abyss, aurora, cavern, copper, cosmos, eclipse, ember, equinox, lavender, lunar, midnight, nebula, rainforest, reef, sakura, slate, solstice, starfall, swamp, taiga, terminal, tundra, twilight, volcanic), light variants (aurora-day, canyon, cirrus, coral, dawn, dunes, eucalyptus, frost, glacier, haze, honeycomb, lagoon, lavender, meadow, mint, opal, orchard, paper, prism, sand, savanna, soleil, wetland, zenith), and material themes (alabaster, amethyst, anthracite, basalt, birch, graphite, limestone, mahogany, marble, obsidian, onyx, pearl, porcelain, quartz, sandstone, titanium)
+
+### Fixed
+
+- Fixed status line end cap rendering to properly apply background colors and use correct powerline separator characters
+
+## [3.15.0] - 2026-01-05
+
+### Added
+
+- Added spinner type variants (status and activity) with distinct animation frames per symbol preset
+- Added animated spinner for task tool progress display during subagent execution
+- Added language/file type icons for read tool output with support for 35+ file types
+- Added async cleanup registry for graceful session flush on SIGINT, SIGTERM, and SIGHUP signals
+- Added subagent token usage aggregation to session statistics and task tool results
+- Added streaming NDJSON writer for session persistence with proper backpressure handling
+- Added `flush()` method to SessionManager for explicit control over pending write completion
+- Added `/exit` slash command to exit the application from interactive mode
+- Added fuzzy path matching suggestions when read tool encounters file-not-found errors, showing closest matches using Levenshtein distance
+- Added `status.shadowed` symbol for theme customization to properly indicate shadowed extension state
+- Added Biome CLI-based linter client as alternative to LSP for more reliable diagnostics
+- Added LinterClient interface for pluggable formatter/linter implementations
+- Added status line segment editor for arranging and toggling status line components
+- Added status line presets (default, minimal, compact, developer, balanced) for quick configuration
+- Added status line separator styles (powerline, powerline-thin, arrow, slash, pipe, space)
+- Added configurable status line segments including time, hostname, and subagent count
+- Added symbol customization via theme overrides for icons, separators, and glyphs
+- Added 30+ built-in color themes including Catppuccin, Dracula, Nord, Gruvbox, Tokyo Night, and more
+- Added configurable status line with customizable segments, presets, and separators
+- Added status line segment editor for arranging and toggling status line components
+- Added symbol preset setting to switch between Unicode, Nerd Font, and ASCII glyphs
+- Added file size limit (20MB) for image files to prevent memory issues during serialization
+
+### Changed
+
+- Changed `isError` property in tool result events to be optional instead of required
+- Changed `SessionManager.open()` and `SessionManager.continueRecent()` to async methods for proper initialization
+- Changed session file writes to use atomic rename pattern with fsync for crash-safe persistence
+- Changed read tool display to show file type icons and metadata inline with path
+- Changed `AgentSession.dispose()` to async method that flushes pending writes before cleanup
+- Changed read tool result display to hide content by default with expand hint, showing only metadata until expanded
+- Changed diagnostics display to group messages by file with tree structure and severity icons
+- Changed diff stats formatting to use colored +/- indicators with slash separators
+- Changed session persistence to use streaming writes instead of synchronous file appends for better performance
+- Changed read tool to automatically redirect to ls when given a directory path instead of a file
+- Changed tool description prompts to be more concise with clearer usage guidelines and structured formatting
+- Moved tool description prompts from inline strings to external markdown files in `src/prompts/tools/` directory for better maintainability
+- Changed Exa web search provider from MCP protocol to direct REST API for simpler integration
+- Changed web search result rendering to handle malformed response data with fallback text display
+- Changed compaction prompts to preserve tool outputs, command results, and repository state in context summaries
+- Changed init prompt to include runtime/tooling preferences section and improved formatting guidelines
+- Changed reviewer prompt to require evidence-backed findings anchored to diff hunks with stricter suggestion block formatting
+- Changed system prompt to include explicit core behavior guidelines for task completion and progress updates
+- Changed task prompt to emphasize end-to-end task completion and tool verification
+- Moved all prompt templates from inline strings to external markdown files in `src/prompts/` directory for better maintainability
+- Changed tool result renderers to use structured tree layouts with consistent expand hints and truncation indicators
+- Changed grep, find, and ls tools to show scope path and detailed truncation reasons in output
+- Changed web search and web fetch result rendering to display structured metadata sections with bounded content previews
+- Changed task/subagent progress rendering to use badge-style status labels and structured output sections
+- Changed notebook tool to display cell content preview with line counts
+- Changed ask tool result to show checkbox-style selection indicators
+- Changed output tool to include provenance metadata and content previews for retrieved outputs
+- Changed collapsed tool views to show consistent "Ctrl+O to expand" hints with remaining item counts
+- Changed Biome integration to use CLI instead of LSP to avoid stale diagnostics issues
+- Changed hardcoded UI symbols throughout codebase to use theme-configurable glyphs
+- Changed tree drawing characters to use theme-defined box-drawing symbols
+- Changed status line rendering to support left/right segment positioning with separators
+- Changed hardcoded UI symbols to use theme-configurable glyphs throughout the interface
+- Changed tree drawing characters to use theme-defined box-drawing symbols
+- Changed CLI image attachments to resize if larger than 2048px (fit within 1920x1080) and convert >2MB images to JPEG
+
+### Removed
+
+- Removed custom renderers for ls, find, and grep tools in favor of generic tool display
+
+### Fixed
+
+- Fixed spinner animation crash when spinner frames array is empty by adding length check
+- Fixed session persistence to properly await all queued writes before closing or switching sessions
+- Fixed session persistence to truncate oversized content blocks before writing to prevent memory exhaustion
+- Fixed extension list and inspector panel to use correct symbols for disabled and shadowed states instead of reusing unrelated status icons
+- Fixed token counting for subagent progress to handle different usage object formats (camelCase and snake_case)
+- Fixed image file handling by adding 20MB size limit to prevent memory issues during serialization
+- Fixed session persistence to truncate oversized entries before writing JSONL to prevent out-of-memory errors
+
 ## [3.14.0] - 2026-01-04
 ### Added
 

package/docs/theme.md

@@ -132,7 +132,7 @@ Themes are defined in JSON files with the following structure:
 
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/badlogic/pi-mono/main/packages/coding-agent/theme-schema.json",
+  "$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
   "name": "my-theme",
   "vars": {
     "blue": "#0066cc",
@@ -149,6 +149,39 @@ Themes are defined in JSON files with the following structure:
 }
 ```
 
+## Symbols
+
+Themes can also customize specific UI symbols (icons, separators, bullets, etc.). Use `symbols.preset` to set a theme default (overridden by user settings), and `symbols.overrides` to override individual keys.
+
+Example:
+
+```json
+{
+  "symbols": {
+    "preset": "ascii",
+    "overrides": {
+      "icon.model": "[M]",
+      "sep.powerlineLeft": ">",
+      "sep.powerlineRight": "<"
+    }
+  }
+}
+```
+
+Symbol keys by category:
+
+- Status: `status.success`, `status.error`, `status.warning`, `status.info`, `status.pending`, `status.disabled`, `status.enabled`, `status.running`, `status.shadowed`, `status.aborted`
+- Navigation: `nav.cursor`, `nav.selected`, `nav.expand`, `nav.collapse`, `nav.back`
+- Tree: `tree.branch`, `tree.last`, `tree.vertical`, `tree.horizontal`, `tree.hook`
+- Boxes (rounded): `boxRound.topLeft`, `boxRound.topRight`, `boxRound.bottomLeft`, `boxRound.bottomRight`, `boxRound.horizontal`, `boxRound.vertical`
+- Boxes (sharp): `boxSharp.topLeft`, `boxSharp.topRight`, `boxSharp.bottomLeft`, `boxSharp.bottomRight`, `boxSharp.horizontal`, `boxSharp.vertical`, `boxSharp.cross`, `boxSharp.teeDown`, `boxSharp.teeUp`, `boxSharp.teeRight`, `boxSharp.teeLeft`
+- Separators: `sep.powerline`, `sep.powerlineThin`, `sep.powerlineLeft`, `sep.powerlineRight`, `sep.powerlineThinLeft`, `sep.powerlineThinRight`, `sep.dot`, `sep.slash`, `sep.pipe`
+- Icons: `icon.model`, `icon.folder`, `icon.file`, `icon.git`, `icon.branch`, `icon.tokens`, `icon.context`, `icon.cost`, `icon.time`, `icon.pi`, `icon.agents`, `icon.cache`, `icon.input`, `icon.output`, `icon.host`, `icon.session`, `icon.package`, `icon.warning`, `icon.rewind`, `icon.auto`, `icon.extensionSkill`, `icon.extensionTool`, `icon.extensionSlashCommand`, `icon.extensionMcp`, `icon.extensionRule`, `icon.extensionHook`, `icon.extensionPrompt`, `icon.extensionContextFile`, `icon.extensionInstruction`
+- Thinking: `thinking.minimal`, `thinking.low`, `thinking.medium`, `thinking.high`, `thinking.xhigh`
+- Checkboxes: `checkbox.checked`, `checkbox.unchecked`
+- Formatting: `format.ellipsis`, `format.bullet`, `format.dash`
+- Markdown: `md.quoteBorder`, `md.hrChar`, `md.bullet`
+
 ### Color Values
 
 Four formats are supported:
@@ -253,7 +286,7 @@ Custom themes are loaded from `~/.omp/agent/themes/*.json`.
 
    ```json
    {
-   	"$schema": "https://raw.githubusercontent.com/badlogic/pi-mono/main/packages/coding-agent/theme-schema.json",
+   	"$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
    	"name": "my-theme",
    	"vars": {
    		"primary": "#00aaff",
@@ -448,14 +481,14 @@ Error loading theme 'my-theme':
 For editor support, the JSON schema is available at:
 
 ```
-https://raw.githubusercontent.com/badlogic/pi-mono/main/packages/coding-agent/theme-schema.json
+https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json
 ```
 
 Add to your theme file for auto-completion and validation:
 
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/badlogic/pi-mono/main/packages/coding-agent/theme-schema.json",
+  "$schema": "https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/theme-schema.json",
   ...
 }
 ```
@@ -552,7 +585,7 @@ function getMarkdownTheme(): MarkdownTheme {
 }
 
 // Create markdown with theme
-const md = new Markdown(text, 1, 1, { bgColor: theme.bg("userMessageBg") }, getMarkdownTheme());
+const md = new Markdown(text, 1, 1, getMarkdownTheme(), { bgColor: theme.bg("userMessageBg") });
 ```
 
 This approach:

package/examples/sdk/11-sessions.ts

@@ -20,7 +20,7 @@ console.log("New session file:", newSession.sessionFile);
 
 // Continue most recent session (or create new if none)
 const { session: continued, modelFallbackMessage } = await createAgentSession({
-	sessionManager: SessionManager.continueRecent(process.cwd()),
+	sessionManager: await SessionManager.continueRecent(process.cwd()),
 });
 if (modelFallbackMessage) console.log("Note:", modelFallbackMessage);
 console.log("Continued session:", continued.sessionFile);
@@ -34,7 +34,7 @@ for (const info of sessions.slice(0, 3)) {
 
 if (sessions.length > 0) {
 	const { session: opened } = await createAgentSession({
-		sessionManager: SessionManager.open(sessions[0].path),
+		sessionManager: await SessionManager.open(sessions[0].path),
 	});
 	console.log(`\nOpened: ${opened.sessionId}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "3.14.0",
+	"version": "3.15.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -39,9 +39,9 @@
 		"prepublishOnly": "bun run generate-template && bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-agent-core": "3.14.0",
-		"@oh-my-pi/pi-ai": "3.14.0",
-		"@oh-my-pi/pi-tui": "3.14.0",
+		"@oh-my-pi/pi-agent-core": "3.15.1",
+		"@oh-my-pi/pi-ai": "3.15.1",
+		"@oh-my-pi/pi-tui": "3.15.1",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",
 		"chalk": "^5.5.0",
@@ -53,15 +53,18 @@
 		"marked": "^15.0.12",
 		"minimatch": "^10.1.1",
 		"nanoid": "^5.1.6",
+		"ndjson": "^2.0.0",
 		"node-html-parser": "^6.1.13",
 		"smol-toml": "^1.6.0",
 		"strip-ansi": "^7.1.2",
+		"sharp": "^0.34.2",
 		"winston": "^3.17.0",
 		"winston-daily-rotate-file": "^5.0.0",
 		"yaml": "^2.8.2"
 	},
 	"devDependencies": {
 		"@types/diff": "^7.0.2",
+		"@types/ndjson": "^2.0.4",
 		"@types/node": "^24.3.0",
 		"vitest": "^3.2.4"
 	},

package/src/cli/file-processor.ts

@@ -6,6 +6,7 @@ import { access, readFile, stat } from "node:fs/promises";
 import { resolve } from "node:path";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import chalk from "chalk";
+import sharp from "sharp";
 import { resolveReadPath } from "../core/tools/path-utils";
 import { detectSupportedImageMimeTypeFromFile } from "../utils/mime";
 
@@ -14,6 +15,53 @@ export interface ProcessedFiles {
 	images: ImageContent[];
 }
 
+const RESIZE_TRIGGER_MAX_DIMENSION = 2048;
+const MAX_RESIZE_WIDTH = 1920;
+const MAX_RESIZE_HEIGHT = 1080;
+const JPEG_CONVERT_THRESHOLD_BYTES = 2 * 1024 * 1024;
+const JPEG_QUALITY = 85;
+
+async function processImageAttachment(buffer: Buffer, mimeType: string): Promise<{ buffer: Buffer; mimeType: string }> {
+	const metadata = await sharp(buffer, { failOnError: false }).metadata();
+	const width = metadata.width ?? 0;
+	const height = metadata.height ?? 0;
+	const maxDim = Math.max(width, height);
+	const shouldResize = width > 0 && height > 0 && maxDim > RESIZE_TRIGGER_MAX_DIMENSION;
+	const shouldConvertToJpeg = buffer.length > JPEG_CONVERT_THRESHOLD_BYTES;
+
+	if (!shouldResize && !shouldConvertToJpeg) {
+		return { buffer, mimeType };
+	}
+
+	let pipeline = sharp(buffer, { failOnError: false });
+	if (shouldResize) {
+		pipeline = pipeline.resize({
+			width: MAX_RESIZE_WIDTH,
+			height: MAX_RESIZE_HEIGHT,
+			fit: "inside",
+			withoutEnlargement: true,
+		});
+	}
+
+	if (shouldConvertToJpeg) {
+		pipeline = pipeline.jpeg({ quality: JPEG_QUALITY });
+		return { buffer: await pipeline.toBuffer(), mimeType: "image/jpeg" };
+	}
+
+	if (mimeType === "image/png") {
+		pipeline = pipeline.png();
+	} else if (mimeType === "image/webp") {
+		pipeline = pipeline.webp();
+	} else if (mimeType === "image/gif") {
+		pipeline = pipeline.gif();
+	} else {
+		pipeline = pipeline.jpeg({ quality: JPEG_QUALITY });
+		return { buffer: await pipeline.toBuffer(), mimeType: "image/jpeg" };
+	}
+
+	return { buffer: await pipeline.toBuffer(), mimeType };
+}
+
 /** Process @file arguments into text content and image attachments */
 export async function processFileArguments(fileArgs: string[]): Promise<ProcessedFiles> {
 	let text = "";
@@ -43,11 +91,12 @@ export async function processFileArguments(fileArgs: string[]): Promise<Processe
 		if (mimeType) {
 			// Handle image file
 			const content = await readFile(absolutePath);
-			const base64Content = content.toString("base64");
+			const processed = await processImageAttachment(content, mimeType);
+			const base64Content = processed.buffer.toString("base64");
 
 			const attachment: ImageContent = {
 				type: "image",
-				mimeType,
+				mimeType: processed.mimeType,
 				data: base64Content,
 			};
 

package/src/cli/plugin-cli.ts

@@ -7,6 +7,7 @@
 import chalk from "chalk";
 import { APP_NAME } from "../config";
 import { PluginManager, parseSettingValue, validateSetting } from "../core/plugins/index";
+import { theme } from "../modes/interactive/theme/theme";
 
 // =============================================================================
 // Types
@@ -173,7 +174,7 @@ async function handleInstall(
 				if (flags.dryRun) {
 					console.log(chalk.dim(`[dry-run] Would install ${spec}`));
 				} else {
-					console.log(chalk.green(`✓ Installed ${result.name}@${result.version}`));
+					console.log(chalk.green(`${theme.status.success} Installed ${result.name}@${result.version}`));
 					if (result.enabledFeatures && result.enabledFeatures.length > 0) {
 						console.log(chalk.dim(`  Features: ${result.enabledFeatures.join(", ")}`));
 					}
@@ -183,7 +184,7 @@ async function handleInstall(
 				}
 			}
 		} catch (err) {
-			console.error(chalk.red(`✗ Failed to install ${spec}: ${err}`));
+			console.error(chalk.red(`${theme.status.error} Failed to install ${spec}: ${err}`));
 			process.exit(1);
 		}
 	}
@@ -202,10 +203,10 @@ async function handleUninstall(manager: PluginManager, packages: string[], flags
 			if (flags.json) {
 				console.log(JSON.stringify({ uninstalled: name }));
 			} else {
-				console.log(chalk.green(`✓ Uninstalled ${name}`));
+				console.log(chalk.green(`${theme.status.success} Uninstalled ${name}`));
 			}
 		} catch (err) {
-			console.error(chalk.red(`✗ Failed to uninstall ${name}: ${err}`));
+			console.error(chalk.red(`${theme.status.error} Failed to uninstall ${name}: ${err}`));
 			process.exit(1);
 		}
 	}
@@ -226,8 +227,9 @@ async function handleList(manager: PluginManager, flags: { json?: boolean }): Pr
 	}
 
 	console.log(chalk.bold("Installed Plugins:\n"));
+
 	for (const plugin of plugins) {
-		const status = plugin.enabled ? chalk.green("●") : chalk.dim("○");
+		const status = plugin.enabled ? chalk.green(theme.status.enabled) : chalk.dim(theme.status.disabled);
 		const nameVersion = `${plugin.name}@${plugin.version}`;
 		console.log(`${status} ${nameVersion}`);
 
@@ -265,10 +267,10 @@ async function handleLink(manager: PluginManager, paths: string[], flags: { json
 		if (flags.json) {
 			console.log(JSON.stringify(result, null, 2));
 		} else {
-			console.log(chalk.green(`✓ Linked ${result.name} from ${paths[0]}`));
+			console.log(chalk.green(`${theme.status.success} Linked ${result.name} from ${paths[0]}`));
 		}
 	} catch (err) {
-		console.error(chalk.red(`✗ Failed to link: ${err}`));
+		console.error(chalk.red(`${theme.status.error} Failed to link: ${err}`));
 		process.exit(1);
 	}
 }
@@ -285,10 +287,14 @@ async function handleDoctor(manager: PluginManager, flags: { json?: boolean; fix
 
 	for (const check of checks) {
 		const icon =
-			check.status === "ok" ? chalk.green("✓") : check.status === "warning" ? chalk.yellow("!") : chalk.red("✗");
+			check.status === "ok"
+				? chalk.green(theme.status.success)
+				: check.status === "warning"
+					? chalk.yellow(theme.status.warning)
+					: chalk.red(theme.status.error);
 		console.log(`${icon} ${check.name}: ${check.message}`);
 		if (check.fixed) {
-			console.log(chalk.dim(`  → Fixed`));
+			console.log(chalk.dim(`  ${theme.nav.cursor} Fixed`));
 		}
 	}
 
@@ -361,7 +367,7 @@ async function handleFeatures(
 		}
 
 		await manager.setEnabledFeatures(pluginName, [...currentFeatures]);
-		console.log(chalk.green(`✓ Updated features for ${pluginName}`));
+		console.log(chalk.green(`${theme.status.success} Updated features for ${pluginName}`));
 	}
 
 	// Display current state
@@ -392,7 +398,7 @@ async function handleFeatures(
 	const enabledSet = new Set(updatedFeatures ?? []);
 	for (const [name, feat] of Object.entries(plugin.manifest.features)) {
 		const enabled = enabledSet.has(name);
-		const icon = enabled ? chalk.green("●") : chalk.dim("○");
+		const icon = enabled ? chalk.green(theme.status.enabled) : chalk.dim(theme.status.disabled);
 		const defaultLabel = feat.default ? chalk.dim(" (default)") : "";
 		console.log(`${icon} ${name}${defaultLabel}`);
 		if (feat.description) {
@@ -507,7 +513,7 @@ async function handleConfig(
 			}
 
 			manager.setPluginSetting(pluginName, key, value);
-			console.log(chalk.green(`✓ Set ${key}`));
+			console.log(chalk.green(`${theme.status.success} Set ${key}`));
 			break;
 		}
 
@@ -518,7 +524,7 @@ async function handleConfig(
 			}
 
 			manager.deletePluginSetting(pluginName, key);
-			console.log(chalk.green(`✓ Deleted ${key}`));
+			console.log(chalk.green(`${theme.status.success} Deleted ${key}`));
 			break;
 		}
 
@@ -554,10 +560,10 @@ async function handleConfigValidate(manager: PluginManager, flags: { json?: bool
 	}
 
 	if (results.length === 0) {
-		console.log(chalk.green("✓ All settings valid"));
+		console.log(chalk.green(`${theme.status.success} All settings valid`));
 	} else {
 		for (const { plugin, key, error } of results) {
-			console.log(chalk.red(`✗ ${plugin}.${key}: ${error}`));
+			console.log(chalk.red(`${theme.status.error} ${plugin}.${key}: ${error}`));
 		}
 		process.exit(1);
 	}
@@ -576,10 +582,10 @@ async function handleEnable(manager: PluginManager, plugins: string[], flags: {
 			if (flags.json) {
 				console.log(JSON.stringify({ enabled: name }));
 			} else {
-				console.log(chalk.green(`✓ Enabled ${name}`));
+				console.log(chalk.green(`${theme.status.success} Enabled ${name}`));
 			}
 		} catch (err) {
-			console.error(chalk.red(`✗ Failed to enable ${name}: ${err}`));
+			console.error(chalk.red(`${theme.status.error} Failed to enable ${name}: ${err}`));
 			process.exit(1);
 		}
 	}
@@ -598,10 +604,10 @@ async function handleDisable(manager: PluginManager, plugins: string[], flags: {
 			if (flags.json) {
 				console.log(JSON.stringify({ disabled: name }));
 			} else {
-				console.log(chalk.green(`✓ Disabled ${name}`));
+				console.log(chalk.green(`${theme.status.success} Disabled ${name}`));
 			}
 		} catch (err) {
-			console.error(chalk.red(`✗ Failed to disable ${name}: ${err}`));
+			console.error(chalk.red(`${theme.status.error} Failed to disable ${name}: ${err}`));
 			process.exit(1);
 		}
 	}

package/src/cli/update-cli.ts

@@ -12,6 +12,7 @@ import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import chalk from "chalk";
 import { APP_NAME, VERSION } from "../config";
+import { theme } from "../modes/interactive/theme/theme";
 
 /**
  * Detect if we're running as a Bun compiled binary.
@@ -142,7 +143,7 @@ async function updateViaBun(): Promise<void> {
 
 	try {
 		execSync(`bun update -g ${PACKAGE}`, { stdio: "inherit" });
-		console.log(chalk.green("\n✓ Update complete"));
+		console.log(chalk.green(`\n${theme.status.success} Update complete`));
 	} catch {
 		throw new Error("bun update failed");
 	}
@@ -192,7 +193,7 @@ async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 		// Clean up backup
 		unlinkSync(backupPath);
 
-		console.log(chalk.green(`\n✓ Updated to ${release.version}`));
+		console.log(chalk.green(`\n${theme.status.success} Updated to ${release.version}`));
 		console.log(chalk.dim(`Restart ${APP_NAME} to use the new version`));
 	} catch (err) {
 		// Restore from backup if possible
@@ -224,7 +225,7 @@ export async function runUpdateCommand(opts: { force: boolean; check: boolean })
 	const comparison = compareVersions(release.version, VERSION);
 
 	if (comparison <= 0 && !opts.force) {
-		console.log(chalk.green("✓ Already up to date"));
+		console.log(chalk.green(`${theme.status.success} Already up to date`));
 		return;
 	}
 

package/src/core/agent-session.ts

@@ -14,7 +14,7 @@
  */
 
 import type { Agent, AgentEvent, AgentMessage, AgentState, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { AssistantMessage, ImageContent, Message, Model, TextContent } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage, ImageContent, Message, Model, TextContent, Usage } from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
 import type { Rule } from "../capability/rule";
 import { getAuthPath } from "../config";
@@ -479,10 +479,11 @@ export class AgentSession {
 	}
 
 	/**
-	 * Remove all listeners and disconnect from agent.
+	 * Remove all listeners, flush pending writes, and disconnect from agent.
 	 * Call this when completely done with the session.
 	 */
-	dispose(): void {
+	async dispose(): Promise<void> {
+		await this.sessionManager.flush();
 		this._disconnectFromAgent();
 		this._eventListeners = [];
 	}
@@ -841,6 +842,7 @@ export class AgentSession {
 		this._disconnectFromAgent();
 		await this.abort();
 		this.agent.reset();
+		await this.sessionManager.flush();
 		this.sessionManager.newSession(options);
 		this._queuedMessages = [];
 		this._reconnectToAgent();
@@ -1636,8 +1638,11 @@ export class AgentSession {
 		await this.abort();
 		this._queuedMessages = [];
 
+		// Flush pending writes before switching
+		await this.sessionManager.flush();
+
 		// Set new session
-		this.sessionManager.setSessionFile(sessionPath);
+		await this.sessionManager.setSessionFile(sessionPath);
 
 		// Reload messages
 		const sessionContext = this.sessionManager.buildSessionContext();
@@ -1714,6 +1719,9 @@ export class AgentSession {
 			skipConversationRestore = result?.skipConversationRestore ?? false;
 		}
 
+		// Flush pending writes before branching
+		await this.sessionManager.flush();
+
 		if (!selectedEntry.parentId) {
 			this.sessionManager.newSession();
 		} else {
@@ -1955,6 +1963,14 @@ export class AgentSession {
 		let totalCacheWrite = 0;
 		let totalCost = 0;
 
+		const getTaskToolUsage = (details: unknown): Usage | undefined => {
+			if (!details || typeof details !== "object") return undefined;
+			const record = details as Record<string, unknown>;
+			const usage = record.usage;
+			if (!usage || typeof usage !== "object") return undefined;
+			return usage as Usage;
+		};
+
 		for (const message of state.messages) {
 			if (message.role === "assistant") {
 				const assistantMsg = message as AssistantMessage;
@@ -1965,6 +1981,17 @@ export class AgentSession {
 				totalCacheWrite += assistantMsg.usage.cacheWrite;
 				totalCost += assistantMsg.usage.cost.total;
 			}
+
+			if (message.role === "toolResult" && message.toolName === "task") {
+				const usage = getTaskToolUsage(message.details);
+				if (usage) {
+					totalInput += usage.input;
+					totalOutput += usage.output;
+					totalCacheRead += usage.cacheRead;
+					totalCacheWrite += usage.cacheWrite;
+					totalCost += usage.cost.total;
+				}
+			}
 		}
 
 		return {

package/src/core/compaction/branch-summarization.ts

@@ -8,6 +8,8 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
+import branchSummaryPrompt from "../../prompts/branch-summary.md" with { type: "text" };
+import branchSummaryPreamble from "../../prompts/branch-summary-preamble.md" with { type: "text" };
 import {
 	convertToLlm,
 	createBranchSummaryMessage,
@@ -235,39 +237,9 @@ export function prepareBranchEntries(entries: SessionEntry[], tokenBudget: numbe
 // Summary Generation
 // ============================================================================
 
-const BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.
-Summary of that exploration:
+const BRANCH_SUMMARY_PREAMBLE = branchSummaryPreamble;
 
-`;
-
-const BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.
-
-Use this EXACT format:
-
-## Goal
-[What was the user trying to accomplish in this branch?]
-
-## Constraints & Preferences
-- [Any constraints, preferences, or requirements mentioned]
-- [Or "(none)" if none were mentioned]
-
-## Progress
-### Done
-- [x] [Completed tasks/changes]
-
-### In Progress
-- [ ] [Work that was started but not finished]
-
-### Blocked
-- [Issues preventing progress, if any]
-
-## Key Decisions
-- **[Decision]**: [Brief rationale]
-
-## Next Steps
-1. [What should happen next to continue this work]
-
-Keep each section concise. Preserve exact file paths, function names, and error messages.`;
+const BRANCH_SUMMARY_PROMPT = branchSummaryPrompt;
 
 /**
  * Generate a summary of abandoned branch entries.