@oh-my-pi/pi-coding-agent 3.30.0 → 3.31.0

package/src/core/system-prompt.ts

@@ -83,9 +83,49 @@ const toolDescriptions: Record<ToolName, string> = {
 	web_fetch: "Fetch and render URLs into clean text for LLM consumption",
 	web_search: "Search the web for information",
 	report_finding: "Report a finding during code review",
-	submit_review: "Submit the final code review with all findings",
 };
 
+function applyTemplate(template: string, values: Record<string, string>): string {
+	let output = template;
+	for (const [key, value] of Object.entries(values)) {
+		output = output.replaceAll(`{{${key}}}`, value);
+	}
+	return output;
+}
+
+function appendBlock(prompt: string, block: string | null | undefined, separator = "\n\n"): string {
+	if (!block) return prompt;
+	if (block.startsWith("\n")) {
+		return `${prompt}${block}`;
+	}
+	return `${prompt}${separator}${block}`;
+}
+
+function appendSection(prompt: string, title: string, content: string | null | undefined): string {
+	if (!content) return prompt;
+	return `${prompt}\n\n# ${title}\n\n${content}`;
+}
+
+function formatProjectContext(contextFiles: Array<{ path: string; content: string; depth?: number }>): string | null {
+	if (contextFiles.length === 0) return null;
+	const parts: string[] = ["The following project context files have been loaded:", ""];
+	for (const { path: filePath, content } of contextFiles) {
+		parts.push(`## ${filePath}`, "", content, "");
+	}
+	return parts.join("\n").trimEnd();
+}
+
+function formatToolDescriptions(tools: Map<string, { description: string; label: string }> | undefined): string | null {
+	if (!tools || tools.size === 0) return null;
+	return Array.from(tools.entries())
+		.map(([name, { description }]) => `- ${name}: ${description}`)
+		.join("\n");
+}
+
+function buildPromptFooter(dateTime: string, cwd: string): string {
+	return `Current date and time: ${dateTime}\nCurrent working directory: ${cwd}`;
+}
+
 /**
  * Generate anti-bash rules section if the agent has both bash and specialized tools.
  * Only include rules for tools that are actually available.
@@ -306,8 +346,6 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 		timeZoneName: "short",
 	});
 
-	const appendSection = resolvedAppendPrompt ? `\n\n${resolvedAppendPrompt}` : "";
-
 	// Resolve context files: use provided or discover
 	const contextFiles = providedContextFiles ?? loadProjectContextFiles({ cwd: resolvedCwd });
 
@@ -324,46 +362,22 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 			? `${systemPromptCustomization}\n\n${resolvedCustomPrompt}`
 			: resolvedCustomPrompt;
 
-		if (appendSection) {
-			prompt += appendSection;
-		}
-
-		// Append project context files
-		if (contextFiles.length > 0) {
-			prompt += "\n\n# Project Context\n\n";
-			prompt += "The following project context files have been loaded:\n\n";
-			for (const { path: filePath, content } of contextFiles) {
-				prompt += `## ${filePath}\n\n${content}\n\n`;
-			}
-		}
-
-		// Append custom tool descriptions if provided
-		if (tools && tools.size > 0) {
-			prompt += "\n\n# Tools\n\n";
-			prompt += Array.from(tools.entries())
-				.map(([name, { description }]) => `- ${name}: ${description}`)
-				.join("\n");
-		}
+		prompt = appendBlock(prompt, resolvedAppendPrompt);
+		prompt = appendSection(prompt, "Project Context", formatProjectContext(contextFiles));
+		prompt = appendSection(prompt, "Tools", formatToolDescriptions(tools));
 
-		// Append git context if in a git repo
 		const gitContext = loadGitContext(resolvedCwd);
-		if (gitContext) {
-			prompt += `\n\n# Git Status\n\n${gitContext}`;
-		}
+		prompt = appendSection(prompt, "Git Status", gitContext);
 
-		// Append skills section (only if read tool is available)
 		if (tools?.has("read") && skills.length > 0) {
-			prompt += formatSkillsForPrompt(skills);
+			prompt = appendBlock(prompt, formatSkillsForPrompt(skills));
 		}
 
-		// Append rules section (always enabled when rules exist)
 		if (rulebookRules && rulebookRules.length > 0) {
-			prompt += formatRulesForPrompt(rulebookRules);
+			prompt = appendBlock(prompt, formatRulesForPrompt(rulebookRules));
 		}
 
-		// Add date/time and working directory last
-		prompt += `\nCurrent date and time: ${dateTime}`;
-		prompt += `\nCurrent working directory: ${resolvedCwd}`;
+		prompt = appendBlock(prompt, buildPromptFooter(dateTime, resolvedCwd), "\n");
 
 		return prompt;
 	}
@@ -428,46 +442,30 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 
 	// Build the prompt with anti-bash rules prominently placed
 	const antiBashBlock = antiBashSection ? `\n${antiBashSection}\n` : "";
-	let prompt = systemPromptTemplate
-		.replaceAll("{{toolsList}}", toolsList)
-		.replaceAll("{{antiBashSection}}", antiBashBlock)
-		.replaceAll("{{guidelines}}", guidelines)
-		.replaceAll("{{readmePath}}", readmePath)
-		.replaceAll("{{docsPath}}", docsPath)
-		.replaceAll("{{examplesPath}}", examplesPath);
-
-	if (appendSection) {
-		prompt += appendSection;
-	}
+	let prompt = applyTemplate(systemPromptTemplate, {
+		toolsList,
+		antiBashSection: antiBashBlock,
+		guidelines,
+		readmePath,
+		docsPath,
+		examplesPath,
+	});
 
-	// Append project context files
-	if (contextFiles.length > 0) {
-		prompt += "\n\n# Project Context\n\n";
-		prompt += "The following project context files have been loaded:\n\n";
-		for (const { path: filePath, content } of contextFiles) {
-			prompt += `## ${filePath}\n\n${content}\n\n`;
-		}
-	}
+	prompt = appendBlock(prompt, resolvedAppendPrompt);
+	prompt = appendSection(prompt, "Project Context", formatProjectContext(contextFiles));
 
-	// Append git context if in a git repo
 	const gitContext = loadGitContext(resolvedCwd);
-	if (gitContext) {
-		prompt += `\n\n# Git Status\n\n${gitContext}`;
-	}
+	prompt = appendSection(prompt, "Git Status", gitContext);
 
-	// Append skills section (only if read tool is available)
 	if (hasRead && skills.length > 0) {
-		prompt += formatSkillsForPrompt(skills);
+		prompt = appendBlock(prompt, formatSkillsForPrompt(skills));
 	}
 
-	// Append rules section (always enabled when rules exist)
 	if (rulebookRules && rulebookRules.length > 0) {
-		prompt += formatRulesForPrompt(rulebookRules);
+		prompt = appendBlock(prompt, formatRulesForPrompt(rulebookRules));
 	}
 
-	// Add date/time and working directory last
-	prompt += `\nCurrent date and time: ${dateTime}`;
-	prompt += `\nCurrent working directory: ${resolvedCwd}`;
+	prompt = appendBlock(prompt, buildPromptFooter(dateTime, resolvedCwd), "\n");
 
 	// Prepend SYSTEM.md customization if present
 	if (systemPromptCustomization) {

package/src/core/tools/ask.ts

@@ -23,7 +23,7 @@ import { type Theme, theme } from "../../modes/interactive/theme/theme";
 import askDescription from "../../prompts/tools/ask.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
 import type { ToolSession } from "./index";
-import { formatErrorMessage, formatMeta } from "./render-utils";
+import { createToolUIKit } from "./render-utils";
 
 // =============================================================================
 // Types
@@ -218,17 +218,18 @@ interface AskRenderArgs {
 
 export const askToolRenderer = {
 	renderCall(args: AskRenderArgs, uiTheme: Theme): Component {
+		const ui = createToolUIKit(uiTheme);
 		if (!args.question) {
-			return new Text(formatErrorMessage("No question provided", uiTheme), 0, 0);
+			return new Text(ui.errorMessage("No question provided"), 0, 0);
 		}
 
-		const label = uiTheme.fg("toolTitle", uiTheme.bold("Ask"));
+		const label = ui.title("Ask");
 		let text = `${label} ${uiTheme.fg("accent", args.question)}`;
 
 		const meta: string[] = [];
 		if (args.multi) meta.push("multi");
 		if (args.options?.length) meta.push(`options:${args.options.length}`);
-		text += formatMeta(meta, uiTheme);
+		text += ui.meta(meta);
 
 		if (args.options?.length) {
 			for (let i = 0; i < args.options.length; i++) {

package/src/core/tools/bash-interceptor.ts

@@ -6,6 +6,8 @@
  * the specialized tools instead.
  */
 
