@howaboua/pi-codex-conversion 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {

package/src/patch/core.ts

@@ -1,8 +1,9 @@
 import * as fs from "node:fs";
 import { dirname } from "node:path";
+import { linesMatch } from "./matching.ts";
 import { parsePatchActions, parseUpdateFile } from "./parser.ts";
 import { openFileAtPath, pathExists, removeFileAtPath, resolvePatchPath, writeFileAtPath } from "./paths.ts";
-import { DiffError, ExecutePatchError, type ExecutePatchResult, type ParsedPatchAction, type ParserState, type PatchAction } from "./types.ts";
+import { DiffError, ExecutePatchError, type ExecutePatchFailure, type ExecutePatchResult, type ParsedPatchAction, type ParserState, type PatchAction } from "./types.ts";
 
 export const patchFsOps = {
 	mkdirSync: fs.mkdirSync,
@@ -64,7 +65,7 @@ function getUpdatedFile({ text, action, path }: { text: string; action: PatchAct
 		destIndex += delta;
 
 		for (const line of chunk.delLines) {
-			if (origLines[origIndex] !== line) {
+			if (!linesMatch(origLines[origIndex] ?? "", line)) {
 				throw new DiffError(`_get_updated_file: ${path}: Expected ${line} but got ${origLines[origIndex]} at line ${origIndex + 1}`);
 			}
 			origIndex += 1;
@@ -217,6 +218,14 @@ function applyAction({
 	return fuzz;
 }
 
+function getActionPaths(action: ParsedPatchAction): string[] {
+	return [action.path, action.type === "update" ? action.movePath : undefined].filter((path): path is string => typeof path === "string");
+}
+
+function getCanonicalActionPaths({ cwd, action }: { cwd: string; action: ParsedPatchAction }): string[] {
+	return getActionPaths(action).map((path) => resolvePatchPath({ cwd, patchPath: path }));
+}
+
 export function executePatch({ cwd, patchText }: { cwd: string; patchText: string }): ExecutePatchResult {
 	if (!patchText.startsWith("*** Begin Patch")) {
 		throw new DiffError("Patch must start with '*** Begin Patch'");
@@ -227,9 +236,22 @@ export function executePatch({ cwd, patchText }: { cwd: string; patchText: strin
 	const createdFiles = new Set<string>();
 	const deletedFiles = new Set<string>();
 	const movedFiles = new Set<string>();
+	const blockedPaths = new Set<string>();
+	const failures: ExecutePatchFailure[] = [];
 	let fuzz = 0;
 
 	for (const action of actions) {
+		const actionPaths = getActionPaths(action);
+		const canonicalActionPaths = getCanonicalActionPaths({ cwd, action });
+		const overlappingPaths = canonicalActionPaths.filter((path) => blockedPaths.has(path));
+		if (overlappingPaths.length > 0) {
+			failures.push({
+				action,
+				message: `Skipped because an earlier failed action affected ${actionPaths.filter((_, index) => overlappingPaths.includes(canonicalActionPaths[index])).join(", ")}`,
+			});
+			continue;
+		}
+
 		try {
 			fuzz += applyAction({
 				cwd,
@@ -241,20 +263,31 @@ export function executePatch({ cwd, patchText }: { cwd: string; patchText: strin
 			});
 		} catch (error) {
 			const message = error instanceof Error ? error.message : String(error);
-			throw new ExecutePatchError(
-				message,
-				buildExecutePatchResult({
-					changedFiles,
-					createdFiles,
-					deletedFiles,
-					movedFiles,
-					fuzz,
-				}),
-				action,
-			);
+			for (const path of canonicalActionPaths) {
+				blockedPaths.add(path);
+			}
+			failures.push({ action, message });
 		}
 	}
 
+	if (failures.length > 0) {
+		const message =
+			failures.length === 1
+				? failures[0].message
+				: failures.map(({ action, message: failureMessage }) => `${action.path}: ${failureMessage}`).join("\n");
+		throw new ExecutePatchError(
+			message,
+			buildExecutePatchResult({
+				changedFiles,
+				createdFiles,
+				deletedFiles,
+				movedFiles,
+				fuzz,
+			}),
+			failures,
+		);
+	}
+
 	return buildExecutePatchResult({
 		changedFiles,
 		createdFiles,

package/src/patch/matching.ts

@@ -0,0 +1,30 @@
+export type LinesMatchQuality = {
+	fuzz: number;
+	worstLineFuzz: number;
+};
+
+export function lineMatchFuzz(left: string, right: string): number | undefined {
+	if (left === right) return 0;
+	if (left.trimEnd() === right.trimEnd()) return 1;
+	if (left.trim() === right.trim()) return 100;
+	return undefined;
+}
+
+export function linesMatch(left: string, right: string): boolean {
+	return left === right || left.trimEnd() === right.trimEnd();
+}
+
+export function linesEqualFuzz({ left, right }: { left: string[]; right: string[] }): LinesMatchQuality | undefined {
+	if (left.length !== right.length) return undefined;
+
+	let fuzz = 0;
+	let worstLineFuzz = 0;
+	for (let index = 0; index < left.length; index++) {
+		const lineFuzz = lineMatchFuzz(left[index], right[index]);
+		if (lineFuzz === undefined) return undefined;
+		fuzz += lineFuzz;
+		worstLineFuzz = Math.max(worstLineFuzz, lineFuzz);
+	}
+
+	return { fuzz, worstLineFuzz };
+}

package/src/patch/parser.ts

@@ -1,3 +1,4 @@
+import { lineMatchFuzz, linesEqualFuzz } from "./matching.ts";
 import { normalizePatchPath } from "./paths.ts";
 import { DiffError, type Chunk, type ParseMode, type ParsedPatchAction, type ParserState, type PatchAction } from "./types.ts";
 
@@ -48,14 +49,6 @@ function splitFileLines(text: string): string[] {
 	return lines;
 }
 
-function linesEqual({ left, right }: { left: string[]; right: string[] }): boolean {
-	if (left.length !== right.length) return false;
-	for (let index = 0; index < left.length; index++) {
-		if (left[index] !== right[index]) return false;
-	}
-	return true;
-}
-
 function findContextCore({ lines, context, start }: { lines: string[]; context: string[]; start: number }): {
 	newIndex: number;
 	fuzz: number;
@@ -64,25 +57,30 @@ function findContextCore({ lines, context, start }: { lines: string[]; context:
 		return { newIndex: start, fuzz: 0 };
 	}
 
-	for (let index = start; index < lines.length; index++) {
-		if (linesEqual({ left: lines.slice(index, index + context.length), right: context })) {
-			return { newIndex: index, fuzz: 0 };
+	for (const tier of [0, 1, 100]) {
+		for (let index = start; index <= lines.length - context.length; index++) {
+			const quality = linesEqualFuzz({ left: lines.slice(index, index + context.length), right: context });
+			if (quality?.worstLineFuzz === tier) {
+				return { newIndex: index, fuzz: quality.fuzz };
+			}
 		}
 	}
 
-	for (let index = start; index < lines.length; index++) {
-		const left = lines.slice(index, index + context.length).map((line) => line.trimEnd());
-		const right = context.map((line) => line.trimEnd());
-		if (linesEqual({ left, right })) {
-			return { newIndex: index, fuzz: 1 };
+	return { newIndex: -1, fuzz: 0 };
+}
+
+function findSectionAnchor({ lines, target, start }: { lines: string[]; target: string; start: number }): { newIndex: number; fuzz: number } {
+	for (const tier of [0, 1, 100]) {
+		const alreadySeen = lines.slice(0, start).some((line) => lineMatchFuzz(line, target) === tier);
+		if (alreadySeen) {
+			continue;
 		}
-	}
 
-	for (let index = start; index < lines.length; index++) {
-		const left = lines.slice(index, index + context.length).map((line) => line.trim());
-		const right = context.map((line) => line.trim());
-		if (linesEqual({ left, right })) {
-			return { newIndex: index, fuzz: 100 };
+		for (let index = start; index < lines.length; index++) {
+			const fuzz = lineMatchFuzz(lines[index], target);
+			if (fuzz === tier) {
+				return { newIndex: index, fuzz };
+			}
 		}
 	}
 
@@ -263,30 +261,10 @@ export function parseUpdateFile({ state, text, path }: { state: ParserState; tex
 		}
 
 		if (defStr.trim().length > 0) {
-			let found = false;
-
-			const exactAlreadySeen = lines.slice(0, index).some((line) => line === defStr);
-			if (!exactAlreadySeen) {
-				for (let lineIndex = index; lineIndex < lines.length; lineIndex++) {
-					if (lines[lineIndex] === defStr) {
-						index = lineIndex + 1;
-						found = true;
-						break;
-					}
-				}
-			}
-
-			if (!found) {
-				const trimAlreadySeen = lines.slice(0, index).some((line) => line.trim() === defStr.trim());
-				if (!trimAlreadySeen) {
-					for (let lineIndex = index; lineIndex < lines.length; lineIndex++) {
-						if (lines[lineIndex].trim() === defStr.trim()) {
-							index = lineIndex + 1;
-							state.fuzz += 1;
-							break;
-						}
-					}
-				}
+			const sectionAnchor = findSectionAnchor({ lines, target: defStr, start: index });
+			if (sectionAnchor.newIndex !== -1) {
+				index = sectionAnchor.newIndex + 1;
+				state.fuzz += sectionAnchor.fuzz;
 			}
 		}
 

package/src/patch/types.ts

@@ -36,6 +36,11 @@ export interface ExecutePatchResult {
 	fuzz: number;
 }
 
+export interface ExecutePatchFailure {
+	action: ParsedPatchAction;
+	message: string;
+}
+
 export class DiffError extends Error {
 	constructor(message: string) {
 		super(message);
@@ -46,12 +51,14 @@ export class DiffError extends Error {
 export class ExecutePatchError extends DiffError {
 	result: ExecutePatchResult;
 	failedAction?: ParsedPatchAction;
+	failures: ExecutePatchFailure[];
 
-	constructor(message: string, result: ExecutePatchResult, failedAction?: ParsedPatchAction) {
+	constructor(message: string, result: ExecutePatchResult, failures: ExecutePatchFailure[] = []) {
 		super(message);
 		this.name = "ExecutePatchError";
 		this.result = result;
-		this.failedAction = failedAction;
+		this.failures = failures;
+		this.failedAction = failures[0]?.action;
 	}
 
 	hasPartialSuccess(): boolean {

package/src/tools/apply-patch-tool.ts

@@ -17,7 +17,7 @@ interface ApplyPatchRenderState {
 	collapsed: string;
 	expanded: string;
 	status: "pending" | "partial_failure" | "failed";
-	failedTarget?: string;
+	failedTargets?: string[];
 }
 
 interface ApplyPatchSuccessDetails {
@@ -29,7 +29,7 @@ interface ApplyPatchPartialFailureDetails {
 	status: "partial_failure";
 	result: ExecutePatchResult;
 	error: string;
-	failedTarget?: string;
+	failedTargets?: string[];
 	appliedFiles: string[];
 	failedFiles: string[];
 	recoveryInstructions: {
@@ -65,7 +65,7 @@ function setApplyPatchRenderState(
 	patchText: string,
 	cwd: string,
 	status: "pending" | "partial_failure" | "failed" = "pending",
-	failedTarget?: string,
+	failedTargets?: string[],
 ): void {
 	const collapsed = formatApplyPatchSummary(patchText, cwd);
 	const expanded = renderApplyPatchCall(patchText, cwd);
@@ -75,15 +75,15 @@ function setApplyPatchRenderState(
 		collapsed,
 		expanded,
 		status,
-		failedTarget,
+		failedTargets,
 	});
 }
 
-function markApplyPatchPartialFailure(toolCallId: string, failedTarget?: string): void {
-	markApplyPatchFailure(toolCallId, "partial_failure", failedTarget);
+function markApplyPatchPartialFailure(toolCallId: string, failedTargets?: string[]): void {
+	markApplyPatchFailure(toolCallId, "partial_failure", failedTargets);
 }
 
-function markApplyPatchFailure(toolCallId: string, status: "partial_failure" | "failed", failedTarget?: string): void {
+function markApplyPatchFailure(toolCallId: string, status: "partial_failure" | "failed", failedTargets?: string[]): void {
 	const existing = applyPatchRenderStates.get(toolCallId);
 	if (!existing) {
 		return;
@@ -91,14 +91,14 @@ function markApplyPatchFailure(toolCallId: string, status: "partial_failure" | "
 	applyPatchRenderStates.set(toolCallId, {
 		...existing,
 		status,
-		failedTarget,
+		failedTargets,
 	});
 }
 
 function renderPartialFailureCall(
 	text: string,
 	theme: { fg(role: string, text: string): string },
-	failedTarget?: string,
+	failedTargets?: string[],
 ): string {
 	const lines = text.split("\n");
 	if (lines.length === 0) {
@@ -106,12 +106,15 @@ function renderPartialFailureCall(
 	}
 	lines[0] = lines[0].replace(/^• (Added|Edited|Deleted)\b/, "• Edit partially failed");
 	const failedLineIndexes = new Set<number>();
-	if (failedTarget) {
+	if (failedTargets) {
 		for (let i = 0; i < lines.length; i += 1) {
-			const failedLine = markFailedTargetLine(lines[i], failedTarget);
-			if (failedLine) {
-				lines[i] = failedLine;
-				failedLineIndexes.add(i);
+			for (const failedTarget of failedTargets) {
+				const failedLine = markFailedTargetLine(lines[i], failedTarget);
+				if (failedLine) {
+					lines[i] = failedLine;
+					failedLineIndexes.add(i);
+					break;
+				}
 			}
 		}
 	}
@@ -131,7 +134,7 @@ function renderPartialFailureCall(
 function renderFailedCall(
 	text: string,
 	theme: { fg(role: string, text: string): string },
-	failedTarget?: string,
+	failedTargets?: string[],
 ): string {
 	const lines = text.split("\n");
 	if (lines.length === 0) {
@@ -139,12 +142,15 @@ function renderFailedCall(
 	}
 	lines[0] = lines[0].replace(/^• (Added|Edited|Deleted)\b/, "• Edit failed");
 	const failedLineIndexes = new Set<number>();
-	if (failedTarget) {
+	if (failedTargets) {
 		for (let i = 0; i < lines.length; i += 1) {
-			const failedLine = markFailedTargetLine(lines[i], failedTarget);
-			if (failedLine) {
-				lines[i] = failedLine;
-				failedLineIndexes.add(i);
+			for (const failedTarget of failedTargets) {
+				const failedLine = markFailedTargetLine(lines[i], failedTarget);
+				if (failedLine) {
+					lines[i] = failedLine;
+					failedLineIndexes.add(i);
+					break;
+				}
 			}
 		}
 	}
@@ -187,26 +193,33 @@ function uniqueStrings(values: Array<string | undefined>): string[] {
 	return Array.from(new Set(values.filter((value): value is string => typeof value === "string" && value.length > 0)));
 }
 
-function buildPartialFailureMessage(message: string, failedTarget: string | undefined, result: ExecutePatchResult): string {
-	const failedFiles = uniqueStrings([failedTarget]);
-	const appliedFiles = result.changedFiles.filter((path) => !failedFiles.includes(path));
+function getFailedPaths(error: ExecutePatchError): string[] {
+	return uniqueStrings(
+		error.failures.flatMap(({ action }) => [action.path, action.type === "update" ? action.movePath : undefined]),
+	);
+}
+
+function getAppliedPaths(result: ExecutePatchResult, failedFiles: string[]): string[] {
+	return result.changedFiles.filter((path) => !failedFiles.includes(path));
+}
+
+function buildPartialFailureMessage(message: string, failedFiles: string[], appliedFiles: string[]): string {
 	const lines = [message];
 	if (failedFiles.length > 0) {
-		lines.push(`Failed file: ${failedFiles.join(", ")}`);
+		lines.push(`Failed file${failedFiles.length === 1 ? "" : "s"}: ${failedFiles.join(", ")}`);
 		lines.push(`Recovery: MUST read ${failedFiles.join(", ")} before retrying.`);
 	}
 	if (appliedFiles.length > 0) {
-		lines.push(`Applied files: ${appliedFiles.join(", ")}`);
-		lines.push(`Recovery: MUST NOT reread ${appliedFiles.join(", ")} unless a specific dependency requires it.`);
+		lines.push("Earlier file actions in this patch were already applied.");
+		lines.push("Recovery: MUST NOT reread other files from this patch unless a specific dependency requires it.");
 	}
 	return lines.join("\n");
 }
 
-function describeFailedAction(error: ExecutePatchError, cwd: string): string | undefined {
-	if (!error.failedAction) {
-		return undefined;
-	}
-	return formatPatchTarget(error.failedAction.path, error.failedAction.type === "update" ? error.failedAction.movePath : undefined, cwd);
+function describeFailedActions(error: ExecutePatchError, cwd: string): string[] {
+	return uniqueStrings(
+		error.failures.map(({ action }) => formatPatchTarget(action.path, action.type === "update" ? action.movePath : undefined, cwd)),
+	);
 }
 
 export type { ExecutePatchResult } from "../patch/types.ts";
@@ -241,9 +254,9 @@ const renderApplyPatchCallWithOptionalContext: any = (
 	}
 	const text =
 		cached?.status === "partial_failure"
-			? renderPartialFailureCall(baseText, theme, cached.failedTarget)
+			? renderPartialFailureCall(baseText, theme, cached.failedTargets)
 			: cached?.status === "failed"
-				? renderFailedCall(baseText, theme, cached.failedTarget)
+				? renderFailedCall(baseText, theme, cached.failedTargets)
 				: baseText;
 	return new Text(text, 0, 0);
 };
@@ -272,23 +285,24 @@ export function registerApplyPatchTool(pi: ExtensionAPI): void {
 			} catch (error) {
 				if (error instanceof ExecutePatchError) {
 					const partial = error.hasPartialSuccess();
-					const failedTarget = describeFailedAction(error, ctx.cwd);
+					const failedTargets = describeFailedActions(error, ctx.cwd);
+					const failedTargetSummary = failedTargets.join(", ");
 					const prefix = partial
 						? `apply_patch partially failed after ${summarizePatchCounts(error.result)}`
 						: "apply_patch failed";
-					const message = failedTarget ? `${prefix} while patching ${failedTarget}: ${error.message}` : `${prefix}: ${error.message}`;
+					const message = failedTargetSummary ? `${prefix} while patching ${failedTargetSummary}: ${error.message}` : `${prefix}: ${error.message}`;
 					if (partial) {
-						const failedFiles = uniqueStrings([failedTarget]);
-						const appliedFiles = error.result.changedFiles.filter((path) => !failedFiles.includes(path));
-						const recoveryMessage = buildPartialFailureMessage(message, failedTarget, error.result);
-						markApplyPatchPartialFailure(toolCallId, failedTarget);
+						const failedFiles = getFailedPaths(error);
+						const appliedFiles = getAppliedPaths(error.result, failedFiles);
+						const recoveryMessage = buildPartialFailureMessage(message, failedFiles, appliedFiles);
+						markApplyPatchPartialFailure(toolCallId, failedTargets);
 						return {
 							content: [{ type: "text", text: recoveryMessage }],
 							details: {
 								status: "partial_failure",
 								result: error.result,
 								error: recoveryMessage,
-								failedTarget,
+								failedTargets,
 								appliedFiles,
 								failedFiles,
 								recoveryInstructions: {
@@ -298,7 +312,7 @@ export function registerApplyPatchTool(pi: ExtensionAPI): void {
 							} satisfies ApplyPatchPartialFailureDetails,
 						};
 					}
-					markApplyPatchFailure(toolCallId, "failed", failedTarget);
+					markApplyPatchFailure(toolCallId, "failed", failedTargets);
 					throw new Error(message);
 				}
 				markApplyPatchFailure(toolCallId, "failed");