@oh-my-pi/pi-coding-agent 6.8.0 → 6.8.2

package/src/lib/worktree/git.ts

@@ -1,5 +1,5 @@
 import * as path from "node:path";
-import type { Subprocess } from "bun";
+import { ptree } from "@oh-my-pi/pi-utils";
 import { execCommand } from "../../core/exec";
 import { WorktreeError, WorktreeErrorCode } from "./errors";
 
@@ -9,32 +9,6 @@ export interface GitResult {
 	stderr: string;
 }
 
-type WritableLike = {
-	write: (chunk: string | Uint8Array) => unknown;
-	flush?: () => unknown;
-	end?: () => unknown;
-};
-
-const textEncoder = new TextEncoder();
-
-async function writeStdin(handle: unknown, stdin: string): Promise<void> {
-	if (!handle || typeof handle === "number") return;
-	if (typeof (handle as WritableStream<Uint8Array>).getWriter === "function") {
-		const writer = (handle as WritableStream<Uint8Array>).getWriter();
-		try {
-			await writer.write(textEncoder.encode(stdin));
-		} finally {
-			await writer.close();
-		}
-		return;
-	}
-
-	const sink = handle as WritableLike;
-	sink.write(stdin);
-	if (sink.flush) sink.flush();
-	if (sink.end) sink.end();
-}
-
 /**
  * Execute a git command.
  * @param args - Command arguments (excluding 'git')
@@ -50,23 +24,15 @@ export async function git(args: string[], cwd?: string): Promise<GitResult> {
  * Execute git command with stdin input.
  * Used for piping diffs to `git apply`.
  */
