@oh-my-pi/pi-coding-agent 14.5.1 → 14.5.3

package/src/tools/grep.ts

@@ -14,6 +14,7 @@ import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, t
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import { createFileRecorder } from "./file-recorder";
+import { formatGroupedFiles } from "./grouped-file-output";
 import { formatMatchLine } from "./match-line-format";
 import { formatFullOutputReference, type OutputMeta } from "./output-meta";
 import {
@@ -283,7 +284,6 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 			}
 			const outputLines: string[] = [];
 			let linesTruncated = false;
-			const hasContextLines = normalizedContextBefore > 0 || normalizedContextAfter > 0;
 			const matchesByFile = new Map<string, GrepMatch[]>();
 			for (const match of selectedMatches) {
 				const relativePath = formatPath(match.path);
@@ -332,46 +332,16 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				return { model: modelOut, display: displayOut };
 			};
 			if (isDirectory) {
-				const filesByDirectory = new Map<string, string[]>();
-				for (const relativePath of fileList) {
-					const directory = path.dirname(relativePath).replace(/\\/g, "/");
-					if (!filesByDirectory.has(directory)) {
-						filesByDirectory.set(directory, []);
-					}
-					filesByDirectory.get(directory)!.push(relativePath);
-				}
-				for (const [directory, directoryFiles] of filesByDirectory) {
-					if (directory === ".") {
-						for (const relativePath of directoryFiles) {
-							const rendered = renderMatchesForFile(relativePath);
-							if (rendered.model.length === 0) continue;
-							if (outputLines.length > 0) {
-								outputLines.push("");
-								displayLines.push("");
-							}
-							const header = `# ${path.basename(relativePath)}`;
-							outputLines.push(header, ...rendered.model);
-							displayLines.push(header, ...rendered.display);
-						}
-						continue;
-					}
-					const renderedFiles = directoryFiles
-						.map(relativePath => ({ relativePath, rendered: renderMatchesForFile(relativePath) }))
-						.filter(file => file.rendered.model.length > 0);
-					if (renderedFiles.length === 0) continue;
-					if (outputLines.length > 0) {
-						outputLines.push("");
-						displayLines.push("");
-					}
-					const dirHeader = `# ${directory}`;
-					outputLines.push(dirHeader);
-					displayLines.push(dirHeader);
-					for (const { relativePath, rendered } of renderedFiles) {
-						const fileHeader = `## └─ ${path.basename(relativePath)}`;
-						outputLines.push(fileHeader, ...rendered.model);
-						displayLines.push(fileHeader, ...rendered.display);
-					}
-				}
+				const grouped = formatGroupedFiles(fileList, relativePath => {
+					const rendered = renderMatchesForFile(relativePath);
+					return {
+						modelLines: rendered.model,
+						displayLines: rendered.display,
+						skip: rendered.model.length === 0,
+					};
+				});
+				outputLines.push(...grouped.model);
+				displayLines.push(...grouped.display);
 			} else {
 				for (const relativePath of fileList) {
 					const rendered = renderMatchesForFile(relativePath);
@@ -379,11 +349,6 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 					displayLines.push(...rendered.display);
 				}
 			}
-			if (hasContextLines && outputLines.length > 0) {
-				outputLines.unshift(
-					"[grep] '*' marks match lines; leading space marks context. Anchor and content are separated by '|'.",
-				);
-			}
 			if (matchLimitReached || result.limitReached) {
 				outputLines.push("", limitMessage);
 			}

package/src/tools/grouped-file-output.ts

@@ -0,0 +1,96 @@
+import path from "node:path";
+
+/**
+ * One file's contribution to a grouped file output. The header itself is generated
+ * by `formatGroupedFiles` (single `#` for root files, `##` for files inside a dir);
+ * use `headerSuffix` to tack on extras like ` (1 replacement)`.
+ */
+export interface GroupedFileSection {
+	/** Optional suffix appended to the file header. */
+	headerSuffix?: string;
+	/** Body lines emitted into the textual model output. */
+	modelLines: string[];
+	/** Body lines emitted into the display output. Defaults to `modelLines`. */
+	displayLines?: string[];
+	/** When true, the file (and its header) is omitted entirely. */
+	skip?: boolean;
+}
+
+export interface GroupedFilesOutput {
+	model: string[];
+	display: string[];
+}
+
+/**
+ * Render a list of files as directory-grouped sections shared by grep, ast-grep,
+ * ast-edit, and the LSP diagnostic formatter.
+ *
+ * Layout:
+ *   # dir/
+ *   ## file.ts
+ *   …body…
+ *
+ *   # otherdir/
+ *   ## other.ts
+ *   …body…
+ *
+ * Files in the project root (directory `.`) become single-`#` headers without a
+ * `## file` line, matching the existing convention.
+ */
+export function formatGroupedFiles(
+	files: string[],
+	renderFile: (filePath: string) => GroupedFileSection,
+): GroupedFilesOutput {
+	const filesByDirectory = new Map<string, string[]>();
+	for (const filePath of files) {
+		const directory = path.dirname(filePath).replace(/\\/g, "/");
+		if (!filesByDirectory.has(directory)) {
+			filesByDirectory.set(directory, []);
+		}
+		filesByDirectory.get(directory)!.push(filePath);
+	}
+
+	const model: string[] = [];
+	const display: string[] = [];
+
+	const pushSeparatorIfNeeded = () => {
+		if (model.length > 0) {
+			model.push("");
+			display.push("");
+		}
+	};
+
+	for (const [directory, dirFiles] of filesByDirectory) {
+		if (directory === ".") {
+			for (const filePath of dirFiles) {
+				const section = renderFile(filePath);
+				if (section.skip) continue;
+				pushSeparatorIfNeeded();
+				const header = `# ${path.basename(filePath)}${section.headerSuffix ?? ""}`;
+				model.push(header, ...section.modelLines);
+				display.push(header, ...(section.displayLines ?? section.modelLines));
+			}
+			continue;
+		}
+
+		const sections: Array<{ filePath: string; section: GroupedFileSection }> = [];
+		for (const filePath of dirFiles) {
+			const section = renderFile(filePath);
+			if (section.skip) continue;
+			sections.push({ filePath, section });
+		}
+		if (sections.length === 0) continue;
+
+		pushSeparatorIfNeeded();
+		const dirHeader = `# ${directory}/`;
+		model.push(dirHeader);
+		display.push(dirHeader);
+		for (const { filePath, section } of sections) {
+			const fileHeader = `## ${path.basename(filePath)}${section.headerSuffix ?? ""}`;
+			model.push(fileHeader, ...section.modelLines);
+			display.push(fileHeader, ...(section.displayLines ?? section.modelLines));
+		}
+	}
+
+	return { model, display };
+}

