@oh-my-pi/pi-coding-agent 1.340.0 → 2.0.1337

package/src/core/title-generator.ts

@@ -0,0 +1,94 @@
+/**
+ * Generate session titles using a smol, fast model.
+ */
+
+import type { Model } from "@oh-my-pi/pi-ai";
+import { completeSimple } from "@oh-my-pi/pi-ai";
+import type { ModelRegistry } from "./model-registry";
+import { findSmolModel } from "./model-resolver";
+
+const TITLE_SYSTEM_PROMPT = `Generate a very short title (3-6 words) for a coding session based on the user's first message. The title should capture the main task or topic. Output ONLY the title, nothing else. No quotes, no punctuation at the end.
+
+Examples:
+- "Fix TypeScript compilation errors"
+- "Add user authentication"
+- "Refactor database queries"
+- "Debug payment webhook"
+- "Update React components"`;
+
+const MAX_INPUT_CHARS = 2000;
+
+/**
+ * Find the best available model for title generation.
+ * Uses the configured smol model if set, otherwise auto-discovers using priority chain.
+ *
+ * @param registry Model registry
+ * @param savedSmolModel Optional saved smol model from settings (provider/modelId format)
+ */
+export async function findTitleModel(registry: ModelRegistry, savedSmolModel?: string): Promise<Model<any> | null> {
+	const model = await findSmolModel(registry, savedSmolModel);
+	return model ?? null;
+}
+
+/**
+ * Generate a title for a session based on the first user message.
+ *
+ * @param firstMessage The first user message
+ * @param registry Model registry
+ * @param savedSmolModel Optional saved smol model from settings (provider/modelId format)
+ */
+export async function generateSessionTitle(
+	firstMessage: string,
+	registry: ModelRegistry,
+	savedSmolModel?: string,
+): Promise<string | null> {
+	const model = await findTitleModel(registry, savedSmolModel);
+	if (!model) return null;
+
+	const apiKey = await registry.getApiKey(model);
+	if (!apiKey) return null;
+
+	// Truncate message if too long
+	const truncatedMessage =
+		firstMessage.length > MAX_INPUT_CHARS ? `${firstMessage.slice(0, MAX_INPUT_CHARS)}...` : firstMessage;
+
+	try {
+		const response = await completeSimple(
+			model,
+			{
+				systemPrompt: TITLE_SYSTEM_PROMPT,
+				messages: [{ role: "user", content: truncatedMessage, timestamp: Date.now() }],
+			},
+			{
+				apiKey,
+				maxTokens: 30,
+			},
+		);
+
+		// Extract title from response text content
+		let title = "";
+		for (const content of response.content) {
+			if (content.type === "text") {
+				title += content.text;
+			}
+		}
+		title = title.trim();
+
+		if (!title || title.length > 60) {
+			return null;
+		}
+
+		// Clean up: remove quotes, trailing punctuation
+		return title.replace(/^["']|["']$/g, "").replace(/[.!?]$/, "");
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Set the terminal title using ANSI escape sequences.
+ */
+export function setTerminalTitle(title: string): void {
+	// OSC 2 sets the window title
+	process.stdout.write(`\x1b]2;${title}\x07`);
+}

package/src/core/tools/bash.ts

@@ -1,20 +1,7 @@
-import { createWriteStream } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { Type } from "@sinclair/typebox";
-import type { Subprocess } from "bun";
-import { getShellConfig, killProcessTree } from "../../utils/shell.js";
-import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateTail } from "./truncate.js";
-
-/**
- * Generate a unique temp file path for bash output
- */
-function getTempFilePath(): string {
-	const randomId = crypto.getRandomValues(new Uint8Array(8));
-	const id = Array.from(randomId, (b) => b.toString(16).padStart(2, "0")).join("");
-	return join(tmpdir(), `pi-bash-${id}.log`);
-}
+import { executeBash } from "../bash-executor";
+import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateTail } from "./truncate";
 
 const bashSchema = Type.Object({
 	command: Type.String({ description: "Bash command to execute" }),
@@ -66,8 +53,7 @@ Usage notes:
     - If the commands are independent and can run in parallel, make multiple bash tool calls in a single message. For example, if you need to run "git status" and "git diff", send a single message with two bash tool calls in parallel.
     - If the commands depend on each other and must run sequentially, use a single bash call with '&&' to chain them together (e.g., \`git add . && git commit -m "message" && git push\`). For instance, if one operation must complete before another starts (like mkdir before cp, Write before Bash for git operations, or git add before git commit), run these operations sequentially instead.
     - Use ';' only when you need to run commands sequentially but don't care if earlier commands fail
-    - DO NOT use newlines to separate commands (newlines are ok in quoted strings)
-  - Try to maintain your current working directory throughout the session by using absolute paths and avoiding usage of \`cd\`. You may use \`cd\` if the User explicitly requests it.`,
+    - DO NOT use newlines to separate commands (newlines are ok in quoted strings)`,
 		parameters: bashSchema,
 		execute: async (
 			_toolCallId: string,
@@ -75,140 +61,34 @@ Usage notes:
 			signal?: AbortSignal,
 			onUpdate?,
 		) => {
-			const { shell, args } = getShellConfig();
-			const child: Subprocess = Bun.spawn([shell, ...args, command], {
-				cwd,
-				stdin: "ignore",
-				stdout: "pipe",
-				stderr: "pipe",
-			});
-
-			// We'll stream to a temp file if output gets large
-			let tempFilePath: string | undefined;
-			let tempFileStream: ReturnType<typeof createWriteStream> | undefined;
-			let totalBytes = 0;
-
-			// Keep a rolling buffer of the last chunks for tail truncation
-			const chunks: Buffer[] = [];
-			let chunksBytes = 0;
-			const maxChunksBytes = DEFAULT_MAX_BYTES * 2;
-
-			let timedOut = false;
-			let aborted = false;
-
-			// Handle abort signal
-			const onAbort = () => {
-				aborted = true;
-				if (child.pid) {
-					killProcessTree(child.pid);
-				}
-			};
+			// Track output for streaming updates
+			let currentOutput = "";
 
-			if (signal) {
-				if (signal.aborted) {
-					child.kill();
-					throw new Error("Command aborted");
-				}
-				signal.addEventListener("abort", onAbort, { once: true });
-			}
-
-			// Set timeout if provided
-			let timeoutHandle: Timer | undefined;
-			if (timeout !== undefined && timeout > 0) {
-				timeoutHandle = setTimeout(() => {
-					timedOut = true;
-					onAbort();
-				}, timeout * 1000);
-			}
-
-			const handleData = (data: Buffer) => {
-				totalBytes += data.length;
-
-				// Start writing to temp file once we exceed the threshold
-				if (totalBytes > DEFAULT_MAX_BYTES && !tempFilePath) {
-					tempFilePath = getTempFilePath();
-					tempFileStream = createWriteStream(tempFilePath);
-					for (const chunk of chunks) {
-						tempFileStream.write(chunk);
-					}
-				}
-
-				if (tempFileStream) {
-					tempFileStream.write(data);
-				}
-
-				// Keep rolling buffer of recent data
-				chunks.push(data);
-				chunksBytes += data.length;
-
-				while (chunksBytes > maxChunksBytes && chunks.length > 1) {
-					const removed = chunks.shift()!;
-					chunksBytes -= removed.length;
-				}
-
-				// Stream partial output to callback
-				if (onUpdate) {
-					const fullBuffer = Buffer.concat(chunks);
-					const fullText = fullBuffer.toString("utf-8");
-					const truncation = truncateTail(fullText);
-					onUpdate({
-						content: [{ type: "text", text: truncation.content || "" }],
-						details: {
-							truncation: truncation.truncated ? truncation : undefined,
-							fullOutputPath: tempFilePath,
-						},
-					});
-				}
-			};
-
-			// Read streams using Bun's ReadableStream API
-			const stdoutReader = (child.stdout as ReadableStream<Uint8Array>).getReader();
-			const stderrReader = (child.stderr as ReadableStream<Uint8Array>).getReader();
-
-			await Promise.all([
-				(async () => {
-					while (true) {
-						const { done, value } = await stdoutReader.read();
-						if (done) break;
-						handleData(Buffer.from(value));
-					}
-				})(),
-				(async () => {
-					while (true) {
-						const { done, value } = await stderrReader.read();
-						if (done) break;
-						handleData(Buffer.from(value));
+			const result = await executeBash(command, {
+				cwd,
+				timeout: timeout ? timeout * 1000 : undefined, // Convert to milliseconds
+				signal,
+				onChunk: (chunk) => {
+					currentOutput += chunk;
+					if (onUpdate) {
+						const truncation = truncateTail(currentOutput);
+						onUpdate({
+							content: [{ type: "text", text: truncation.content || "" }],
+							details: {
+								truncation: truncation.truncated ? truncation : undefined,
+							},
+						});
 					}
-				})(),
-			]);
-
-			const exitCode = await child.exited;
-
-			// Cleanup
-			if (timeoutHandle) clearTimeout(timeoutHandle);
-			if (signal) signal.removeEventListener("abort", onAbort);
-			if (tempFileStream) tempFileStream.end();
-
-			// Combine all buffered chunks
-			const fullBuffer = Buffer.concat(chunks);
-			const fullOutput = fullBuffer.toString("utf-8");
-
-			if (aborted && !timedOut) {
-				let output = fullOutput;
-				if (output) output += "\n\n";
-				output += "Command aborted";
-				throw new Error(output);
-			}
+				},
+			});
 
-			if (timedOut) {
-				let output = fullOutput;
-				if (output) output += "\n\n";
-				output += `Command timed out after ${timeout} seconds`;
-				throw new Error(output);
+			// Handle errors
+			if (result.cancelled) {
+				throw new Error(result.output || "Command aborted");
 			}
 
-			// Apply tail truncation
-			const truncation = truncateTail(fullOutput);
+			// Apply tail truncation for final output
+			const truncation = truncateTail(result.output);
 			let outputText = truncation.content || "(no output)";
 
 			let details: BashToolDetails | undefined;
@@ -216,28 +96,24 @@ Usage notes:
 			if (truncation.truncated) {
 				details = {
 					truncation,
-					fullOutputPath: tempFilePath,
+					fullOutputPath: result.fullOutputPath,
 				};
 
 				const startLine = truncation.totalLines - truncation.outputLines + 1;
 				const endLine = truncation.totalLines;
 
 				if (truncation.lastLinePartial) {
-					const lastLineSize = formatSize(Buffer.byteLength(fullOutput.split("\n").pop() || "", "utf-8"));
-					outputText += `\n\n[Showing last ${formatSize(
-						truncation.outputBytes,
-					)} of line ${endLine} (line is ${lastLineSize}). Full output: ${tempFilePath}]`;
+					const lastLineSize = formatSize(Buffer.byteLength(result.output.split("\n").pop() || "", "utf-8"));
+					outputText += `\n\n[Showing last ${formatSize(truncation.outputBytes)} of line ${endLine} (line is ${lastLineSize}). Full output: ${result.fullOutputPath}]`;
 				} else if (truncation.truncatedBy === "lines") {
-					outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}. Full output: ${tempFilePath}]`;
+					outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines}. Full output: ${result.fullOutputPath}]`;
 				} else {
-					outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(
-						DEFAULT_MAX_BYTES,
-					)} limit). Full output: ${tempFilePath}]`;
+					outputText += `\n\n[Showing lines ${startLine}-${endLine} of ${truncation.totalLines} (${formatSize(DEFAULT_MAX_BYTES)} limit). Full output: ${result.fullOutputPath}]`;
 				}
 			}
 
-			if (exitCode !== 0 && exitCode !== null) {
-				outputText += `\n\nCommand exited with code ${exitCode}`;
+			if (result.exitCode !== 0 && result.exitCode !== undefined) {
+				outputText += `\n\nCommand exited with code ${result.exitCode}`;
 				throw new Error(outputText);
 			}
 

package/src/core/tools/context.ts

@@ -1,6 +1,6 @@
 import type { AgentToolContext } from "@oh-my-pi/pi-agent-core";
-import type { CustomToolContext } from "../custom-tools/types.js";
-import type { HookUIContext } from "../hooks/types.js";
+import type { CustomToolContext } from "../custom-tools/types";
+import type { HookUIContext } from "../hooks/types";
 
 declare module "@oh-my-pi/pi-agent-core" {
 	interface AgentToolContext extends CustomToolContext {

package/src/core/tools/edit-diff.ts

@@ -3,10 +3,10 @@
  * Used by both edit.ts (for execution) and tool-execution.ts (for preview rendering).
  */
 
+import { constants } from "node:fs";
+import { access, readFile } from "node:fs/promises";
 import * as Diff from "diff";
-import { constants } from "fs";
-import { access, readFile } from "fs/promises";
-import { resolveToCwd } from "./path-utils.js";
+import { resolveToCwd } from "./path-utils";
 
 export function detectLineEnding(content: string): "\r\n" | "\n" {
 	const crlfIdx = content.indexOf("\r\n");
@@ -271,7 +271,7 @@ export function formatEditMatchError(
 		? options.fuzzyMatches && options.fuzzyMatches > 1
 			? `Found ${options.fuzzyMatches} high-confidence matches. Provide more context to make it unique.`
 			: `Closest match was below the ${thresholdPercent}% similarity threshold.`
-		: "Hint: Use fuzzy=true to accept high-confidence matches.";
+		: "Fuzzy matching is disabled. Enable 'Edit fuzzy match' in settings to accept high-confidence matches.";
 
 	return [
 		options.allowFuzzy
@@ -409,7 +409,7 @@ export async function computeEditDiff(
 	oldText: string,
 	newText: string,
 	cwd: string,
-	fuzzy = false,
+	fuzzy = true,
 ): Promise<EditDiffResult | EditDiffError> {
 	const absolutePath = resolveToCwd(path, cwd);
 

package/src/core/tools/edit.ts

@@ -1,7 +1,7 @@
+import { constants } from "node:fs";
+import { access, readFile, writeFile } from "node:fs/promises";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { Type } from "@sinclair/typebox";
-import { constants } from "fs";
-import { access, readFile, writeFile } from "fs/promises";
 import {
 	DEFAULT_FUZZY_THRESHOLD,
 	detectLineEnding,
@@ -11,8 +11,9 @@ import {
 	normalizeToLF,
 	restoreLineEndings,
 	stripBom,
-} from "./edit-diff.js";
-import { resolveToCwd } from "./path-utils.js";
+} from "./edit-diff";
+import type { FileDiagnosticsResult } from "./lsp/index";
+import { resolveToCwd } from "./path-utils";
 
 const editSchema = Type.Object({
 	path: Type.String({ description: "Path to the file to edit (relative or absolute)" }),
@@ -27,9 +28,21 @@ export interface EditToolDetails {
 	diff: string;
 	/** Line number of the first change in the new file (for editor navigation) */
 	firstChangedLine?: number;
+	/** Whether LSP diagnostics were retrieved */
+	hasDiagnostics?: boolean;
+	/** Diagnostic result (if available) */
+	diagnostics?: FileDiagnosticsResult;
 }
 
-export function createEditTool(cwd: string): AgentTool<typeof editSchema> {
+export interface EditToolOptions {
+	/** Whether to accept high-confidence fuzzy matches for whitespace/indentation (default: true) */
+	fuzzyMatch?: boolean;
+	/** Callback to get LSP diagnostics after editing a file */
+	getDiagnostics?: (absolutePath: string) => Promise<FileDiagnosticsResult>;
+}
+
+export function createEditTool(cwd: string, options: EditToolOptions = {}): AgentTool<typeof editSchema> {
+	const allowFuzzy = options.fuzzyMatch ?? true;
 	return {
 		name: "edit",
 		label: "Edit",
@@ -50,6 +63,19 @@ Usage:
 		) => {
 			const absolutePath = resolveToCwd(path, cwd);
 
+			// Reject .ipynb files - use NotebookEdit tool instead
+			if (absolutePath.endsWith(".ipynb")) {
+				return {
+					content: [
+						{
+							type: "text",
+							text: "Cannot edit Jupyter notebooks with the Edit tool. Use the NotebookEdit tool instead.",
+						},
+					],
+					details: undefined,
+				};
+			}
+
 			return new Promise<{
 				content: Array<{ type: "text"; text: string }>;
 				details: EditToolDetails | undefined;
@@ -108,7 +134,7 @@ Usage:
 						const normalizedNewText = normalizeToLF(newText);
 
 						const matchOutcome = findEditMatch(normalizedContent, normalizedOldText, {
-							allowFuzzy: true,
+							allowFuzzy,
 							similarityThreshold: DEFAULT_FUZZY_THRESHOLD,
 						});
 
@@ -131,7 +157,7 @@ Usage:
 							reject(
 								new Error(
 									formatEditMatchError(path, normalizedOldText, matchOutcome.closest, {
-										allowFuzzy: true,
+										allowFuzzy,
 										similarityThreshold: DEFAULT_FUZZY_THRESHOLD,
 										fuzzyMatches: matchOutcome.fuzzyMatches,
 									}),
@@ -179,14 +205,39 @@ Usage:
 						}
 
 						const diffResult = generateDiffString(normalizedContent, normalizedNewContent);
+
+						// Get LSP diagnostics if callback provided
+						let diagnosticsResult: FileDiagnosticsResult | undefined;
+						if (options.getDiagnostics) {
+							try {
+								diagnosticsResult = await options.getDiagnostics(absolutePath);
+							} catch {
+								// Ignore diagnostics errors - don't fail the edit
+							}
+						}
+
+						// Build result text
+						let resultText = `Successfully replaced text in ${path}.`;
+
+						// Append diagnostics if available and there are issues
+						if (diagnosticsResult?.available && diagnosticsResult.diagnostics.length > 0) {
+							resultText += `\n\nLSP Diagnostics (${diagnosticsResult.summary}):\n`;
+							resultText += diagnosticsResult.diagnostics.map((d) => `  ${d}`).join("\n");
+						}
+
 						resolve({
 							content: [
 								{
 									type: "text",
-									text: `Successfully replaced text in ${path}.`,
+									text: resultText,
 								},
 							],
-							details: { diff: diffResult.diff, firstChangedLine: diffResult.firstChangedLine },
+							details: {
+								diff: diffResult.diff,
+								firstChangedLine: diffResult.firstChangedLine,
+								hasDiagnostics: diagnosticsResult?.available ?? false,
+								diagnostics: diagnosticsResult,
+							},
 						});
 					} catch (error: any) {
 						// Clean up abort handler

package/src/core/tools/exa/company.ts

@@ -5,8 +5,8 @@
  */
 
 import { Type } from "@sinclair/typebox";
-import type { CustomTool } from "../../custom-tools/types.js";
-import type { ExaRenderDetails } from "./types.js";
+import type { CustomTool } from "../../custom-tools/types";
+import type { ExaRenderDetails } from "./types";
 
 /** exa_company - Company research */
 export const companyTool: CustomTool<any, ExaRenderDetails> = {
@@ -34,7 +34,7 @@ Parameters:
 					details: { error: "EXA_API_KEY not found", toolName: "exa_company" },
 				};
 			}
-			const response = await callExaTool("company_research_exa", params, apiKey);
+			const response = await callExaTool("company_research", params, apiKey);
 
 			if (isSearchResponse(response)) {
 				const formatted = formatSearchResults(response);

package/src/core/tools/exa/index.ts

@@ -9,14 +9,14 @@
  * - 14 websets tools (CRUD, items, search, enrichment, monitor)
  */
 
-import type { CustomTool } from "../../custom-tools/types.js";
-import type { ExaSettings } from "../../settings-manager.js";
-import { companyTool } from "./company.js";
-import { linkedinTool } from "./linkedin.js";
-import { researcherTools } from "./researcher.js";
-import { searchTools } from "./search.js";
-import type { ExaRenderDetails } from "./types.js";
-import { websetsTools } from "./websets.js";
+import type { CustomTool } from "../../custom-tools/types";
+import type { ExaSettings } from "../../settings-manager";
+import { companyTool } from "./company";
+import { linkedinTool } from "./linkedin";
+import { researcherTools } from "./researcher";
+import { searchTools } from "./search";
+import type { ExaRenderDetails } from "./types";
+import { websetsTools } from "./websets";
 
 /** All Exa tools (22 total) - static export for backward compatibility */
 export const exaTools: CustomTool<any, ExaRenderDetails>[] = [
@@ -42,9 +42,8 @@ export function getExaTools(settings: Required<ExaSettings>): CustomTool<any, Ex
 	return tools;
 }
 
-export { companyTool } from "./company.js";
-export { linkedinTool } from "./linkedin.js";
-export { logExaError, logViewError } from "./logger.js";
+export { companyTool } from "./company";
+export { linkedinTool } from "./linkedin";
 export {
 	callExaTool,
 	callWebsetsTool,
@@ -54,11 +53,11 @@ export {
 	findApiKey,
 	formatSearchResults,
 	isSearchResponse,
-} from "./mcp-client.js";
-export { renderExaCall, renderExaResult } from "./render.js";
-export { researcherTools } from "./researcher.js";
+} from "./mcp-client";
+export { renderExaCall, renderExaResult } from "./render";
+export { researcherTools } from "./researcher";
 // Re-export individual modules for selective importing
-export { searchTools } from "./search.js";
+export { searchTools } from "./search";
 // Re-export types and utilities
-export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult, MCPToolWrapperConfig } from "./types.js";
-export { websetsTools } from "./websets.js";
+export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult, MCPToolWrapperConfig } from "./types";
+export { websetsTools } from "./websets";

package/src/core/tools/exa/linkedin.ts

@@ -5,8 +5,8 @@
  */
 
 import { Type } from "@sinclair/typebox";
-import type { CustomTool } from "../../custom-tools/types.js";
-import type { ExaRenderDetails } from "./types.js";
+import type { CustomTool } from "../../custom-tools/types";
+import type { ExaRenderDetails } from "./types";
 
 /** exa_linkedin - LinkedIn search */
 export const linkedinTool: CustomTool<any, ExaRenderDetails> = {
@@ -34,7 +34,7 @@ Parameters:
 					details: { error: "EXA_API_KEY not found", toolName: "exa_linkedin" },
 				};
 			}
-			const response = await callExaTool("linkedin_search_exa", params, apiKey);
+			const response = await callExaTool("linkedin_search", params, apiKey);
 
 			if (isSearchResponse(response)) {
 				const formatted = formatSearchResults(response);

package/src/core/tools/exa/mcp-client.ts

@@ -5,8 +5,8 @@
  */
 
 import type { TSchema } from "@sinclair/typebox";
-import type { CustomTool } from "../../custom-tools/types.js";
-import { logExaError } from "./logger.js";
+import type { CustomTool } from "../../custom-tools/types";
+import { logger } from "../../logger";
 import type {
 	ExaRenderDetails,
 	ExaSearchResponse,
@@ -15,7 +15,7 @@ import type {
 	MCPTool,
 	MCPToolsResponse,
 	MCPToolWrapperConfig,
-} from "./types.js";
+} from "./types";
 
 /** Find EXA_API_KEY from process.env or .env files */
 export async function findApiKey(): Promise<string | null> {
@@ -89,7 +89,7 @@ export async function callMCP(url: string, method: string, params?: Record<strin
 
 	if (!response.ok) {
 		const errorMsg = `MCP request failed: ${response.status} ${response.statusText}`;
-		logExaError(errorMsg, { url, method, params });
+		logger.error(errorMsg, { url, method, params });
 		throw new Error(errorMsg);
 	}
 
@@ -97,7 +97,7 @@ export async function callMCP(url: string, method: string, params?: Record<strin
 	const result = parseSSE(text);
 
 	if (!result) {
-		logExaError("Failed to parse MCP response", { url, method, responseText: text.slice(0, 500) });
+		logger.error("Failed to parse MCP response", { url, method, responseText: text.slice(0, 500) });
 		throw new Error("Failed to parse MCP response");
 	}
 
@@ -110,7 +110,7 @@ export async function fetchExaTools(apiKey: string, toolNames: string[]): Promis
 	const response = (await callMCP(url, "tools/list")) as MCPToolsResponse;
 
 	if (response.error) {
-		logExaError("MCP tools/list error", { toolNames, error: response.error });
+		logger.error("MCP tools/list error", { toolNames, error: response.error });
 		throw new Error(`MCP error: ${response.error.message}`);
 	}
 
@@ -123,7 +123,7 @@ export async function fetchWebsetsTools(apiKey: string): Promise<MCPTool[]> {
 	const response = (await callMCP(url, "tools/list")) as MCPToolsResponse;
 
 	if (response.error) {
-		logExaError("Websets MCP tools/list error", { error: response.error });
+		logger.error("Websets MCP tools/list error", { error: response.error });
 		throw new Error(`MCP error: ${response.error.message}`);
 	}
 
@@ -139,7 +139,7 @@ export async function callExaTool(toolName: string, args: Record<string, unknown
 	})) as MCPCallResponse;
 
 	if (response.error) {
-		logExaError("MCP tools/call error", { toolName, args, error: response.error });
+		logger.error("MCP tools/call error", { toolName, args, error: response.error });
 		throw new Error(`MCP error: ${response.error.message}`);
 	}
 
@@ -159,7 +159,7 @@ export async function callWebsetsTool(
 	})) as MCPCallResponse;
 
 	if (response.error) {
-		logExaError("Websets MCP tools/call error", { toolName, args, error: response.error });
+		logger.error("Websets MCP tools/call error", { toolName, args, error: response.error });
 		throw new Error(`MCP error: ${response.error.message}`);
 	}