@oh-my-pi/pi-coding-agent 1.338.0 → 1.341.0

package/src/core/tools/index.ts

@@ -1,13 +1,25 @@
 export { type AskToolDetails, askTool, createAskTool } from "./ask.js";
 export { type BashToolDetails, bashTool, createBashTool } from "./bash.js";
-export { createEditTool, editTool } from "./edit.js";
+export { createEditTool, type EditToolOptions, editTool } from "./edit.js";
 // Exa MCP tools (22 tools)
 export { exaTools } from "./exa/index.js";
 export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult } from "./exa/types.js";
 export { createFindTool, type FindToolDetails, findTool } from "./find.js";
 export { createGrepTool, type GrepToolDetails, grepTool } from "./grep.js";
 export { createLsTool, type LsToolDetails, lsTool } from "./ls.js";
-export { createLspTool, type LspToolDetails, lspTool } from "./lsp/index.js";
+export {
+	createLspTool,
+	type FileDiagnosticsResult,
+	type FileFormatResult,
+	formatFile,
+	getDiagnosticsForFile,
+	getLspStatus,
+	type LspServerStatus,
+	type LspToolDetails,
+	type LspWarmupResult,
+	lspTool,
+	warmupLspServers,
+} from "./lsp/index.js";
 export { createNotebookTool, type NotebookToolDetails, notebookTool } from "./notebook.js";
 export { createReadTool, type ReadToolDetails, readTool } from "./read.js";
 export { BUNDLED_AGENTS, createTaskTool, taskTool } from "./task/index.js";
@@ -31,7 +43,7 @@ export {
 	webSearchLinkedinTool,
 	webSearchTool,
 } from "./web-search/index.js";
-export { createWriteTool, writeTool } from "./write.js";
+export { createWriteTool, type WriteToolDetails, type WriteToolOptions, writeTool } from "./write.js";
 
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { askTool, createAskTool } from "./ask.js";
@@ -41,7 +53,7 @@ import { createEditTool, editTool } from "./edit.js";
 import { createFindTool, findTool } from "./find.js";
 import { createGrepTool, grepTool } from "./grep.js";
 import { createLsTool, lsTool } from "./ls.js";
-import { createLspTool, lspTool } from "./lsp/index.js";
+import { createLspTool, formatFile, getDiagnosticsForFile, lspTool } from "./lsp/index.js";
 import { createNotebookTool, notebookTool } from "./notebook.js";
 import { createReadTool, readTool } from "./read.js";
 import { createTaskTool, taskTool } from "./task/index.js";
@@ -57,16 +69,47 @@ export interface SessionContext {
 	getSessionFile: () => string | null;
 }
 
+/** Options for creating coding tools */
+export interface CodingToolsOptions {
+	/** Whether to fetch LSP diagnostics after write tool writes files (default: true) */
+	lspDiagnosticsOnWrite?: boolean;
+	/** Whether to fetch LSP diagnostics after edit tool edits files (default: false) */
+	lspDiagnosticsOnEdit?: boolean;
+	/** Whether to format files using LSP after write tool writes (default: true) */
+	lspFormatOnWrite?: boolean;
+	/** Whether to accept high-confidence fuzzy matches in edit tool (default: true) */
+	editFuzzyMatch?: boolean;
+}
+
 // Factory function type
