@ottocode/sdk 0.1.265 → 0.1.267

package/src/core/src/tools/builtin/patch/apply-hunk.ts

@@ -0,0 +1,308 @@
+import { adjustReplacementIndentation } from './indentation.ts';
+import {
+	findLineIndex,
+	findSubsequence,
+	lineExists,
+	linesMatch,
+} from './matching.ts';
+import type { AppliedPatchHunk, PatchHunk } from './types.ts';
+
+function computeInsertionIndex(
+	lines: string[],
+	header: PatchHunk['header'],
+	hint: number,
+): number {
+	if (header.context) {
+		const contextIndex = findLineIndex(lines, header.context, 0, true);
+		if (contextIndex !== -1) return contextIndex + 1;
+	}
+
+	if (typeof header.oldStart === 'number') {
+		const zeroBased = Math.max(0, header.oldStart - 1);
+		return Math.min(lines.length, zeroBased);
+	}
+
+	if (typeof header.newStart === 'number') {
+		const zeroBased = Math.max(0, header.newStart - 1);
+		return Math.min(lines.length, zeroBased);
+	}
+
+	return Math.min(lines.length, Math.max(0, hint));
+}
+
+function isHunkAlreadyApplied(
+	lines: string[],
+	hunk: PatchHunk,
+	useFuzzy: boolean,
+): boolean {
+	const replacement = hunk.lines
+		.filter((line) => line.kind !== 'remove')
+		.map((line) => line.content);
+
+	if (replacement.length > 0) {
+		return findSubsequence(lines, replacement, 0, useFuzzy) !== -1;
+	}
+
+	const removals = hunk.lines.filter((line) => line.kind === 'remove');
+	const _additions = hunk.lines
+		.filter((line) => line.kind === 'add')
+		.map((line) => line.content);
+	const _contextLines = hunk.lines
+		.filter((line) => line.kind === 'context')
+		.map((line) => line.content);
+	if (removals.length === 0) return false;
+	return removals.every((line) => !lineExists(lines, line.content, useFuzzy));
+}
+
+export function applyHunkToLines(
+	lines: string[],
+	originalLines: string[],
+	hunk: PatchHunk,
+	hint: number,
+	useFuzzy: boolean,
+): AppliedPatchHunk | null {
+	const expected = hunk.lines
+		.filter((line) => line.kind !== 'add')
+		.map((line) => line.content);
+	const replacement = hunk.lines
+		.filter((line) => line.kind !== 'remove')
+		.map((line) => line.content);
+
+	const removals = hunk.lines.filter((line) => line.kind === 'remove');
+	const additions = hunk.lines
+		.filter((line) => line.kind === 'add')
+		.map((line) => line.content);
+	const contextLines = hunk.lines
+		.filter((line) => line.kind === 'context')
+		.map((line) => line.content);
+
+	const hasExpected = expected.length > 0;
+	const initialHint =
+		typeof hunk.header.oldStart === 'number'
+			? Math.max(0, hunk.header.oldStart - 1)
+			: hint;
+
+	let matchIndex = hasExpected
+		? findSubsequence(lines, expected, Math.max(0, initialHint - 3), useFuzzy)
+		: -1;
+	let matchedExpected = expected;
+
+	if (hasExpected && matchIndex === -1) {
+		matchIndex = findSubsequence(lines, expected, 0, useFuzzy);
+	}
+
+	if (matchIndex === -1 && removals.length > 0) {
+		const allContextPresent = contextLines.every((line) =>
+			lineExists(lines, line, useFuzzy),
+		);
+		if (!allContextPresent) {
+			matchIndex = -1;
+		} else {
+			const expectedWithoutMissingRemovals = hunk.lines
+				.filter((line) => {
+					if (line.kind === 'add') return false;
+					if (line.kind === 'remove') {
+						return lineExists(lines, line.content, useFuzzy);
+					}
+					return true;
+				})
+				.map((line) => line.content);
+			const includedRemovalCount = hunk.lines.filter(
+				(line) =>
+					line.kind === 'remove' && lineExists(lines, line.content, useFuzzy),
+			).length;
+			const minRequired = Math.max(contextLines.length, 2);
+			if (
+				includedRemovalCount > 0 &&
+				expectedWithoutMissingRemovals.length >= minRequired
+			) {
+				matchIndex = findSubsequence(
+					lines,
+					expectedWithoutMissingRemovals,
+					Math.max(0, initialHint - 3),
+					useFuzzy,
+				);
+				if (matchIndex === -1) {
+					matchIndex = findSubsequence(
+						lines,
+						expectedWithoutMissingRemovals,
+						0,
+						useFuzzy,
+					);
+				}
+				if (matchIndex !== -1) {
+					matchedExpected = expectedWithoutMissingRemovals;
+				}
+			}
+		}
+	}
+
+	if (
+		matchIndex === -1 &&
+		useFuzzy &&
+		removals.length >= 2 &&
+		contextLines.length === 0
+	) {
+		const firstRemoval = removals[0].content;
+		const lastRemoval = removals[removals.length - 1].content;
+		const firstIdx = findLineIndex(lines, firstRemoval, 0, true);
+		if (firstIdx !== -1) {
+			const rangeEnd = firstIdx + expected.length - 1;
+			if (rangeEnd < lines.length) {
+				const lastInRange = lines[rangeEnd];
+				const lastMatches = linesMatch(lastInRange, lastRemoval, true);
+				if (lastMatches) {
+					let matchCount = 0;
+					for (let k = 0; k < expected.length; k++) {
+						const fileLine = lines[firstIdx + k];
+						const expLine = expected[k];
+						if (linesMatch(fileLine, expLine, true)) {
+							matchCount++;
+						}
+					}
+					const matchRatio = matchCount / expected.length;
+					if (matchRatio >= 0.5) {
+						matchIndex = firstIdx;
+						matchedExpected = lines.slice(firstIdx, firstIdx + expected.length);
+					}
+				}
+			}
+		}
+	}
+
+	if (matchIndex === -1 && isHunkAlreadyApplied(lines, hunk, useFuzzy)) {
+		const skipStart =
+			initialHint >= 0 && initialHint < lines.length ? initialHint + 1 : 1;
+		return {
+			header: { ...hunk.header },
+			lines: hunk.lines.map((line) => ({ ...line })),
+			oldStart: skipStart,
+			oldLines: 0,
+			newStart: skipStart,
+			newLines: replacement.length,
+			additions: hunk.lines.filter((l) => l.kind === 'add').length,
+			deletions: hunk.lines.filter((l) => l.kind === 'remove').length,
+		};
+	}
+
+	if (matchIndex === -1 && !hasExpected) {
+		matchIndex = computeInsertionIndex(lines, hunk.header, initialHint);
+	}
+
+	if (matchIndex === -1) {
+		const contextInfo = hunk.header.context
+			? ` near context '${hunk.header.context}'`
+			: '';
+
+		if (additions.length > 0) {
+			const hasRemovals = removals.length > 0;
+			let anchorIndex = -1;
+			if (!hasRemovals && contextLines.length > 0) {
+				const anchorContext = contextLines[contextLines.length - 1];
+				anchorIndex = findLineIndex(lines, anchorContext, 0, useFuzzy);
+			} else if (!hasRemovals) {
+				anchorIndex = -1;
+			}
+
+			const insertionIndex =
+				anchorIndex !== -1
+					? anchorIndex + 1
+					: computeInsertionIndex(lines, hunk.header, initialHint);
+
+			if (
+				findSubsequence(
+					lines,
+					additions,
+					Math.max(0, insertionIndex - additions.length),
+					useFuzzy,
+				) !== -1
+			) {
+				const skipStart =
+					insertionIndex >= 0 && insertionIndex < lines.length
+						? insertionIndex + 1
+						: lines.length + 1;
+				return {
+					header: { ...hunk.header },
+					lines: hunk.lines.map((line) => ({ ...line })),
+					oldStart: skipStart,
+					oldLines: 0,
+					newStart: skipStart,
+					newLines: additions.length,
+					additions: additions.length,
+					deletions: 0,
+				};
+			}
+		}
+
+		let errorMsg = `Failed to apply patch hunk${contextInfo}.`;
+		if (expected.length > 0) {
+			errorMsg += `\nExpected to find:\n${expected
+				.map((l) => `  ${l}`)
+				.join('\n')}`;
+		}
+		if (removals.length > 0) {
+			const missing = removals
+				.filter((line) => !lineExists(lines, line.content, useFuzzy))
+				.map((line) => line.content);
+			if (missing.length === removals.length) {
+				errorMsg +=
+					'\nAll removal lines already absent; consider reading the file again to capture current state.';
+			}
+		}
+		throw new Error(errorMsg);
+	}
+
+	const deleteCount = hasExpected ? matchedExpected.length : 0;
+	const originalIndex = matchIndex;
+	const oldStart = Math.min(
+		originalLines.length,
+		Math.max(0, originalIndex) + 1,
+	);
+	const newStart = matchIndex + 1;
+
+	const adjustedReplacement =
+		useFuzzy && hasExpected && matchedExpected.length === expected.length
+			? adjustReplacementIndentation(
+					hunk,
+					lines.slice(matchIndex, matchIndex + matchedExpected.length),
+					originalLines,
+				)
+			: replacement;
+
+	const targetSlice = lines.slice(
+		matchIndex,
+		matchIndex + adjustedReplacement.length,
+	);
+	if (
+		adjustedReplacement.length > 0 &&
+		adjustedReplacement.length === targetSlice.length &&
+		adjustedReplacement.every((line, i) => {
+			return linesMatch(line, targetSlice[i], useFuzzy);
+		})
+	) {
+		const skipStart = matchIndex + 1;
+		return {
+			header: { ...hunk.header },
+			lines: hunk.lines.map((line) => ({ ...line })),
+			oldStart: skipStart,
+			oldLines: 0,
+			newStart: skipStart,
+			newLines: adjustedReplacement.length,
+			additions: 0,
+			deletions: 0,
+		};
+	}
+
+	lines.splice(matchIndex, deleteCount, ...adjustedReplacement);
+
+	return {
+		header: { ...hunk.header },
+		lines: hunk.lines.map((line) => ({ ...line })),
+		oldStart,
+		oldLines: deleteCount,
+		newStart,
+		newLines: adjustedReplacement.length,
+		additions: hunk.lines.filter((l) => l.kind === 'add').length,
+		deletions: hunk.lines.filter((l) => l.kind === 'remove').length,
+	};
+}

