gsd-pi 2.43.0 → 2.44.0-dev.0b97ffd

package/packages/pi-coding-agent/src/main.ts

@@ -20,6 +20,7 @@ import type { LoadExtensionsResult } from "./core/extensions/index.js";
 import { KeybindingsManager } from "./core/keybindings.js";
 import { ModelRegistry } from "./core/model-registry.js";
 import { resolveCliModel, resolveModelScope, type ScopedModel } from "./core/model-resolver.js";
+import { runPackageCommand } from "./core/package-commands.js";
 import { DefaultPackageManager } from "./core/package-manager.js";
 import { DefaultResourceLoader } from "./core/resource-loader.js";
 import { type CreateAgentSessionOptions, createAgentSession } from "./core/sdk.js";
@@ -69,237 +70,6 @@ function isTruthyEnvFlag(value: string | undefined): boolean {
 	return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
 }
 
-type PackageCommand = "install" | "remove" | "update" | "list";
-
-interface PackageCommandOptions {
-	command: PackageCommand;
-	source?: string;
-	local: boolean;
-	help: boolean;
-	invalidOption?: string;
-}
-
-function getPackageCommandUsage(command: PackageCommand): string {
-	switch (command) {
-		case "install":
-			return `${APP_NAME} install <source> [-l]`;
-		case "remove":
-			return `${APP_NAME} remove <source> [-l]`;
-		case "update":
-			return `${APP_NAME} update [source]`;
-		case "list":
-			return `${APP_NAME} list`;
-	}
-}
-
-function printPackageCommandHelp(command: PackageCommand): void {
-	switch (command) {
-		case "install":
-			console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("install")}
-
-Install a package and add it to settings.
-
-Options:
-  -l, --local    Install project-locally (.pi/settings.json)
-
-Examples:
-  ${APP_NAME} install npm:@foo/bar
-  ${APP_NAME} install git:github.com/user/repo
-  ${APP_NAME} install git:git@github.com:user/repo
-  ${APP_NAME} install https://github.com/user/repo
-  ${APP_NAME} install ssh://git@github.com/user/repo
-  ${APP_NAME} install ./local/path
-`);
-			return;
-
-		case "remove":
-			console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("remove")}
-
-Remove a package and its source from settings.
-
-Options:
-  -l, --local    Remove from project settings (.pi/settings.json)
-
-Example:
-  ${APP_NAME} remove npm:@foo/bar
-`);
-			return;
-
-		case "update":
-			console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("update")}
-
-Update installed packages.
-If <source> is provided, only that package is updated.
-`);
-			return;
-
-		case "list":
-			console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("list")}
-
-List installed packages from user and project settings.
-`);
-			return;
-	}
-}
-
-function parsePackageCommand(args: string[]): PackageCommandOptions | undefined {
-	const [command, ...rest] = args;
-	if (command !== "install" && command !== "remove" && command !== "update" && command !== "list") {
-		return undefined;
-	}
-
-	let local = false;
-	let help = false;
-	let invalidOption: string | undefined;
-	let source: string | undefined;
-
-	for (const arg of rest) {
-		if (arg === "-h" || arg === "--help") {
-			help = true;
-			continue;
-		}
-
-		if (arg === "-l" || arg === "--local") {
-			if (command === "install" || command === "remove") {
-				local = true;
-			} else {
-				invalidOption = invalidOption ?? arg;
-			}
-			continue;
-		}
-
-		if (arg.startsWith("-")) {
-			invalidOption = invalidOption ?? arg;
-			continue;
-		}
-
-		if (!source) {
-			source = arg;
-		}
-	}
-
-	return { command, source, local, help, invalidOption };
-}
-
-async function handlePackageCommand(args: string[]): Promise<boolean> {
-	const options = parsePackageCommand(args);
-	if (!options) {
-		return false;
-	}
-
-	if (options.help) {
-		printPackageCommandHelp(options.command);
-		return true;
-	}
-
-	if (options.invalidOption) {
-		console.error(chalk.red(`Unknown option ${options.invalidOption} for "${options.command}".`));
-		console.error(chalk.dim(`Use "${APP_NAME} --help" or "${getPackageCommandUsage(options.command)}".`));
-		process.exitCode = 1;
-		return true;
-	}
-
-	const source = options.source;
-	if ((options.command === "install" || options.command === "remove") && !source) {
-		console.error(chalk.red(`Missing ${options.command} source.`));
-		console.error(chalk.dim(`Usage: ${getPackageCommandUsage(options.command)}`));
-		process.exitCode = 1;
-		return true;
-	}
-
-	const cwd = process.cwd();
-	const agentDir = getAgentDir();
-	const settingsManager = SettingsManager.create(cwd, agentDir);
-	reportSettingsErrors(settingsManager, "package command");
-	const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
-
-	packageManager.setProgressCallback((event) => {
-		if (event.type === "start") {
-			process.stdout.write(chalk.dim(`${event.message}\n`));
-		}
-	});
-
-	try {
-		switch (options.command) {
-			case "install":
-				await packageManager.install(source!, { local: options.local });
-				packageManager.addSourceToSettings(source!, { local: options.local });
-				console.log(chalk.green(`Installed ${source}`));
-				return true;
-
-			case "remove": {
-				await packageManager.remove(source!, { local: options.local });
-				const removed = packageManager.removeSourceFromSettings(source!, { local: options.local });
-				if (!removed) {
-					console.error(chalk.red(`No matching package found for ${source}`));
-					process.exitCode = 1;
-					return true;
-				}
-				console.log(chalk.green(`Removed ${source}`));
-				return true;
-			}
-
-			case "list": {
-				const globalSettings = settingsManager.getGlobalSettings();
-				const projectSettings = settingsManager.getProjectSettings();
-				const globalPackages = globalSettings.packages ?? [];
-				const projectPackages = projectSettings.packages ?? [];
-
-				if (globalPackages.length === 0 && projectPackages.length === 0) {
-					console.log(chalk.dim("No packages installed."));
-					return true;
-				}
-
-				const formatPackage = (pkg: (typeof globalPackages)[number], scope: "user" | "project") => {
-					const source = typeof pkg === "string" ? pkg : pkg.source;
-					const filtered = typeof pkg === "object";
-					const display = filtered ? `${source} (filtered)` : source;
-					console.log(`  ${display}`);
-					const path = packageManager.getInstalledPath(source, scope);
-					if (path) {
-						console.log(chalk.dim(`    ${path}`));
-					}
-				};
-
-				if (globalPackages.length > 0) {
-					console.log(chalk.bold("User packages:"));
-					for (const pkg of globalPackages) {
-						formatPackage(pkg, "user");
-					}
-				}
-
-				if (projectPackages.length > 0) {
-					if (globalPackages.length > 0) console.log();
-					console.log(chalk.bold("Project packages:"));
-					for (const pkg of projectPackages) {
-						formatPackage(pkg, "project");
-					}
-				}
-
-				return true;
-			}
-
-			case "update":
-				await packageManager.update(source);
-				if (source) {
-					console.log(chalk.green(`Updated ${source}`));
-				} else {
-					console.log(chalk.green("Updated packages"));
-				}
-				return true;
-		}
-	} catch (error: unknown) {
-		const message = error instanceof Error ? error.message : "Unknown package command error";
-		console.error(chalk.red(`Error: ${message}`));
-		process.exitCode = 1;
-		return true;
-	}
-}
-
 async function prepareInitialMessage(
 	parsed: Args,
 	autoResizeImages: boolean,
@@ -590,7 +360,16 @@ export async function main(args: string[]) {
 		process.env.PI_SKIP_VERSION_CHECK = "1";
 	}
 
-	if (await handlePackageCommand(args)) {
+	const packageCommand = await runPackageCommand({
+		appName: APP_NAME,
+		args,
+		cwd: process.cwd(),
+		agentDir: getAgentDir(),
+		stdout: process.stdout,
+		stderr: process.stderr,
+	});
+	if (packageCommand.handled) {
+		process.exitCode = packageCommand.exitCode;
 		return;
 	}
 

package/packages/pi-coding-agent/src/modes/interactive/components/footer.ts

@@ -26,6 +26,18 @@ function formatTokens(count: number): string {
 	return `${Math.round(count / 1000000)}M`;
 }
 
+/**
+ * Format a cost value for compact display.
+ * Uses fewer decimal places for larger amounts.
+ * @internal Exported for testing only.
+ */
+export function formatPromptCost(cost: number): string {
+	if (cost < 0.001) return `$${cost.toFixed(4)}`;
+	if (cost < 0.01) return `$${cost.toFixed(3)}`;
+	if (cost < 1) return `$${cost.toFixed(3)}`;
+	return `$${cost.toFixed(2)}`;
+}
+
 /**
  * Footer component that shows pwd, token stats, and context usage.
  * Computes token/context stats from session, gets git branch and extension statuses from provider.
@@ -112,6 +124,14 @@ export class FooterComponent implements Component {
 			statsParts.push(costStr);
 		}
 
+		// Per-prompt cost annotation (opt-in via show_token_cost preference, #1515)
+		if (process.env.GSD_SHOW_TOKEN_COST === "1") {
+			const lastTurnCost = this.session.getLastTurnCost();
+			if (lastTurnCost > 0) {
+				statsParts.push(`(last: ${formatPromptCost(lastTurnCost)})`);
+			}
+		}
+
 		// Colorize context percentage based on usage
 		let contextPercentStr: string;
 		const autoIndicator = this.autoCompactEnabled ? " (auto)" : "";

package/packages/pi-coding-agent/src/modes/interactive/theme/theme.ts

@@ -663,7 +663,7 @@ function setGlobalTheme(t: Theme): void {
 
 let currentThemeName: string | undefined;
 let themeWatcher: fs.FSWatcher | undefined;
-let onThemeChangeCallback: (() => void) | undefined;
+const onThemeChangeCallbacks = new Set<() => void>();
 const registeredThemes = new Map<string, Theme>();
 
 export function setRegisteredThemes(themes: Theme[]): void {
@@ -698,9 +698,7 @@ export function setTheme(name: string, enableWatcher: boolean = false): { succes
 		if (enableWatcher) {
 			startThemeWatcher();
 		}
-		if (onThemeChangeCallback) {
-			onThemeChangeCallback();
-		}
+		onThemeChangeCallbacks.forEach(cb => cb());
 		return { success: true };
 	} catch (error) {
 		// Theme is invalid - fall back to dark theme
@@ -718,13 +716,12 @@ export function setThemeInstance(themeInstance: Theme): void {
 	setGlobalTheme(themeInstance);
 	currentThemeName = "<in-memory>";
 	stopThemeWatcher(); // Can't watch a direct instance
-	if (onThemeChangeCallback) {
-		onThemeChangeCallback();
-	}
+	onThemeChangeCallbacks.forEach(cb => cb());
 }
 
-export function onThemeChange(callback: () => void): void {
-	onThemeChangeCallback = callback;
+export function onThemeChange(callback: () => void): () => void {
+	onThemeChangeCallbacks.add(callback);
+	return () => { onThemeChangeCallbacks.delete(callback); };
 }
 
 function startThemeWatcher(): void {
@@ -755,10 +752,8 @@ function startThemeWatcher(): void {
 					try {
 						// Reload the theme
 						setGlobalTheme(loadTheme(currentThemeName!));
-						// Notify callback (to invalidate UI)
-						if (onThemeChangeCallback) {
-							onThemeChangeCallback();
-						}
+						// Notify callbacks (to invalidate UI)
+						onThemeChangeCallbacks.forEach(cb => cb());
 					} catch (_error) {
 						// Ignore errors (file might be in invalid state while being edited)
 					}
@@ -773,9 +768,7 @@ function startThemeWatcher(): void {
 							themeWatcher.close();
 							themeWatcher = undefined;
 						}
-						if (onThemeChangeCallback) {
-							onThemeChangeCallback();
-						}
+						onThemeChangeCallbacks.forEach(cb => cb());
 					}
 				}, 100);
 			}

package/packages/pi-coding-agent/src/modes/print-mode.ts

@@ -45,52 +45,62 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	});
 
 	// Always subscribe to enable session persistence via _handleAgentEvent
-	session.subscribe((event) => {
+	const unsubscribe = session.subscribe((event) => {
 		// In JSON mode, output all events
 		if (mode === "json") {
 			console.log(JSON.stringify(event));
 		}
 	});
 
-	// Send initial message with attachments
-	if (initialMessage) {
-		await session.prompt(initialMessage, { images: initialImages });
-	}
+	let exitCode = 0;
 
-	// Send remaining messages
-	for (const message of messages) {
-		await session.prompt(message);
-	}
+	try {
+		// Send initial message with attachments
+		if (initialMessage) {
+			await session.prompt(initialMessage, { images: initialImages });
+		}
 
-	// In text mode, output final response
-	if (mode === "text") {
-		const state = session.state;
-		const lastMessage = state.messages[state.messages.length - 1];
+		// Send remaining messages
+		for (const message of messages) {
+			await session.prompt(message);
+		}
 
-		if (lastMessage?.role === "assistant") {
-			const assistantMsg = lastMessage as AssistantMessage;
+		// In text mode, output final response
+		if (mode === "text") {
+			const state = session.state;
+			const lastMessage = state.messages[state.messages.length - 1];
 
-			// Check for error/aborted
-			if (assistantMsg.stopReason === "error" || assistantMsg.stopReason === "aborted") {
-				console.error(assistantMsg.errorMessage || `Request ${assistantMsg.stopReason}`);
-				process.exit(1);
-			}
+			if (lastMessage?.role === "assistant") {
+				const assistantMsg = lastMessage as AssistantMessage;
 
-			// Output text content
-			for (const content of assistantMsg.content) {
-				if (content.type === "text") {
-					console.log(content.text);
+				// Check for error/aborted
+				if (assistantMsg.stopReason === "error" || assistantMsg.stopReason === "aborted") {
+					console.error(assistantMsg.errorMessage || `Request ${assistantMsg.stopReason}`);
+					exitCode = 1;
+				} else {
+					// Output text content
+					for (const content of assistantMsg.content) {
+						if (content.type === "text") {
+							console.log(content.text);
+						}
+					}
 				}
 			}
 		}
-	}
 
-	// Ensure stdout is fully flushed before returning
-	// This prevents race conditions where the process exits before all output is written
-	await new Promise<void>((resolve, reject) => {
-		process.stdout.write("", (err) => {
-			if (err) reject(err);
-			else resolve();
+		// Ensure stdout is fully flushed before returning
+		// This prevents race conditions where the process exits before all output is written
+		await new Promise<void>((resolve, reject) => {
+			process.stdout.write("", (err) => {
+				if (err) reject(err);
+				else resolve();
+			});
 		});
-	});
+	} finally {
+		unsubscribe();
+	}
+
+	if (exitCode !== 0) {
+		process.exit(exitCode);
+	}
 }

package/packages/pi-coding-agent/src/modes/rpc/rpc-client.ts

@@ -54,6 +54,7 @@ export type RpcEventListener = (event: AgentEvent) => void;
 export class RpcClient {
 	private process: ChildProcess | null = null;
 	private stopReadingStdout: (() => void) | null = null;
+	private _stderrHandler?: (data: Buffer) => void;
 	private eventListeners: RpcEventListener[] = [];
 	private pendingRequests: Map<string, { resolve: (response: RpcResponse) => void; reject: (error: Error) => void }> =
 		new Map();
@@ -90,9 +91,10 @@ export class RpcClient {
 		});
 
 		// Collect stderr for debugging
-		this.process.stderr?.on("data", (data) => {
+		this._stderrHandler = (data: Buffer) => {
 			this.stderr += data.toString();
-		});
+		};
+		this.process.stderr?.on("data", this._stderrHandler);
 
 		// Set up strict JSONL reader for stdout.
 		this.stopReadingStdout = attachJsonlLineReader(this.process.stdout!, (line) => {
@@ -127,6 +129,10 @@ export class RpcClient {
 
 		this.stopReadingStdout?.();
 		this.stopReadingStdout = null;
+		if (this._stderrHandler) {
+			this.process.stderr?.removeListener("data", this._stderrHandler);
+			this._stderrHandler = undefined;
+		}
 		this.process.kill("SIGTERM");
 
 		// Wait for process to exit

package/packages/pi-coding-agent/src/modes/rpc/rpc-mode.ts

@@ -424,7 +424,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 	void extensionsReadyPromise;
 
 	// Output all agent events as JSON
-	session.subscribe((event) => {
+	const unsubscribe = session.subscribe((event) => {
 		output(event);
 	});
 
@@ -730,6 +730,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 			await currentRunner.emit({ type: "session_shutdown" });
 		}
 
+		unsubscribe();
 		embeddedInteractiveMode?.stop();
 		detachInput();
 		process.stdin.pause();

package/packages/pi-coding-agent/src/resources/extensions/memory/storage.test.ts

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { describe, it, mock } from "node:test";
+import { describe, it, afterEach } from "node:test";
 import { mkdtempSync, rmSync, readFileSync, existsSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
@@ -15,84 +15,84 @@ function wait(ms: number): Promise<void> {
 }
 
 describe("MemoryStorage debounced persistence", () => {
-	it("multiple rapid mutations only trigger one persist write", async () => {
-		const dir = makeTmpDir();
-		const dbPath = join(dir, "test.db");
-		try {
-			const storage = await MemoryStorage.create(dbPath);
-
-			const initialStat = readFileSync(dbPath);
-			const initialMtime = initialStat.length;
-
-			storage.upsertThreads([
-				{ threadId: "t1", filePath: "/a.txt", fileSize: 100, fileMtime: 1000, cwd: "/proj" },
-			]);
-			storage.upsertThreads([
-				{ threadId: "t2", filePath: "/b.txt", fileSize: 200, fileMtime: 2000, cwd: "/proj" },
-			]);
-			storage.upsertThreads([
-				{ threadId: "t3", filePath: "/c.txt", fileSize: 300, fileMtime: 3000, cwd: "/proj" },
-			]);
-
-			const afterMutationsBuf = readFileSync(dbPath);
-			assert.deepEqual(
-				afterMutationsBuf,
-				initialStat,
-				"File should not have been written yet (debounce window has not elapsed)",
-			);
-
-			await wait(700);
-
-			const afterDebounceBuf = readFileSync(dbPath);
-			assert.notDeepEqual(
-				afterDebounceBuf,
-				initialStat,
-				"File should have been written after debounce window elapsed",
-			);
-
-			const stats = storage.getStats();
-			assert.equal(stats.totalThreads, 3);
-
-			storage.close();
-		} finally {
+	let dir: string;
+
+	afterEach(() => {
+		if (dir) {
 			rmSync(dir, { recursive: true, force: true });
 		}
 	});
 
+	it("multiple rapid mutations only trigger one persist write", async () => {
+		dir = makeTmpDir();
+		const dbPath = join(dir, "test.db");
+		const storage = await MemoryStorage.create(dbPath);
+
+		const initialStat = readFileSync(dbPath);
+		const initialMtime = initialStat.length;
+
+		storage.upsertThreads([
+			{ threadId: "t1", filePath: "/a.txt", fileSize: 100, fileMtime: 1000, cwd: "/proj" },
+		]);
+		storage.upsertThreads([
+			{ threadId: "t2", filePath: "/b.txt", fileSize: 200, fileMtime: 2000, cwd: "/proj" },
+		]);
+		storage.upsertThreads([
+			{ threadId: "t3", filePath: "/c.txt", fileSize: 300, fileMtime: 3000, cwd: "/proj" },
+		]);
+
+		const afterMutationsBuf = readFileSync(dbPath);
+		assert.deepEqual(
+			afterMutationsBuf,
+			initialStat,
+			"File should not have been written yet (debounce window has not elapsed)",
+		);
+
+		await wait(700);
+
+		const afterDebounceBuf = readFileSync(dbPath);
+		assert.notDeepEqual(
+			afterDebounceBuf,
+			initialStat,
+			"File should have been written after debounce window elapsed",
+		);
+
+		const stats = storage.getStats();
+		assert.equal(stats.totalThreads, 3);
+
+		storage.close();
+	});
+
 	it("close() flushes pending changes immediately without waiting for debounce", async () => {
-		const dir = makeTmpDir();
+		dir = makeTmpDir();
 		const dbPath = join(dir, "test.db");
-		try {
-			const storage = await MemoryStorage.create(dbPath);
-
-			const initialBuf = readFileSync(dbPath);
-
-			storage.upsertThreads([
-				{ threadId: "t1", filePath: "/a.txt", fileSize: 100, fileMtime: 1000, cwd: "/proj" },
-			]);
-
-			const beforeCloseBuf = readFileSync(dbPath);
-			assert.deepEqual(
-				beforeCloseBuf,
-				initialBuf,
-				"File should not have been written yet (debounce window has not elapsed)",
-			);
-
-			storage.close();
-
-			const afterCloseBuf = readFileSync(dbPath);
-			assert.notDeepEqual(
-				afterCloseBuf,
-				initialBuf,
-				"File should have been written immediately on close()",
-			);
-
-			const reopened = await MemoryStorage.create(dbPath);
-			const stats = reopened.getStats();
-			assert.equal(stats.totalThreads, 1, "Data should be persisted and readable after close");
-			reopened.close();
-		} finally {
-			rmSync(dir, { recursive: true, force: true });
-		}
+		const storage = await MemoryStorage.create(dbPath);
+
+		const initialBuf = readFileSync(dbPath);
+
+		storage.upsertThreads([
+			{ threadId: "t1", filePath: "/a.txt", fileSize: 100, fileMtime: 1000, cwd: "/proj" },
+		]);
+
+		const beforeCloseBuf = readFileSync(dbPath);
+		assert.deepEqual(
+			beforeCloseBuf,
+			initialBuf,
+			"File should not have been written yet (debounce window has not elapsed)",
+		);
+
+		storage.close();
+
+		const afterCloseBuf = readFileSync(dbPath);
+		assert.notDeepEqual(
+			afterCloseBuf,
+			initialBuf,
+			"File should have been written immediately on close()",
+		);
+
+		const reopened = await MemoryStorage.create(dbPath);
+		const stats = reopened.getStats();
+		assert.equal(stats.totalThreads, 1, "Data should be persisted and readable after close");
+		reopened.close();
 	});
 });

package/pkg/dist/modes/interactive/theme/theme.d.ts

@@ -106,7 +106,7 @@ export declare function setTheme(name: string, enableWatcher?: boolean): {
     error?: string;
 };
 export declare function setThemeInstance(themeInstance: Theme): void;
-export declare function onThemeChange(callback: () => void): void;
+export declare function onThemeChange(callback: () => void): () => void;
 export declare function stopThemeWatcher(): void;
 /**
  * Get resolved theme colors as CSS-compatible hex strings.