@oh-my-pi/pi-coding-agent 14.4.0 → 14.4.3

package/src/edit/modes/hashline.ts

@@ -8,7 +8,7 @@
  * if the file has changed since the caller last read it, hash mismatches are caught
  * before any mutation occurs.
  *
- * Displayed format: `LINE+ID:TEXT`
+ * Displayed format: `LINE+ID|TEXT`
  * Reference format: `"LINE+ID"` (e.g. `"1ab"`)
  *
  * In tool JSON, each edit's `content` is `string[]` (one string per logical line) or
@@ -28,7 +28,7 @@ import { resolveToCwd } from "../../tools/path-utils";
 import { enforcePlanModeWrite, resolvePlanPath } from "../../tools/plan-mode-guard";
 import { formatCodeFrameLine } from "../../tools/render-utils";
 import { generateDiffString } from "../diff";
-import { computeLineHash, formatLineHash, HASHLINE_BIGRAM_RE_SRC, HASHLINE_CONTENT_SEPARATOR } from "../line-hash";
+import { computeLineHash, formatHashLine, HASHLINE_BIGRAM_RE_SRC, HASHLINE_CONTENT_SEPARATOR } from "../line-hash";
 import { detectLineEnding, normalizeToLF, restoreLineEndings, stripBom } from "../normalize";
 import type { EditToolDetails, LspBatchRequest } from "../renderer";
 
@@ -38,7 +38,7 @@ export interface HashMismatch {
 	actual: string;
 }
 
-export type Anchor = { line: number; hash: string };
+export type Anchor = { line: number; hash: string; contentHint?: string };
 export type HashlineEdit =
 	| { op: "replace_line"; pos: Anchor; lines: string[] }
 	| { op: "replace_range"; pos: Anchor; end: Anchor; lines: string[] }
@@ -47,10 +47,11 @@ export type HashlineEdit =
 	| { op: "append_file"; lines: string[] }
 	| { op: "prepend_file"; lines: string[] };
 
-// Tight prefix matchers for the new format `LINE+ID:content`. Hard
-// cutover — do not accept legacy `LINENUM#BIGRAM:content` or tab separators.
-// The terminator must be a literal colon; line-number digits are mandatory.
-const HASHLINE_CONTENT_SEPARATOR_RE = HASHLINE_CONTENT_SEPARATOR.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+// Tight prefix matchers for the new format `LINE+ID|content`. The pipe is the
+// canonical separator; legacy reads using `:` are tolerated for back-compat.
+// Line-number digits are mandatory.
+// Accept both `|` (canonical) and `:` (legacy) so re-reads of older outputs still parse.
+const HASHLINE_CONTENT_SEPARATOR_RE = "[:|]";
 const HASHLINE_PREFIX_RE = new RegExp(
 	`^\\s*(?:>>>|>>)?\\s*(?:\\+\\s*)?\\d+${HASHLINE_BIGRAM_RE_SRC}${HASHLINE_CONTENT_SEPARATOR_RE}`,
 );
@@ -58,7 +59,7 @@ const HASHLINE_PREFIX_PLUS_RE = new RegExp(
 	`^\\s*(?:>>>|>>)?\\s*\\+\\s*\\d+${HASHLINE_BIGRAM_RE_SRC}${HASHLINE_CONTENT_SEPARATOR_RE}`,
 );
 const DIFF_PLUS_RE = /^[+](?![+])/;
