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

package/src/core/session-manager.ts

@@ -1,5 +1,3 @@
-import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
 import {
 	appendFileSync,
 	closeSync,
@@ -11,16 +9,18 @@ import {
 	readSync,
 	statSync,
 	writeFileSync,
-} from "fs";
-import { join, resolve } from "path";
-import { getAgentDir as getDefaultAgentDir } from "../config.js";
+} from "node:fs";
+import { join, resolve } from "node:path";
+import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { ImageContent, Message, TextContent } from "@oh-my-pi/pi-ai";
+import { getAgentDir as getDefaultAgentDir } from "../config";
 import {
 	type BashExecutionMessage,
 	createBranchSummaryMessage,
 	createCompactionSummaryMessage,
 	createHookMessage,
 	type HookMessage,
-} from "./messages.js";
+} from "./messages";
 
 export const CURRENT_SESSION_VERSION = 2;
 

package/src/core/settings-manager.ts

@@ -1,6 +1,6 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { dirname, join } from "path";
-import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { CONFIG_DIR_NAME, getAgentDir } from "../config";
 
 export interface CompactionSettings {
 	enabled?: boolean; // default: true
@@ -30,6 +30,11 @@ export interface SkillsSettings {
 	includeSkills?: string[]; // default: [] (empty = include all; glob patterns to filter)
 }
 
+export interface CommandsSettings {
+	enableClaudeUser?: boolean; // default: true (load from ~/.claude/commands/)
+	enableClaudeProject?: boolean; // default: true (load from .claude/commands/)
+}
+
 export interface TerminalSettings {
 	showImages?: boolean; // default: true (only relevant if terminal supports images)
 }
@@ -78,6 +83,7 @@ export interface Settings {
 	hooks?: string[]; // Array of hook file paths
 	customTools?: string[]; // Array of custom tool file paths
 	skills?: SkillsSettings;
+	commands?: CommandsSettings;
 	terminal?: TerminalSettings;
 	enabledModels?: string[]; // Model patterns for cycling (same format as --models CLI flag)
 	exa?: ExaSettings;
@@ -399,6 +405,13 @@ export class SettingsManager {
 		};
 	}
 
+	getCommandsSettings(): Required<CommandsSettings> {
+		return {
+			enableClaudeUser: this.settings.commands?.enableClaudeUser ?? true,
+			enableClaudeProject: this.settings.commands?.enableClaudeProject ?? true,
+		};
+	}
+
 	getShowImages(): boolean {
 		return this.settings.terminal?.showImages ?? true;
 	}

package/src/core/skills.ts

@@ -1,9 +1,9 @@
-import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from "fs";
+import { existsSync, readdirSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { basename, dirname, join, resolve } from "node:path";
 import { minimatch } from "minimatch";
-import { homedir } from "os";
-import { basename, dirname, join, resolve } from "path";
-import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
-import type { SkillsSettings } from "./settings-manager.js";
+import { CONFIG_DIR_NAME, getAgentDir } from "../config";
+import type { SkillsSettings } from "./settings-manager";
 
 /**
  * Standard frontmatter fields per Agent Skills spec.

package/src/core/slash-commands.ts

@@ -1,6 +1,8 @@
-import { existsSync, readdirSync, readFileSync } from "fs";
-import { join, resolve } from "path";
-import { CONFIG_DIR_NAME, getCommandsDir } from "../config.js";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
+import { CONFIG_DIR_NAME, getCommandsDir } from "../config";
+import { logger } from "./logger";
 
 /**
  * Represents a custom slash command loaded from a file
@@ -98,14 +100,12 @@ export function substituteArgs(content: string, args: string[]): string {
 	return result;
 }
 
+type CommandSource = "builtin" | "claude-user" | "claude-project" | "user" | "project";
+
 /**
  * Recursively scan a directory for .md files (and symlinks to .md files) and load them as slash commands
  */
-function loadCommandsFromDir(
-	dir: string,
-	source: "builtin" | "user" | "project",
-	subdir: string = "",
-): FileSlashCommand[] {
+function loadCommandsFromDir(dir: string, source: CommandSource, subdir: string = ""): FileSlashCommand[] {
 	const commands: FileSlashCommand[] = [];
 
 	if (!existsSync(dir)) {
@@ -129,15 +129,18 @@ function loadCommandsFromDir(
 
 					const name = entry.name.slice(0, -3); // Remove .md extension
 
-					// Build source string
-					let sourceStr: string;
-					if (source === "builtin") {
-						sourceStr = subdir ? `(builtin:${subdir})` : "(builtin)";
-					} else if (source === "user") {
-						sourceStr = subdir ? `(user:${subdir})` : "(user)";
-					} else {
-						sourceStr = subdir ? `(project:${subdir})` : "(project)";
-					}
+					// Build source string based on source type
+					const sourceLabel =
+						source === "builtin"
+							? "builtin"
+							: source === "claude-user"
+								? "claude-user"
+								: source === "claude-project"
+									? "claude-project"
+									: source === "user"
+										? "user"
+										: "project";
+					const sourceStr = subdir ? `(${sourceLabel}:${subdir})` : `(${sourceLabel})`;
 
 					// Get description from frontmatter or first non-empty line
 					let description = frontmatter.description || "";
@@ -159,13 +162,13 @@ function loadCommandsFromDir(
 						content,
 						source: sourceStr,
 					});
-				} catch (_error) {
-					// Silently skip files that can't be read
+				} catch (err) {
+					logger.debug("Failed to read slash command file", { error: String(err) });
 				}
 			}
 		}
-	} catch (_error) {
-		// Silently skip directories that can't be read
+	} catch (err) {
+		logger.debug("Failed to read slash command directory", { error: String(err) });
 	}
 
 	return commands;
@@ -176,54 +179,66 @@ export interface LoadSlashCommandsOptions {
 	cwd?: string;
 	/** Agent config directory for global commands. Default: from getCommandsDir() */
 	agentDir?: string;
+	/** Enable loading from ~/.claude/commands/. Default: true */
+	enableClaudeUser?: boolean;
+	/** Enable loading from .claude/commands/. Default: true */
+	enableClaudeProject?: boolean;
 }
 
 /**
  * Load all custom slash commands from:
  * 1. Builtin: package commands/
- * 2. Global: agentDir/commands/
- * 3. Project: cwd/{CONFIG_DIR_NAME}/commands/
+ * 2. Claude user: ~/.claude/commands/
+ * 3. Claude project: .claude/commands/
+ * 4. Pi user: agentDir/commands/
+ * 5. Pi project: cwd/{CONFIG_DIR_NAME}/commands/
+ *
+ * First occurrence wins (earlier sources have priority).
  */
 export function loadSlashCommands(options: LoadSlashCommandsOptions = {}): FileSlashCommand[] {
 	const resolvedCwd = options.cwd ?? process.cwd();
 	const resolvedAgentDir = options.agentDir ?? getCommandsDir();
+	const enableClaudeUser = options.enableClaudeUser ?? true;
+	const enableClaudeProject = options.enableClaudeProject ?? true;
 
 	const commands: FileSlashCommand[] = [];
 	const seenNames = new Set<string>();
 
-	// 1. Builtin commands (from package)
-	const builtinDir = join(import.meta.dir, "../commands");
-	if (existsSync(builtinDir)) {
-		const builtinCommands = loadCommandsFromDir(builtinDir, "builtin");
-		for (const cmd of builtinCommands) {
+	const addCommands = (newCommands: FileSlashCommand[]) => {
+		for (const cmd of newCommands) {
 			if (!seenNames.has(cmd.name)) {
 				commands.push(cmd);
 				seenNames.add(cmd.name);
 			}
 		}
+	};
+
+	// 1. Builtin commands (from package)
+	const builtinDir = join(import.meta.dir, "../commands");
+	if (existsSync(builtinDir)) {
+		addCommands(loadCommandsFromDir(builtinDir, "builtin"));
 	}
 
-	// 2. Load global commands from agentDir/commands/
-	// Note: if agentDir is provided, it should be the agent dir, not the commands dir
-	const globalCommandsDir = options.agentDir ? join(options.agentDir, "commands") : resolvedAgentDir;
-	const globalCommands = loadCommandsFromDir(globalCommandsDir, "user");
-	for (const cmd of globalCommands) {
-		if (!seenNames.has(cmd.name)) {
-			commands.push(cmd);
-			seenNames.add(cmd.name);
-		}
+	// 2. Claude user commands (~/.claude/commands/)
+	if (enableClaudeUser) {
+		const claudeUserDir = join(homedir(), ".claude", "commands");
+		addCommands(loadCommandsFromDir(claudeUserDir, "claude-user"));
 	}
 
-	// 3. Load project commands from cwd/{CONFIG_DIR_NAME}/commands/
-	const projectCommandsDir = resolve(resolvedCwd, CONFIG_DIR_NAME, "commands");
-	const projectCommands = loadCommandsFromDir(projectCommandsDir, "project");
-	for (const cmd of projectCommands) {
-		if (!seenNames.has(cmd.name)) {
-			commands.push(cmd);
-			seenNames.add(cmd.name);
-		}
+	// 3. Claude project commands (.claude/commands/)
+	if (enableClaudeProject) {
+		const claudeProjectDir = resolve(resolvedCwd, ".claude", "commands");
+		addCommands(loadCommandsFromDir(claudeProjectDir, "claude-project"));
 	}
 
+	// 4. Pi user commands (agentDir/commands/)
+	const globalCommandsDir = options.agentDir ? join(options.agentDir, "commands") : resolvedAgentDir;
+	addCommands(loadCommandsFromDir(globalCommandsDir, "user"));
+
+	// 5. Pi project commands (cwd/{CONFIG_DIR_NAME}/commands/)
+	const projectCommandsDir = resolve(resolvedCwd, CONFIG_DIR_NAME, "commands");
+	addCommands(loadCommandsFromDir(projectCommandsDir, "project"));
+
 	return commands;
 }
 

package/src/core/system-prompt.ts

@@ -2,13 +2,13 @@
  * System prompt construction and project context loading
  */
 
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
 import chalk from "chalk";
-import { existsSync, readFileSync } from "fs";
-import { join, resolve } from "path";
-import { getAgentDir, getDocsPath, getExamplesPath, getReadmePath } from "../config.js";
-import type { SkillsSettings } from "./settings-manager.js";
-import { formatSkillsForPrompt, loadSkills, type Skill } from "./skills.js";
-import type { ToolName } from "./tools/index.js";
+import { getAgentDir, getDocsPath, getExamplesPath, getReadmePath } from "../config";
+import type { SkillsSettings } from "./settings-manager";
+import { formatSkillsForPrompt, loadSkills, type Skill } from "./skills";
+import type { ToolName } from "./tools/index";
 
 /**
  * Execute a git command synchronously and return stdout or null on failure.

package/src/core/title-generator.ts

@@ -4,8 +4,8 @@
 
 import type { Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "./model-registry.js";
-import { findSmolModel } from "./model-resolver.js";
+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.
 

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" }),
@@ -74,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;
@@ -215,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");

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,9 +11,9 @@ import {
 	normalizeToLF,
 	restoreLineEndings,
 	stripBom,
-} from "./edit-diff.js";
-import type { FileDiagnosticsResult } from "./lsp/index.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)" }),
@@ -63,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;

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";