package/src/core/src/tools/builtin/patch/apply-report.ts

@@ -0,0 +1,99 @@
+import {
+	PATCH_ADD_PREFIX,
+	PATCH_BEGIN_MARKER,
+	PATCH_DELETE_PREFIX,
+	PATCH_END_MARKER,
+	PATCH_UPDATE_PREFIX,
+} from './constants.ts';
+import type {
+	AppliedPatchHunk,
+	AppliedPatchOperation,
+	PatchHunkLine,
+	PatchSummary,
+} from './types.ts';
+
+export function makeAppliedRecord(
+	kind: AppliedPatchOperation['kind'],
+	filePath: string,
+	hunks: AppliedPatchHunk[],
+): AppliedPatchOperation {
+	const stats = hunks.reduce(
+		(acc, hunk) => ({
+			additions: acc.additions + hunk.additions,
+			deletions: acc.deletions + hunk.deletions,
+		}),
+		{ additions: 0, deletions: 0 },
+	);
+	return {
+		kind,
+		filePath,
+		stats,
+		hunks,
+	};
+}
+
+export function makeSummary(operations: AppliedPatchOperation[]): PatchSummary {
+	return operations.reduce<PatchSummary>(
+		(acc, op) => ({
+			files: acc.files + 1,
+			additions: acc.additions + op.stats.additions,
+			deletions: acc.deletions + op.stats.deletions,
+		}),
+		{ files: 0, additions: 0, deletions: 0 },
+	);
+}
+
+export function formatNormalizedPatch(
+	operations: AppliedPatchOperation[],
+): string {
+	const lines: string[] = [PATCH_BEGIN_MARKER];
+	for (const op of operations) {
+		switch (op.kind) {
+			case 'add':
+				lines.push(`${PATCH_ADD_PREFIX} ${op.filePath}`);
+				break;
+			case 'delete':
+				lines.push(`${PATCH_DELETE_PREFIX} ${op.filePath}`);
+				break;
+			case 'update':
+				lines.push(`${PATCH_UPDATE_PREFIX} ${op.filePath}`);
+				break;
+		}
+
+		for (const hunk of op.hunks) {
+			lines.push(formatHunkHeader(hunk));
+			for (const line of hunk.lines) {
+				lines.push(serializePatchLine(line));
+			}
+		}
+	}
+	lines.push(PATCH_END_MARKER);
+	return lines.join('\n');
+}
+
+function serializePatchLine(line: PatchHunkLine): string {
+	switch (line.kind) {
+		case 'add':
+			return `+${line.content}`;
+		case 'remove':
+			return `-${line.content}`;
+		default:
+			return ` ${line.content}`;
+	}
+}
+
+function formatRange(start: number, count: number) {
+	const normalizedStart = Math.max(0, start);
+	if (count === 0) return `${normalizedStart},0`;
+	if (count === 1) return `${normalizedStart}`;
+	return `${normalizedStart},${count}`;
+}
+
+function formatHunkHeader(hunk: AppliedPatchHunk) {
+	const oldRange = formatRange(hunk.oldStart, hunk.oldLines);
+	const newRange = formatRange(hunk.newStart, hunk.newLines);
+	const context = hunk.header.context?.trim();
+	return context
+		? `@@ -${oldRange} +${newRange} @@ ${context}`
+		: `@@ -${oldRange} +${newRange} @@`;
+}