-const READ_TRUNCATION_NOTICE_RE = /^\[(?:Showing lines \d+-\d+ of \d+|\d+ more lines? in (?:file|\S+))\b.*\bsel=L\d+/;
+const READ_TRUNCATION_NOTICE_RE = /^\[(?:Showing lines \d+-\d+ of \d+|\d+ more lines? in (?:file|\S+))\b.*\bsel=L?\d+/;
 
 type LinePrefixStats = {
 	nonEmpty: number;
@@ -312,8 +313,6 @@ interface ResolvedHashlineStreamOptions {
 	maxChunkBytes: number;
 }
 
-type HashlineLineFormatter = (lineNumber: number, line: string) => string;
-
 interface HashlineChunkEmitter {
 	pushLine: (line: string) => string[];
 	flush: () => string | undefined;
@@ -329,7 +328,7 @@ function resolveHashlineStreamOptions(options: HashlineStreamOptions): ResolvedH
 
 function createHashlineChunkEmitter(
 	options: ResolvedHashlineStreamOptions,
-	formatLine: HashlineLineFormatter,
+	formatLine = formatHashLine,
 ): HashlineChunkEmitter {
 	let lineNumber = options.startLine;
 	let outLines: string[] = [];
@@ -373,10 +372,6 @@ function createHashlineChunkEmitter(
 	return { pushLine, flush };
 }
 
-function formatHashlineStreamLine(lineNumber: number, line: string): string {
-	return `${formatLineHash(lineNumber, line)}${HASHLINE_CONTENT_SEPARATOR}${line}`;
-}
-
 function isReadableStream(value: unknown): value is ReadableStream<Uint8Array> {
 	return (
 		typeof value === "object" &&
@@ -416,7 +411,7 @@ export async function* streamHashLinesFromUtf8(
 	let pending = "";
 	let sawAnyText = false;
 	let endedWithNewline = false;
-	const emitter = createHashlineChunkEmitter(resolvedOptions, formatHashlineStreamLine);
+	const emitter = createHashlineChunkEmitter(resolvedOptions);
 
 	const consumeText = (text: string): string[] => {
 		if (text.length === 0) return [];
@@ -469,7 +464,7 @@ export async function* streamHashLinesFromLines(
 	options: HashlineStreamOptions = {},
 ): AsyncGenerator<string> {
 	const resolvedOptions = resolveHashlineStreamOptions(options);
-	const emitter = createHashlineChunkEmitter(resolvedOptions, formatHashlineStreamLine);
+	const emitter = createHashlineChunkEmitter(resolvedOptions);
 	let sawAnyLine = false;
 
 	const asyncIterator = (lines as AsyncIterable<string>)[Symbol.asyncIterator];
@@ -530,7 +525,7 @@ const MISMATCH_CONTEXT = 2;
 /**
  * Error thrown when one or more hashline references have stale hashes.
  *
- * Displays grep-style output with `:` separator on mismatched lines and `-` on
+ * Displays grep-style output with `*` marker on mismatched lines and a leading space on
  * surrounding context, showing the correct `LINE+ID` so the caller can fix all refs at once.
  */
 export class HashlineMismatchError extends Error {
@@ -552,7 +547,7 @@ export class HashlineMismatchError extends Error {
 	/**
 	 * User-visible variant of {@link formatMessage} — omits the bigram fingerprint
 	 * and uses a `│` gutter so TUI rendering is clean. The model still receives
-	 * the full `LINE+ID:content` form via {@link Error.message}.
+	 * the full `LINE+ID|content` form via {@link Error.message}.
 	 */
 	get displayMessage(): string {
 		return HashlineMismatchError.formatDisplayMessage(this.mismatches, this.fileLines);
@@ -609,7 +604,7 @@ export class HashlineMismatchError extends Error {
 
 		lines.push(
 			`Edit rejected: ${mismatches.length} line${mismatches.length > 1 ? "s have" : " has"} changed since the last read. The edit was NOT applied.`,
-			"Use the updated anchors shown below (`:` marks changed lines, `-` marks context) and retry the edit.",
+			"Use the updated anchors shown below (`*` marks changed lines, leading space marks context) and retry the edit.",
 		);
 		lines.push("");
 
@@ -626,9 +621,9 @@ export class HashlineMismatchError extends Error {
 			const prefix = `${lineNum}${hash}`;
 
 			if (mismatchSet.has(lineNum)) {
-				lines.push(`${prefix}:${text}`);
+				lines.push(`*${prefix}|${text}`);
 			} else {
-				lines.push(`${prefix}-${text}`);
+				lines.push(` ${prefix}|${text}`);
 			}
 		}
 		return lines.join("\n");
@@ -762,7 +757,7 @@ function collectBoundaryDuplicationWarning(edit: HashlineEdit, originalFileLines
 	const trimmedNext = nextSurvivingLine.trim();
 	const trimmedLast = lastInsertedLine.trim();
 	if (trimmedLast.length > 0 && trimmedLast === trimmedNext) {
-		const tag = formatLineHash(endLine + 1, nextSurvivingLine);
+		const tag = formatHashLine(endLine + 1, nextSurvivingLine);
 		warnings.push(
 			`Possible boundary duplication: your last replacement line \`${trimmedLast}\` is identical to the next surviving line ${tag}. ` +
 				`If you meant to replace the entire block, set \`end\` to ${tag} instead.`,
@@ -1065,7 +1060,6 @@ export interface CompactHashlineDiffPreview {
 
 export interface CompactHashlineDiffOptions {
 	maxUnchangedRun?: number;
-	maxAdditionRun?: number;
 	maxDeletionRun?: number;
 	maxOutputLines?: number;
 }
@@ -1221,7 +1215,6 @@ export function buildCompactHashlineDiffPreview(
 	options: CompactHashlineDiffOptions = {},
 ): CompactHashlineDiffPreview {
 	const maxUnchangedRun = options.maxUnchangedRun ?? 2;
-	const maxAdditionRun = options.maxAdditionRun ?? 2;
 	const maxDeletionRun = options.maxDeletionRun ?? 2;
 	const maxOutputLines = options.maxOutputLines ?? 16;
 
@@ -1240,7 +1233,7 @@ export function buildCompactHashlineDiffPreview(
 				break;
 			case "+":
 				addedLines += run.lines.length;
-				out.push(...collapseFromStart(run.lines, maxAdditionRun, "added"));
+				out.push(...run.lines);
 				break;
 			case "-":
 				removedLines += run.lines.length;

package/src/edit/renderer.ts

@@ -94,7 +94,7 @@ interface EditRenderArgs {
 	 */
 	previewDiff?: string;
 	__partialJson?: string;
-	// Hashline / chunk mode fields
+	// Hashline mode fields
 	edits?: EditRenderEntry[];
 }
 
@@ -141,7 +141,7 @@ export interface EditRenderContext {
 	editMode?: EditMode;
 	/** Pre-computed diff preview (computed before tool executes) */
 	editDiffPreview?: DiffResult | DiffError;
-	/** Multi-file streaming diff preview (chunk edits spanning several files) */
+	/** Multi-file streaming diff preview (edits spanning several files) */
 	perFileDiffPreview?: PerFileDiffPreview[];
 	/** Function to render diff text with syntax highlighting */
 	renderDiff?: (diffText: string, options?: { filePath?: string }) => string;
@@ -151,11 +151,9 @@ const EDIT_STREAMING_PREVIEW_LINES = 12;
 const CALL_TEXT_PREVIEW_LINES = 6;
 const CALL_TEXT_PREVIEW_WIDTH = 80;
 
-/** Extract file path from an edit entry's path (handles chunk's file:selector format). */
+/** Extract file path from an edit entry. */
 function filePathFromEditEntry(p: string | undefined): string | undefined {
-	if (!p) return undefined;
-	const ci = /^[a-zA-Z]:[/\\]/.test(p) ? p.indexOf(":", 2) : p.indexOf(":");
-	return ci === -1 ? p : p.slice(0, ci);
+	return p ?? undefined;
 }
 
 function decodePartialJsonStringFragment(fragment: string): string {
@@ -284,7 +282,7 @@ function formatMultiFileStreamingDiff(previews: PerFileDiffPreview[], uiTheme: T
 	const parts: string[] = [];
 	for (const preview of previews) {
 		if (!preview.diff && !preview.error) continue;
-		const header = uiTheme.fg("dim", `\n\n── ${shortenPath(preview.path)} ──`);
+		const header = uiTheme.fg("dim", `\n\n\u2500\u2500 ${shortenPath(preview.path)} \u2500\u2500`);
 		if (preview.error) {
 			parts.push(`${header}\n${uiTheme.fg("error", replaceTabs(preview.error))}`);
 			continue;
@@ -303,7 +301,7 @@ function getCallPreview(
 	renderContext: EditRenderContext | undefined,
 ): string {
 	const multi = renderContext?.perFileDiffPreview;
-	if (multi && multi.length > 0 && multi.some(p => p.diff || p.error)) {
+	if (multi && multi.length > 1 && multi.some(p => p.diff || p.error)) {
 		return formatMultiFileStreamingDiff(multi, uiTheme);
 	}
 	if (args.previewDiff) {

package/src/edit/streaming.ts

@@ -16,7 +16,6 @@ import type { Theme } from "../modes/theme/theme";
 import { type EditMode, resolveEditMode } from "../utils/edit-mode";
 import { computeEditDiff, type DiffError, type DiffResult } from "./diff";
 import { expandApplyPatchToEntries, expandApplyPatchToPreviewEntries } from "./modes/apply-patch";
-import { type ChunkToolEdit, computeChunkDiff, parseChunkEditPath } from "./modes/chunk";
 import { computeHashlineDiff, type HashlineToolEdit } from "./modes/hashline";
 import { computePatchDiff, type PatchEditEntry } from "./modes/patch";
 import type { ReplaceEditEntry } from "./modes/replace";
@@ -126,6 +125,38 @@ export function dropIncompleteLastEdit<T>(edits: readonly T[], partialJson: stri
 	return [...edits];
 }
 
+// -----------------------------------------------------------------------------
+// Multi-file grouping
+// -----------------------------------------------------------------------------
+
+/** Cap on how many distinct files a streaming preview will render diffs for. */
+const MAX_PREVIEW_FILES = 5;
+
+/**
+ * Group a list of edits by their effective `path` (per-edit `path` falls back
+ * to the top-level `args.path`). Insertion order is preserved and the number of
+ * distinct buckets is capped at {@link MAX_PREVIEW_FILES}.
+ */
+function groupEditsByPath<T extends { path?: string }>(
+	edits: readonly T[],
+	fallbackPath: string | undefined,
+): Map<string, Array<T & { path: string }>> {
+	const groups = new Map<string, Array<T & { path: string }>>();
+	for (const edit of edits) {
+		if (!edit) continue;
+		const editPath = edit.path ?? fallbackPath;
+		if (!editPath) continue;
+		let bucket = groups.get(editPath);
+		if (!bucket) {
+			if (groups.size >= MAX_PREVIEW_FILES) continue;
+			bucket = [];
+			groups.set(editPath, bucket);
+		}
+		bucket.push({ ...edit, path: editPath });
+	}
+	return groups;
+}
+
 // -----------------------------------------------------------------------------
 // Strategies
 // -----------------------------------------------------------------------------
@@ -142,22 +173,26 @@ const replaceStrategy: EditStreamingStrategy<ReplaceArgs> = {
 		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
 	},
 	async computeDiffPreview(args, ctx) {
-		const first = args.edits?.[0];
-		if (!first) return null;
-		const path = first.path ?? args.path;
-		if (!path || first.old_text === undefined || first.new_text === undefined) return null;
-		ctx.signal.throwIfAborted();
-		const result = await computeEditDiff(
-			path,
-			first.old_text,
-			first.new_text,
-			ctx.cwd,
-			ctx.allowFuzzy ?? true,
-			first.all,
-			ctx.fuzzyThreshold,
-		);
-		ctx.signal.throwIfAborted();
-		return [toPerFilePreview(path, result)];
+		const groups = groupEditsByPath(args.edits ?? [], args.path);
+		if (groups.size === 0) return null;
+		const previews: PerFileDiffPreview[] = [];
+		for (const [path, fileEdits] of groups) {
+			const first = fileEdits[0];
+			if (!first || first.old_text === undefined || first.new_text === undefined) continue;
+			ctx.signal.throwIfAborted();
+			const result = await computeEditDiff(
+				path,
+				first.old_text,
+				first.new_text,
+				ctx.cwd,
+				ctx.allowFuzzy ?? true,
+				first.all,
+				ctx.fuzzyThreshold,
+			);
+			ctx.signal.throwIfAborted();
+			previews.push(toPerFilePreview(path, result));
+		}
+		return previews.length > 0 ? previews : null;
 	},
 	renderStreamingFallback() {
 		return "";
@@ -176,17 +211,22 @@ const patchStrategy: EditStreamingStrategy<PatchArgs> = {
 		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
 	},
 	async computeDiffPreview(args, ctx) {
-		const first = args.edits?.[0];
-		const path = first?.path ?? args.path;
-		if (!path) return null;
-		ctx.signal.throwIfAborted();
-		const result = await computePatchDiff(
-			{ path, op: first?.op ?? "update", rename: first?.rename, diff: first?.diff },
-			ctx.cwd,
-			{ fuzzyThreshold: ctx.fuzzyThreshold, allowFuzzy: ctx.allowFuzzy },
-		);
-		ctx.signal.throwIfAborted();
-		return [toPerFilePreview(path, result)];
+		const groups = groupEditsByPath(args.edits ?? [], args.path);
+		if (groups.size === 0) return null;
+		const previews: PerFileDiffPreview[] = [];
+		for (const [path, fileEdits] of groups) {
+			const first = fileEdits[0];
+			if (!first) continue;
+			ctx.signal.throwIfAborted();
+			const result = await computePatchDiff(
+				{ path, op: first.op ?? "update", rename: first.rename, diff: first.diff },
+				ctx.cwd,
+				{ fuzzyThreshold: ctx.fuzzyThreshold, allowFuzzy: ctx.allowFuzzy },
+			);
+			ctx.signal.throwIfAborted();
+			previews.push(toPerFilePreview(path, result));
+		}
+		return previews.length > 0 ? previews : null;
 	},
 	renderStreamingFallback() {
 		return "";
@@ -205,83 +245,14 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
 	},
 	async computeDiffPreview(args, ctx) {
-		const first = args.edits?.[0] as (HashlineToolEdit & { path?: string }) | undefined;
-		const path = first?.path ?? args.path;
-		if (!path) return null;
-		const fileEdits = (args.edits ?? [])
-			.map(e => {
-				if (!e || typeof e !== "object") return undefined;
-				const entryPath = (e as { path?: string }).path ?? args.path;
-				if (!entryPath || entryPath !== path) return undefined;
-				return { ...(e as HashlineToolEdit), path } as HashlineToolEdit & { path: string };
-			})
-			.filter((e): e is HashlineToolEdit & { path: string } => e !== undefined);
-		ctx.signal.throwIfAborted();
-		const result = await computeHashlineDiff({ path, edits: fileEdits }, ctx.cwd);
-		ctx.signal.throwIfAborted();
-		return [toPerFilePreview(path, result)];
-	},
-	renderStreamingFallback() {
-		return "";
-	},
-};
-
-interface ChunkArgs {
-	path?: string;
-	edits?: ChunkToolEdit[];
-	__partialJson?: string;
-}
-
-const chunkStrategy: EditStreamingStrategy<ChunkArgs> = {
-	extractCompleteEdits(args, partialJson) {
-		if (!args?.edits) return args;
-		let edits = dropIncompleteLastEdit(args.edits, partialJson, "edits");
-		// Extra guard: if partial JSON still contains `":nu` / `":nul` (partial
-		// `null` literals), `partial-json` may have already surfaced the last
-		// entry with `write === null`. When that entry's `}` hasn't closed
-		// yet, it has already been dropped above. But if dropping was not
-		// triggered (e.g. list still open and no new `{` after), also drop the
-		// trailing null-write entry so the preview does not flicker with an
-		// error for an incomplete string/null literal.
-		if (partialJson && edits.length > 0) {
-			const last = edits[edits.length - 1] as Partial<ChunkToolEdit> | undefined;
-			const endsInPartialNull = /:\s*nu?l?\s*$/.test(partialJson.trimEnd());
-			if (last && endsInPartialNull && last.write === null) {
-				edits = edits.slice(0, -1);
-			}
-		}
-		return { ...args, edits };
-	},
-	async computeDiffPreview(args, ctx) {
-		const edits = args.edits ?? [];
-		if (edits.length === 0) return null;
-		// Group edits by file path
-		const groups = new Map<string, ChunkToolEdit[]>();
-		const fileOrder: string[] = [];
-		for (const edit of edits) {
-			if (!edit) continue;
-			const editPath = edit.path ?? args.path;
-			if (!editPath) continue;
-			const { filePath } = parseChunkEditPath(editPath);
-			if (!filePath) continue;
-			let bucket = groups.get(filePath);
-			if (!bucket) {
-				bucket = [];
-				groups.set(filePath, bucket);
-				fileOrder.push(filePath);
-			}
-			bucket.push({ ...edit, path: editPath });
-		}
-		if (fileOrder.length === 0) return null;
-
-		const MAX_FILES = 5;
-		const selected = fileOrder.slice(0, MAX_FILES);
+		const groups = groupEditsByPath(args.edits ?? [], args.path);
+		if (groups.size === 0) return null;
 		const previews: PerFileDiffPreview[] = [];
-		for (const filePath of selected) {
+		for (const [path, fileEdits] of groups) {
 			ctx.signal.throwIfAborted();
-			const fileEdits = groups.get(filePath) ?? [];
-			const result = await computeChunkDiff({ path: filePath, edits: fileEdits }, ctx.cwd, { signal: ctx.signal });
-			previews.push(toPerFilePreview(filePath, result));
+			const result = await computeHashlineDiff({ path, edits: fileEdits }, ctx.cwd);
+			ctx.signal.throwIfAborted();
+			previews.push(toPerFilePreview(path, result));
 		}
 		return previews;
 	},
@@ -311,16 +282,22 @@ const applyPatchStrategy: EditStreamingStrategy<ApplyPatchArgs> = {
 				return [{ path: "", error: err instanceof Error ? err.message : String(err) }];
 			}
 		}
-		const first = entries[0];
-		if (!first?.path) return null;
-		ctx.signal.throwIfAborted();
-		const result = await computePatchDiff(
-			{ path: first.path, op: first.op ?? "update", rename: first.rename, diff: first.diff },
-			ctx.cwd,
-			{ fuzzyThreshold: ctx.fuzzyThreshold, allowFuzzy: ctx.allowFuzzy },
-		);
-		ctx.signal.throwIfAborted();
-		return [toPerFilePreview(first.path, result)];
+		const groups = groupEditsByPath(entries, undefined);
+		if (groups.size === 0) return null;
+		const previews: PerFileDiffPreview[] = [];
+		for (const [path, fileEntries] of groups) {
+			const first = fileEntries[0];
+			if (!first) continue;
+			ctx.signal.throwIfAborted();
+			const result = await computePatchDiff(
+				{ path, op: first.op ?? "update", rename: first.rename, diff: first.diff },
+				ctx.cwd,
+				{ fuzzyThreshold: ctx.fuzzyThreshold, allowFuzzy: ctx.allowFuzzy },
+			);
+			ctx.signal.throwIfAborted();
+			previews.push(toPerFilePreview(path, result));
+		}
+		return previews.length > 0 ? previews : null;
 	},
 	renderStreamingFallback() {
 		return "";
@@ -365,7 +342,6 @@ export const EDIT_MODE_STRATEGIES: Record<EditMode, EditStreamingStrategy<unknow
 	replace: replaceStrategy as EditStreamingStrategy<unknown>,
 	patch: patchStrategy as EditStreamingStrategy<unknown>,
 	hashline: hashlineStrategy as EditStreamingStrategy<unknown>,
-	chunk: chunkStrategy as EditStreamingStrategy<unknown>,
 	apply_patch: applyPatchStrategy as EditStreamingStrategy<unknown>,
 	vim: vimStrategy,
 	atom: atomStrategy as EditStreamingStrategy<unknown>,