@oh-my-pi/pi-coding-agent 16.4.4 → 16.4.6

package/src/tools/ask.ts

@@ -23,6 +23,7 @@ import {
 	Markdown,
 	type MarkdownTheme,
 	renderInlineMarkdown,
+	replaceTabs,
 	TERMINAL,
 	Text,
 	truncateToWidth,
@@ -44,17 +45,34 @@ import { ToolAbortError } from "./tool-errors";
 // Types
 // =============================================================================
 
+const OTHER_OPTION = "Other (type your own)";
+const CHAT_ABOUT_THIS_OPTION = "Chat about this";
+const NEXT_OPTION = "Next →";
+const RESERVED_OPTION_LABELS: Record<string, true> = {
+	[OTHER_OPTION]: true,
+	[CHAT_ABOUT_THIS_OPTION]: true,
+	[NEXT_OPTION]: true,
+};
+
 const OptionItem = arkType({
 	label: arkType("string").describe("display label"),
 	"description?": arkType("string").describe("optional explanatory text displayed below the label"),
+	"preview?": arkType("string").describe("optional rich preview content for interactive ask dialogs"),
 });
 
 const QuestionItem = arkType({
 	id: arkType("string").describe("question id"),
 	question: arkType("string").describe("question text"),
+	"header?": arkType("string").describe("optional short display chip for rich ask dialogs"),
 	options: OptionItem.array().describe("available options"),
 	"multi?": arkType("boolean").describe("allow multiple selections"),
 	"recommended?": arkType("number").describe("recommended option index"),
+}).narrow((question, ctx) => {
+	const reserved = question.options.find(option => RESERVED_OPTION_LABELS[option.label] === true);
+	return (
+		reserved === undefined ||
+		ctx.mustBe(`defined with option labels that do not collide with reserved runtime labels: ${reserved.label}`)
+	);
 });
 
 const askSchema = arkType({
@@ -71,6 +89,8 @@ export interface QuestionResult {
 	multi: boolean;
 	selectedOptions: string[];
 	customInput?: string;
+	/** Optional note attached to the selected answer in the rich ask dialog. */
+	note?: string;
 	/** True when the answer was auto-selected because the dialog timed out. */
 	timedOut?: boolean;
 }
@@ -81,10 +101,16 @@ export interface AskToolDetails {
 	multi?: boolean;
 	selectedOptions?: string[];
 	customInput?: string;
+	/** Optional note attached to the selected answer in the rich ask dialog. */
+	note?: string;
 	/** True when the answer was auto-selected because the dialog timed out. */
 	timedOut?: boolean;
 	/** Multi-part question mode */
 	results?: QuestionResult[];
+	/** Chat redirect: the user chose "Chat about this" instead of answering. */
+	chatRedirect?: boolean;
+	/** Questions surfaced when chatRedirect is true. */
+	questions?: string[];
 }
 
 interface AskOption {
@@ -108,7 +134,6 @@ function toSelectOption(option: AskOption, label = option.label): ExtensionUISel
 // Constants
 // =============================================================================
 
-const OTHER_OPTION = "Other (type your own)";
 const RECOMMENDED_SUFFIX = " (Recommended)";
 // Window after the timeout deadline within which an `undefined` selection is
 // attributed to a UI-enforced timeout (for surfaces that close the dialog at
@@ -361,6 +386,7 @@ function formatCustomInputTitle(
 interface SelectionResult {
 	selectedOptions: string[];
 	customInput?: string;
+	note?: string;
 	timedOut: boolean;
 	navigation?: "back" | "forward";
 	cancelled?: boolean;
@@ -375,7 +401,7 @@ interface AskSingleQuestionOptions {
 	recommended?: number;
 	timeout?: number;
 	signal?: AbortSignal;
-	initialSelection?: Pick<SelectionResult, "selectedOptions" | "customInput">;
+	initialSelection?: Pick<SelectionResult, "selectedOptions" | "customInput" | "note">;
 	navigation?: NavigationControls;
 }
 
@@ -419,6 +445,7 @@ async function askSingleQuestion(
 	const doneLabel = getDoneOptionLabel();
 	let selectedOptions = [...(initialSelection?.selectedOptions ?? [])];
 	let customInput = initialSelection?.customInput;
+	const note = initialSelection?.note;
 	let timedOut = false;
 
 	const selectOption = async (
@@ -547,14 +574,14 @@ async function askSingleQuestion(
 			});
 
 			if (arrowNavigation) {
-				return { selectedOptions: Array.from(selected), customInput, timedOut, navigation: arrowNavigation };
+				return { selectedOptions: Array.from(selected), customInput, note, timedOut, navigation: arrowNavigation };
 			}
 			if (choice === undefined) {
 				if (selectTimedOut) {
 					timedOut = true;
 					break;
 				}
-				return { selectedOptions: Array.from(selected), customInput, timedOut, cancelled: true };
+				return { selectedOptions: Array.from(selected), customInput, note, timedOut, cancelled: true };
 			}
 			if (choice === doneLabel) break;
 
@@ -621,11 +648,11 @@ async function askSingleQuestion(
 			timedOut = selectTimedOut;
 
 			if (arrowNavigation) {
-				return { selectedOptions, customInput, timedOut, navigation: arrowNavigation };
+				return { selectedOptions, customInput, note, timedOut, navigation: arrowNavigation };
 			}
 			if (choice === undefined) {
 				if (!timedOut) {
-					return { selectedOptions, customInput, timedOut, cancelled: true };
+					return { selectedOptions, customInput, note, timedOut, cancelled: true };
 				}
 				break;
 			}
@@ -652,7 +679,7 @@ async function askSingleQuestion(
 			selectedOptions = getAutoSelectionOnTimeout(questionOptions, recommended);
 		}
 		if (navigation?.allowForward) {
-			return { selectedOptions, customInput, timedOut, navigation: "forward" };
+			return { selectedOptions, customInput, note, timedOut, navigation: "forward" };
 		}
 	}
 
@@ -660,20 +687,58 @@ async function askSingleQuestion(
 		selectedOptions = getAutoSelectionOnTimeout(questionOptions, recommended);
 	}
 
-	return { selectedOptions, customInput, timedOut };
+	return { selectedOptions, customInput, note, timedOut };
 }
 
 function formatQuestionResult(result: QuestionResult): string {
+	const noteSuffix = result.note ? ` (note: ${result.note})` : "";
 	if (result.customInput !== undefined) {
-		return `${result.id}: "${result.customInput}"`;
+		return `${result.id}: "${result.customInput}"${noteSuffix}`;
 	}
 	if (result.selectedOptions.length > 0) {
-		const suffix = result.timedOut ? " (auto-selected after timeout)" : "";
+		const suffix = `${result.timedOut ? " (auto-selected after timeout)" : ""}${noteSuffix}`;
 		return result.multi
 			? `${result.id}: [${result.selectedOptions.join(", ")}]${suffix}`
 			: `${result.id}: ${result.selectedOptions[0]}${suffix}`;
 	}
-	return `${result.id}: (cancelled)`;
+	return `${result.id}: (cancelled)${noteSuffix}`;
+}
+
+function formatSingleQuestionResponse(result: {
+	selectedOptions: string[];
+	customInput?: string;
+	note?: string;
+	timedOut?: boolean;
+	multi: boolean;
+}): string {
+	const responseParts: string[] = [];
+	if (result.selectedOptions.length > 0) {
+		const selectedText = result.multi
+			? `User selected: ${result.selectedOptions.join(", ")}`
+			: `User selected: ${result.selectedOptions[0]}`;
+		responseParts.push(result.timedOut ? `${selectedText} (auto-selected after timeout)` : selectedText);
+	}
+	if (result.customInput !== undefined) {
+		responseParts.push(
+			result.customInput.includes("\n")
+				? `User provided custom input:\n${result.customInput
+						.split("\n")
+						.map(line => `  ${line}`)
+						.join("\n")}`
+				: `User provided custom input: ${result.customInput}`,
+		);
+	}
+	if (result.note) {
+		responseParts.push(
+			result.note.includes("\n")
+				? `User added note:\n${result.note
+						.split("\n")
+						.map(line => `  ${line}`)
+						.join("\n")}`
+				: `User added note: ${result.note}`,
+		);
+	}
+	return responseParts.length > 0 ? responseParts.join("\n") : "User cancelled the selection";
 }
 
 // =============================================================================
@@ -810,6 +875,95 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			vocalizer.speak(params.questions.map(q => q.question).join("\n"));
 		}
 
+		const richAskDialog = extensionUi.askDialog;
+		if (richAskDialog) {
+			try {
+				const showRichDialog = () =>
+					richAskDialog(
+						params.questions.map(q => ({
+							id: q.id,
+							question: q.question,
+							...(q.header?.trim() ? { header: q.header } : {}),
+							options: q.options.map(option => ({
+								label: option.label,
+								...(option.description?.trim() ? { description: option.description.trim() } : {}),
+								...(option.preview?.trim() ? { preview: option.preview } : {}),
+							})),
+							...(q.multi !== undefined ? { multi: q.multi } : {}),
+							...(q.recommended !== undefined ? { recommended: q.recommended } : {}),
+						})),
+						{ timeout: timeout ?? undefined, signal },
+					);
+				const richResult = signal ? await untilAborted(signal, showRichDialog) : await showRichDialog();
+				if (!richResult) {
+					context.abort();
+					throw new ToolAbortError("Ask tool was cancelled by the user");
+				}
+				if (richResult.kind === "chat") {
+					const questionText = params.questions.map(q => q.question).join("\n");
+					return {
+						content: [
+							{
+								type: "text" as const,
+								text: `User chose to chat about this instead of answering.\n\nQuestions asked:\n${questionText}`,
+							},
+						],
+						details: { chatRedirect: true, questions: params.questions.map(q => q.question) },
+					};
+				}
+				if (richResult.results.length !== params.questions.length) {
+					throw new Error("Ask dialog returned a result count that does not match the requested questions");
+				}
+				const results: QuestionResult[] = [];
+				for (let index = 0; index < params.questions.length; index++) {
+					const question = params.questions[index];
+					const result = richResult.results[index];
+					if (!question || !result || result.id !== question.id) {
+						throw new Error("Ask dialog returned results that do not match the requested question order");
+					}
+					results.push({
+						id: question.id,
+						question: question.question,
+						options: question.options.map(option => option.label),
+						multi: question.multi ?? false,
+						selectedOptions: result.selectedOptions,
+						customInput: result.customInput,
+						note: result.note,
+						timedOut: result.timedOut,
+					});
+				}
+				if (params.questions.length === 1) {
+					const result = results[0];
+					if (
+						!result ||
+						(!result.timedOut && result.selectedOptions.length === 0 && result.customInput === undefined)
+					) {
+						context.abort();
+						throw new ToolAbortError("Ask tool was cancelled by the user");
+					}
+					const details: AskToolDetails = {
+						question: result.question,
+						options: result.options,
+						multi: result.multi,
+						selectedOptions: result.selectedOptions,
+						customInput: result.customInput,
+						note: result.note,
+						timedOut: result.timedOut,
+					};
+					const responseText = formatSingleQuestionResponse(result);
+					return { content: [{ type: "text" as const, text: responseText }], details };
+				}
+				const details: AskToolDetails = { results };
+				const responseText = `User answers:\n${results.map(formatQuestionResult).join("\n")}`;
+				return { content: [{ type: "text" as const, text: responseText }], details };
+			} catch (error) {
+				if (error instanceof Error && error.name === "AbortError") {
+					throw new ToolAbortError("Ask input was cancelled");
+				}
+				throw error;
+			}
+		}
+
 		const askQuestion = async (
 			q: AskParams["questions"][number],
 			options?: { previous?: QuestionResult; navigation?: NavigationControls },
@@ -820,7 +974,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			}));
 			const optionLabels = questionOptions.map(getAskOptionLabel);
 			try {
-				const { selectedOptions, customInput, navigation, cancelled, timedOut } = await askSingleQuestion(
+				const { selectedOptions, customInput, note, navigation, cancelled, timedOut } = await askSingleQuestion(
 					ui,
 					q.question,
 					questionOptions,
@@ -833,7 +987,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 						navigation: options?.navigation,
 					},
 				);
-				return { optionLabels, selectedOptions, customInput, navigation, cancelled, timedOut };
+				return { optionLabels, selectedOptions, customInput, note, navigation, cancelled, timedOut };
 			} catch (error) {
 				if (error instanceof Error && error.name === "AbortError") {
 					throw new ToolAbortError("Ask input was cancelled");
@@ -844,7 +998,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 
 		if (params.questions.length === 1) {
 			const [q] = params.questions;
-			const { optionLabels, selectedOptions, customInput, cancelled, timedOut } = await askQuestion(q);
+			const { optionLabels, selectedOptions, customInput, note, cancelled, timedOut } = await askQuestion(q);
 
 			if (!timedOut && (cancelled || (selectedOptions.length === 0 && customInput === undefined))) {
 				context.abort();
@@ -856,27 +1010,17 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				multi: q.multi ?? false,
 				selectedOptions,
 				customInput,
+				note,
 				timedOut: timedOut || undefined,
 			};
 
-			const responseParts: string[] = [];
-			if (selectedOptions.length > 0) {
-				const selectedText = q.multi
-					? `User selected: ${selectedOptions.join(", ")}`
-					: `User selected: ${selectedOptions[0]}`;
-				responseParts.push(timedOut ? `${selectedText} (auto-selected after timeout)` : selectedText);
-			}
-			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";
+			const responseText = formatSingleQuestionResponse({
+				selectedOptions,
+				customInput,
+				note,
+				timedOut: timedOut || undefined,
+				multi: q.multi ?? false,
+			});
 
 			return { content: [{ type: "text" as const, text: responseText }], details };
 		}
@@ -884,7 +1028,8 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 		const resultsByIndex: Array<QuestionResult | undefined> = Array.from({ length: params.questions.length });
 		let questionIndex = 0;
 		while (questionIndex < params.questions.length) {
-			const q = params.questions[questionIndex]!;
+			const q = params.questions[questionIndex];
+			if (!q) throw new Error("Ask question index exceeded the requested question list");
 			const previous = resultsByIndex[questionIndex];
 			const navigation: NavigationControls = {
 				allowBack: questionIndex > 0,
@@ -895,6 +1040,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				optionLabels,
 				selectedOptions,
 				customInput,
+				note,
 				navigation: navAction,
 				cancelled,
 				timedOut,
@@ -912,6 +1058,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 				multi: q.multi ?? false,
 				selectedOptions,
 				customInput,
+				note,
 				timedOut: timedOut || undefined,
 			};
 
@@ -923,9 +1070,9 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			questionIndex += 1;
 		}
 
-		const results = resultsByIndex.map((result, index) => {
+		const results = params.questions.map((q, index) => {
+			const result = resultsByIndex[index];
 			if (result) return result;
-			const q = params.questions[index]!;
 			return {
 				id: q.id,
 				question: q.question,
@@ -1024,6 +1171,21 @@ function renderCustomInputLines(uiTheme: Theme, customInput: string): string[] {
 	return out;
 }
 
+/** Render an answer note with tab replacement and line-width clamping. */
+function renderNoteLines(uiTheme: Theme, note: string, width: number): string[] {
+	const prefix = " Note: ";
+	const continuationPrefix = "       ";
+	const firstLineWidth = Math.max(1, width - visibleWidth(prefix));
+	const continuationWidth = Math.max(1, width - visibleWidth(continuationPrefix));
+	return replaceTabs(note)
+		.split("\n")
+		.map((line, index) => {
+			const linePrefix = index === 0 ? `${uiTheme.fg("dim", " Note:")} ` : continuationPrefix;
+			const maxWidth = index === 0 ? firstLineWidth : continuationWidth;
+			return `${linePrefix}${uiTheme.fg("toolOutput", truncateToWidth(line, maxWidth))}`;
+		});
+}
+
 /**
  * Marker glyph for a question option. Single-choice questions render circular radio
  * buttons (pick one); multi-select questions render rectangular checkboxes (pick many).
@@ -1064,6 +1226,8 @@ function renderAnswerOptionLines(
 	selectedOptions: string[] | undefined,
 	multi: boolean | undefined,
 	customInput: string | undefined,
+	note: string | undefined,
+	width: number,
 ): string[] {
 	const selected = new Set(selectedOptions ?? []);
 	// Prefer the full recorded option set; fall back to the selected labels when
@@ -1071,7 +1235,7 @@ function renderAnswerOptionLines(
 	const list = options && options.length > 0 ? options : (selectedOptions ?? []);
 
 	// Nothing was chosen (and no custom answer) → a lone cancelled marker.
-	if (selected.size === 0 && customInput === undefined) {
+	if (selected.size === 0 && customInput === undefined && note === undefined) {
 		return [` ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`];
 	}
 
@@ -1086,6 +1250,7 @@ function renderAnswerOptionLines(
 		out.push(` ${markerStyled} ${labelStyled}`);
 	}
 	if (customInput !== undefined) out.push(...renderCustomInputLines(uiTheme, customInput));
+	if (note !== undefined) out.push(...renderNoteLines(uiTheme, note, width));
 	return out;
 }
 
@@ -1175,11 +1340,27 @@ export const askToolRenderer = {
 			return new Text(`${header}${body}`, 0, 0);
 		}
 
+		// Chat redirect: user chose "Chat about this" instead of answering.
+		if (details.chatRedirect) {
+			const header = renderStatusLine({ icon: "info", title: "Ask", meta: ["chat redirect"] }, uiTheme);
+			const questions = details.questions ?? [];
+			return framedBlock(uiTheme, width => ({
+				header,
+				sections: questions.length > 0 ? [{ lines: questions.flatMap(q => md(q, width)) }] : [],
+				state: "warning",
+				borderColor: "borderMuted",
+				width,
+			}));
+		}
+
 		// Multi-part results: one divider-labelled section per question.
 		if (details.results && details.results.length > 0) {
 			const results = details.results;
 			const hasAnySelection = results.some(
-				r => r.customInput !== undefined || (r.selectedOptions && r.selectedOptions.length > 0),
+				r =>
+					r.customInput !== undefined ||
+					r.note !== undefined ||
+					(r.selectedOptions && r.selectedOptions.length > 0),
 			);
 			const header = renderStatusLine(
 				{
@@ -1194,7 +1375,16 @@ export const askToolRenderer = {
 					// md() returns a shared cached array (module-level Markdown LRU) — copy before appending.
 					const lines = [
 						...md(r.question, width),
-						...renderAnswerOptionLines(uiTheme, mdTheme, r.options, r.selectedOptions, r.multi, r.customInput),
+						...renderAnswerOptionLines(
+							uiTheme,
+							mdTheme,
+							r.options,
+							r.selectedOptions,
+							r.multi,
+							r.customInput,
+							r.note,
+							width,
+						),
 					];
 					return { label: uiTheme.fg("dim", `[${r.id}]`), lines };
 				});
@@ -1217,7 +1407,9 @@ export const askToolRenderer = {
 
 		const question = details.question;
 		const hasSelection =
-			details.customInput !== undefined || (details.selectedOptions && details.selectedOptions.length > 0);
+			details.customInput !== undefined ||
+			details.note !== undefined ||
+			(details.selectedOptions && details.selectedOptions.length > 0);
 		const header = renderStatusLine(
 			hasSelection
 				? { iconOverride: uiTheme.styledSymbol("tool.ask", "accent"), title: "Ask" }
@@ -1228,12 +1420,13 @@ export const askToolRenderer = {
 		const dSelected = details.selectedOptions;
 		const dMulti = details.multi;
 		const dCustom = details.customInput;
+		const dNote = details.note;
 		const dTimedOut = details.timedOut;
 		return framedBlock(uiTheme, width => {
 			// md() returns a shared cached array (module-level Markdown LRU) — copy before appending.
 			const bodyLines = [
 				...md(question, width),
-				...renderAnswerOptionLines(uiTheme, mdTheme, dOptions, dSelected, dMulti, dCustom),
+				...renderAnswerOptionLines(uiTheme, mdTheme, dOptions, dSelected, dMulti, dCustom, dNote, width),
 			];
 			if (dTimedOut) {
 				// Distinguish auto-selection from a real user choice in the transcript.

package/src/tools/conflict-detect.ts

@@ -319,6 +319,15 @@ export function parseConflictUri(raw: string): ParsedConflictUri | null {
 	return recoveredPrefix !== undefined ? { id, scope, recoveredPrefix } : { id, scope };
 }
 
+/** Result of {@link spliceConflict}: the new file text plus any boundary-echo repair applied. */
+export interface ConflictSplice {
+	text: string;
+	/** Replacement lines dropped because they duplicated the context directly above the region. */
+	trimmedLeading: number;
+	/** Replacement lines dropped because they duplicated the context directly below the region. */
+	trimmedTrailing: number;
+}
+
 /**
  * Splice the conflict region recorded in `entry` out of `originalText`
  * and replace it with `replacement` (markers and all sides included).
@@ -328,8 +337,16 @@ export function parseConflictUri(raw: string): ParsedConflictUri | null {
  * match), so out-of-band edits earlier in the file that shift line
  * numbers don't break resolution. Throws clearly when the marker block
  * has actually been altered or removed.
+ *
+ * Boundary-echo repair (same philosophy as the edit tool's hashline
+ * keeper repair): models frequently paste the "whole resolved function"
+ * including the lines that live directly before/after the marker block,
+ * which the verbatim splice would duplicate. Replacement lines that
+ * exactly echo the adjacent context are dropped when the echo is
+ * unambiguous — two or more consecutive lines, or a single line whose
+ * removal fixes a delimiter-balance mismatch against the recorded sides.
  */
-export function spliceConflict(originalText: string, entry: ConflictEntry, replacement: string): string {
+export function spliceConflict(originalText: string, entry: ConflictEntry, replacement: string): ConflictSplice {
 	const lines = originalText.split("\n");
 	const expected = buildRecordedRegion(entry);
 	const match = locateRegion(lines, expected, entry.startLine - 1);
@@ -341,6 +358,8 @@ export function spliceConflict(originalText: string, entry: ConflictEntry, repla
 
 	const trimmed = normalizeTrailingNewline(replacement);
 	let replacementLines = trimmed.split("\n").map(stripTrailingCr);
+	const echo = trimBoundaryEcho(replacementLines, lines, match, entry);
+	replacementLines = echo.lines;
 	// Round-trip fidelity for CRLF files: recorded sections are LF-normalized,
 	// so re-apply \r to spliced lines when the matched region used CRLF. The
 	// final replacement line only carries \r when another line follows it.
@@ -351,7 +370,79 @@ export function spliceConflict(originalText: string, entry: ConflictEntry, repla
 		);
 	}
 	const next = [...lines.slice(0, match.startIdx), ...replacementLines, ...lines.slice(match.endIdx + 1)];
-	return next.join("\n");
+	return { text: next.join("\n"), trimmedLeading: echo.leading, trimmedTrailing: echo.trailing };
+}
+
+const MAX_ECHO_LINES = 12;
+
+/**
+ * Net `{}`/`()`/`[]` count over `lines`. Crude (string/comment-blind) —
+ * used only to corroborate single-line echo trims, never alone.
+ */
+function delimiterBalance(lines: readonly string[]): number {
+	let balance = 0;
+	for (const line of lines) {
+		for (let i = 0; i < line.length; i++) {
+			const ch = line.charCodeAt(i);
+			if (ch === 123 /* { */ || ch === 40 /* ( */ || ch === 91 /* [ */) balance++;
+			else if (ch === 125 /* } */ || ch === 41 /* ) */ || ch === 93 /* ] */) balance--;
+		}
+	}
+	return balance;
+}
+
+/**
+ * Drop replacement lines that exactly echo the file lines adjacent to the
+ * located region. A multi-line echo is trimmed unconditionally (a correct
+ * resolution ending with the exact lines that already follow the region
+ * would mean intentionally duplicated code — vanishingly unlikely, and the
+ * untrimmed splice produces exactly that duplication). A single-line echo
+ * is trimmed only when the recorded sides agree on the region's delimiter
+ * balance and dropping the echo is what restores it.
+ */
+function trimBoundaryEcho(
+	replacement: string[],
+	fileLines: readonly string[],
+	match: { startIdx: number; endIdx: number },
+	entry: ConflictBlock,
+): { lines: string[]; leading: number; trailing: number } {
+	const oursBalance = delimiterBalance(entry.oursLines);
+	const expectedBalance = oursBalance === delimiterBalance(entry.theirsLines) ? oursBalance : null;
+	const singleEchoJustified = (lines: string[], without: string[]) =>
+		expectedBalance !== null &&
+		delimiterBalance(lines) !== expectedBalance &&
+		delimiterBalance(without) === expectedBalance;
+
+	let lines = replacement;
+	let trailing = 0;
+	const after: string[] = [];
+	for (let i = match.endIdx + 1; i < fileLines.length && after.length < MAX_ECHO_LINES; i++) {
+		after.push(stripTrailingCr(fileLines[i]!));
+	}
+	for (let k = Math.min(after.length, lines.length - 1); k >= 1; k--) {
+		if (!after.slice(0, k).every((line, i) => lines[lines.length - k + i] === line)) continue;
+		if (k >= 2 || singleEchoJustified(lines, lines.slice(0, -1))) {
+			trailing = k;
+			lines = lines.slice(0, lines.length - k);
+		}
+		break;
+	}
+
+	let leading = 0;
+	const before: string[] = [];
+	for (let i = match.startIdx - 1; i >= 0 && before.length < MAX_ECHO_LINES; i--) {
+		before.unshift(stripTrailingCr(fileLines[i]!));
+	}
+	for (let k = Math.min(before.length, lines.length - 1); k >= 1; k--) {
+		if (!before.slice(before.length - k).every((line, i) => lines[i] === line)) continue;
+		if (k >= 2 || singleEchoJustified(lines, lines.slice(1))) {
+			leading = k;
+			lines = lines.slice(k);
+		}
+		break;
+	}
+
+	return { lines, leading, trailing };
 }
 
 /** Reconstruct the recorded marker block as it should appear in the file. */
@@ -608,10 +699,16 @@ export function formatConflictWarning(
 	if (theirsLabel) out.push(`- theirs = ${theirsLabel}`);
 	if (anyBase) out.push(`- base = ${baseLabel ?? "(no label)"}`);
 	out.push(
-		'NOTICE: Inspect a block by reading `conflict://<N>` (add `/ours` / `/theirs` / `/base` to render a single side). Resolve with `write({ path: "conflict://<N>", content })`, or bulk-resolve every registered conflict with `write({ path: "conflict://*", content })`. Writes replace the whole conflict region (markers + all sides).',
+		'NOTICE: Inspect a block by reading `conflict://<N>` (add `/ours` / `/theirs` / `/base` to render a single side). Resolve with `write({ path: "conflict://<N>", content })`, or bulk-resolve every registered conflict with `write({ path: "conflict://*", content })`. Writes replace ONLY the marker block (markers + all sides) — never repeat the lines before/after it; they stay in place.',
+	);
+	out.push(
+		'`content` shorthand: a line that is exactly `@ours` / `@theirs` / `@base` / `@both` expands to that recorded section. `@both` is ours-then-theirs with no separator — only for additive conflicts where each side adds something different; NEVER for competing edits of the same lines (pick a side or write the combined text). Lines that are not a token pass through verbatim, so `"// keep both\\n@ours\\n@theirs"` literally writes the comment, then ours, then theirs.',
+	);
+	out.push(
+		'Per-id bulk: `write({ path: "conflict://*", content: "1: @ours\\n2: @theirs\\n…" })` resolves each listed id with that side in ONE call — the cheapest way through many pick-one conflicts; unlisted ids stay registered.',
 	);
 	out.push(
-		'`content` shorthand: a line that is exactly `@ours` / `@theirs` / `@base` / `@both` expands to that recorded section. `@both` is ours-then-theirs with no separator. Lines that are not a token pass through verbatim, so `"// keep both\\n@ours\\n@theirs"` literally writes the comment, then ours, then theirs.',
+		"Resolve each block faithfully: keep one side (`@ours`/`@theirs`), or combine them when both intents apply — never invent content beyond the recorded sides, and never stack both sides of competing edits. Resolve several conflicts in a single turn by issuing multiple `write` calls at once; ids stay valid as earlier blocks are resolved.",
 	);
 
 	for (const entry of entries) {
@@ -674,7 +771,7 @@ export function formatConflictSummary(
 		'NOTICE: Bulk-resolve with `write({ path: "conflict://*", content })`, or address a single block with `write({ path: "conflict://<N>", content })`. Inspect a block by reading `conflict://<N>` (add `/ours` / `/theirs` / `/base` for a single side).',
 	);
 	lines.push(
-		"`content` shorthand: `@ours` / `@theirs` / `@base` / `@both` lines expand to the recorded sections; `@both` = ours-then-theirs. Non-token lines pass through verbatim.",
+		'`content` shorthand: `@ours` / `@theirs` / `@base` / `@both` lines expand to the recorded sections; `@both` = ours-then-theirs (additive conflicts only — never for competing edits of the same lines). Per-id bulk: content of `<id>: @side` lines (e.g. "1: @ours\\n2: @theirs") resolves each listed id in one call. Non-token lines pass through verbatim. Writes replace ONLY the marker block — never repeat the surrounding lines. Keep one side or combine faithfully; never invent content beyond the recorded sides.',
 	);
 	lines.push("");
 	const idWidth = String(entries[entries.length - 1]?.id ?? 1).length;

package/src/tools/index.ts

@@ -617,6 +617,7 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		if (name === "web_search") return session.settings.get("web_search.enabled");
 		// search_tool_bm25 is allowed when either legacy mcp.discoveryMode or new tools.discoveryMode is active.
 		if (name === "search_tool_bm25") return discoveryActive;
+		if (name === "ask") return session.settings.get("ask.enabled");
 		if (name === "browser") return session.settings.get("browser.enabled");
 		if (name === "checkpoint" || name === "rewind") return session.settings.get("checkpoint.enabled");
 		if (name === "irc") return isIrcEnabled(session.settings, session.taskDepth ?? 0);