+import { type BashInterceptorRule, DEFAULT_BASH_INTERCEPTOR_RULES } from "../settings-manager";
+
 export interface InterceptionResult {
 	/** If true, the bash command should be blocked */
 	block: boolean;
@@ -16,62 +18,20 @@ export interface InterceptionResult {
 }
 
 /**
- * Patterns that should NEVER use bash when specialized tools exist.
- * Each pattern maps to a helpful error message.
+ * Compile bash interceptor rules into regexes, skipping invalid patterns.
  */
-const forbiddenPatterns: Array<{
-	pattern: RegExp;
-	tool: string;
-	message: string;
-}> = [
-	// File reading
-	{
-		pattern: /^\s*(cat|head|tail|less|more)\s+/,
-		tool: "read",
-		message: "Use the `read` tool instead of cat/head/tail. It provides better context and handles binary files.",
-	},
-	// Content search (grep variants)
-	{
-		pattern: /^\s*(grep|rg|ripgrep|ag|ack)\s+/,
-		tool: "grep",
-		message: "Use the `grep` tool instead of grep/rg. It respects .gitignore and provides structured output.",
-	},
-	// Git operations
-	{
-		pattern: /^\s*git(\s+|$)/,
-		tool: "git",
-		message:
-			"Use the `git` tool instead of running git in bash. It provides structured output and safety confirmations.",
-	},
-	// File finding
-	{
-		pattern: /^\s*(find|fd|locate)\s+.*(-name|-iname|-type|--type|-glob)/,
-		tool: "find",
-		message: "Use the `find` tool instead of find/fd. It respects .gitignore and is faster for glob patterns.",
-	},
-	// In-place file editing
-	{
-		pattern: /^\s*sed\s+(-i|--in-place)/,
-		tool: "edit",
-		message: "Use the `edit` tool instead of sed -i. It provides diff preview and fuzzy matching.",
-	},
-	{
-		pattern: /^\s*perl\s+.*-[pn]?i/,
-		tool: "edit",
-		message: "Use the `edit` tool instead of perl -i. It provides diff preview and fuzzy matching.",
-	},
-	{
-		pattern: /^\s*awk\s+.*-i\s+inplace/,
-		tool: "edit",
-		message: "Use the `edit` tool instead of awk -i inplace. It provides diff preview and fuzzy matching.",
-	},
-	// File creation via redirection (but allow legitimate uses like piping)
-	{
-		pattern: /^\s*(echo|printf|cat\s*<<)\s+.*[^|]>\s*\S/,
-		tool: "write",
-		message: "Use the `write` tool instead of echo/cat redirection. It handles encoding and provides confirmation.",
-	},
-];
+function compileRules(rules: BashInterceptorRule[]): Array<{ rule: BashInterceptorRule; regex: RegExp }> {
+	const compiled: Array<{ rule: BashInterceptorRule; regex: RegExp }> = [];
+	for (const rule of rules) {
+		const flags = rule.flags ?? "";
+		try {
+			compiled.push({ rule, regex: new RegExp(rule.pattern, flags) });
+		} catch {
+			// Skip invalid regex patterns
+		}
+	}
+	return compiled;
+}
 
 /**
  * Check if a bash command should be intercepted.
@@ -80,21 +40,26 @@ const forbiddenPatterns: Array<{
  * @param availableTools Set of tool names that are available
  * @returns InterceptionResult indicating if the command should be blocked
  */
-export function checkBashInterception(command: string, availableTools: string[]): InterceptionResult {
+export function checkBashInterception(
+	command: string,
+	availableTools: string[],
+	rules: BashInterceptorRule[] = DEFAULT_BASH_INTERCEPTOR_RULES,
+): InterceptionResult {
 	// Normalize command for pattern matching
 	const normalizedCommand = command.trim();
+	const compiled = compileRules(rules);
 
-	for (const { pattern, tool, message } of forbiddenPatterns) {
+	for (const { rule, regex } of compiled) {
 		// Only block if the suggested tool is actually available
-		if (!availableTools.includes(tool)) {
+		if (!availableTools.includes(rule.tool)) {
 			continue;
 		}
 
-		if (pattern.test(normalizedCommand)) {
+		if (regex.test(normalizedCommand)) {
 			return {
 				block: true,
-				message: `❌ Blocked: ${message}\n\nOriginal command: ${command}`,
-				suggestedTool: tool,
+				message: `Blocked: ${rule.message}\n\nOriginal command: ${command}`,
+				suggestedTool: rule.tool,
 			};
 		}
 	}

package/src/core/tools/bash.ts

@@ -8,7 +8,7 @@ import { executeBash } from "../bash-executor";
 import type { RenderResultOptions } from "../custom-tools/types";
 import { checkBashInterception, checkSimpleLsInterception } from "./bash-interceptor";
 import type { ToolSession } from "./index";
-import { formatBytes, wrapBrackets } from "./render-utils";
+import { createToolUIKit } from "./render-utils";
 import { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateTail } from "./truncate";
 
 const bashSchema = Type.Object({
@@ -36,13 +36,16 @@ export function createBashTool(session: ToolSession): AgentTool<typeof bashSchem
 		) => {
 			// Check interception if enabled and available tools are known
 			if (session.settings?.getBashInterceptorEnabled()) {
-				const interception = checkBashInterception(command, ctx?.toolNames ?? []);
+				const rules = session.settings?.getBashInterceptorRules?.();
+				const interception = checkBashInterception(command, ctx?.toolNames ?? [], rules);
 				if (interception.block) {
 					throw new Error(interception.message);
 				}
-				const lsInterception = checkSimpleLsInterception(command, ctx?.toolNames ?? []);
-				if (lsInterception.block) {
-					throw new Error(lsInterception.message);
+				if (session.settings?.getBashInterceptorSimpleLsEnabled?.() !== false) {
+					const lsInterception = checkSimpleLsInterception(command, ctx?.toolNames ?? []);
+					if (lsInterception.block) {
+						throw new Error(lsInterception.message);
+					}
 				}
 			}
 
@@ -127,8 +130,9 @@ interface BashRenderContext {
 
 export const bashToolRenderer = {
 	renderCall(args: BashRenderArgs, uiTheme: Theme): Component {
+		const ui = createToolUIKit(uiTheme);
 		const command = args.command || uiTheme.format.ellipsis;
-		const text = uiTheme.fg("toolTitle", uiTheme.bold(`$ ${command}`));
+		const text = ui.title(`$ ${command}`);
 		return new Text(text, 0, 0);
 	},
 
@@ -140,6 +144,7 @@ export const bashToolRenderer = {
 		options: RenderResultOptions & { renderContext?: BashRenderContext },
 		uiTheme: Theme,
 	): Component {
+		const ui = createToolUIKit(uiTheme);
 		const { expanded, renderContext } = options;
 		const details = result.details;
 		const lines: string[] = [];
@@ -195,11 +200,11 @@ export const bashToolRenderer = {
 					warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
 				} else {
 					warnings.push(
-						`Truncated: ${truncation.outputLines} lines shown (${formatBytes(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`,
+						`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`,
 					);
 				}
 			}
-			lines.push(uiTheme.fg("warning", wrapBrackets(warnings.join(". "), uiTheme)));
+			lines.push(uiTheme.fg("warning", ui.wrapBrackets(warnings.join(". "))));
 		}
 
 		return new Text(lines.join("\n"), 0, 0);

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

@@ -3,8 +3,6 @@
  * 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 { resolveToCwd } from "./path-utils";
 
@@ -428,14 +426,23 @@ export async function computeEditDiff(
 
 	try {
 		// Check if file exists and is readable
+		const file = Bun.file(absolutePath);
 		try {
-			await access(absolutePath, constants.R_OK);
+			if (!(await file.exists())) {
+				return { error: `File not found: ${path}` };
+			}
 		} catch {
 			return { error: `File not found: ${path}` };
 		}
 
 		// Read the file
-		const rawContent = await readFile(absolutePath, "utf-8");
+		let rawContent: string;
+		try {
+			rawContent = await file.text();
+		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
+			return { error: message || `Unable to read ${path}` };
+		}
 
 		// Strip BOM before matching (LLM won't include invisible BOM in oldText)
 		const { text: content } = stripBom(rawContent);

package/src/core/tools/edit.ts

@@ -20,14 +20,7 @@ import {
 import type { ToolSession } from "./index";
 import { createLspWritethrough, type FileDiagnosticsResult } from "./lsp/index";
 import { resolveToCwd } from "./path-utils";
-import {
-	formatDiagnostics,
-	formatDiffStats,
-	getDiffStats,
-	shortenPath,
-	truncateDiffByHunk,
-	wrapBrackets,
-} from "./render-utils";
+import { createToolUIKit, getDiffStats, shortenPath, truncateDiffByHunk } from "./render-utils";
 
 const editSchema = Type.Object({
 	path: Type.String({ description: "Path to the file to edit (relative or absolute)" }),
@@ -237,13 +230,14 @@ function formatMetadataLine(lineCount: number | null, language: string | undefin
 
 export const editToolRenderer = {
 	renderCall(args: EditRenderArgs, uiTheme: Theme): Component {
+		const ui = createToolUIKit(uiTheme);
 		const rawPath = args.file_path || args.path || "";
 		const filePath = shortenPath(rawPath);
 		const editLanguage = getLanguageFromPath(rawPath) ?? "text";
 		const editIcon = uiTheme.fg("muted", uiTheme.getLangIcon(editLanguage));
 		const pathDisplay = filePath ? uiTheme.fg("accent", filePath) : uiTheme.fg("toolOutput", uiTheme.format.ellipsis);
 
-		const text = `${uiTheme.fg("toolTitle", uiTheme.bold("Edit"))} ${editIcon} ${pathDisplay}`;
+		const text = `${ui.title("Edit")} ${editIcon} ${pathDisplay}`;
 		return new Text(text, 0, 0);
 	},
 
@@ -253,6 +247,7 @@ export const editToolRenderer = {
 		uiTheme: Theme,
 		args?: EditRenderArgs,
 	): Component {
+		const ui = createToolUIKit(uiTheme);
 		const { expanded, renderContext } = options;
 		const rawPath = args?.file_path || args?.path || "";
 		const filePath = shortenPath(rawPath);
@@ -287,11 +282,10 @@ export const editToolRenderer = {
 				text += `\n\n${uiTheme.fg("error", editDiffPreview.error)}`;
 			} else if (editDiffPreview.diff) {
 				const diffStats = getDiffStats(editDiffPreview.diff);
-				text += `\n${uiTheme.fg("dim", uiTheme.format.bracketLeft)}${formatDiffStats(
+				text += `\n${uiTheme.fg("dim", uiTheme.format.bracketLeft)}${ui.formatDiffStats(
 					diffStats.added,
 					diffStats.removed,
 					diffStats.hunks,
-					uiTheme,
 				)}${uiTheme.fg("dim", uiTheme.format.bracketRight)}`;
 
 				const {
@@ -309,7 +303,7 @@ export const editToolRenderer = {
 					if (hiddenLines > 0) remainder.push(`${hiddenLines} more lines`);
 					text += uiTheme.fg(
 						"toolOutput",
-						`\n${uiTheme.format.ellipsis} (${remainder.join(", ")}) ${wrapBrackets("Ctrl+O to expand", uiTheme)}`,
+						`\n${uiTheme.format.ellipsis} (${remainder.join(", ")}) ${ui.wrapBrackets("Ctrl+O to expand")}`,
 					);
 				}
 			}
@@ -317,7 +311,7 @@ export const editToolRenderer = {
 
 		// Show LSP diagnostics if available
 		if (result.details?.diagnostics) {
-			text += formatDiagnostics(result.details.diagnostics, expanded, uiTheme, (fp) =>
+			text += ui.formatDiagnostics(result.details.diagnostics, expanded, (fp: string) =>
 				uiTheme.getLangIcon(getLanguageFromPath(fp)),
 			);
 		}