@oh-my-pi/pi-coding-agent 3.20.1 → 3.24.0

package/src/core/tools/web-search/providers/perplexity.ts

@@ -13,6 +13,7 @@ import type {
 	WebSearchResponse,
 	WebSearchSource,
 } from "../types";
+import { WebSearchProviderError } from "../types";
 
 const PERPLEXITY_API_URL = "https://api.perplexity.ai/chat/completions";
 
@@ -92,7 +93,11 @@ async function callPerplexity(apiKey: string, request: PerplexityRequest): Promi
 
 	if (!response.ok) {
 		const errorText = await response.text();
-		throw new Error(`Perplexity API error (${response.status}): ${errorText}`);
+		throw new WebSearchProviderError(
+			"perplexity",
+			`Perplexity API error (${response.status}): ${errorText}`,
+			response.status,
+		);
 	}
 
 	return response.json() as Promise<PerplexityResponse>;

package/src/core/tools/web-search/render.ts

@@ -257,10 +257,7 @@ export function renderWebSearchResult(
 	}
 	if (response.requestId) {
 		metaLines.push(
-			`${theme.fg("muted", "Request:")} ${theme.fg(
-				"text",
-				truncate(response.requestId, MAX_REQUEST_ID_LEN, theme.format.ellipsis),
-			)}`,
+			`${theme.fg("muted", "Request:")} ${theme.fg("text", truncate(response.requestId, MAX_REQUEST_ID_LEN, theme.format.ellipsis))}`,
 		);
 	}
 	if (searchQueries.length > 0) {
@@ -325,3 +322,8 @@ export function renderWebSearchCall(
 	const text = `${theme.fg("toolTitle", "Web Search")} ${theme.fg("dim", `(${provider})`)} ${theme.fg("muted", query)}`;
 	return new Text(text, 0, 0);
 }
+
+export const webSearchToolRenderer = {
+	renderCall: renderWebSearchCall,
+	renderResult: renderWebSearchResult,
+};

package/src/core/tools/web-search/types.ts

@@ -57,6 +57,19 @@ export interface WebSearchResponse {
 	requestId?: string;
 }
 
+/** Provider-specific error with optional HTTP status */
+export class WebSearchProviderError extends Error {
+	provider: WebSearchProvider;
+	status?: number;
+
+	constructor(provider: WebSearchProvider, message: string, status?: number) {
+		super(message);
+		this.name = "WebSearchProviderError";
+		this.provider = provider;
+		this.status = status;
+	}
+}
+
 /** Auth configuration for Anthropic */
 export interface AnthropicAuthConfig {
 	apiKey: string;

package/src/core/tools/write.ts

@@ -1,29 +1,29 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
+import { getLanguageFromPath, highlightCode, type Theme } from "../../modes/interactive/theme/theme";
 import writeDescription from "../../prompts/tools/write.md" with { type: "text" };
-import { type FileDiagnosticsResult, type WritethroughCallback, writethroughNoop } from "./lsp/index";
+import type { RenderResultOptions } from "../custom-tools/types";
+import type { ToolSession } from "../sdk";
+import { createLspWritethrough, type FileDiagnosticsResult } from "./lsp/index";
 import { resolveToCwd } from "./path-utils";
+import { formatDiagnostics, replaceTabs, shortenPath } from "./render-utils";
 
 const writeSchema = Type.Object({
 	path: Type.String({ description: "Path to the file to write (relative or absolute)" }),
 	content: Type.String({ description: "Content to write to the file" }),
 });
 
-/** Options for creating the write tool */
-export interface WriteToolOptions {
-	writethrough?: WritethroughCallback;
-}
-
 /** Details returned by the write tool for TUI rendering */
 export interface WriteToolDetails {
 	diagnostics?: FileDiagnosticsResult;
 }
 
-export function createWriteTool(
-	cwd: string,
-	options: WriteToolOptions = {},
-): AgentTool<typeof writeSchema, WriteToolDetails> {
-	const writethrough = options.writethrough ?? writethroughNoop;
+export function createWriteTool(session: ToolSession): AgentTool<typeof writeSchema, WriteToolDetails> {
+	const enableFormat = session.settings?.getLspFormatOnWrite() ?? true;
+	const enableDiagnostics = session.settings?.getLspDiagnosticsOnWrite() ?? true;
+	const writethrough = createLspWritethrough(session.cwd, { enableFormat, enableDiagnostics });
 	return {
 		name: "write",
 		label: "Write",
@@ -34,7 +34,7 @@ export function createWriteTool(
 			{ path, content }: { path: string; content: string },
 			signal?: AbortSignal,
 		) => {
-			const absolutePath = resolveToCwd(path, cwd);
+			const absolutePath = resolveToCwd(path, session.cwd);
 
 			const diagnostics = await writethrough(absolutePath, content, signal);
 
@@ -59,5 +59,87 @@ export function createWriteTool(
 	};
 }
 
-/** Default write tool using process.cwd() - for backwards compatibility */
-export const writeTool = createWriteTool(process.cwd());
+// =============================================================================
+// TUI Renderer
+// =============================================================================
+
+interface WriteRenderArgs {
+	path?: string;
+	file_path?: string;
+	content?: string;
+}
+
+function countLines(text: string): number {
+	if (!text) return 0;
+	return text.split("\n").length;
+}
+
+function formatMetadataLine(lineCount: number | null, language: string | undefined, uiTheme: Theme): string {
+	const icon = uiTheme.getLangIcon(language);
+	if (lineCount !== null) {
+		return uiTheme.fg("dim", `${icon} ${lineCount} lines`);
+	}
+	return uiTheme.fg("dim", `${icon}`);
+}
+
+export const writeToolRenderer = {
+	renderCall(args: WriteRenderArgs, uiTheme: Theme): Component {
+		const rawPath = args.file_path || args.path || "";
+		const filePath = shortenPath(rawPath);
+		const pathDisplay = filePath ? uiTheme.fg("accent", filePath) : uiTheme.fg("toolOutput", uiTheme.format.ellipsis);
+		const text = `${uiTheme.fg("toolTitle", uiTheme.bold("Write"))} ${pathDisplay}`;
+		return new Text(text, 0, 0);
+	},
+
+	renderResult(
+		result: { content: Array<{ type: string; text?: string }>; details?: WriteToolDetails },
+		{ expanded }: RenderResultOptions,
+		uiTheme: Theme,
+		args?: WriteRenderArgs,
+	): Component {
+		const rawPath = args?.file_path || args?.path || "";
+		const fileContent = args?.content || "";
+		const lang = getLanguageFromPath(rawPath);
+		const contentLines = fileContent
+			? lang
+				? highlightCode(replaceTabs(fileContent), lang)
+				: fileContent.split("\n")
+			: [];
+		const totalLines = contentLines.length;
+		const outputLines: string[] = [];
+
+		outputLines.push(formatMetadataLine(countLines(fileContent), lang ?? "text", uiTheme));
+
+		if (fileContent) {
+			const maxLines = expanded ? contentLines.length : 10;
+			const displayLines = contentLines.slice(0, maxLines);
+			const remaining = contentLines.length - maxLines;
+
+			outputLines.push(
+				"",
+				...displayLines.map((line: string) =>
+					lang ? replaceTabs(line) : uiTheme.fg("toolOutput", replaceTabs(line)),
+				),
+			);
+			if (remaining > 0) {
+				outputLines.push(
+					uiTheme.fg(
+						"toolOutput",
+						`${uiTheme.format.ellipsis} (${remaining} more lines, ${totalLines} total) ${uiTheme.format.bracketLeft}Ctrl+O to expand${uiTheme.format.bracketRight}`,
+					),
+				);
+			}
+		}
+
+		// Show LSP diagnostics if available
+		if (result.details?.diagnostics) {
+			outputLines.push(
+				formatDiagnostics(result.details.diagnostics, expanded, uiTheme, (fp) =>
+					uiTheme.getLangIcon(getLanguageFromPath(fp)),
+				),
+			);
+		}
+
+		return new Text(outputLines.join("\n"), 0, 0);
+	},
+};

package/src/core/voice.ts

@@ -1,7 +1,7 @@
 import { unlinkSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { completeSimple, type Model } from "@oh-my-pi/pi-ai";
+import { completeSimple, type Model } from "@mariozechner/pi-ai";
 import voiceSummaryPrompt from "../prompts/voice-summary.md" with { type: "text" };
 import { logger } from "./logger";
 import type { ModelRegistry } from "./model-registry";

package/src/discovery/helpers.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test } from "bun:test";
 import { parseFrontmatter } from "./helpers";
 
 describe("parseFrontmatter", () => {

package/src/index.ts

@@ -81,6 +81,8 @@ export { ModelRegistry } from "./core/model-registry";
 export type { PromptTemplate } from "./core/prompt-templates";
 // SDK for programmatic usage
 export {
+	// Tool factories
+	BUILTIN_TOOLS,
 	type BuildSystemPromptOptions,
 	buildSystemPrompt,
 	type CreateAgentSessionOptions,
@@ -88,14 +90,12 @@ export {
 	// Factory
 	createAgentSession,
 	createBashTool,
-	// Tool factories (for custom cwd)
-	createCodingTools,
 	createEditTool,
 	createFindTool,
 	createGrepTool,
 	createLsTool,
-	createReadOnlyTools,
 	createReadTool,
+	createTools,
 	createWriteTool,
 	// Discovery
 	discoverAuthStorage,
@@ -107,8 +107,7 @@ export {
 	discoverPromptTemplates,
 	discoverSkills,
 	loadSettings,
-	// Pre-built tools (use process.cwd())
-	readOnlyTools,
+	type ToolSession,
 } from "./core/sdk";
 export {
 	type BranchSummaryEntry,
@@ -154,27 +153,17 @@ export {
 } from "./core/skills";
 // Slash commands
 export { type FileSlashCommand, loadSlashCommands as discoverSlashCommands } from "./core/slash-commands";
-// Tools
+// Tools (detail types only - factories exported from sdk)
 export {
 	type BashToolDetails,
-	bashTool,
-	type CodingToolsOptions,
-	codingTools,
-	editTool,
 	type FindToolDetails,
-	findTool,
 	type GitToolDetails,
 	type GrepToolDetails,
 	gitTool,
-	grepTool,
 	type LsToolDetails,
-	lsTool,
 	type ReadToolDetails,
-	readTool,
 	type TruncationResult,
 	type WriteToolDetails,
-	type WriteToolOptions,
-	writeTool,
 } from "./core/tools/index";
 export type { FileDiagnosticsResult } from "./core/tools/lsp/index";
 // Main entry point

package/src/main.ts

@@ -5,7 +5,7 @@
  * createAgentSession() options. The SDK does the heavy lifting.
  */
 
-import { type ImageContent, supportsXhigh } from "@oh-my-pi/pi-ai";
+import { type ImageContent, supportsXhigh } from "@mariozechner/pi-ai";
 import chalk from "chalk";
 import { type Args, parseArgs, printHelp } from "./cli/args";
 import { processFileArguments } from "./cli/file-processor";
@@ -24,7 +24,6 @@ import { SessionManager } from "./core/session-manager";
 import { SettingsManager } from "./core/settings-manager";
 import { resolvePromptInput } from "./core/system-prompt";
 import { printTimings, time } from "./core/timings";
-import { allTools } from "./core/tools/index";
 import { runMigrations, showDeprecationWarnings } from "./migrations";
 import { InteractiveMode, installTerminalCrashHandlers, runPrintMode, runRpcMode } from "./modes/index";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme";
@@ -210,7 +209,9 @@ async function buildSessionOptions(
 	modelRegistry: ModelRegistry,
 	settingsManager: SettingsManager,
 ): Promise<CreateAgentSessionOptions> {
-	const options: CreateAgentSessionOptions = {};
+	const options: CreateAgentSessionOptions = {
+		cwd: parsed.cwd ?? process.cwd(),
+	};
 
 	// Auto-discover SYSTEM.md if no CLI system prompt provided
 	const systemPromptSource = parsed.systemPrompt ?? discoverSystemPromptFile();
@@ -263,8 +264,7 @@ async function buildSessionOptions(
 
 	// Tools
 	if (parsed.tools) {
-		options.tools = parsed.tools.map((name) => allTools[name]);
-		options.explicitTools = parsed.tools;
+		options.toolNames = parsed.tools;
 	}
 
 	// Skills

package/src/modes/interactive/components/assistant-message.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage } from "@mariozechner/pi-ai";
 import { Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { getMarkdownTheme, theme } from "../theme/theme";
 

package/src/modes/interactive/components/custom-message.ts

@@ -1,4 +1,4 @@
-import type { TextContent } from "@oh-my-pi/pi-ai";
+import type { TextContent } from "@mariozechner/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Box, Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
 import type { MessageRenderer } from "../../../core/extensions/types";

package/src/modes/interactive/components/extensions/inspector-panel.ts

@@ -68,7 +68,7 @@ export class InspectorPanel implements Component {
 
 		switch (ext.kind) {
 			case "context-file":
-				content = this.renderFilePreview(ext.path, width);
+				content = this.renderFilePreview(ext.raw, width);
 				break;
 			case "tool":
 				content = this.renderToolArgs(ext.raw, width);
@@ -91,37 +91,40 @@ export class InspectorPanel implements Component {
 		return lines;
 	}
 
-	private renderFilePreview(path: string, width: number): string[] {
+	private renderFilePreview(raw: unknown, width: number): string[] {
 		const lines: string[] = [];
 		lines.push(theme.fg("muted", "Preview:"));
 		lines.push(theme.fg("dim", theme.boxSharp.horizontal.repeat(Math.min(width - 2, 40))));
 
-		try {
-			const content = Bun.file(path).text();
-			// Note: async call to sync context - will show empty on first render
-			// This is acceptable for preview which can populate on next render
-			if (typeof content === "object" && "then" in content) {
-				content.then((text: string) => {
-					const fileLines = text.split("\n").slice(0, 20);
-
-					for (const line of fileLines) {
-						const highlighted = this.highlightMarkdown(line);
-						lines.push(truncateToWidth(highlighted, width - 2));
-					}
-
-					if (text.split("\n").length > 20) {
-						lines.push(theme.fg("dim", "(truncated at line 20)"));
-					}
-				});
-			}
-		} catch (err) {
-			lines.push(theme.fg("error", `Failed to read file: ${err instanceof Error ? err.message : String(err)}`));
+		const content = this.getContextFileContent(raw);
+		if (!content) {
+			lines.push(theme.fg("dim", "  (no content)"));
+			lines.push("");
+			return lines;
+		}
+
+		const fileLines = content.split("\n");
+		for (const line of fileLines.slice(0, 20)) {
+			const highlighted = this.highlightMarkdown(line);
+			lines.push(truncateToWidth(highlighted, width - 2));
+		}
+
+		if (fileLines.length > 20) {
+			lines.push(theme.fg("dim", "(truncated at line 20)"));
 		}
 
 		lines.push("");
 		return lines;
 	}
 
+	private getContextFileContent(raw: unknown): string | null {
+		if (raw && typeof raw === "object" && "content" in raw) {
+			const content = (raw as { content?: unknown }).content;
+			return typeof content === "string" ? content : null;
+		}
+		return null;
+	}
+
 	private highlightMarkdown(line: string): string {
 		// Basic markdown syntax highlighting
 		let highlighted = line;

package/src/modes/interactive/components/extensions/state-manager.ts

@@ -10,6 +10,7 @@ import type { MCPServer } from "../../../../capability/mcp";
 import type { Prompt } from "../../../../capability/prompt";
 import type { Rule } from "../../../../capability/rule";
 import type { Skill } from "../../../../capability/skill";
+import type { SlashCommand } from "../../../../capability/slash-command";
 import type { CustomTool } from "../../../../capability/tool";
 import type { SourceMeta } from "../../../../capability/types";
 import {
@@ -192,6 +193,17 @@ export function loadAllExtensions(cwd?: string, disabledIds?: string[]): Extensi
 		// Capability may not be registered
 	}
 
+	// Load slash commands
+	try {
+		const commands = loadSync<SlashCommand>("slash-commands", loadOpts);
+		addItems(commands.all, "slash-command", {
+			getDescription: () => undefined,
+			getTrigger: (c) => `/${c.name}`,
+		});
+	} catch {
+		// Capability may not be registered
+	}
+
 	// Load hooks
 	try {
 		const hooks = loadSync<Hook>("hooks", loadOpts);

package/src/modes/interactive/components/footer.ts

@@ -1,5 +1,5 @@
 import { existsSync, type FSWatcher, readFileSync, watch } from "node:fs";
-import type { AssistantMessage } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage } from "@mariozechner/pi-ai";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { dirname, join } from "path";
 import type { AgentSession } from "../../../core/agent-session";

package/src/modes/interactive/components/hook-message.ts

@@ -1,4 +1,4 @@
-import type { TextContent } from "@oh-my-pi/pi-ai";
+import type { TextContent } from "@mariozechner/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Box, Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
 import type { HookMessageRenderer } from "../../../core/hooks/types";

package/src/modes/interactive/components/model-selector.ts

@@ -1,4 +1,4 @@
-import { type Model, modelsAreEqual } from "@oh-my-pi/pi-ai";
+import { type Model, modelsAreEqual } from "@mariozechner/pi-ai";
 import {
 	Container,
 	Input,

package/src/modes/interactive/components/oauth-selector.ts

@@ -1,4 +1,4 @@
-import { getOAuthProviders, type OAuthProviderInfo } from "@oh-my-pi/pi-ai";
+import { getOAuthProviders, type OAuthProviderInfo } from "@mariozechner/pi-ai";
 import { Container, isArrowDown, isArrowUp, isCtrlC, isEnter, isEscape, Spacer, TruncatedText } from "@oh-my-pi/pi-tui";
 import type { AuthStorage } from "../../../core/auth-storage";
 import { theme } from "../theme/theme";

package/src/modes/interactive/components/settings-defs.ts

@@ -11,11 +11,13 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { getCapabilities } from "@oh-my-pi/pi-tui";
 import type {
+	ImageProviderOption,
 	NotificationMethod,
 	SettingsManager,
 	StatusLinePreset,
 	StatusLineSeparatorStyle,
 	SymbolPreset,
+	WebSearchProviderOption,
 } from "../../../core/settings-manager";
 import { getPreset } from "./status-line/presets";
 
@@ -86,6 +88,15 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getCompactionEnabled(),
 		set: (sm, v) => sm.setCompactionEnabled(v), // Also handled in session
 	},
+	{
+		id: "branchSummaries",
+		tab: "config",
+		type: "boolean",
+		label: "Branch summaries",
+		description: "Prompt to summarize when leaving a branch",
+		get: (sm) => sm.getBranchSummaryEnabled(),
+		set: (sm, v) => sm.setBranchSummaryEnabled(v),
+	},
 	{
 		id: "showImages",
 		tab: "config",
@@ -191,6 +202,15 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getBashInterceptorEnabled(),
 		set: (sm, v) => sm.setBashInterceptorEnabled(v),
 	},
+	{
+		id: "gitTool",
+		tab: "config",
+		type: "boolean",
+		label: "Git tool",
+		description: "Enable structured Git tool",
+		get: (sm) => sm.getGitToolEnabled(),
+		set: (sm, v) => sm.setGitToolEnabled(v),
+	},
 	{
 		id: "mcpProjectConfig",
 		tab: "config",
@@ -277,6 +297,35 @@ export const SETTINGS_DEFS: SettingDef[] = [
 			{ value: "ascii", label: "ASCII", description: "ASCII-only characters (maximum compatibility)" },
 		],
 	},
+	{
+		id: "webSearchProvider",
+		tab: "config",
+		type: "submenu",
+		label: "Web search provider",
+		description: "Provider for web search tool",
+		get: (sm) => sm.getWebSearchProvider(),
+		set: (sm, v) => sm.setWebSearchProvider(v as WebSearchProviderOption),
+		getOptions: () => [
+			{ value: "auto", label: "Auto", description: "Priority: Exa > Perplexity > Anthropic" },
+			{ value: "exa", label: "Exa", description: "Use Exa (requires EXA_API_KEY)" },
+			{ value: "perplexity", label: "Perplexity", description: "Use Perplexity (requires PERPLEXITY_API_KEY)" },
+			{ value: "anthropic", label: "Anthropic", description: "Use Anthropic web search" },
+		],
+	},
+	{
+		id: "imageProvider",
+		tab: "config",
+		type: "submenu",
+		label: "Image provider",
+		description: "Provider for image generation tool",
+		get: (sm) => sm.getImageProvider(),
+		set: (sm, v) => sm.setImageProvider(v as ImageProviderOption),
+		getOptions: () => [
+			{ value: "auto", label: "Auto", description: "Priority: OpenRouter > Gemini" },
+			{ value: "gemini", label: "Gemini", description: "Use Gemini API directly (requires GEMINI_API_KEY)" },
+			{ value: "openrouter", label: "OpenRouter", description: "Use OpenRouter (requires OPENROUTER_API_KEY)" },
+		],
+	},
 
 	// LSP tab
 	{

package/src/modes/interactive/components/status-line.ts

@@ -1,4 +1,4 @@
-import type { AssistantMessage } from "@oh-my-pi/pi-ai";
+import type { AssistantMessage } from "@mariozechner/pi-ai";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { type FSWatcher, watch } from "fs";
 import { dirname, join } from "path";