@oh-my-pi/pi-coding-agent 8.12.9 → 8.13.0

package/src/lsp/client.ts

@@ -1,4 +1,4 @@
-import { isEnoent, logger } from "@oh-my-pi/pi-utils";
+import { isEnoent, logger, ptree } from "@oh-my-pi/pi-utils";
 import { ToolAbortError, throwIfAborted } from "../tools/tool-errors";
 import { applyWorkspaceEdit } from "./edits";
 import { getLspmuxCommand, isLspmuxSupported } from "./lspmux";
@@ -206,7 +206,7 @@ function concatBuffers(a: Uint8Array, b: Uint8Array): Uint8Array {
 }
 
 async function writeMessage(
-	sink: import("bun").FileSink,
+	sink: Bun.FileSink,
 	message: LspJsonRpcRequest | LspJsonRpcNotification | LspJsonRpcResponse,
 ): Promise<void> {
 	const content = JSON.stringify(message);
@@ -230,7 +230,7 @@ async function startMessageReader(client: LspClient): Promise<void> {
 	if (client.isReading) return;
 	client.isReading = true;
 
-	const reader = (client.process.stdout as ReadableStream<Uint8Array>).getReader();
+	const reader = (client.proc.stdout as ReadableStream<Uint8Array>).getReader();
 
 	try {
 		while (true) {
@@ -364,7 +364,7 @@ async function sendResponse(
 	};
 
 	try {
-		await writeMessage(client.process.stdin as import("bun").FileSink, response);
+		await writeMessage(client.proc.stdin, response);
 	} catch (err) {
 		logger.error("LSP failed to respond.", { method, error: String(err) });
 	}
@@ -409,18 +409,17 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string, initT
 			? await getLspmuxCommand(baseCommand, baseArgs)
 			: { command: baseCommand, args: baseArgs };
 
-		const proc = Bun.spawn([command, ...args], {
+		const proc = ptree.spawn([command, ...args], {
 			cwd,
+			detached: true,
 			stdin: "pipe",
-			stdout: "pipe",
-			stderr: "pipe",
 			env: env ? { ...process.env, ...env } : undefined,
 		});
 
 		const client: LspClient = {
 			name: key,
 			cwd,
-			process: proc,
+			proc,
 			config,
 			requestId: 0,
 			diagnostics: new Map(),
@@ -686,7 +685,7 @@ export function shutdownClient(key: string): void {
 	sendRequest(client, "shutdown", null).catch(() => {});
 
 	// Kill process
-	client.process.kill();
+	client.proc.kill();
 	clients.delete(key);
 }
 
@@ -773,7 +772,7 @@ export async function sendRequest(
 	});
 
 	// Write request
-	writeMessage(client.process.stdin as import("bun").FileSink, request).catch(err => {
+	writeMessage(client.proc.stdin, request).catch(err => {
 		if (timeout) clearTimeout(timeout);
 		client.pendingRequests.delete(id);
 		cleanup();
@@ -793,26 +792,33 @@ export async function sendNotification(client: LspClient, method: string, params
 	};
 
 	client.lastActivity = Date.now();
-	await writeMessage(client.process.stdin as import("bun").FileSink, notification);
+	await writeMessage(client.proc.stdin, notification);
 }
 
 /**
  * Shutdown all LSP clients.
  */
 export function shutdownAll(): void {
-	for (const client of Array.from(clients.values())) {
-		// Reject all pending requests
-		for (const pending of Array.from(client.pendingRequests.values())) {
-			pending.reject(new Error("LSP client shutdown"));
-		}
-		client.pendingRequests.clear();
+	const clientsToShutdown = Array.from(clients.values());
+	clients.clear();
 
-		// Send shutdown request (best effort, don't wait)
-		sendRequest(client, "shutdown", null).catch(() => {});
+	const err = new Error("LSP client shutdown");
+	for (const client of clientsToShutdown) {
+		/// Reject all pending requests
+		const reqs = Array.from(client.pendingRequests.values());
+		client.pendingRequests.clear();
+		for (const pending of reqs) {
+			pending.reject(err);
+		}
 
-		client.process.kill();
+		void (async () => {
+			// Send shutdown request (best effort, don't wait)
+			const timeout = Bun.sleep(5_000);
+			const result = sendRequest(client, "shutdown", null).catch(() => {});
+			await Promise.race([result, timeout]);
+			client.proc.kill();
+		})().catch(() => {});
 	}
-	clients.clear();
 }
 
 /** Status of an LSP server */

package/src/lsp/index.ts

@@ -118,6 +118,7 @@ export async function warmupLspServers(cwd: string, options?: LspWarmupOptions):
 			});
 		} else {
 			const errorMsg = result.reason?.message ?? String(result.reason);
+			logger.warn("LSP server failed to start", { server: name, error: errorMsg });
 			servers.push({
 				name,
 				status: "error",

package/src/lsp/render.ts

@@ -8,8 +8,8 @@
  * - Collapsible/expandable views
  */
 import type { RenderResultOptions } from "@oh-my-pi/pi-agent-core";
+import { type HighlightColors, highlightCode as nativeHighlightCode, supportsLanguage } from "@oh-my-pi/pi-natives";
 import { type Component, Text } from "@oh-my-pi/pi-tui";
-import { highlight, supportsLanguage } from "cli-highlight";
 import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
 import {
 	formatExpandHint,
@@ -291,29 +291,23 @@ function renderHover(
 }
 
 /**
- * Syntax highlight code using highlight.ts.
+ * Syntax highlight code using native WASM highlighter.
  */
 function highlightCode(codeText: string, language: string, theme: Theme): string[] {
 	const validLang = language && supportsLanguage(language) ? language : undefined;
 	try {
-		const cliTheme = {
-			keyword: (s: string) => theme.fg("syntaxKeyword", s),
-			built_in: (s: string) => theme.fg("syntaxType", s),
-			literal: (s: string) => theme.fg("syntaxNumber", s),
-			number: (s: string) => theme.fg("syntaxNumber", s),
-			string: (s: string) => theme.fg("syntaxString", s),
-			comment: (s: string) => theme.fg("syntaxComment", s),
-			function: (s: string) => theme.fg("syntaxFunction", s),
-			title: (s: string) => theme.fg("syntaxFunction", s),
-			class: (s: string) => theme.fg("syntaxType", s),
-			type: (s: string) => theme.fg("syntaxType", s),
-			attr: (s: string) => theme.fg("syntaxVariable", s),
-			variable: (s: string) => theme.fg("syntaxVariable", s),
-			params: (s: string) => theme.fg("syntaxVariable", s),
-			operator: (s: string) => theme.fg("syntaxOperator", s),
-			punctuation: (s: string) => theme.fg("syntaxPunctuation", s),
+		const colors: HighlightColors = {
+			comment: theme.getFgAnsi("syntaxComment"),
+			keyword: theme.getFgAnsi("syntaxKeyword"),
+			function: theme.getFgAnsi("syntaxFunction"),
+			variable: theme.getFgAnsi("syntaxVariable"),
+			string: theme.getFgAnsi("syntaxString"),
+			number: theme.getFgAnsi("syntaxNumber"),
+			type: theme.getFgAnsi("syntaxType"),
+			operator: theme.getFgAnsi("syntaxOperator"),
+			punctuation: theme.getFgAnsi("syntaxPunctuation"),
 		};
-		return highlight(codeText, { language: validLang, ignoreIllegals: true, theme: cliTheme }).split("\n");
+		return nativeHighlightCode(codeText, validLang, colors).split("\n");
 	} catch {
 		return codeText.split("\n");
 	}

package/src/lsp/types.ts

@@ -1,6 +1,6 @@
 import { StringEnum } from "@oh-my-pi/pi-ai";
+import type { ptree } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import type { Subprocess } from "bun";
 
 // =============================================================================
 // Tool Schema
@@ -400,7 +400,7 @@ export interface LspClient {
 	name: string;
 	cwd: string;
 	config: ServerConfig;
-	process: Subprocess;
+	proc: ptree.ChildProcess<"pipe">;
 	requestId: number;
 	diagnostics: Map<string, Diagnostic[]>;
 	diagnosticsVersion: number;

package/src/main.ts

@@ -87,7 +87,7 @@ async function runInteractiveMode(
 	versionCheckPromise: Promise<string | undefined>,
 	initialMessages: string[],
 	setExtensionUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void,
-	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined,
+	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }> | undefined,
 	mcpManager: import("./mcp").MCPManager | undefined,
 	initialMessage?: string,
 	initialImages?: ImageContent[],

package/src/modes/controllers/command-controller.ts

@@ -5,7 +5,6 @@ import type { UsageLimit, UsageReport } from "@oh-my-pi/pi-ai";
 import { Loader, Markdown, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
 import { nanoid } from "nanoid";
-import { getDebugLogPath } from "../../config";
 import { loadCustomShare } from "../../export/custom-share";
 import type { CompactOptions } from "../../extensibility/extensions/types";
 import { getGatewayStatus } from "../../ipy/gateway-coordinator";
@@ -266,7 +265,9 @@ export class CommandController {
 			info += `\n${theme.bold("LSP Servers")}\n`;
 			for (const server of this.ctx.lspServers) {
 				const statusColor = server.status === "ready" ? "success" : "error";
-				info += `${theme.fg("dim", `${server.name}:`)} ${theme.fg(statusColor, server.status)} ${theme.fg("dim", `(${server.fileTypes.join(", ")})`)}\n`;
+				const statusText =
+					server.status === "error" && server.error ? `${server.status}: ${server.error}` : server.status;
+				info += `${theme.fg("dim", `${server.name}:`)} ${theme.fg(statusColor, statusText)} ${theme.fg("dim", `(${server.fileTypes.join(", ")})`)}\n`;
 			}
 		}
 
@@ -447,46 +448,6 @@ export class CommandController {
 		this.ctx.ui.requestRender();
 	}
 
-	async handleDebugCommand(): Promise<void> {
-		const width = this.ctx.ui.terminal.columns;
-		const allLines = this.ctx.ui.render(width);
-
-		const debugLogPath = getDebugLogPath();
-		const debugData = [
-			`Debug output at ${new Date().toISOString()}`,
-			`Terminal width: ${width}`,
-			`Total lines: ${allLines.length}`,
-			"",
-			"=== All rendered lines with visible widths ===",
-			...allLines.map((line, idx) => {
-				const vw = visibleWidth(line);
-				const escaped = JSON.stringify(line);
-				return `[${idx}] (w=${vw}) ${escaped}`;
-			}),
-			"",
-			"=== Agent messages (JSONL) ===",
-			...this.ctx.session.messages.map(msg => JSON.stringify(msg)),
-			"",
-		].join("\n");
-
-		try {
-			await Bun.write(debugLogPath, debugData);
-		} catch (error) {
-			this.ctx.showError(`Failed to write debug log: ${error instanceof Error ? error.message : String(error)}`);
-			return;
-		}
-
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(
-			new Text(
-				`${theme.fg("accent", `${theme.status.success} Debug log written`)}\n${theme.fg("muted", debugLogPath)}`,
-				1,
-				1,
-			),
-		);
-		this.ctx.ui.requestRender();
-	}
-
 	handleArminSaysHi(): void {
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(new ArminComponent(this.ctx.ui));

package/src/modes/controllers/input-controller.ts

@@ -64,7 +64,7 @@ export class InputController {
 		this.ctx.editor.onAltP = () => this.ctx.showModelSelector({ temporaryOnly: true });
 
 		// Global debug handler on TUI (works regardless of focus)
-		this.ctx.ui.onDebug = () => void this.ctx.handleDebugCommand();
+		this.ctx.ui.onDebug = () => this.ctx.showDebugSelector();
 		this.ctx.editor.onCtrlL = () => this.ctx.showModelSelector();
 		this.ctx.editor.onCtrlR = () => this.ctx.showHistorySearch();
 		this.ctx.editor.onCtrlT = () => this.ctx.toggleTodoExpansion();
@@ -293,7 +293,7 @@ export class InputController {
 				return;
 			}
 			if (text === "/debug") {
-				void this.ctx.handleDebugCommand();
+				this.ctx.showDebugSelector();
 				this.ctx.editor.setText("");
 				return;
 			}

package/src/modes/controllers/selector-controller.ts

@@ -3,6 +3,7 @@ import type { OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { getAgentDbPath } from "../../config";
+import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
 import { AssistantMessageComponent } from "../../modes/components/assistant-message";
 import { ExtensionDashboard } from "../../modes/components/extensions";
@@ -625,4 +626,11 @@ export class SelectorController {
 			return { component: selector, focus: selector };
 		});
 	}
+
+	showDebugSelector(): void {
+		this.showSelector(done => {
+			const selector = new DebugSelectorComponent(this.ctx, done);
+			return { component: selector, focus: selector };
+		});
+	}
 }

package/src/modes/interactive-mode.ts

@@ -134,8 +134,9 @@ export class InteractiveMode implements InteractiveModeContext {
 	private planModePreviousTools: string[] | undefined;
 	private planModePreviousModel: Model<any> | undefined;
 	private planModeHasEntered = false;
-	public readonly lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined =
-		undefined;
+	public readonly lspServers:
+		| Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }>
+		| undefined = undefined;
 	public mcpManager?: import("../mcp").MCPManager;
 	private readonly toolUiContextSetter: (uiContext: ExtensionUIContext, hasUI: boolean) => void;
 
@@ -151,7 +152,9 @@ export class InteractiveMode implements InteractiveModeContext {
 		version: string,
 		changelogMarkdown: string | undefined = undefined,
 		setToolUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void = () => {},
-		lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined = undefined,
+		lspServers:
+			| Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }>
+			| undefined = undefined,
 		mcpManager?: import("../mcp").MCPManager,
 	) {
 		this.session = session;
@@ -861,8 +864,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		return this.commandController.handleForkCommand();
 	}
 
-	handleDebugCommand(): Promise<void> {
-		return this.commandController.handleDebugCommand();
+	showDebugSelector(): void {
+		this.selectorController.showDebugSelector();
 	}
 
 	handleArminSaysHi(): void {

package/src/modes/rpc/rpc-client.ts

@@ -524,7 +524,7 @@ export class RpcClient {
 
 		// Write to stdin after registering the handler
 		const stdin = this.process!.stdin as import("bun").FileSink;
-		stdin.write(new TextEncoder().encode(`${JSON.stringify(fullCommand)}\n`));
+		stdin.write(`${JSON.stringify(fullCommand)}\n`);
 		// flush() returns number | Promise<number> - handle both cases
 		const flushResult = stdin.flush();
 		if (flushResult instanceof Promise) {

package/src/modes/theme/theme.ts

@@ -1,11 +1,15 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
+import {
+	type HighlightColors as NativeHighlightColors,
+	highlightCode as nativeHighlightCode,
+	supportsLanguage as nativeSupportsLanguage,
+} from "@oh-my-pi/pi-natives";
 import type { EditorTheme, MarkdownTheme, SelectListTheme, SymbolTheme } from "@oh-my-pi/pi-tui";
 import { adjustHsv, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
-import { highlight, supportsLanguage } from "cli-highlight";
 import { getCustomThemesDir } from "../../config";
 // Embed theme JSON files at build time
 import darkThemeJson from "./dark.json" with { type: "json" };
@@ -2029,37 +2033,25 @@ export async function getThemeExportColors(themeName?: string): Promise<{
 // TUI Helpers
 // ============================================================================
 
-type CliHighlightTheme = Record<string, (s: string) => string>;
-
-let cachedHighlightThemeFor: Theme | undefined;
-let cachedCliHighlightTheme: CliHighlightTheme | undefined;
-
-function buildCliHighlightTheme(t: Theme): CliHighlightTheme {
-	return {
-		keyword: (s: string) => t.fg("syntaxKeyword", s),
-		built_in: (s: string) => t.fg("syntaxType", s),
-		literal: (s: string) => t.fg("syntaxNumber", s),
-		number: (s: string) => t.fg("syntaxNumber", s),
-		string: (s: string) => t.fg("syntaxString", s),
-		comment: (s: string) => t.fg("syntaxComment", s),
-		function: (s: string) => t.fg("syntaxFunction", s),
-		title: (s: string) => t.fg("syntaxFunction", s),
-		class: (s: string) => t.fg("syntaxType", s),
-		type: (s: string) => t.fg("syntaxType", s),
-		attr: (s: string) => t.fg("syntaxVariable", s),
-		variable: (s: string) => t.fg("syntaxVariable", s),
-		params: (s: string) => t.fg("syntaxVariable", s),
-		operator: (s: string) => t.fg("syntaxOperator", s),
-		punctuation: (s: string) => t.fg("syntaxPunctuation", s),
-	};
-}
-
-function getCliHighlightTheme(t: Theme): CliHighlightTheme {
-	if (cachedHighlightThemeFor !== t || !cachedCliHighlightTheme) {
-		cachedHighlightThemeFor = t;
-		cachedCliHighlightTheme = buildCliHighlightTheme(t);
+let cachedHighlightColorsFor: Theme | undefined;
+let cachedHighlightColors: NativeHighlightColors | undefined;
+
+function getHighlightColors(t: Theme): NativeHighlightColors {
+	if (cachedHighlightColorsFor !== t || !cachedHighlightColors) {
+		cachedHighlightColorsFor = t;
+		cachedHighlightColors = {
+			comment: t.getFgAnsi("syntaxComment"),
+			keyword: t.getFgAnsi("syntaxKeyword"),
+			function: t.getFgAnsi("syntaxFunction"),
+			variable: t.getFgAnsi("syntaxVariable"),
+			string: t.getFgAnsi("syntaxString"),
+			number: t.getFgAnsi("syntaxNumber"),
+			type: t.getFgAnsi("syntaxType"),
+			operator: t.getFgAnsi("syntaxOperator"),
+			punctuation: t.getFgAnsi("syntaxPunctuation"),
+		};
 	}
-	return cachedCliHighlightTheme;
+	return cachedHighlightColors;
 }
 
 /**
@@ -2067,15 +2059,9 @@ function getCliHighlightTheme(t: Theme): CliHighlightTheme {
  * Returns array of highlighted lines.
  */
 export function highlightCode(code: string, lang?: string): string[] {
-	// Validate language before highlighting to avoid stderr spam from cli-highlight
-	const validLang = lang && supportsLanguage(lang) ? lang : undefined;
-	const opts = {
-		language: validLang,
-		ignoreIllegals: true,
-		theme: getCliHighlightTheme(theme),
-	};
+	const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
 	try {
-		return highlight(code, opts).split("\n");
+		return nativeHighlightCode(code, validLang, getHighlightColors(theme)).split("\n");
 	} catch {
 		return code.split("\n");
 	}
@@ -2212,15 +2198,9 @@ export function getMarkdownTheme(): MarkdownTheme {
 		symbols: getSymbolTheme(),
 		getMermaidImage,
 		highlightCode: (code: string, lang?: string): string[] => {
-			// Validate language before highlighting to avoid stderr spam from cli-highlight
-			const validLang = lang && supportsLanguage(lang) ? lang : undefined;
-			const opts = {
-				language: validLang,
-				ignoreIllegals: true,
-				theme: getCliHighlightTheme(theme),
-			};
+			const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
 			try {
-				return highlight(code, opts).split("\n");
+				return nativeHighlightCode(code, validLang, getHighlightColors(theme)).split("\n");
 			} catch {
 				return code.split("\n").map(line => theme.fg("mdCodeBlock", line));
 			}

package/src/modes/types.ts

@@ -51,7 +51,7 @@ export interface InteractiveModeContext {
 	agent: AgentSession["agent"];
 	historyStorage?: HistoryStorage;
 	mcpManager?: MCPManager;
-	lspServers?: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }>;
+	lspServers?: Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }>;
 
 	// State
 	isInitialized: boolean;
@@ -144,7 +144,6 @@ export interface InteractiveModeContext {
 	handleDumpCommand(): Promise<void>;
 	handleClearCommand(): Promise<void>;
 	handleForkCommand(): Promise<void>;
-	handleDebugCommand(): Promise<void>;
 	handleArminSaysHi(): void;
 	handleBashCommand(command: string, excludeFromContext?: boolean): Promise<void>;
 	handlePythonCommand(code: string, excludeFromContext?: boolean): Promise<void>;
@@ -164,6 +163,7 @@ export interface InteractiveModeContext {
 	handleResumeSession(sessionPath: string): Promise<void>;
 	showOAuthSelector(mode: "login" | "logout"): Promise<void>;
 	showHookConfirm(title: string, message: string): Promise<boolean>;
+	showDebugSelector(): void;
 
 	// Input handling
 	handleCtrlC(): void;

package/src/sdk.ts

@@ -204,7 +204,7 @@ export interface CreateAgentSessionResult {
 	/** Warning if session was restored with a different model than saved */
 	modelFallbackMessage?: string;
 	/** LSP servers that were warmed up at startup */
-	lspServers?: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }>;
+	lspServers?: Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }>;
 }
 
 // Re-exports

package/src/session/agent-storage.ts

@@ -138,7 +138,18 @@ export class AgentStorage {
 
 	private constructor(dbPath: string) {
 		this.ensureDir(dbPath);
-		this.db = new Database(dbPath);
+		try {
+			this.db = new Database(dbPath);
+		} catch (err) {
+			const dir = path.dirname(dbPath);
+			const dirExists = fs.existsSync(dir);
+			const errMsg = err instanceof Error ? err.message : String(err);
+			throw new Error(
+				`Failed to open agent database at '${dbPath}': ${errMsg}\n` +
+					`Directory '${dir}' exists: ${dirExists}\n` +
+					`Ensure the directory is writable and not corrupted.`,
+			);
+		}
 
 		this.initializeSchema();
 		this.hardenPermissions(dbPath);
@@ -537,7 +548,20 @@ CREATE TABLE settings (
 	 * @param dbPath - Path to the database file
 	 */
 	private ensureDir(dbPath: string): void {
-		fs.mkdirSync(path.dirname(dbPath), { recursive: true });
+		const dir = path.dirname(dbPath);
+		try {
+			fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
+		} catch (err) {
+			const code = (err as NodeJS.ErrnoException).code;
+			// EEXIST is fine - directory already exists
+			if (code !== "EEXIST") {
+				throw new Error(`Failed to create agent storage directory '${dir}': ${code || err}`);
+			}
+		}
+		// Verify directory was created
+		if (!fs.existsSync(dir)) {
+			throw new Error(`Agent storage directory '${dir}' does not exist after creation attempt`);
+		}
 	}
 
 	private hardenPermissions(dbPath: string): void {