-export async function gitWithStdin(args: string[], stdin: string, cwd?: string): Promise<GitResult> {
-	const proc: Subprocess = Bun.spawn(["git", ...args], {
+export async function gitWithInput(args: string[], stdin: string, cwd?: string): Promise<GitResult> {
+	const proc = ptree.cspawn(["git", ...args], {
 		cwd: cwd ?? process.cwd(),
-		stdin: "pipe",
-		stdout: "pipe",
-		stderr: "pipe",
+		stdin: Buffer.from(stdin),
 	});
 
-	await writeStdin(proc.stdin, stdin);
-
-	const [stdout, stderr, exitCode] = await Promise.all([
-		(proc.stdout as ReadableStream<Uint8Array>).text(),
-		(proc.stderr as ReadableStream<Uint8Array>).text(),
-		proc.exited,
-	]);
+	const [stdout, stderr] = await Promise.all([proc.stdout.text(), proc.stderr.text()]);
 
-	return { code: exitCode ?? 0, stdout, stderr };
+	return { code: proc.exitCode ?? 0, stdout, stderr };
 }
 
 /**

package/src/lib/worktree/index.ts

@@ -1,7 +1,7 @@
 export { type CollapseOptions, type CollapseResult, type CollapseStrategy, collapse } from "./collapse";
 export { WORKTREE_BASE } from "./constants";
 export { WorktreeError, WorktreeErrorCode } from "./errors";
-export { getRepoName, getRepoRoot, git, gitWithStdin } from "./git";
+export { getRepoName, getRepoRoot, git, gitWithInput as gitWithStdin } from "./git";
 export { create, find, list, prune, remove, type Worktree, which } from "./operations";
 export {
 	cleanupSessions,

package/src/main.ts

@@ -92,11 +92,13 @@ async function runInteractiveMode(
 
 	await mode.init();
 
-	versionCheckPromise.then((newVersion) => {
-		if (newVersion) {
-			mode.showNewVersionNotification(newVersion);
-		}
-	});
+	versionCheckPromise
+		.then((newVersion) => {
+			if (newVersion) {
+				mode.showNewVersionNotification(newVersion);
+			}
+		})
+		.catch(() => {});
 
 	mode.renderInitialMessages();
 

package/src/modes/interactive/components/login-dialog.ts

@@ -109,7 +109,9 @@ export class LoginDialogComponent extends Container {
 	showManualInput(prompt: string): Promise<string> {
 		this.contentContainer.addChild(new Spacer(1));
 		this.contentContainer.addChild(new Text(theme.fg("dim", prompt), 1, 0));
-		this.contentContainer.addChild(this.input);
+		if (!this.contentContainer.children.includes(this.input)) {
+			this.contentContainer.addChild(this.input);
+		}
 		this.contentContainer.addChild(new Text(theme.fg("dim", "(Escape to cancel)"), 1, 0));
 		this.tui.requestRender();
 
@@ -129,7 +131,9 @@ export class LoginDialogComponent extends Container {
 		if (placeholder) {
 			this.contentContainer.addChild(new Text(theme.fg("dim", `e.g., ${placeholder}`), 1, 0));
 		}
-		this.contentContainer.addChild(this.input);
+		if (!this.contentContainer.children.includes(this.input)) {
+			this.contentContainer.addChild(this.input);
+		}
 		this.contentContainer.addChild(new Text(theme.fg("dim", "(Escape to cancel, Enter to submit)"), 1, 0));
 
 		this.input.setValue("");

package/src/modes/interactive/components/tool-execution.ts

@@ -260,6 +260,10 @@ export class ToolExecutionComponent extends Container {
 	): void {
 		this.result = result;
 		this.isPartial = isPartial;
+		// When tool is complete, ensure args are marked complete so spinner stops
+		if (!isPartial) {
+			this.argsComplete = true;
+		}
 		this.updateSpinnerAnimation();
 		this.updateDisplay();
 		// Convert non-PNG images to PNG for Kitty protocol (async)

package/src/modes/interactive/interactive-mode.ts

@@ -168,6 +168,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.editor.onAutocompleteCancel = () => {
 			this.ui.requestRender(true);
 		};
+		this.editor.onAutocompleteUpdate = () => {
+			this.ui.requestRender(true);
+		};
 		try {
 			this.historyStorage = HistoryStorage.open();
 			this.editor.setHistoryStorage(this.historyStorage);

package/src/utils/clipboard.ts

@@ -32,8 +32,6 @@ function selectPreferredImageMimeType(mimeTypes: string[]): string | null {
 }
 
 export async function copyToClipboard(text: string): Promise<void> {
-	const timeout = Bun.sleep(3000).then(() => Promise.reject(new Error("Clipboard operation timed out")));
-
 	let promise: Promise<void>;
 	try {
 		switch (platform()) {
@@ -56,11 +54,11 @@ export async function copyToClipboard(text: string): Promise<void> {
 		}
 	} catch (error) {
 		if (error instanceof Error) {
-			throw new Error(`Failed to copy to clipboard: ${error.message}`);
+			throw new Error(`Failed to copy to clipboard: ${error.message}`, { cause: error });
 		}
-		throw new Error(`Failed to copy to clipboard: ${String(error)}`);
+		throw new Error(`Failed to copy to clipboard: ${String(error)}`, { cause: error });
 	}
-	await Promise.race([promise, timeout]);
+	await Promise.race([promise, Bun.sleep(3000)]);
 }
 
 export interface ClipboardImage {

package/src/core/tools/task/model-resolver.ts

@@ -1,206 +0,0 @@
-/**
- * Model resolution with fuzzy pattern matching.
- *
- * Returns models in "provider/modelId" format for use with --model flag.
- *
- * Supports:
- *   - Exact match: "gpt-5.2" → "p-openai/gpt-5.2"
- *   - Fuzzy match: "opus" → "p-anthropic/claude-opus-4-5"
- *   - Comma fallback: "gpt, opus" → tries gpt first, then opus
- *   - "default" → undefined (use system default)
- *   - "omp/slow" or "pi/slow" → configured slow model from settings
- */
-
-import { $ } from "bun";
-import { type Settings as SettingsFile, settingsCapability } from "../../../capability/settings";
-import { loadCapability } from "../../../discovery";
-import type { Settings as SettingsData } from "../../settings-manager";
-import { resolveOmpCommand } from "./omp-command";
-
-/** Cache for available models (provider/modelId format) */
-let cachedModels: string[] | null = null;
-
-/** Cache expiry time (5 minutes) */
-let cacheExpiry = 0;
-
-const CACHE_TTL_MS = 5 * 60 * 1000;
-
-/**
- * Get available models from `omp --list-models`.
- * Returns models in "provider/modelId" format.
- * Caches the result for performance.
- */
-export async function getAvailableModels(): Promise<string[]> {
-	const now = Date.now();
-	if (cachedModels !== null && now < cacheExpiry) {
-		return cachedModels;
-	}
-
-	try {
-		const ompCommand = resolveOmpCommand();
-		const result = await $`${ompCommand.cmd} ${ompCommand.args} --list-models`.quiet().nothrow();
-		const stdout = result.stdout?.toString() ?? "";
-
-		if (result.exitCode !== 0 || !stdout.trim()) {
-			cachedModels = [];
-			cacheExpiry = now + CACHE_TTL_MS;
-			return cachedModels;
-		}
-
-		// Parse output: skip header line, extract provider/model
-		const lines = stdout.trim().split("\n");
-		cachedModels = lines
-			.slice(1) // Skip header
-			.map((line) => {
-				const parts = line.trim().split(/\s+/);
-				// Format: provider/modelId
-				return parts[0] && parts[1] ? `${parts[0]}/${parts[1]}` : "";
-			})
-			.filter(Boolean);
-
-		cacheExpiry = now + CACHE_TTL_MS;
-		return cachedModels;
-	} catch {
-		cachedModels = [];
-		cacheExpiry = now + CACHE_TTL_MS;
-		return cachedModels;
-	}
-}
-
-/**
- * Clear the model cache (for testing).
- */
-export function clearModelCache(): void {
-	cachedModels = null;
-	cacheExpiry = 0;
-}
-
-/**
- * Load model roles from settings files using capability API.
- */
-async function loadModelRoles(): Promise<Record<string, string>> {
-	const result = await loadCapability<SettingsFile>(settingsCapability.id, { cwd: process.cwd() });
-
-	// Merge all settings, prioritizing first (highest priority)
-	let modelRoles: Record<string, string> = {};
-	for (const settings of result.items.reverse()) {
-		const roles = settings.data.modelRoles as Record<string, string> | undefined;
-		if (roles) {
-			modelRoles = { ...modelRoles, ...roles };
-		}
-	}
-
-	return modelRoles;
-}
-
-/**
- * Resolve an omp/<role> alias to a model string.
- * Looks up the role in settings.modelRoles and returns the configured model.
- * Returns undefined if the role isn't configured.
- */
-async function resolveOmpAlias(
-	role: string,
-	availableModels: string[],
-	settings?: SettingsData,
-): Promise<string | undefined> {
-	const roles = settings?.modelRoles ?? (await loadModelRoles());
-
-	// Look up role in settings (case-insensitive)
-	const configured = roles[role] || roles[role.toLowerCase()];
-	if (!configured) return undefined;
-
-	// configured is in "provider/modelId" format, find in available models
-	return availableModels.find((m) => m.toLowerCase() === configured.toLowerCase());
-}
-
-/**
- * Extract model ID from "provider/modelId" format.
- */
-function getModelId(fullModel: string): string {
-	const slashIdx = fullModel.indexOf("/");
-	return slashIdx > 0 ? fullModel.slice(slashIdx + 1) : fullModel;
-}
-
-/**
- * Extract provider from "provider/modelId" format.
- * Returns undefined if no provider prefix.
- */
-function getProvider(fullModel: string): string | undefined {
-	const slashIdx = fullModel.indexOf("/");
-	return slashIdx > 0 ? fullModel.slice(0, slashIdx) : undefined;
-}
-
-/**
- * Resolve a fuzzy model pattern to "provider/modelId" format.
- *
- * Supports comma-separated patterns (e.g., "gpt, opus") - tries each in order.
- * Returns undefined if pattern is "default", undefined, or no match found.
- *
- * @param pattern - Model pattern to resolve
- * @param availableModels - Optional pre-fetched list of available models (in provider/modelId format)
- * @param settings - Optional settings for role alias resolution (pi/..., omp/...)
- */
-export async function resolveModelPattern(
-	pattern: string | undefined,
-	availableModels?: string[],
-	settings?: SettingsData,
-): Promise<string | undefined> {
-	if (!pattern || pattern === "default") {
-		return undefined;
-	}
-
-	const models = availableModels ?? (await getAvailableModels());
-	if (models.length === 0) {
-		// Fallback: return pattern as-is if we can't get available models
-		return pattern;
-	}
-
-	// Split by comma, try each pattern in order
-	const patterns = pattern
-		.split(",")
-		.map((p) => p.trim())
-		.filter(Boolean);
-
-	for (const p of patterns) {
-		// Handle omp/<role> or pi/<role> aliases - looks up role in settings.modelRoles
-		const lower = p.toLowerCase();
-		if (lower.startsWith("omp/") || lower.startsWith("pi/")) {
-			const role = lower.startsWith("omp/") ? p.slice(4) : p.slice(3);
-			const resolved = await resolveOmpAlias(role, models, settings);
-			if (resolved) return resolved;
-			continue; // Role not configured, try next pattern
-		}
-
-		// Try exact match on full provider/modelId
-		const exactFull = models.find((m) => m.toLowerCase() === p.toLowerCase());
-		if (exactFull) return exactFull;
-
-		// Try exact match on model ID only
-		const exactId = models.find((m) => getModelId(m).toLowerCase() === p.toLowerCase());
-		if (exactId) return exactId;
-
-		// Check if pattern has provider prefix (e.g., "zai/glm-4.7")
-		const patternProvider = getProvider(p);
-		const patternModelId = getModelId(p);
-
-		// If pattern has provider prefix, fuzzy match must stay within that provider
-		// (don't cross provider boundaries when user explicitly specifies provider)
-		if (patternProvider) {
-			const providerFuzzyMatch = models.find(
-				(m) =>
-					getProvider(m)?.toLowerCase() === patternProvider.toLowerCase() &&
-					getModelId(m).toLowerCase().includes(patternModelId.toLowerCase()),
-			);
-			if (providerFuzzyMatch) return providerFuzzyMatch;
-			// No match in specified provider - don't fall through to other providers
-			continue;
-		}
-
-		// No provider prefix - fall back to general fuzzy match on model ID (substring)
-		const fuzzyMatch = models.find((m) => getModelId(m).toLowerCase().includes(patternModelId.toLowerCase()));
-		if (fuzzyMatch) return fuzzyMatch;
-	}
-
-	// No match found - use default model
-	return undefined;
-}