lonny-agent 0.2.4 → 0.2.7

package/dist/tools/edit/diff-render.js

@@ -0,0 +1,128 @@
+import { computeDiff } from './diff-compute.js';
+// ── ANSI colors for terminal output ───────────────────────────────────────
+const DIFF_RED = '\x1b[38;2;255;80;80m';
+const DIFF_GREEN = '\x1b[38;2;0;200;100m';
+const DIFF_DIM = '\x1b[38;2;100;100;100m';
+const DIFF_RESET = '\x1b[0m';
+// ── Colors for HTML output ────────────────────────────────────────────────
+const HTML_RED = '#ff5050';
+const HTML_GREEN = '#00c864';
+const HTML_DIM = '#888888';
+/** Terminal renderer — unified-diff format with color */
+export function renderDiffTerminal(lines, startLineNum) {
+    if (lines.length === 0)
+        return '';
+    const output = [];
+    let oldLn = startLineNum ?? 1;
+    let newLn = startLineNum ?? 1;
+    for (const line of lines) {
+        if (line.type === 'delete') {
+            output.push(`  ${DIFF_RED}- ${oldLn}  ${line.content}${DIFF_RESET}`);
+            oldLn++;
+        }
+        else if (line.type === 'insert') {
+            output.push(`  ${DIFF_GREEN}+ ${newLn}  ${line.content}${DIFF_RESET}`);
+            newLn++;
+        }
+        else {
+            output.push(`  ${DIFF_DIM}  ${oldLn}  ${line.content}${DIFF_RESET}`);
+            oldLn++;
+            newLn++;
+        }
+    }
+    return output.join('\n');
+}
+/** HTML renderer for web output */
+export function renderDiffHtml(lines) {
+    if (lines.length === 0)
+        return '';
+    const output = [];
+    for (const line of lines) {
+        if (line.type === 'delete') {
+            output.push(`  <span style="color: ${HTML_RED};">- ${escapeHtml(line.content)}</span>`);
+        }
+        else if (line.type === 'insert') {
+            output.push(`  <span style="color: ${HTML_GREEN};">+ ${escapeHtml(line.content)}</span>`);
+        }
+        else {
+            output.push(`  <span style="color: ${HTML_DIM};">  ${escapeHtml(line.content)}</span>`);
+        }
+    }
+    return output.join('\n');
+}
+/** Escape HTML special characters */
+export function escapeHtml(str) {
+    return str
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;');
+}
+/**
+ * Generate diff output using jest-diff.
+ * Returns terminal-colored unified-diff format with line numbers.
+ */
+export function generateDiff(oldStr, newStr, startLineNum) {
+    const lines = computeDiff(oldStr, newStr);
+    return renderDiffTerminal(lines, startLineNum);
+}
+/**
+ * Generate diff with surrounding context lines (1 before, 1 after)
+ * and line numbers. Context lines are extracted from the full file content.
+ */
+export function generateDiffWithContext(fullContent, oldStr, newStr, matchIndex, matchLength) {
+    // Calculate 1-based line number of the first matched line
+    const firstLineNum = fullContent.slice(0, matchIndex).split('\n').length;
+    const contentLines = fullContent.split('\n');
+    // Find 0-based line index where matchIndex falls
+    let charPos = 0;
+    let matchStartLineIdx = 0;
+    for (let i = 0; i < contentLines.length; i++) {
+        if (charPos <= matchIndex && matchIndex < charPos + contentLines[i].length + 1) {
+            matchStartLineIdx = i;
+            break;
+        }
+        charPos += contentLines[i].length + 1; // +1 for \n
+    }
+    // How many lines does oldStr span in the original content?
+    const oldLines = oldStr === '' ? [] : oldStr.split('\n');
+    const oldLineCount = oldLines.length;
+    const matchEndLineIdx = matchStartLineIdx + oldLineCount - 1;
+    // Context before (1 line) and after (1 line)
+    const beforeLineIdx = matchStartLineIdx > 0 ? matchStartLineIdx - 1 : -1;
+    const afterLineIdx = matchEndLineIdx < contentLines.length - 1 ? matchEndLineIdx + 1 : -1;
+    // Compute diff between oldStr and newStr
+    const diffLines = computeDiff(oldStr, newStr);
+    const output = [];
+    // Context before
+    if (beforeLineIdx !== -1) {
+        const lineNum = beforeLineIdx + 1;
+        output.push(`  ${DIFF_DIM}  ${lineNum}  ${contentLines[beforeLineIdx]}${DIFF_RESET}`);
+    }
+    // Diff lines with line numbers
+    let oldLn = firstLineNum;
+    let newLn = firstLineNum;
+    for (const line of diffLines) {
+        if (line.type === 'delete') {
+            output.push(`  ${DIFF_RED}- ${oldLn}  ${line.content}${DIFF_RESET}`);
+            oldLn++;
+        }
+        else if (line.type === 'insert') {
+            output.push(`  ${DIFF_GREEN}+ ${newLn}  ${line.content}${DIFF_RESET}`);
+            newLn++;
+        }
+        else {
+            output.push(`  ${DIFF_DIM}  ${oldLn}  ${line.content}${DIFF_RESET}`);
+            oldLn++;
+            newLn++;
+        }
+    }
+    // Context after
+    if (afterLineIdx !== -1) {
+        const lineNum = afterLineIdx + 1;
+        output.push(`  ${DIFF_DIM}  ${lineNum}  ${contentLines[afterLineIdx]}${DIFF_RESET}`);
+    }
+    return output.join('\n');
+}
+//# sourceMappingURL=diff-render.js.map

