@oh-my-pi/pi-coding-agent 11.8.2 → 11.8.3

package/docs/tui.md

@@ -20,13 +20,13 @@ interface Component {
 }
 ```
 
-| Member                       | Description                                                                                               |
-| ---------------------------- | --------------------------------------------------------------------------------------------------------- |
-| `render(width)`              | Return array of strings (one per line). Each line **must not exceed `width`**.                            |
-| `handleInput?(data)`         | Receive keyboard input when component has focus.                                                          |
-| `wantsKeyRelease?`           | Opt-in to key release events (Kitty protocol). Default is `false` (release events are filtered out).      |
-| `getCursorPosition?(width)`  | Optional cursor position within the rendered output (0-based row/col) for hardware cursor placement.      |
-| `invalidate()`               | Clear cached render state (called when themes change or the component needs a full re-render).            |
+| Member                      | Description                                                                                          |
+| --------------------------- | ---------------------------------------------------------------------------------------------------- |
+| `render(width)`             | Return array of strings (one per line). Each line **must not exceed `width`**.                       |
+| `handleInput?(data)`        | Receive keyboard input when component has focus.                                                     |
+| `wantsKeyRelease?`          | Opt-in to key release events (Kitty protocol). Default is `false` (release events are filtered out). |
+| `getCursorPosition?(width)` | Optional cursor position within the rendered output (0-based row/col) for hardware cursor placement. |
+| `invalidate()`              | Clear cached render state (called when themes change or the component needs a full re-render).       |
 
 ## Using Components
 
@@ -333,8 +333,8 @@ class MySelector implements Component {
 	private cachedWidth?: number;
 	private cachedLines?: string[];
 
-	public onSelect?: (item: string) => void;
-	public onCancel?: () => void;
+	onSelect?: (item: string) => void;
+	onCancel?: () => void;
 
 	constructor(items: string[]) {
 		this.items = items;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "11.8.2",
+	"version": "11.8.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -90,12 +90,12 @@
 		"@mozilla/readability": "0.6.0",
 		"@oclif/core": "^4.8.0",
 		"@oclif/plugin-autocomplete": "^3.2.40",
-		"@oh-my-pi/omp-stats": "11.8.2",
-		"@oh-my-pi/pi-agent-core": "11.8.2",
-		"@oh-my-pi/pi-ai": "11.8.2",
-		"@oh-my-pi/pi-natives": "11.8.2",
-		"@oh-my-pi/pi-tui": "11.8.2",
-		"@oh-my-pi/pi-utils": "11.8.2",
+		"@oh-my-pi/omp-stats": "11.8.3",
+		"@oh-my-pi/pi-agent-core": "11.8.3",
+		"@oh-my-pi/pi-ai": "11.8.3",
+		"@oh-my-pi/pi-natives": "11.8.3",
+		"@oh-my-pi/pi-tui": "11.8.3",
+		"@oh-my-pi/pi-utils": "11.8.3",
 		"@sinclair/typebox": "^0.34.48",
 		"ajv": "^8.17.1",
 		"chalk": "^5.6.2",

package/src/cli/file-processor.ts

@@ -1,7 +1,7 @@
 /**
  * Process @file CLI arguments into text content and image attachments
  */
-import * as fs from "node:fs/promises";
+import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import { isEnoent } from "@oh-my-pi/pi-utils";
@@ -36,15 +36,10 @@ export async function processFileArguments(fileArgs: string[], options?: Process
 		// Expand and resolve path (handles ~ expansion and macOS screenshot Unicode spaces)
 		const absolutePath = path.resolve(resolveReadPath(fileArg, process.cwd()));
 
-		let stat: Awaited<ReturnType<typeof fs.stat>>;
-		try {
-			stat = await fs.stat(absolutePath);
-		} catch (err) {
-			if (isEnoent(err)) {
-				console.error(chalk.red(`Error: File not found: ${absolutePath}`));
-				process.exit(1);
-			}
-			throw err;
+		const stat = fs.statSync(absolutePath, { throwIfNoEntry: false });
+		if (!stat) {
+			console.error(chalk.red(`Error: File not found: ${absolutePath}`));
+			process.exit(1);
 		}
 
 		const mimeType = await detectSupportedImageMimeTypeFromFile(absolutePath);
@@ -58,9 +53,9 @@ export async function processFileArguments(fileArgs: string[], options?: Process
 		}
 
 		// Read file, handling not-found gracefully
-		let buffer: Buffer;
+		let buffer: Uint8Array;
 		try {
-			buffer = await fs.readFile(absolutePath);
+			buffer = await Bun.file(absolutePath).bytes();
 		} catch (err) {
 			if (isEnoent(err)) {
 				console.error(chalk.red(`Error: File not found: ${absolutePath}`));
@@ -114,7 +109,7 @@ export async function processFileArguments(fileArgs: string[], options?: Process
 		} else {
 			// Handle text file
 			try {
-				const content = buffer.toString("utf-8");
+				const content = new TextDecoder().decode(buffer);
 				text += `<file name="${absolutePath}">\n${content}\n</file>\n`;
 			} catch (error: unknown) {
 				const message = error instanceof Error ? error.message : String(error);

package/src/cli/oclif-help.ts

@@ -5,7 +5,7 @@ import { CommandHelp, Help } from "@oclif/core";
 import { getExtraHelpText } from "./args";
 
 export default class OclifHelp extends Help {
-	protected async showRootHelp(): Promise<void> {
+	async showRootHelp(): Promise<void> {
 		await super.showRootHelp();
 		const rootCommand = this.config.findCommand("index");
 		if (rootCommand) {

package/src/cli.ts

@@ -8,6 +8,20 @@
 import { run } from "@oclif/core";
 import { APP_NAME } from "./config";
 
+// oclif's warn() doesn't unwrap AggregateError — override to surface the real messages
+const originalWarn = console.warn;
+console.warn = (...args: unknown[]) => {
+	for (const arg of args) {
+		if (arg instanceof AggregateError) {
+			for (const err of arg.errors) {
+				originalWarn(err instanceof Error ? (err.stack ?? err.message) : String(err));
+			}
+			return;
+		}
+	}
+	originalWarn(...args);
+};
+
 process.title = APP_NAME;
 const argv = process.argv.slice(2);
 const runArgv = argv.length === 0 || argv[0]?.startsWith("-") ? ["index", ...argv] : argv;

package/src/commit/git/index.ts

@@ -18,21 +18,21 @@ export class ControlledGit {
 	async getDiff(staged: boolean): Promise<string> {
 		const args = staged ? ["diff", "--cached"] : ["diff"];
 		const result = await runGitCommand(this.cwd, args);
-		this.ensureSuccess(result, "git diff");
+		this.#ensureSuccess(result, "git diff");
 		return result.stdout;
 	}
 
 	async getDiffForFiles(files: string[], staged = true): Promise<string> {
 		const args = staged ? ["diff", "--cached", "--", ...files] : ["diff", "--", ...files];
 		const result = await runGitCommand(this.cwd, args);
-		this.ensureSuccess(result, "git diff (files)");
+		this.#ensureSuccess(result, "git diff (files)");
 		return result.stdout;
 	}
 
 	async getChangedFiles(staged: boolean): Promise<string[]> {
 		const args = staged ? ["diff", "--cached", "--name-only"] : ["diff", "--name-only"];
 		const result = await runGitCommand(this.cwd, args);
-		this.ensureSuccess(result, "git diff --name-only");
+		this.#ensureSuccess(result, "git diff --name-only");
 		return result.stdout
 			.split("\n")
 			.map(line => line.trim())
@@ -42,27 +42,27 @@ export class ControlledGit {
 	async getStat(staged: boolean): Promise<string> {
 		const args = staged ? ["diff", "--cached", "--stat"] : ["diff", "--stat"];
 		const result = await runGitCommand(this.cwd, args);
-		this.ensureSuccess(result, "git diff --stat");
+		this.#ensureSuccess(result, "git diff --stat");
 		return result.stdout;
 	}
 
 	async getStatForFiles(files: string[], staged = true): Promise<string> {
 		const args = staged ? ["diff", "--cached", "--stat", "--", ...files] : ["diff", "--stat", "--", ...files];
 		const result = await runGitCommand(this.cwd, args);
-		this.ensureSuccess(result, "git diff --stat (files)");
+		this.#ensureSuccess(result, "git diff --stat (files)");
 		return result.stdout;
 	}
 
 	async getNumstat(staged: boolean): Promise<NumstatEntry[]> {
 		const args = staged ? ["diff", "--cached", "--numstat"] : ["diff", "--numstat"];
 		const result = await runGitCommand(this.cwd, args);
-		this.ensureSuccess(result, "git diff --numstat");
+		this.#ensureSuccess(result, "git diff --numstat");
 		return parseNumstat(result.stdout);
 	}
 
 	async getRecentCommits(count: number): Promise<string[]> {
 		const result = await runGitCommand(this.cwd, ["log", `-n${count}`, "--pretty=format:%s"]);
-		this.ensureSuccess(result, "git log");
+		this.#ensureSuccess(result, "git log");
 		return result.stdout
 			.split("\n")
 			.map(line => line.trim())
@@ -71,7 +71,7 @@ export class ControlledGit {
 
 	async getStagedFiles(): Promise<string[]> {
 		const result = await runGitCommand(this.cwd, ["diff", "--cached", "--name-only"]);
-		this.ensureSuccess(result, "git diff --cached --name-only");
+		this.#ensureSuccess(result, "git diff --cached --name-only");
 		return result.stdout
 			.split("\n")
 			.map(line => line.trim())
@@ -80,7 +80,7 @@ export class ControlledGit {
 
 	async getUntrackedFiles(): Promise<string[]> {
 		const result = await runGitCommand(this.cwd, ["ls-files", "--others", "--exclude-standard"]);
-		this.ensureSuccess(result, "git ls-files --others --exclude-standard");
+		this.#ensureSuccess(result, "git ls-files --others --exclude-standard");
 		return result.stdout
 			.split("\n")
 			.map(line => line.trim())
@@ -89,12 +89,12 @@ export class ControlledGit {
 
 	async stageAll(): Promise<void> {
 		const result = await stageFiles(this.cwd, []);
-		this.ensureSuccess(result, "git add -A");
+		this.#ensureSuccess(result, "git add -A");
 	}
 
 	async stageFiles(files: string[]): Promise<void> {
 		const result = await stageFiles(this.cwd, files);
-		this.ensureSuccess(result, "git add");
+		this.#ensureSuccess(result, "git add");
 	}
 
 	async stageHunks(selections: HunkSelection[]): Promise<void> {
@@ -137,7 +137,7 @@ export class ControlledGit {
 		try {
 			await Bun.write(tempPath, patch);
 			const result = await runGitCommand(this.cwd, ["apply", "--cached", "--binary", tempPath]);
-			this.ensureSuccess(result, "git apply --cached");
+			this.#ensureSuccess(result, "git apply --cached");
 		} finally {
 			await fs.rm(tempPath, { force: true });
 		}
@@ -145,17 +145,17 @@ export class ControlledGit {
 
 	async resetStaging(files: string[] = []): Promise<void> {
 		const result = await resetStaging(this.cwd, files);
-		this.ensureSuccess(result, "git reset");
+		this.#ensureSuccess(result, "git reset");
 	}
 
 	async commit(message: string): Promise<void> {
 		const result = await commit(this.cwd, message);
-		this.ensureSuccess(result, "git commit");
+		this.#ensureSuccess(result, "git commit");
 	}
 
 	async push(): Promise<void> {
 		const result = await push(this.cwd);
-		this.ensureSuccess(result, "git push");
+		this.#ensureSuccess(result, "git push");
 	}
 
 	parseDiffFiles(diff: string): FileDiff[] {
@@ -171,7 +171,7 @@ export class ControlledGit {
 		return this.parseDiffHunks(diff);
 	}
 
-	private ensureSuccess(result: { exitCode: number; stderr: string }, label: string): void {
+	#ensureSuccess(result: { exitCode: number; stderr: string }, label: string): void {
 		if (result.exitCode !== 0) {
 			logger.error("commit git command failed", { label, stderr: result.stderr });
 			throw new GitError(label, result.stderr);

package/src/config/keybindings.ts

@@ -166,11 +166,11 @@ export function formatKeyHints(keys: KeyId | KeyId[]): string {
  * Manages all keybindings (app + editor).
  */
 export class KeybindingsManager {
-	private appActionToKeys: Map<AppAction, KeyId[]>;
+	#appActionToKeys: Map<AppAction, KeyId[]>;
 
 	private constructor(private readonly config: KeybindingsConfig) {
-		this.appActionToKeys = new Map();
-		this.buildMaps();
+		this.#appActionToKeys = new Map();
+		this.#buildMaps();
 	}
 
 	/**
@@ -178,7 +178,7 @@ export class KeybindingsManager {
 	 */
 	static async create(agentDir: string = getAgentDir()): Promise<KeybindingsManager> {
 		const configPath = path.join(agentDir, "keybindings.json");
-		const config = await KeybindingsManager.loadFromFile(configPath);
+		const config = await KeybindingsManager.#loadFromFile(configPath);
 		const manager = new KeybindingsManager(config);
 
 		// Set up editor keybindings globally
@@ -200,7 +200,7 @@ export class KeybindingsManager {
 		return new KeybindingsManager(config);
 	}
 
-	private static async loadFromFile(path: string): Promise<KeybindingsConfig> {
+	static async #loadFromFile(path: string): Promise<KeybindingsConfig> {
 		try {
 			return await Bun.file(path).json();
 		} catch (error) {
@@ -209,13 +209,13 @@ export class KeybindingsManager {
 		}
 	}
 
-	private buildMaps(): void {
-		this.appActionToKeys.clear();
+	#buildMaps(): void {
+		this.#appActionToKeys.clear();
 
 		// Set defaults for app actions
 		for (const [action, keys] of Object.entries(DEFAULT_APP_KEYBINDINGS)) {
 			const keyArray = Array.isArray(keys) ? keys : [keys];
-			this.appActionToKeys.set(
+			this.#appActionToKeys.set(
 				action as AppAction,
 				keyArray.map(key => normalizeKeyId(key as KeyId)),
 			);
@@ -225,7 +225,7 @@ export class KeybindingsManager {
 		for (const [action, keys] of Object.entries(this.config)) {
 			if (keys === undefined || !isAppAction(action)) continue;
 			const keyArray = Array.isArray(keys) ? keys : [keys];
-			this.appActionToKeys.set(
+			this.#appActionToKeys.set(
 				action,
 				keyArray.map(key => normalizeKeyId(key as KeyId)),
 			);
@@ -236,7 +236,7 @@ export class KeybindingsManager {
 	 * Check if input matches an app action.
 	 */
 	matches(data: string, action: AppAction): boolean {
-		const keys = this.appActionToKeys.get(action);
+		const keys = this.#appActionToKeys.get(action);
 		if (!keys) return false;
 		for (const key of keys) {
 			if (matchesKey(data, key)) return true;
@@ -248,7 +248,7 @@ export class KeybindingsManager {
 	 * Get keys bound to an app action.
 	 */
 	getKeys(action: AppAction): KeyId[] {
-		return this.appActionToKeys.get(action) ?? [];
+		return this.#appActionToKeys.get(action) ?? [];
 	}
 
 	/**

package/src/config/model-registry.ts

@@ -253,10 +253,10 @@ function applyModelOverride(model: Model<Api>, override: ModelOverride): Model<A
  * Model registry - loads and manages models, resolves API keys via AuthStorage.
  */
 export class ModelRegistry {
-	private models: Model<Api>[] = [];
-	private customProviderApiKeys: Map<string, string> = new Map();
-	private configError: ConfigError | undefined = undefined;
-	private modelsConfigFile: ConfigFile<ModelsConfig>;
+	#models: Model<Api>[] = [];
+	#customProviderApiKeys: Map<string, string> = new Map();
+	#configError: ConfigError | undefined = undefined;
+	#modelsConfigFile: ConfigFile<ModelsConfig>;
 
 	/**
 	 * @param authStorage - Auth storage for API key resolution
@@ -265,83 +265,48 @@ export class ModelRegistry {
 		readonly authStorage: AuthStorage,
 		modelsPath?: string,
 	) {
-		this.modelsConfigFile = ModelsConfigFile.relocate(modelsPath);
+		this.#modelsConfigFile = ModelsConfigFile.relocate(modelsPath);
 		// Set up fallback resolver for custom provider API keys
 		this.authStorage.setFallbackResolver(provider => {
-			const keyConfig = this.customProviderApiKeys.get(provider);
+			const keyConfig = this.#customProviderApiKeys.get(provider);
 			if (keyConfig) {
 				return resolveApiKeyConfig(keyConfig);
 			}
 			return undefined;
 		});
 		// Load models synchronously in constructor
-		this.loadModels();
-	}
-
-	/**
-	 * Create an in-memory ModelRegistry instance from serialized data.
-	 * Used by subagent workers to bypass discovery and use parent's models.
-	 */
-	static fromSerialized(data: SerializedModelRegistry, authStorage: AuthStorage): ModelRegistry {
-		const instance = Object.create(ModelRegistry.prototype) as ModelRegistry;
-		(instance as any).authStorage = authStorage;
-		instance.models = data.models;
-		instance.customProviderApiKeys = new Map(Object.entries(data.customProviderApiKeys ?? {}));
-
-		authStorage.setFallbackResolver(provider => {
-			const keyConfig = instance.customProviderApiKeys.get(provider);
-			if (keyConfig) {
-				return resolveApiKeyConfig(keyConfig);
-			}
-			return undefined;
-		});
-
-		return instance;
-	}
-
-	/**
-	 * Serialize ModelRegistry for passing to subagent workers.
-	 */
-	serialize(): SerializedModelRegistry {
-		const customProviderApiKeys: Record<string, string> = {};
-		for (const [k, v] of this.customProviderApiKeys.entries()) {
-			customProviderApiKeys[k] = v;
-		}
-		return {
-			models: this.models,
-			customProviderApiKeys: Object.keys(customProviderApiKeys).length > 0 ? customProviderApiKeys : undefined,
-		};
+		this.#loadModels();
 	}
 
 	/**
 	 * Reload models from disk (built-in + custom from models.json).
 	 */
 	refresh(): void {
-		this.modelsConfigFile.invalidate();
-		this.customProviderApiKeys.clear();
-		this.configError = undefined;
-		this.loadModels();
+		this.#modelsConfigFile.invalidate();
+		this.#customProviderApiKeys.clear();
+		this.#configError = undefined;
+		this.#loadModels();
 	}
 
 	/**
 	 * Get any error from loading models.json (undefined if no error).
 	 */
 	getError(): ConfigError | undefined {
-		return this.configError;
+		return this.#configError;
 	}
 
-	private loadModels() {
+	#loadModels() {
 		// Load custom models from models.json first (to know which providers to override)
 		const {
 			models: customModels = [],
 			overrides = new Map(),
 			modelOverrides = new Map(),
 			error: configError,
-		} = this.loadCustomModels();
-		this.configError = configError;
+		} = this.#loadCustomModels();
+		this.#configError = configError;
 
-		const builtInModels = this.loadBuiltInModels(overrides, modelOverrides);
-		const combined = this.mergeCustomModels(builtInModels, customModels);
+		const builtInModels = this.#loadBuiltInModels(overrides, modelOverrides);
+		const combined = this.#mergeCustomModels(builtInModels, customModels);
 
 		// Update github-copilot base URL based on OAuth credentials
 		const copilotCred = this.authStorage.getOAuthCredential("github-copilot");
@@ -350,14 +315,14 @@ export class ModelRegistry {
 				? (normalizeDomain(copilotCred.enterpriseUrl) ?? undefined)
 				: undefined;
 			const baseUrl = getGitHubCopilotBaseUrl(copilotCred.access, domain);
-			this.models = combined.map(m => (m.provider === "github-copilot" ? { ...m, baseUrl } : m));
+			this.#models = combined.map(m => (m.provider === "github-copilot" ? { ...m, baseUrl } : m));
 		} else {
-			this.models = combined;
+			this.#models = combined;
 		}
 	}
 
 	/** Load built-in models, applying provider and per-model overrides */
-	private loadBuiltInModels(
+	#loadBuiltInModels(
 		overrides: Map<string, ProviderOverride>,
 		modelOverrides: Map<string, Map<string, ModelOverride>>,
 	): Model<Api>[] {
@@ -385,7 +350,7 @@ export class ModelRegistry {
 	}
 
 	/** Merge custom models with built-in, replacing by provider+id match */
-	private mergeCustomModels(builtInModels: Model<Api>[], customModels: Model<Api>[]): Model<Api>[] {
+	#mergeCustomModels(builtInModels: Model<Api>[], customModels: Model<Api>[]): Model<Api>[] {
 		const merged = [...builtInModels];
 		for (const customModel of customModels) {
 			const existingIndex = merged.findIndex(m => m.provider === customModel.provider && m.id === customModel.id);
@@ -398,8 +363,8 @@ export class ModelRegistry {
 		return merged;
 	}
 
-	private loadCustomModels(): CustomModelsResult {
-		const { value, error, status } = this.modelsConfigFile.tryLoad();
+	#loadCustomModels(): CustomModelsResult {
+		const { value, error, status } = this.#modelsConfigFile.tryLoad();
 
 		if (status === "error") {
 			return { models: [], overrides: new Map(), modelOverrides: new Map(), error, found: true };
@@ -422,7 +387,7 @@ export class ModelRegistry {
 
 			// Always store API key for fallback resolver
 			if (providerConfig.apiKey) {
-				this.customProviderApiKeys.set(providerName, providerConfig.apiKey);
+				this.#customProviderApiKeys.set(providerName, providerConfig.apiKey);
 			}
 
 			// Parse per-model overrides
@@ -435,10 +400,10 @@ export class ModelRegistry {
 			}
 		}
 
-		return { models: this.parseModels(value), overrides, modelOverrides: allModelOverrides, found: true };
+		return { models: this.#parseModels(value), overrides, modelOverrides: allModelOverrides, found: true };
 	}
 
-	private parseModels(config: ModelsConfig): Model<Api>[] {
+	#parseModels(config: ModelsConfig): Model<Api>[] {
 		const models: Model<Api>[] = [];
 
 		for (const [providerName, providerConfig] of Object.entries(config.providers)) {
@@ -447,7 +412,7 @@ export class ModelRegistry {
 
 			// Store API key config for fallback resolver
 			if (providerConfig.apiKey) {
-				this.customProviderApiKeys.set(providerName, providerConfig.apiKey);
+				this.#customProviderApiKeys.set(providerName, providerConfig.apiKey);
 			}
 
 			for (const modelDef of modelDefs) {
@@ -496,7 +461,7 @@ export class ModelRegistry {
 	 * If models.json had errors, returns only built-in models.
 	 */
 	getAll(): Model<Api>[] {
-		return this.models;
+		return this.#models;
 	}
 
 	/**
@@ -504,21 +469,21 @@ export class ModelRegistry {
 	 * This is a fast check that doesn't refresh OAuth tokens.
 	 */
 	getAvailable(): Model<Api>[] {
-		return this.models.filter(m => this.authStorage.hasAuth(m.provider));
+		return this.#models.filter(m => this.authStorage.hasAuth(m.provider));
 	}
 
 	/**
 	 * Find a model by provider and ID.
 	 */
 	find(provider: string, modelId: string): Model<Api> | undefined {
-		return this.models.find(m => m.provider === provider && m.id === modelId);
+		return this.#models.find(m => m.provider === provider && m.id === modelId);
 	}
 
 	/**
 	 * Get the base URL associated with a provider, if any model defines one.
 	 */
 	getProviderBaseUrl(provider: string): string | undefined {
-		return this.models.find(m => m.provider === provider && m.baseUrl)?.baseUrl;
+		return this.#models.find(m => m.provider === provider && m.baseUrl)?.baseUrl;
 	}
 
 	/**