@oh-my-pi/pi-coding-agent 13.15.2 → 13.16.0

package/src/system-prompt.ts

@@ -16,6 +16,57 @@ import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile
 import { loadSkills, type Skill } from "./extensibility/skills";
 import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
+import { formatPromptContent } from "./utils/prompt-format";
+
+interface AlwaysApplyRule {
+	name: string;
+	content: string;
+	path: string;
+}
+
+function normalizePromptBlock(content: string): string {
+	return formatPromptContent(content, { renderPhase: "post-render" }).trim();
+}
+
+function splitComparablePromptBlocks(content: string | null | undefined): string[] {
+	const normalized = firstNonEmpty(content);
+	if (!normalized) return [];
+
+	return normalizePromptBlock(normalized)
+		.split(/\n{2,}/)
+		.map(block => block.trim())
+		.filter(block => block.length > 0);
+}
+
+function promptSourceContainsRule(source: string | null | undefined, ruleContent: string): boolean {
+	const sourceBlocks = splitComparablePromptBlocks(source);
+	const ruleBlocks = splitComparablePromptBlocks(ruleContent);
+	if (sourceBlocks.length === 0 || ruleBlocks.length === 0 || ruleBlocks.length > sourceBlocks.length) return false;
+
+	for (let start = 0; start <= sourceBlocks.length - ruleBlocks.length; start += 1) {
+		if (ruleBlocks.every((block, offset) => sourceBlocks[start + offset] === block)) return true;
+	}
+
+	return false;
+}
+
+function dedupeAlwaysApplyRules(
+	alwaysApplyRules: AlwaysApplyRule[] | undefined,
+	promptSources: Array<string | null | undefined>,
+): AlwaysApplyRule[] {
+	if (!alwaysApplyRules || alwaysApplyRules.length === 0) return [];
+
+	return alwaysApplyRules.filter(
+		rule => !promptSources.some(source => promptSourceContainsRule(source, rule.content)),
+	);
+}
+
+function dedupePromptSource(source: string | null | undefined, otherSources: Array<string | null | undefined>): string {
+	const resolvedSource = firstNonEmpty(source);
+	if (!resolvedSource) return "";
+
+	return otherSources.some(otherSource => promptSourceContainsRule(otherSource, resolvedSource)) ? "" : resolvedSource;
+}
 
 function firstNonEmpty(...values: (string | undefined | null)[]): string | null {
 	for (const value of values) {
@@ -379,6 +430,8 @@ export interface BuildSystemPromptOptions {
 	mcpDiscoveryServerSummaries?: string[];
 	/** Encourage the agent to delegate via tasks unless changes are trivial. */
 	eagerTasks?: boolean;
+	/** Rules with alwaysApply=true — their full content is injected into the prompt. */
+	alwaysApplyRules?: AlwaysApplyRule[];
 }
 
 /** Build the system prompt with tools, guidelines, and context */
@@ -398,6 +451,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		contextFiles: providedContextFiles,
 		skills: providedSkills,
 		rules,
+		alwaysApplyRules,
 		intentField,
 		mcpDiscoveryMode = false,
 		mcpDiscoveryServerSummaries = [],
@@ -519,10 +573,16 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 	const hasRead = tools?.has("read");
 	const filteredSkills = hasRead ? skills : [];
 
+	const effectiveSystemPromptCustomization = dedupePromptSource(systemPromptCustomization, [
+		resolvedCustomPrompt,
+		resolvedAppendPrompt,
+	]);
+	const promptSources = [effectiveSystemPromptCustomization, resolvedCustomPrompt, resolvedAppendPrompt];
+	const injectedAlwaysApplyRules = dedupeAlwaysApplyRules(alwaysApplyRules, promptSources);
+
 	const environment = await logger.timeAsync("getEnvironmentInfo", getEnvironmentInfo);
 	const data = {
-		// Explicit custom prompts replace discovered SYSTEM.md content rather than layering it twice.
-		systemPromptCustomization: resolvedCustomPrompt ? "" : (systemPromptCustomization ?? ""),
+		systemPromptCustomization: effectiveSystemPromptCustomization,
 		customPrompt: resolvedCustomPrompt,
 		appendPrompt: resolvedAppendPrompt ?? "",
 		tools: toolNames,
@@ -533,6 +593,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		agentsMdSearch,
 		skills: filteredSkills,
 		rules: rules ?? [],
+		alwaysApplyRules: injectedAlwaysApplyRules,
 		date,
 		dateTime,
 		cwd: promptCwd,

package/src/tools/ask.ts

@@ -147,9 +147,11 @@ interface UIContext {
 			helpText?: string;
 		},
 	): Promise<string | undefined>;
-	input(
-		prompt: string,
-		options_?: { signal?: AbortSignal; timeout?: number; onTimeout?: () => void },
+	editor(
+		title: string,
+		prefill?: string,
+		dialogOptions?: { signal?: AbortSignal },
+		editorOptions?: { promptStyle?: boolean },
 	): Promise<string | undefined>;
 }
 
@@ -207,15 +209,11 @@ async function askSingleQuestion(
 		return { choice, timedOut: timeoutTriggered, navigation: navigationAction };
 	};
 
-	const promptForInput = async (): Promise<{ input: string | undefined; timedOut: boolean }> => {
-		let inputTimedOut = false;
-		const onTimeout = () => {
-			inputTimedOut = true;
-		};
-		const input = signal
-			? await untilAborted(signal, () => ui.input("Enter your response:", { signal, timeout, onTimeout }))
-			: await ui.input("Enter your response:", { signal, timeout, onTimeout });
-		return { input, timedOut: inputTimedOut };
+	const promptForCustomInput = async (): Promise<{ input: string | undefined }> => {
+		const dialogOptions = signal ? { signal } : undefined;
+		const showCustomInput = () => ui.editor("Enter your response:", undefined, dialogOptions, { promptStyle: true });
+		const input = signal ? await untilAborted(signal, showCustomInput) : await showCustomInput();
+		return { input };
 	};
 
 	const promptWithProgress = navigation?.progressText ? `${question} (${navigation.progressText})` : question;
@@ -264,9 +262,11 @@ async function askSingleQuestion(
 					timedOut = true;
 					break;
 				}
-				const inputResult = await promptForInput();
-				if (inputResult.input) customInput = inputResult.input;
-				if (inputResult.timedOut) timedOut = true;
+				const customResult = await promptForCustomInput();
+				if (customResult.input === undefined) {
+					break;
+				}
+				customInput = customResult.input;
 				break;
 			}
 
@@ -306,7 +306,7 @@ async function askSingleQuestion(
 		if (previouslySelected) {
 			const selectedIndex = optionLabels.indexOf(previouslySelected);
 			if (selectedIndex >= 0) initialIndex = selectedIndex;
-		} else if (customInput) {
+		} else if (customInput !== undefined) {
 			initialIndex = displayLabels.length;
 		}
 		if (initialIndex !== undefined) {
@@ -330,11 +330,13 @@ async function askSingleQuestion(
 			}
 		} else if (choice === OTHER_OPTION) {
 			if (!selectTimedOut) {
-				const inputResult = await promptForInput();
-				if (inputResult.input) customInput = inputResult.input;
-				if (inputResult.timedOut) timedOut = true;
+				const customResult = await promptForCustomInput();
+				if (customResult.input !== undefined) {
+					customInput = customResult.input;
+					selectedOptions = [];
+				}
+				// If editor was dismissed (undefined), keep prior selectedOptions/customInput intact
 			}
-			selectedOptions = [];
 		} else {
 			selectedOptions = [stripRecommendedSuffix(choice)];
 			customInput = undefined;
@@ -344,7 +346,7 @@ async function askSingleQuestion(
 		}
 	}
 
-	if (timedOut && selectedOptions.length === 0 && !customInput) {
+	if (timedOut && selectedOptions.length === 0 && customInput === undefined) {
 		selectedOptions = getAutoSelectionOnTimeout(optionLabels, recommended);
 	}
 
@@ -352,7 +354,7 @@ async function askSingleQuestion(
 }
 
 function formatQuestionResult(result: QuestionResult): string {
-	if (result.customInput) {
+	if (result.customInput !== undefined) {
 		return `${result.id}: "${result.customInput}"`;
 	}
 	if (result.selectedOptions.length > 0) {
@@ -415,7 +417,8 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 		const extensionUi = context.ui;
 		const ui: UIContext = {
 			select: (prompt, options, dialogOptions) => extensionUi.select(prompt, options, dialogOptions),
-			input: (prompt, dialogOptions) => extensionUi.input(prompt, undefined, dialogOptions),
+			editor: (title, prefill, dialogOptions, editorOptions) =>
+				extensionUi.editor(title, prefill, dialogOptions, editorOptions),
 		};
 
 		// Determine timeout based on settings and plan mode
@@ -467,7 +470,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			const [q] = params.questions;
 			const { optionLabels, selectedOptions, customInput, cancelled, timedOut } = await askQuestion(q);
 
-			if (!timedOut && (cancelled || (selectedOptions.length === 0 && !customInput))) {
+			if (!timedOut && (cancelled || (selectedOptions.length === 0 && customInput === undefined))) {
 				context.abort();
 				throw new ToolAbortError("Ask tool was cancelled by the user");
 			}
@@ -479,16 +482,23 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				customInput,
 			};
 
-			let responseText: string;
-			if (customInput) {
-				responseText = `User provided custom input: ${customInput}`;
-			} else if (selectedOptions.length > 0) {
-				responseText = q.multi
-					? `User selected: ${selectedOptions.join(", ")}`
-					: `User selected: ${selectedOptions[0]}`;
-			} else {
-				responseText = "User cancelled the selection";
+			const responseParts: string[] = [];
+			if (selectedOptions.length > 0) {
+				responseParts.push(
+					q.multi ? `User selected: ${selectedOptions.join(", ")}` : `User selected: ${selectedOptions[0]}`,
+				);
 			}
+			if (customInput !== undefined) {
+				responseParts.push(
+					customInput.includes("\n")
+						? `User provided custom input:\n${customInput
+								.split("\n")
+								.map(line => `  ${line}`)
+								.join("\n")}`
+						: `User provided custom input: ${customInput}`,
+				);
+			}
+			const responseText = responseParts.length > 0 ? responseParts.join("\n") : "User cancelled the selection";
 
 			return { content: [{ type: "text" as const, text: responseText }], details };
 		}
@@ -570,6 +580,25 @@ interface AskRenderArgs {
 	}>;
 }
 
+/** Render custom input as a single block with continuation lines (not one entry per line) */
+function renderCustomInput(
+	uiTheme: Theme,
+	prefix: string,
+	customInput: string,
+	isLastEntry: boolean,
+	includeLeadingNewline = true,
+): string {
+	const lines = customInput.split("\n");
+	const branch = isLastEntry ? uiTheme.tree.last : uiTheme.tree.branch;
+	const firstLine = lines[0] ?? "";
+	let text = `${includeLeadingNewline ? "\n" : ""}${prefix}${uiTheme.fg("dim", branch)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", firstLine)}`;
+	const continuationIndent = isLastEntry ? "   " : `${uiTheme.fg("dim", uiTheme.tree.vertical)}  `;
+	for (let i = 1; i < lines.length; i++) {
+		text += `\n${prefix}${continuationIndent}   ${uiTheme.fg("toolOutput", lines[i])}`;
+	}
+	return text;
+}
+
 export const askToolRenderer = {
 	renderCall(args: AskRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const label = formatTitle("Ask", uiTheme);
@@ -658,7 +687,7 @@ export const askToolRenderer = {
 		// Multi-part results
 		if (details.results && details.results.length > 0) {
 			const hasAnySelection = details.results.some(
-				r => r.customInput || (r.selectedOptions && r.selectedOptions.length > 0),
+				r => r.customInput !== undefined || (r.selectedOptions && r.selectedOptions.length > 0),
 			);
 			const header = renderStatusLine(
 				{
@@ -676,7 +705,7 @@ export const askToolRenderer = {
 				const isLastQuestion = i === details.results.length - 1;
 				const branch = isLastQuestion ? uiTheme.tree.last : uiTheme.tree.branch;
 				const continuation = isLastQuestion ? "   " : `${uiTheme.fg("dim", uiTheme.tree.vertical)}  `;
-				const hasSelection = r.customInput || r.selectedOptions.length > 0;
+				const hasSelection = r.customInput !== undefined || r.selectedOptions.length > 0;
 				const statusIcon = hasSelection
 					? uiTheme.styledSymbol("status.success", "success")
 					: uiTheme.styledSymbol("status.warning", "warning");
@@ -686,23 +715,30 @@ export const askToolRenderer = {
 				);
 				container.addChild(new Markdown(r.question, 3, 0, mdTheme, accentStyle));
 
-				let answerText = "";
-				if (r.customInput) {
-					answerText = `${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", r.customInput)}`;
-				} else if (r.selectedOptions.length > 0) {
-					for (let j = 0; j < r.selectedOptions.length; j++) {
-						const isLast = j === r.selectedOptions.length - 1;
-						const optBranch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-						const selectedLabel = renderInlineMarkdown(r.selectedOptions[j], mdTheme, t =>
-							uiTheme.fg("toolOutput", t),
-						);
-						answerText += `\n${continuation}${uiTheme.fg("dim", optBranch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${selectedLabel}`;
-					}
-				} else {
-					answerText = `${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`;
+				const answerLines: string[] = [];
+				for (let j = 0; j < r.selectedOptions.length; j++) {
+					const isLast = j === r.selectedOptions.length - 1 && r.customInput === undefined;
+					const optBranch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+					const selectedLabel = renderInlineMarkdown(r.selectedOptions[j], mdTheme, t =>
+						uiTheme.fg("toolOutput", t),
+					);
+					answerLines.push(
+						`${continuation}${uiTheme.fg("dim", optBranch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${selectedLabel}`,
+					);
+				}
+				if (answerLines.length > 0) {
+					container.addChild(new Text(answerLines.join("\n"), 0, 0));
 				}
-				if (answerText) {
-					container.addChild(new Text(answerText, 0, 0));
+				if (r.customInput !== undefined) {
+					container.addChild(new Text(renderCustomInput(uiTheme, continuation, r.customInput, true, false), 0, 0));
+				} else if (r.selectedOptions.length === 0) {
+					container.addChild(
+						new Text(
+							`${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`,
+							0,
+							0,
+						),
+					);
 				}
 			}
 			return container;
@@ -715,28 +751,40 @@ export const askToolRenderer = {
 			return new Text(fallback, 0, 0);
 		}
 
-		const hasSelection = details.customInput || (details.selectedOptions && details.selectedOptions.length > 0);
+		const hasSelection =
+			details.customInput !== undefined || (details.selectedOptions && details.selectedOptions.length > 0);
 		const header = renderStatusLine({ icon: hasSelection ? "success" : "warning", title: "Ask" }, uiTheme);
 		const container = new Container();
 		container.addChild(new Text(header, 0, 0));
 		container.addChild(new Markdown(details.question, 1, 0, mdTheme, accentStyle));
 
-		let answerText = "";
-		if (details.customInput) {
-			answerText = ` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", details.customInput)}`;
-		} else if (details.selectedOptions && details.selectedOptions.length > 0) {
+		const answerLines: string[] = [];
+		if (details.selectedOptions && details.selectedOptions.length > 0) {
 			for (let i = 0; i < details.selectedOptions.length; i++) {
-				const isLast = i === details.selectedOptions.length - 1;
+				const isLast = i === details.selectedOptions.length - 1 && details.customInput === undefined;
 				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
 				const selectedLabel = renderInlineMarkdown(details.selectedOptions[i], mdTheme, t =>
 					uiTheme.fg("toolOutput", t),
 				);
-				answerText += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${selectedLabel}`;
+				answerLines.push(
+					` ${uiTheme.fg("dim", branch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${selectedLabel}`,
+				);
 			}
-		} else {
-			answerText = ` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`;
 		}
-		container.addChild(new Text(answerText, 0, 0));
+		if (answerLines.length > 0) {
+			container.addChild(new Text(answerLines.join("\n"), 0, 0));
+		}
+		if (details.customInput !== undefined) {
+			container.addChild(new Text(renderCustomInput(uiTheme, " ", details.customInput, true, false), 0, 0));
+		} else if (!details.selectedOptions || details.selectedOptions.length === 0) {
+			container.addChild(
+				new Text(
+					` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`,
+					0,
+					0,
+				),
+			);
+		}
 
 		return container;
 	},

package/src/tools/ast-edit.ts

@@ -435,18 +435,6 @@ export const astEditToolRenderer = {
 			group => !group[0]?.startsWith("Safety cap reached") && !group[0]?.startsWith("Parse issues:"),
 		);
 
-		const getCollapsedChangeLimit = (groups: string[][], maxLines: number): number => {
-			if (groups.length === 0) return 0;
-			let usedLines = 0;
-			let count = 0;
-			for (const group of groups) {
-				if (count > 0 && usedLines + group.length > maxLines) break;
-				usedLines += group.length;
-				count += 1;
-				if (usedLines >= maxLines) break;
-			}
-			return count;
-		};
 		const badge = { label: "proposed", color: "warning" as const };
 		const header = renderStatusLine(
 			{ icon: limitReached ? "warning" : "success", title: "AST Edit", description, badge, meta },
@@ -471,14 +459,12 @@ export const astEditToolRenderer = {
 				const { expanded } = options;
 				const key = new Hasher().bool(expanded).u32(width).digest();
 				if (cached?.key === key) return cached.lines;
-				const maxCollapsed = expanded
-					? changeGroups.length
-					: getCollapsedChangeLimit(changeGroups, COLLAPSED_CHANGE_LIMIT);
 				const changeLines = renderTreeList(
 					{
 						items: changeGroups,
 						expanded,
-						maxCollapsed,
+						maxCollapsed: changeGroups.length,
+						maxCollapsedLines: COLLAPSED_CHANGE_LIMIT,
 						itemType: "change",
 						renderItem: group =>
 							group.map(line => {

package/src/tools/ast-grep.ts

@@ -402,19 +402,6 @@ export const astGrepToolRenderer = {
 			group => !group[0]?.startsWith("Result limit reached") && !group[0]?.startsWith("Parse issues:"),
 		);
 
-		const getCollapsedMatchLimit = (groups: string[][], maxLines: number): number => {
-			if (groups.length === 0) return 0;
-			let usedLines = 0;
-			let count = 0;
-			for (const group of groups) {
-				if (count > 0 && usedLines + group.length > maxLines) break;
-				usedLines += group.length;
-				count += 1;
-				if (usedLines >= maxLines) break;
-			}
-			return count;
-		};
-
 		const extraLines: string[] = [];
 		if (limitReached) {
 			extraLines.push(uiTheme.fg("warning", "limit reached; narrow path pattern or increase limit"));
@@ -434,14 +421,12 @@ export const astGrepToolRenderer = {
 				const { expanded } = options;
 				const key = new Hasher().bool(expanded).u32(width).digest();
 				if (cached?.key === key) return cached.lines;
-				const maxCollapsed = expanded
-					? matchGroups.length
-					: getCollapsedMatchLimit(matchGroups, COLLAPSED_MATCH_LIMIT);
 				const matchLines = renderTreeList(
 					{
 						items: matchGroups,
 						expanded,
-						maxCollapsed,
+						maxCollapsed: matchGroups.length,
+						maxCollapsedLines: COLLAPSED_MATCH_LIMIT,
 						itemType: "match",
 						renderItem: group =>
 							group.map(line => {

package/src/tools/browser.ts

@@ -1,3 +1,4 @@
+import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { Readability } from "@mozilla/readability";
@@ -18,9 +19,10 @@ import type {
 import { renderPromptTemplate } from "../config/prompt-templates";
 import browserDescription from "../prompts/tools/browser.md" with { type: "text" };
 import type { ToolSession } from "../sdk";
-import { formatDimensionNote, resizeImage } from "../utils/image-resize";
+import { resizeImage } from "../utils/image-resize";
 import { htmlToBasicMarkdown } from "../web/scrapers/types";
 import type { OutputMeta } from "./output-meta";
+import { expandPath, resolveToCwd } from "./path-utils";
 import stealthTamperingScript from "./puppeteer/00_stealth_tampering.txt" with { type: "text" };
 import stealthActivityScript from "./puppeteer/01_stealth_activity.txt" with { type: "text" };
 import stealthHairlineScript from "./puppeteer/02_stealth_hairline.txt" with { type: "text" };
@@ -35,6 +37,7 @@ import stealthPluginsScript from "./puppeteer/10_stealth_plugins.txt" with { typ
 import stealthHardwareScript from "./puppeteer/11_stealth_hardware.txt" with { type: "text" };
 import stealthCodecsScript from "./puppeteer/12_stealth_codecs.txt" with { type: "text" };
 import stealthWorkerScript from "./puppeteer/13_stealth_worker.txt" with { type: "text" };
+import { formatScreenshot } from "./render-utils";
 import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { clampTimeout } from "./tool-timeouts";
@@ -1364,23 +1367,38 @@ export class BrowserTool implements AgentTool<typeof browserSchema, BrowserToolD
 						{ type: "image", data: buffer.toBase64(), mimeType: "image/png" },
 						{ maxBytes: 0.75 * 1024 * 1024 },
 					);
-					const dimensionNote = formatDimensionNote(resized);
-					const tempFile = path.join(os.tmpdir(), `omp-sshots-${Snowflake.next()}.png`);
-					await Bun.write(tempFile, resized.buffer);
-					details.screenshotPath = tempFile;
-					details.mimeType = resized.mimeType;
-					details.bytes = resized.buffer.length;
-
-					// Show both raw bytes (saved to disk) and compressed bytes (sent to model).
-					const lines = [
-						"Screenshot captured",
-						`Format: ${resized.mimeType} (${(resized.buffer.length / 1024).toFixed(2)} KB)`,
-						`Dimensions: ${resized.width}x${resized.height}`,
-					];
-					if (dimensionNote) {
-						lines.push(dimensionNote);
+					// Resolve destination: user-defined path > screenshotDir (auto-named) > temp file.
+					const screenshotDir = (() => {
+						const v = this.session.settings.get("browser.screenshotDir") as string | undefined;
+						return v ? expandPath(v) : undefined;
+					})();
+					const paramPath = params.path ? resolveToCwd(params.path as string, this.session.cwd) : undefined;
+					let dest: string;
+					if (paramPath) {
+						dest = paramPath;
+					} else if (screenshotDir) {
+						const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, -1);
+						dest = path.join(screenshotDir, `screenshot-${ts}.png`);
+					} else {
+						dest = path.join(os.tmpdir(), `omp-sshots-${Snowflake.next()}.png`);
 					}
-
+					await fs.mkdir(path.dirname(dest), { recursive: true });
+					// Full-res buffer when saving to a user-defined location; resized (API copy) for temp-only.
+					const saveFullRes = !!(paramPath || screenshotDir);
+					const savedBuffer = saveFullRes ? buffer : resized.buffer;
+					const savedMimeType = saveFullRes ? "image/png" : resized.mimeType;
+					await Bun.write(dest, savedBuffer);
+					details.screenshotPath = dest;
+					details.mimeType = savedMimeType;
+					details.bytes = savedBuffer.length;
+
+					const lines = formatScreenshot({
+						saveFullRes,
+						savedMimeType,
+						savedByteLength: savedBuffer.length,
+						dest,
+						resized,
+					});
 					return toolResult(details)
 						.content([
 							{ type: "text", text: lines.join("\n") },

package/src/tools/grep.ts

@@ -457,6 +457,7 @@ export const grepToolRenderer = {
 							items: lines,
 							expanded,
 							maxCollapsed: COLLAPSED_TEXT_LIMIT,
+							maxCollapsedLines: COLLAPSED_TEXT_LIMIT,
 							itemType: "item",
 							renderItem: line => uiTheme.fg("toolOutput", line),
 						},
@@ -522,19 +523,6 @@ export const grepToolRenderer = {
 			}
 		}
 
-		const getCollapsedMatchLimit = (groups: string[][], maxLines: number): number => {
-			if (groups.length === 0) return 0;
-			let usedLines = 0;
-			let count = 0;
-			for (const group of groups) {
-				if (count > 0 && usedLines + group.length > maxLines) break;
-				usedLines += group.length;
-				count += 1;
-				if (usedLines >= maxLines) break;
-			}
-			return count;
-		};
-
 		const truncationReasons: string[] = [];
 		if (limits?.matchLimit) truncationReasons.push(`limit ${limits.matchLimit.reached} matches`);
 		if (limits?.resultLimit) truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
@@ -551,14 +539,13 @@ export const grepToolRenderer = {
 				const { expanded } = options;
 				const key = new Hasher().bool(expanded).u32(width).digest();
 				if (cached?.key === key) return cached.lines;
-				const maxCollapsed = expanded
-					? matchGroups.length
-					: getCollapsedMatchLimit(matchGroups, COLLAPSED_TEXT_LIMIT);
+				const collapsedMatchLineBudget = Math.max(COLLAPSED_TEXT_LIMIT - extraLines.length, 0);
 				const matchLines = renderTreeList(
 					{
 						items: matchGroups,
 						expanded,
-						maxCollapsed,
+						maxCollapsed: matchGroups.length,
+						maxCollapsedLines: collapsedMatchLineBudget,
 						itemType: "match",
 						renderItem: group =>
 							group.map(line => {

package/src/tools/path-utils.ts

@@ -102,9 +102,16 @@ export function expandPath(filePath: string): string {
 /**
  * Resolve a path relative to the given cwd.
  * Handles ~ expansion and absolute paths.
+ *
+ * A bare root slash is treated as a workspace-root alias for tool inputs. Users
+ * often pass `/` to mean “search from here”, and letting tools escape to the
+ * filesystem root is almost never what they intended.
  */
 export function resolveToCwd(filePath: string, cwd: string): string {
 	const expanded = expandPath(filePath);
+	if (/^\/+$/.test(expanded)) {
+		return cwd;
+	}
 	if (path.isAbsolute(expanded)) {
 		return expanded;
 	}

package/src/tools/render-utils.ts

@@ -8,6 +8,7 @@ import * as os from "node:os";
 import { type Ellipsis, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { getIndentation, pluralize } from "@oh-my-pi/pi-utils";
 import type { Theme } from "../modes/theme/theme";
+import { formatDimensionNote, type ResizedImage } from "../utils/image-resize";
 
 export { Ellipsis, truncateToWidth } from "@oh-my-pi/pi-tui";
 
@@ -527,6 +528,32 @@ export function shortenPath(filePath: string, homeDir?: string): string {
 	return filePath;
 }
 
+export function formatScreenshot(opts: {
+	saveFullRes: boolean;
+	savedMimeType: string;
+	savedByteLength: number;
+	dest: string;
+	resized: ResizedImage;
+}): string[] {
+	const lines = ["Screenshot captured"];
+	if (opts.saveFullRes) {
+		lines.push(
+			`Saved: ${opts.savedMimeType} (${(opts.savedByteLength / 1024).toFixed(2)} KB) to ${shortenPath(opts.dest)}`,
+		);
+		lines.push(
+			`Model: ${opts.resized.mimeType} (${(opts.resized.buffer.length / 1024).toFixed(2)} KB, ${opts.resized.width}x${opts.resized.height})`,
+		);
+	} else {
+		lines.push(`Format: ${opts.resized.mimeType} (${(opts.resized.buffer.length / 1024).toFixed(2)} KB)`);
+		lines.push(`Dimensions: ${opts.resized.width}x${opts.resized.height}`);
+	}
+	const dimensionNote = formatDimensionNote(opts.resized);
+	if (dimensionNote) {
+		lines.push(dimensionNote);
+	}
+	return lines;
+}
+
 export function wrapBrackets(text: string, theme: Theme): string {
 	return `${theme.format.bracketLeft}${text}${theme.format.bracketRight}`;
 }