package/dist/tools/edit/diff-render.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-render.js","sourceRoot":"","sources":["../../../src/tools/edit/diff-render.ts"],"names":[],"mappings":"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"}

package/dist/tools/edit/edit.d.ts

@@ -0,0 +1,4 @@
+import type { FileReadTracker } from '../../diff/apply.js';
+import type { Tool } from '../types.js';
+export declare function createEditTool(applier: FileReadTracker, cwd: string): Tool;
+//# sourceMappingURL=edit.d.ts.map

package/dist/tools/edit/edit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../../src/tools/edit/edit.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE1D,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,aAAa,CAAA;AAMnD,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAyc1E"}

package/dist/tools/edit/edit.js

@@ -0,0 +1,440 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { fmtErr } from '../errors.js';
+import { generateDiff, generateDiffWithContext } from './diff-render.js';
+import { findAllLinesTolerant, normalizeLine } from './matcher.js';
+import { buildDiag, extractEditsFromJSON, parseMarkdownEdit, summarizeRawInput } from './parser.js';
+export function createEditTool(applier, cwd) {
+    return {
+        definition: {
+            name: 'edit',
+            category: 'Edit',
+            group: 'File',
+            description: `Replace exact text in files using markdown code block format.
+IMPORTANT: There is no "write" tool — always use this tool ("edit") to modify files.
+
+HOW TO USE:
+1. Read the file first with \`read\`
+2. Copy the EXACT text to replace — include 2-3 lines of context before/after
+3. Use markdown code block format below
+
+FORMAT:
+\`\`\`edit
+file: <file_path>
+old: |
+  <exact text to find>
+new: |
+  <replacement text>
+\`\`\`
+
+EXAMPLES:
+Single edit:
+\`\`\`edit
+file: src/config.ts
+old: |
+  mode: 'code'
+new: |
+  mode: 'plan'
+\`\`\`
+
+Create new file:
+\`\`\`edit
+file: src/new.ts
+old: |
+new: |
+  const x = 1
+\`\`\`
+
+Multiple files (use separate code blocks):
+\`\`\`edit
+file: src/config.ts
+old: |
+  mode: 'code'
+new: |
+  mode: 'plan'
+\`\`\`
+\`\`\`edit
+file: src/constants.ts
+old: |
+  MAX_RETRIES = 3
+new: |
+  MAX_RETRIES = 5
+\`\`\`
+
+CRITICAL RULES:
+- old and new are separated by "old:" and "new:" labels
+- Use | after label for multi-line content
+- old_string must match EXACTLY (whitespace, indentation, line breaks)
+- Do NOT include the "<lineNumber>: " prefix from read output
+- old_string must be CONTIGUOUS text from the file — you CANNOT skip lines between old_string and new_string boundaries. If you need to edit non-adjacent sections, use separate \`\`\`edit blocks.`,
+            parameters: {
+                content: {
+                    type: 'string',
+                    description: 'Markdown code block with edit instructions. See description for format.',
+                    required: true,
+                },
+            },
+        },
+        async execute(input) {
+            // Debug: keep rawInput for error messages (capture early for all error paths)
+            const rawInput = input;
+            // ── Parse markdown format ─────────────────────────────────────────
+            let edits = [];
+            // If input has 'content' field (new markdown format)
+            if (typeof input.content === 'string') {
+                // Compat: handle double-JSON-wrapped content
+                let contentStr = input.content;
+                try {
+                    const parsed = JSON.parse(contentStr);
+                    if (typeof parsed === 'string') {
+                        contentStr = parsed;
+                    }
+                    else if (parsed && typeof parsed === 'object' && typeof parsed.content === 'string') {
+                        contentStr = parsed.content;
+                    }
+                }
+                catch {
+                    // Not JSON — use as-is
+                }
+                edits = parseMarkdownEdit(contentStr);
+                if (edits.length === 0) {
+                    return {
+                        success: false,
+                        output: '',
+                        error: `Failed to parse edit format. Raw input: ${summarizeRawInput(rawInput)}\nUse: \`\`\`edit\\nfile: path\\nold: |\\ntext\\nnew: |\\ntext\\n\`\`\``,
+                    };
+                }
+            }
+            else {
+                // Legacy JSON format (backward compatibility)
+                edits = extractEditsFromJSON(input);
+            }
+            if (edits.length === 0) {
+                // Check if input specifically had empty edits array (for better error message)
+                const inputEdits = input.edits;
+                if ('edits' in input && Array.isArray(inputEdits) && inputEdits.length === 0) {
+                    return {
+                        success: false,
+                        output: '',
+                        error: `edit FAILED — no edits to apply. The edits array exists but is empty. Raw input: ${summarizeRawInput(rawInput)}`,
+                    };
+                }
+                // Check if input has edits key but it's not an array
+                if ('edits' in input && !Array.isArray(input.edits)) {
+                    return {
+                        success: false,
+                        output: '',
+                        error: `edit requires "edits" array. Use markdown format: \`\`\`edit\\nfile: path\\nold: |\\ntext\\nnew: |\\ntext\\n\`\`\`\nRaw input: ${summarizeRawInput(rawInput)}`,
+                    };
+                }
+                return {
+                    success: false,
+                    output: '',
+                    error: `No valid edits found (empty or invalid format). The edit array must contain objects with file_path, old_string, and new_string. Use markdown code block format: \`\`\`edit\\nfile: path\\nold: |\\ntext\\nnew: |\\ntext\\n\`\`\`\nRaw input: ${summarizeRawInput(rawInput)}`,
+                };
+            }
+            // Validate each edit object
+            const editErrors = [];
+            for (let i = 0; i < edits.length; i++) {
+                const e = edits[i];
+                const missing = [];
+                if (typeof e.file_path !== 'string' || !e.file_path)
+                    missing.push('file_path');
+                if (typeof e.old_string !== 'string')
+                    missing.push('old_string');
+                if (typeof e.new_string !== 'string')
+                    missing.push('new_string');
+                if (e.new_string === '__MISSING_NEW_STRING__') {
+                    missing.push('new_string (required — LLM must provide a non-empty replacement)');
+                }
+                if (missing.length > 0) {
+                    const present = Object.keys(e)
+                        .filter(k => typeof e[k] === 'string')
+                        .join(', ');
+                    editErrors.push(`  edit #${i + 1}: missing ${missing.join(', ')}${present ? ` (has: ${present})` : ''}`);
+                }
+            }
+            if (editErrors.length > 0) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `edit FAILED — ${editErrors.length} of ${edits.length} edit(s) have missing fields.\n${editErrors.join('\n')}\n\nReceived: ${summarizeRawInput(rawInput)}\n\nEach edit object must be a COMPLETE find-replace pair with BOTH old_string AND new_string.`,
+                };
+            }
+            // ── Path traversal security check (symlink-aware) ─────────────────
+            const resolvedCwd = path.resolve(cwd);
+            let realCwd;
+            try {
+                realCwd = fs.realpathSync(resolvedCwd);
+            }
+            catch {
+                realCwd = resolvedCwd;
+            }
+            for (let i = 0; i < edits.length; i++) {
+                const e = edits[i];
+                const resolved = path.resolve(cwd, e.file_path);
+                const relative = path.relative(resolvedCwd, resolved);
+                if (relative.startsWith('..') || path.isAbsolute(relative)) {
+                    return {
+                        success: false,
+                        output: '',
+                        error: 'edit FAILED — Path traversal detected: "' +
+                            e.file_path +
+                            '" resolves outside the working directory "' +
+                            resolvedCwd +
+                            '". All file paths must be within the project directory.',
+                    };
+                }
+                // Symlink-aware check: resolve real path to detect traversal via symlink
+                let realPath;
+                try {
+                    realPath = fs.realpathSync(resolved);
+                }
+                catch {
+                    // File doesn't exist yet – resolve nearest existing ancestor through symlinks
+                    let dir = path.dirname(resolved);
+                    while (!fs.existsSync(dir)) {
+                        const parent = path.dirname(dir);
+                        if (parent === dir)
+                            break; // root
+                        dir = parent;
+                    }
+                    try {
+                        realPath = path.join(fs.realpathSync(dir), path.relative(dir, resolved));
+                    }
+                    catch {
+                        realPath = resolved;
+                    }
+                }
+                const realRelative = path.relative(realCwd, realPath);
+                if (realRelative.startsWith('..') || path.isAbsolute(realRelative)) {
+                    return {
+                        success: false,
+                        output: '',
+                        error: 'edit FAILED — Path traversal detected via symlink: "' +
+                            e.file_path +
+                            '" resolves outside "' +
+                            realCwd +
+                            '".',
+                    };
+                }
+            }
+            const fileGroups = new Map();
+            for (const e of edits) {
+                const resolved = path.resolve(cwd, e.file_path);
+                if (!fileGroups.has(resolved)) {
+                    let originalContent = null;
+                    try {
+                        originalContent = fs.readFileSync(resolved, 'utf-8');
+                    }
+                    catch {
+                        /* file doesn't exist yet */
+                    }
+                    fileGroups.set(resolved, { edits: [], originalContent });
+                }
+                fileGroups.get(resolved).edits.push(e);
+            }
+            const results = [];
+            let anyFailed = false;
+            let firstError = '';
+            const modifiedFiles = new Map();
+            for (const [resolved, group] of fileGroups) {
+                const relPath = path.relative(cwd, resolved).replace(/\\/g, '/');
+                let content = group.originalContent !== null ? group.originalContent.replace(/\r\n/g, '\n') : null;
+                // Check if file was read (for stale-content diagnostics)
+                const readWarning = content !== null ? applier.checkModified(resolved) : null;
+                for (let i = group.edits.length - 1; i >= 0; i--) {
+                    const e = group.edits[i];
+                    // Normalize CRLF → LF in AI-provided strings (critical on Windows)
+                    e.old_string = e.old_string.replace(/\r\n/g, '\n');
+                    e.new_string = e.new_string.replace(/\r\n/g, '\n');
+                    if (e.old_string === '') {
+                        if (content !== null) {
+                            // File already exists in-memory (from prior edit in this batch)
+                            // or on disk — treat as error to prevent silent overwrites.
+                            results.push(`  FAIL ${relPath}: Cannot create — file already exists (duplicate create in batch or file on disk)`);
+                            if (!anyFailed) {
+                                anyFailed = true;
+                                firstError = `Cannot create file "${relPath}": file already exists`;
+                            }
+                            break;
+                        }
+                        const newLines = e.new_string.split('\n').length;
+                        content = e.new_string;
+                        results.push(`  Created ${relPath} (${newLines} lines):\n${generateDiff('', e.new_string, 1)}`);
+                        continue;
+                    }
+                    if (content === null) {
+                        const diag = buildDiag(e);
+                        const suggestion = `  → Check the file path, or create it first with old_string: "" (empty string).`;
+                        results.push(`  FAIL ${relPath}: File not found
+  Edit: ${diag}
+${suggestion}`);
+                        if (!anyFailed) {
+                            anyFailed = true;
+                            firstError = `File not found: ${relPath}`;
+                        }
+                        break;
+                    }
+                    // ── Tier 1: Exact match ──────────────────────────────────────
+                    const exactIdx = content.indexOf(e.old_string);
+                    let matchInfo = null;
+                    if (exactIdx !== -1) {
+                        // Exact match found — check for duplicates
+                        const lastIdx = content.lastIndexOf(e.old_string);
+                        if (exactIdx !== lastIdx) {
+                            const diag = buildDiag(e);
+                            const suggestion = `  → Include more surrounding context lines (2-3 lines before and after) in old_string to make the match unique.`;
+                            results.push(`  FAIL ${relPath}: old_string appears MULTIPLE times
+  Edit: ${diag}
+${suggestion}`);
+                            if (!anyFailed) {
+                                anyFailed = true;
+                                firstError = `old_string appears MULTIPLE times in ${relPath}`;
+                            }
+                            break;
+                        }
+                        matchInfo = { index: exactIdx, length: e.old_string.length, strategy: 'exact' };
+                    }
+                    else {
+                        // ── Tier 2: Whitespace-normalized fallback ─────────────────
+                        const tolerant = findAllLinesTolerant(content, e.old_string);
+                        if (tolerant.length === 0) {
+                            // Not found by any strategy — check if old_string lines are scattered (non-contiguous)
+                            const contentLines = content.split('\n');
+                            const oldLines = e.old_string.split('\n').filter(l => l.trim());
+                            const foundIndices = [];
+                            for (const ol of oldLines) {
+                                const normOl = normalizeLine(ol.trim());
+                                if (!normOl)
+                                    continue;
+                                const idx = contentLines.findIndex((cl, ci) => !foundIndices.includes(ci) && normalizeLine(cl).includes(normOl));
+                                if (idx !== -1)
+                                    foundIndices.push(idx);
+                            }
+                            let hint = '';
+                            const isScattered = foundIndices.length >= 2 &&
+                                foundIndices[foundIndices.length - 1] - foundIndices[0] + 1 > foundIndices.length;
+                            if (isScattered) {
+                                hint = `\n  ⚠️  ${foundIndices.length} lines of old_string were found in the file, but they are NOT contiguous — you skipped lines between them.
+  old_string must be a CONTIGUOUS chunk of the file. Use separate \`\`\`edit blocks for each section (see "Multiple files" example above).
+  Matched at lines: ${foundIndices.map(i => i + 1).join(', ')}`;
+                            }
+                            else {
+                                const firstLine = (e.old_string.split('\n')[0] || '').trim();
+                                if (firstLine) {
+                                    const normFirst = normalizeLine(firstLine);
+                                    const similarIdx = contentLines.findIndex(l => l.length > 0 && normFirst.length > 0 && normalizeLine(l).includes(normFirst));
+                                    if (similarIdx !== -1) {
+                                        const start = Math.max(0, similarIdx - 1);
+                                        const end = Math.min(contentLines.length, similarIdx + 2);
+                                        const snippet = contentLines.slice(start, end).join('\n');
+                                        hint = `\n  Near line ${similarIdx + 1}:\n  """\n${snippet}\n  """`;
+                                    }
+                                }
+                                if (!hint && contentLines.length > 0) {
+                                    const lines = contentLines.slice(0, Math.min(contentLines.length, 5));
+                                    hint = `\n  File content (first ${lines.length} lines):\n  """\n${lines.join('\n')}\n  """`;
+                                }
+                            }
+                            const diag = buildDiag(e);
+                            const readHint = readWarning ? `\n  ${readWarning}` : '';
+                            const suggestion = `  → Read the file again with read({ paths: ["${e.file_path}"] }) to get current content, then retry with exact matching text. Include 2-3 lines of surrounding context for uniqueness.${readHint}`;
+                            results.push(`  FAIL ${relPath}: old_string not found${hint}
+  Edit: ${diag}
+${suggestion}`);
+                            if (!anyFailed) {
+                                anyFailed = true;
+                                firstError = `old_string not found in ${relPath}${hint}`;
+                            }
+                            break;
+                        }
+                        if (tolerant.length > 1) {
+                            const diag = buildDiag(e);
+                            const suggestion = `  → Include more surrounding context lines (2-3 lines before and after) in old_string to make the match unique.`;
+                            results.push(`  FAIL ${relPath}: old_string appears MULTIPLE times (whitespace-normalized)\n  Edit: ${diag}\n${suggestion}`);
+                            if (!anyFailed) {
+                                anyFailed = true;
+                                firstError = `old_string appears MULTIPLE times in ${relPath} (whitespace-normalized)`;
+                            }
+                            break;
+                        }
+                        matchInfo = {
+                            index: tolerant[0].index,
+                            length: tolerant[0].length,
+                            strategy: 'tolerant',
+                        };
+                    }
+                    // For tolerant matching, use the actual file text at the match position
+                    // so the diff reflects what was really in the file (with original whitespace).
+                    const matchedOld = matchInfo.strategy === 'tolerant'
+                        ? content.slice(matchInfo.index, matchInfo.index + matchInfo.length)
+                        : e.old_string;
+                    const diff = generateDiffWithContext(content, matchedOld, e.new_string, matchInfo.index, matchInfo.length);
+                    results.push(`  Edited ${relPath}:\n${diff}`);
+                    content =
+                        content.slice(0, matchInfo.index) +
+                            e.new_string +
+                            content.slice(matchInfo.index + matchInfo.length);
+                }
+                if (anyFailed)
+                    break;
+                modifiedFiles.set(resolved, content);
+            }
+            if (anyFailed) {
+                for (const [filePath, group] of fileGroups) {
+                    const originalContent = group.originalContent;
+                    if (originalContent === null) {
+                        try {
+                            fs.unlinkSync(filePath);
+                        }
+                        catch {
+                            /* ok */
+                        }
+                    }
+                    else {
+                        try {
+                            fs.mkdirSync(path.dirname(filePath), { recursive: true });
+                            fs.writeFileSync(filePath, originalContent, 'utf-8');
+                        }
+                        catch {
+                            /* ok */
+                        }
+                    }
+                    applier.markRead(filePath);
+                }
+                // Only show FAIL lines in the error (successful edits were rolled back)
+                const failLines = results.filter(r => r.startsWith('  FAIL ')).join('\n');
+                return {
+                    success: false,
+                    output: '',
+                    error: `Edit FAILED — all changes rolled back.\n${failLines}\n\n${firstError}`,
+                };
+            }
+            for (const [resolved, content] of modifiedFiles) {
+                try {
+                    if (content === null) {
+                        fs.unlinkSync(resolved);
+                    }
+                    else {
+                        fs.mkdirSync(path.dirname(resolved), { recursive: true });
+                        fs.writeFileSync(resolved, content, 'utf-8');
+                    }
+                }
+                catch (err) {
+                    return {
+                        success: false,
+                        output: '',
+                        error: `Failed to write ${path.relative(cwd, resolved).replace(/\\/g, '/')}: ${fmtErr(err)}. Input: ${summarizeRawInput(rawInput)}`,
+                    };
+                }
+                applier.markRead(resolved);
+            }
+            return {
+                success: true,
+                output: results.join('\n').replace(/^ {2}/gm, ''),
+            };
+        },
+    };
+}
+//# sourceMappingURL=edit.js.map