package/src/tools/read.ts

@@ -456,6 +456,12 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 	readonly parameters = readSchema;
 	readonly nonAbortable = true;
 	readonly strict = true;
+	readonly intent = (args: Partial<ReadParams>): string => {
+		const p = typeof args.path === "string" ? args.path.trim() : "";
+		if (!p) return "Reading";
+		const isUrl = /^(https?|ftp):\/\//i.test(p);
+		return isUrl ? `Fetching ${p}` : `Reading ${p}`;
+	};
 
 	readonly #autoResizeImages: boolean;
 	readonly #defaultLimit: number;

package/src/tools/report-tool-issue.ts

@@ -60,6 +60,7 @@ export function createReportToolIssueTool(session: ToolSession): AgentTool {
 		strict: false,
 		description: "Report unexpected tool behavior for automated QA tracking.",
 		parameters: ReportToolIssueParams,
+		intent: "omit",
 		async execute(_toolCallId, rawParams) {
 			try {
 				const params = rawParams as { tool: string; report: string };

package/src/tools/resolve.ts

@@ -110,6 +110,8 @@ export class ResolveTool implements AgentTool<typeof resolveSchema, ResolveToolD
 	readonly description: string;
 	readonly parameters = resolveSchema;
 	readonly strict = true;
+	readonly intent = (args: Partial<ResolveParams>) =>
+		args.action === "discard" ? "Discarding pending action" : "Applying pending action";
 
 	constructor(private readonly session: ToolSession) {
 		this.description = prompt.render(resolveDescription);

package/src/tools/review.ts

@@ -135,6 +135,7 @@ export const reportFindingTool: AgentTool<typeof ReportFindingParams, ReportFind
 	label: "Report Finding",
 	description: "Report a code review finding. Use this for each issue found. Call yield when done.",
 	parameters: ReportFindingParams,
+	intent: "omit",
 	async execute(_toolCallId, params, _signal, _onUpdate, _ctx) {
 		const { title, body, priority, confidence, file_path, line_start, line_end } = params;
 		const location = `${file_path}:${line_start}${line_end !== line_start ? `-${line_end}` : ""}`;

package/src/tools/todo-write.ts

@@ -583,6 +583,7 @@ export class TodoWriteTool implements AgentTool<typeof todoWriteSchema, TodoWrit
 	readonly parameters = todoWriteSchema;
 	readonly concurrency = "exclusive";
 	readonly strict = true;
+	readonly intent = "omit" as const;
 
 	constructor(private readonly session: ToolSession) {
 		this.description = prompt.render(todoWriteDescription);
@@ -716,7 +717,6 @@ export const todoWriteToolRenderer = {
 		const lines: string[] = [header];
 		for (let p = 0; p < phases.length; p++) {
 			const phase = phases[p];
-			if (p > 0) lines.push("");
 			if (phases.length > 1) {
 				lines.push(uiTheme.fg("accent", chalk.bold(`  ${phase.name}`)));
 			}

package/src/tools/yield.ts

@@ -49,6 +49,7 @@ export class YieldTool implements AgentTool<TSchema, YieldDetails> {
 		"The `data`/`error` wrapper is required — do not put your output directly in `result`.";
 	readonly parameters: TSchema;
 	strict = true;
+	readonly intent = "omit" as const;
 	lenientArgValidation = true;
 
 	readonly #validate?: ValidateFunction;

package/src/utils/tool-choice.ts

@@ -20,7 +20,12 @@ export function buildNamedToolChoice(toolName: string, model?: Model<Api>): Tool
 		return { type: "function", name: toolName };
 	}
 
-	if (model.api === "google-generative-ai" || model.api === "google-gemini-cli" || model.api === "google-vertex") {
+	if (
+		model.api === "google-generative-ai" ||
+		model.api === "google-gemini-cli" ||
+		model.api === "google-vertex" ||
+		model.api === "ollama-chat"
+	) {
 		return "required";
 	}