-type ToolFactory = (cwd: string, sessionContext?: SessionContext) => Tool;
+type ToolFactory = (cwd: string, sessionContext?: SessionContext, options?: CodingToolsOptions) => Tool;
 
 // Tool definitions: static tools and their factory functions
 const toolDefs: Record<string, { tool: Tool; create: ToolFactory }> = {
 	ask: { tool: askTool, create: createAskTool },
 	read: { tool: readTool, create: createReadTool },
 	bash: { tool: bashTool, create: createBashTool },
-	edit: { tool: editTool, create: createEditTool },
-	write: { tool: writeTool, create: createWriteTool },
+	edit: {
+		tool: editTool,
+		create: (cwd, _ctx, options) => {
+			const enableDiagnostics = options?.lspDiagnosticsOnEdit ?? false;
+			return createEditTool(cwd, {
+				fuzzyMatch: options?.editFuzzyMatch ?? true,
+				getDiagnostics: enableDiagnostics ? (absolutePath) => getDiagnosticsForFile(absolutePath, cwd) : undefined,
+			});
+		},
+	},
+	write: {
+		tool: writeTool,
+		create: (cwd, _ctx, options) => {
+			const enableFormat = options?.lspFormatOnWrite ?? true;
+			const enableDiagnostics = options?.lspDiagnosticsOnWrite ?? true;
+			return createWriteTool(cwd, {
+				formatOnWrite: enableFormat ? (absolutePath) => formatFile(absolutePath, cwd) : undefined,
+				getDiagnostics: enableDiagnostics ? (absolutePath) => getDiagnosticsForFile(absolutePath, cwd) : undefined,
+			});
+		},
+	},
 	grep: { tool: grepTool, create: createGrepTool },
 	find: { tool: findTool, create: createFindTool },
 	ls: { tool: lsTool, create: createLsTool },
@@ -116,10 +159,16 @@ export const allTools = Object.fromEntries(Object.entries(toolDefs).map(([name,
  * @param cwd - Working directory for tools
  * @param hasUI - Whether UI is available (includes ask tool if true)
  * @param sessionContext - Optional session context for tools that need it
+ * @param options - Options for tool configuration
  */
-export function createCodingTools(cwd: string, hasUI = false, sessionContext?: SessionContext): Tool[] {
+export function createCodingTools(
+	cwd: string,
+	hasUI = false,
+	sessionContext?: SessionContext,
+	options?: CodingToolsOptions,
+): Tool[] {
 	const names = hasUI ? [...baseCodingToolNames, ...uiToolNames] : baseCodingToolNames;
-	return names.map((name) => toolDefs[name].create(cwd, sessionContext));
+	return names.map((name) => toolDefs[name].create(cwd, sessionContext, options));
 }
 
 /**
@@ -127,20 +176,31 @@ export function createCodingTools(cwd: string, hasUI = false, sessionContext?: S
  * @param cwd - Working directory for tools
  * @param hasUI - Whether UI is available (includes ask tool if true)
  * @param sessionContext - Optional session context for tools that need it
+ * @param options - Options for tool configuration
  */
-export function createReadOnlyTools(cwd: string, hasUI = false, sessionContext?: SessionContext): Tool[] {
+export function createReadOnlyTools(
+	cwd: string,
+	hasUI = false,
+	sessionContext?: SessionContext,
+	options?: CodingToolsOptions,
+): Tool[] {
 	const names = hasUI ? [...baseReadOnlyToolNames, ...uiToolNames] : baseReadOnlyToolNames;
-	return names.map((name) => toolDefs[name].create(cwd, sessionContext));
+	return names.map((name) => toolDefs[name].create(cwd, sessionContext, options));
 }
 
 /**
  * Create all tools configured for a specific working directory.
  * @param cwd - Working directory for tools
  * @param sessionContext - Optional session context for tools that need it
+ * @param options - Options for tool configuration
  */
-export function createAllTools(cwd: string, sessionContext?: SessionContext): Record<ToolName, Tool> {
+export function createAllTools(
+	cwd: string,
+	sessionContext?: SessionContext,
+	options?: CodingToolsOptions,
+): Record<ToolName, Tool> {
 	return Object.fromEntries(
-		Object.entries(toolDefs).map(([name, def]) => [name, def.create(cwd, sessionContext)]),
+		Object.entries(toolDefs).map(([name, def]) => [name, def.create(cwd, sessionContext, options)]),
 	) as Record<ToolName, Tool>;
 }
 

package/src/core/tools/lsp/client.ts

@@ -17,20 +17,32 @@ import { detectLanguageId, fileToUri } from "./utils.js";
 
 const clients = new Map<string, LspClient>();
 
-// Idle timeout: shutdown clients after 5 minutes of inactivity
-const IDLE_TIMEOUT_MS = 5 * 60 * 1000;
+// Idle timeout configuration (disabled by default)
+let idleTimeoutMs: number | null = null;
+let idleCheckInterval: Timer | null = null;
 const IDLE_CHECK_INTERVAL_MS = 60 * 1000;
 
-// Background task to shutdown idle clients
-let idleCheckInterval: Timer | null = null;
+/**
+ * Configure the idle timeout for LSP clients.
+ * @param ms - Timeout in milliseconds, or null/undefined to disable
+ */
+export function setIdleTimeout(ms: number | null | undefined): void {
+	idleTimeoutMs = ms ?? null;
+
+	if (idleTimeoutMs && idleTimeoutMs > 0) {
+		startIdleChecker();
+	} else {
+		stopIdleChecker();
+	}
+}
 
 function startIdleChecker(): void {
 	if (idleCheckInterval) return;
 	idleCheckInterval = setInterval(() => {
+		if (!idleTimeoutMs) return;
 		const now = Date.now();
 		for (const [key, client] of Array.from(clients.entries())) {
-			if (now - client.lastActivity > IDLE_TIMEOUT_MS) {
-				console.log(`[LSP] Shutting down idle client: ${key}`);
+			if (now - client.lastActivity > idleTimeoutMs) {
 				shutdownClient(key);
 			}
 		}
@@ -98,6 +110,12 @@ const CLIENT_CAPABILITIES = {
 				properties: ["edit"],
 			},
 		},
+		formatting: {
+			dynamicRegistration: false,
+		},
+		rangeFormatting: {
+			dynamicRegistration: false,
+		},
 		publishDiagnostics: {
 			relatedInformation: true,
 			versionSupport: false,
@@ -357,7 +375,8 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string): Prom
 	}
 
 	const args = config.args ?? [];
-	const proc = Bun.spawn([config.command, ...args], {
+	const command = config.resolvedCommand ?? config.command;
+	const proc = Bun.spawn([command, ...args], {
 		cwd,
 		stdin: "pipe",
 		stdout: "pipe",
@@ -379,16 +398,9 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string): Prom
 	};
 	clients.set(key, client);
 
-	// Start idle checker if not already running
-	startIdleChecker();
-
 	// Register crash recovery - remove client on process exit
 	proc.exited.then(() => {
-		console.log(`[LSP] Process exited: ${key}`);
 		clients.delete(key);
-		if (clients.size === 0) {
-			stopIdleChecker();
-		}
 	});
 
 	// Start background message reader
@@ -497,10 +509,6 @@ export function shutdownClient(key: string): void {
 	// Kill process
 	client.process.kill();
 	clients.delete(key);
-
-	if (clients.size === 0) {
-		stopIdleChecker();
-	}
 }
 
 // =============================================================================
@@ -570,8 +578,6 @@ export async function sendNotification(client: LspClient, method: string, params
  * Shutdown all LSP clients.
  */
 export function shutdownAll(): void {
-	stopIdleChecker();
-
 	for (const client of Array.from(clients.values())) {
 		// Reject all pending requests
 		for (const pending of Array.from(client.pendingRequests.values())) {
@@ -587,6 +593,25 @@ export function shutdownAll(): void {
 	clients.clear();
 }
 
+/** Status of an LSP server */
+export interface LspServerStatus {
+	name: string;
+	status: "connecting" | "ready" | "error";
+	fileTypes: string[];
+	error?: string;
+}
+
+/**
+ * Get status of all active LSP clients.
+ */
+export function getActiveClients(): LspServerStatus[] {
+	return Array.from(clients.values()).map((client) => ({
+		name: client.config.command,
+		status: "ready" as const,
+		fileTypes: client.config.fileTypes,
+	}));
+}
+
 // =============================================================================
 // Process Cleanup
 // =============================================================================