mirror of
https://github.com/getcompanion-ai/co-mono.git
synced 2026-04-15 19:05:11 +00:00
Normalize line endings to LF before matching, restore original style on write. Files with CRLF now match when LLMs send LF-only oldText. Fixes #355
286 lines
8.2 KiB
TypeScript
286 lines
8.2 KiB
TypeScript
import type { AgentTool } from "@mariozechner/pi-ai";
|
|
import { Type } from "@sinclair/typebox";
|
|
import * as Diff from "diff";
|
|
import { constants } from "fs";
|
|
import { access, readFile, writeFile } from "fs/promises";
|
|
import { resolveToCwd } from "./path-utils.js";
|
|
|
|
function detectLineEnding(content: string): "\r\n" | "\n" {
|
|
const crlfIdx = content.indexOf("\r\n");
|
|
const lfIdx = content.indexOf("\n");
|
|
if (lfIdx === -1) return "\n";
|
|
if (crlfIdx === -1) return "\n";
|
|
return crlfIdx < lfIdx ? "\r\n" : "\n";
|
|
}
|
|
|
|
function normalizeToLF(text: string): string {
|
|
return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
|
|
}
|
|
|
|
function restoreLineEndings(text: string, ending: "\r\n" | "\n"): string {
|
|
return ending === "\r\n" ? text.replace(/\n/g, "\r\n") : text;
|
|
}
|
|
|
|
/**
|
|
* Generate a unified diff string with line numbers and context
|
|
*/
|
|
function generateDiffString(oldContent: string, newContent: string, contextLines = 4): string {
|
|
const parts = Diff.diffLines(oldContent, newContent);
|
|
const output: string[] = [];
|
|
|
|
const oldLines = oldContent.split("\n");
|
|
const newLines = newContent.split("\n");
|
|
const maxLineNum = Math.max(oldLines.length, newLines.length);
|
|
const lineNumWidth = String(maxLineNum).length;
|
|
|
|
let oldLineNum = 1;
|
|
let newLineNum = 1;
|
|
let lastWasChange = false;
|
|
|
|
for (let i = 0; i < parts.length; i++) {
|
|
const part = parts[i];
|
|
const raw = part.value.split("\n");
|
|
if (raw[raw.length - 1] === "") {
|
|
raw.pop();
|
|
}
|
|
|
|
if (part.added || part.removed) {
|
|
// Show the change
|
|
for (const line of raw) {
|
|
if (part.added) {
|
|
const lineNum = String(newLineNum).padStart(lineNumWidth, " ");
|
|
output.push(`+${lineNum} ${line}`);
|
|
newLineNum++;
|
|
} else {
|
|
// removed
|
|
const lineNum = String(oldLineNum).padStart(lineNumWidth, " ");
|
|
output.push(`-${lineNum} ${line}`);
|
|
oldLineNum++;
|
|
}
|
|
}
|
|
lastWasChange = true;
|
|
} else {
|
|
// Context lines - only show a few before/after changes
|
|
const nextPartIsChange = i < parts.length - 1 && (parts[i + 1].added || parts[i + 1].removed);
|
|
|
|
if (lastWasChange || nextPartIsChange) {
|
|
// Show context
|
|
let linesToShow = raw;
|
|
let skipStart = 0;
|
|
let skipEnd = 0;
|
|
|
|
if (!lastWasChange) {
|
|
// Show only last N lines as leading context
|
|
skipStart = Math.max(0, raw.length - contextLines);
|
|
linesToShow = raw.slice(skipStart);
|
|
}
|
|
|
|
if (!nextPartIsChange && linesToShow.length > contextLines) {
|
|
// Show only first N lines as trailing context
|
|
skipEnd = linesToShow.length - contextLines;
|
|
linesToShow = linesToShow.slice(0, contextLines);
|
|
}
|
|
|
|
// Add ellipsis if we skipped lines at start
|
|
if (skipStart > 0) {
|
|
output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
|
|
// Update line numbers for the skipped leading context
|
|
oldLineNum += skipStart;
|
|
newLineNum += skipStart;
|
|
}
|
|
|
|
for (const line of linesToShow) {
|
|
const lineNum = String(oldLineNum).padStart(lineNumWidth, " ");
|
|
output.push(` ${lineNum} ${line}`);
|
|
oldLineNum++;
|
|
newLineNum++;
|
|
}
|
|
|
|
// Add ellipsis if we skipped lines at end
|
|
if (skipEnd > 0) {
|
|
output.push(` ${"".padStart(lineNumWidth, " ")} ...`);
|
|
// Update line numbers for the skipped trailing context
|
|
oldLineNum += skipEnd;
|
|
newLineNum += skipEnd;
|
|
}
|
|
} else {
|
|
// Skip these context lines entirely
|
|
oldLineNum += raw.length;
|
|
newLineNum += raw.length;
|
|
}
|
|
|
|
lastWasChange = false;
|
|
}
|
|
}
|
|
|
|
return output.join("\n");
|
|
}
|
|
|
|
const editSchema = Type.Object({
|
|
path: Type.String({ description: "Path to the file to edit (relative or absolute)" }),
|
|
oldText: Type.String({ description: "Exact text to find and replace (must match exactly)" }),
|
|
newText: Type.String({ description: "New text to replace the old text with" }),
|
|
});
|
|
|
|
export function createEditTool(cwd: string): AgentTool<typeof editSchema> {
|
|
return {
|
|
name: "edit",
|
|
label: "edit",
|
|
description:
|
|
"Edit a file by replacing exact text. The oldText must match exactly (including whitespace). Use this for precise, surgical edits.",
|
|
parameters: editSchema,
|
|
execute: async (
|
|
_toolCallId: string,
|
|
{ path, oldText, newText }: { path: string; oldText: string; newText: string },
|
|
signal?: AbortSignal,
|
|
) => {
|
|
const absolutePath = resolveToCwd(path, cwd);
|
|
|
|
return new Promise<{
|
|
content: Array<{ type: "text"; text: string }>;
|
|
details: { diff: string } | undefined;
|
|
}>((resolve, reject) => {
|
|
// Check if already aborted
|
|
if (signal?.aborted) {
|
|
reject(new Error("Operation aborted"));
|
|
return;
|
|
}
|
|
|
|
let aborted = false;
|
|
|
|
// Set up abort handler
|
|
const onAbort = () => {
|
|
aborted = true;
|
|
reject(new Error("Operation aborted"));
|
|
};
|
|
|
|
if (signal) {
|
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
}
|
|
|
|
// Perform the edit operation
|
|
(async () => {
|
|
try {
|
|
// Check if file exists
|
|
try {
|
|
await access(absolutePath, constants.R_OK | constants.W_OK);
|
|
} catch {
|
|
if (signal) {
|
|
signal.removeEventListener("abort", onAbort);
|
|
}
|
|
reject(new Error(`File not found: ${path}`));
|
|
return;
|
|
}
|
|
|
|
// Check if aborted before reading
|
|
if (aborted) {
|
|
return;
|
|
}
|
|
|
|
// Read the file
|
|
const content = await readFile(absolutePath, "utf-8");
|
|
|
|
// Check if aborted after reading
|
|
if (aborted) {
|
|
return;
|
|
}
|
|
|
|
const originalEnding = detectLineEnding(content);
|
|
const normalizedContent = normalizeToLF(content);
|
|
const normalizedOldText = normalizeToLF(oldText);
|
|
const normalizedNewText = normalizeToLF(newText);
|
|
|
|
// Check if old text exists
|
|
if (!normalizedContent.includes(normalizedOldText)) {
|
|
if (signal) {
|
|
signal.removeEventListener("abort", onAbort);
|
|
}
|
|
reject(
|
|
new Error(
|
|
`Could not find the exact text in ${path}. The old text must match exactly including all whitespace and newlines.`,
|
|
),
|
|
);
|
|
return;
|
|
}
|
|
|
|
// Count occurrences
|
|
const occurrences = normalizedContent.split(normalizedOldText).length - 1;
|
|
|
|
if (occurrences > 1) {
|
|
if (signal) {
|
|
signal.removeEventListener("abort", onAbort);
|
|
}
|
|
reject(
|
|
new Error(
|
|
`Found ${occurrences} occurrences of the text in ${path}. The text must be unique. Please provide more context to make it unique.`,
|
|
),
|
|
);
|
|
return;
|
|
}
|
|
|
|
// Check if aborted before writing
|
|
if (aborted) {
|
|
return;
|
|
}
|
|
|
|
// Perform replacement using indexOf + substring (raw string replace, no special character interpretation)
|
|
// String.replace() interprets $ in the replacement string, so we do manual replacement
|
|
const index = normalizedContent.indexOf(normalizedOldText);
|
|
const normalizedNewContent =
|
|
normalizedContent.substring(0, index) +
|
|
normalizedNewText +
|
|
normalizedContent.substring(index + normalizedOldText.length);
|
|
|
|
// Verify the replacement actually changed something
|
|
if (normalizedContent === normalizedNewContent) {
|
|
if (signal) {
|
|
signal.removeEventListener("abort", onAbort);
|
|
}
|
|
reject(
|
|
new Error(
|
|
`No changes made to ${path}. The replacement produced identical content. This might indicate an issue with special characters or the text not existing as expected.`,
|
|
),
|
|
);
|
|
return;
|
|
}
|
|
|
|
const finalContent = restoreLineEndings(normalizedNewContent, originalEnding);
|
|
await writeFile(absolutePath, finalContent, "utf-8");
|
|
|
|
// Check if aborted after writing
|
|
if (aborted) {
|
|
return;
|
|
}
|
|
|
|
// Clean up abort handler
|
|
if (signal) {
|
|
signal.removeEventListener("abort", onAbort);
|
|
}
|
|
|
|
resolve({
|
|
content: [
|
|
{
|
|
type: "text",
|
|
text: `Successfully replaced text in ${path}.`,
|
|
},
|
|
],
|
|
details: { diff: generateDiffString(normalizedContent, normalizedNewContent) },
|
|
});
|
|
} catch (error: any) {
|
|
// Clean up abort handler
|
|
if (signal) {
|
|
signal.removeEventListener("abort", onAbort);
|
|
}
|
|
|
|
if (!aborted) {
|
|
reject(error);
|
|
}
|
|
}
|
|
})();
|
|
});
|
|
},
|
|
};
|
|
}
|
|
|
|
/** Default edit tool using process.cwd() - for backwards compatibility */
|
|
export const editTool = createEditTool(process.cwd());
|