package/dist/tools/edit/edit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../../src/tools/edit/edit.ts"],"names":[],"mappings":"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"}

package/dist/tools/edit/matcher.d.ts

@@ -0,0 +1,24 @@
+import type { MatchPos } from './types.js';
+/**
+ * Normalize a line for whitespace-tolerant comparison:
+ * 1. Trim leading/trailing whitespace
+ * 2. Collapse runs of 2+ spaces/tabs into a single space
+ *
+ * This handles whitespace differences ANYWHERE on the line:
+ * - Leading/trailing spaces → `trim()` removes them
+ * - Extra internal spaces → `"foo  bar"` → `"foo bar"`
+ * - Blank lines with spaces → `"   "` → `""`
+ */
+/** Export for testing */
+export declare function normalizeLine(s: string): string;
+/**
+ * Sliding-window line search that ignores whitespace differences
+ * (leading, trailing, and internal runs).
+ *
+ * Returns all match positions in the ORIGINAL (unnormalized) content,
+ * so the caller can do content.slice(match.index, match.index + match.length)
+ * to extract the actual matched text (with its original whitespace).
+ */
+/** Export for testing */
+export declare function findAllLinesTolerant(content: string, oldString: string): MatchPos[];
+//# sourceMappingURL=matcher.d.ts.map

package/dist/tools/edit/matcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../../src/tools/edit/matcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C;;;;;;;;;GASG;AACH,yBAAyB;AACzB,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED;;;;;;;GAOG;AACH,yBAAyB;AACzB,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,EAAE,CA2CnF"}