lonny-agent 0.2.4 → 0.2.7

package/dist/tools/edit/matcher.js

@@ -0,0 +1,66 @@
+/**
+ * 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 function normalizeLine(s) {
+    return s.trim().replace(/[ \t]{2,}/g, ' ');
+}
+/**
+ * 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 function findAllLinesTolerant(content, oldString) {
+    if (oldString === '')
+        return [];
+    const contentLines = content.split('\n');
+    const oldLines = oldString.split('\n');
+    if (oldLines.length > contentLines.length)
+        return [];
+    // Pre-normalize for speed
+    const normContent = contentLines.map(normalizeLine);
+    const normOld = oldLines.map(normalizeLine);
+    const matches = [];
+    for (let start = 0; start <= normContent.length - normOld.length; start++) {
+        let match = true;
+        for (let j = 0; j < normOld.length; j++) {
+            if (normContent[start + j] !== normOld[j]) {
+                match = false;
+                break;
+            }
+        }
+        if (match) {
+            // Compute byte position in ORIGINAL (unnormalized) content
+            let charPos = 0;
+            for (let k = 0; k < start; k++) {
+                charPos += contentLines[k].length + 1; // +1 for the \n
+            }
+            // Compute matched text length in ORIGINAL content
+            let matchedLen = 0;
+            for (let j = 0; j < oldLines.length; j++) {
+                const line = contentLines[start + j];
+                let lineLen = line.length;
+                // CRLF: the last line's trailing \r is part of content but not in oldString
+                if (j === oldLines.length - 1 && line.endsWith('\r'))
+                    lineLen -= 1;
+                matchedLen += lineLen;
+                if (j < oldLines.length - 1)
+                    matchedLen += 1; // +1 for the \n
+            }
+            matches.push({ index: charPos, length: matchedLen });
+        }
+    }
+    return matches;
+}
+//# sourceMappingURL=matcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../../src/tools/edit/matcher.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,yBAAyB;AACzB,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC,CAAA;AAC5C,CAAC;AAED;;;;;;;GAOG;AACH,yBAAyB;AACzB,MAAM,UAAU,oBAAoB,CAAC,OAAe,EAAE,SAAiB;IACrE,IAAI,SAAS,KAAK,EAAE;QAAE,OAAO,EAAE,CAAA;IAE/B,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEtC,IAAI,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM;QAAE,OAAO,EAAE,CAAA;IAEpD,0BAA0B;IAC1B,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAE3C,MAAM,OAAO,GAAe,EAAE,CAAA;IAE9B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,WAAW,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1E,IAAI,KAAK,GAAG,IAAI,CAAA;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,IAAI,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1C,KAAK,GAAG,KAAK,CAAA;gBACb,MAAK;YACP,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,2DAA2D;YAC3D,IAAI,OAAO,GAAG,CAAC,CAAA;YACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC/B,OAAO,IAAI,YAAY,CAAC,CAAC,CAAE,CAAC,MAAM,GAAG,CAAC,CAAA,CAAC,gBAAgB;YACzD,CAAC;YACD,kDAAkD;YAClD,IAAI,UAAU,GAAG,CAAC,CAAA;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzC,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,GAAG,CAAC,CAAE,CAAA;gBACrC,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAA;gBACzB,4EAA4E;gBAC5E,IAAI,CAAC,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAAE,OAAO,IAAI,CAAC,CAAA;gBAClE,UAAU,IAAI,OAAO,CAAA;gBACrB,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC;oBAAE,UAAU,IAAI,CAAC,CAAA,CAAC,gBAAgB;YAC/D,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC"}

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

@@ -0,0 +1,10 @@
+import type { Edit, SingleEdit } from './types.js';
+/** Build diagnostic JSON for error messages */
+export declare function buildDiag(edit: SingleEdit): string;
+/** Summarize raw input for error messages to avoid dumping huge strings into the LLM context. */
+export declare function summarizeRawInput(rawInput: unknown): string;
+/** Export for testing */
+export declare function parseMarkdownEdit(content: string): Edit[];
+/** Extract edits from legacy JSON format (backward compatibility) */
+export declare function extractEditsFromJSON(input: Record<string, unknown>): Edit[];
+//# sourceMappingURL=parser.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../../src/tools/edit/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAElD,+CAA+C;AAC/C,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAMlD;AAED,iGAAiG;AACjG,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAI3D;AAED,yBAAyB;AACzB,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,CAoDzD;AAED,qEAAqE;AACrE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EAAE,CAwD3E"}

package/dist/tools/edit/parser.js

@@ -0,0 +1,120 @@
+/** Build diagnostic JSON for error messages */
+export function buildDiag(edit) {
+    return JSON.stringify({
+        file_path: edit.file_path,
+        old_string: edit.old_string,
+        new_string: edit.new_string,
+    });
+}
+/** Summarize raw input for error messages to avoid dumping huge strings into the LLM context. */
+export function summarizeRawInput(rawInput) {
+    const s = JSON.stringify(rawInput);
+    if (s.length <= 500)
+        return s;
+    return `${s.slice(0, 500)}... [truncated, total ${s.length} chars]`;
+}
+/** Export for testing */
+export function parseMarkdownEdit(content) {
+    const edits = [];
+    function parseEditBlock(raw) {
+        // Remove stray ``` lines (model may close the block early before new:)
+        const cleaned = raw.replace(/^```\s*$/gm, '');
+        const fileMatch = cleaned.match(/^file:\s*(.+)$/m);
+        if (!fileMatch)
+            return null;
+        const filePath = fileMatch[1].trim();
+        let oldString = '';
+        let newString = '';
+        const oldMatch = cleaned.match(/^old:(?:\s*\|\s*[\d\-+]*\r?\n)?([\s\S]*?)^new:/m);
+        const newMatch = cleaned.match(/^new:(?:\s*\|\s*[\d\-+]*\r?\n)?([\s\S]*)$/m);
+        if (oldMatch) {
+            oldString = oldMatch[1].replace(/^\n+/, '').replace(/\n+$/, '');
+        }
+        if (newMatch) {
+            newString = newMatch[1].replace(/^\n+/, '').replace(/\n+$/, '');
+        }
+        return { file_path: filePath, old_string: oldString || '', new_string: newString || '' };
+    }
+    // Strategy 1: Non-greedy block regex (handles multi-edit, correct formatting)
+    const blockRegex = /```edit\s*([\s\S]*?)```/gi;
+    for (const regexMatch of content.matchAll(blockRegex)) {
+        const edit = parseEditBlock(regexMatch[1]);
+        if (edit)
+            edits.push(edit);
+    }
+    // Strategy 2: If no edit with new_string found (model likely closed ``` before new:),
+    // retry with greedy matching to capture everything up to the last ```
+    if (!edits.some(e => e.new_string)) {
+        edits.length = 0;
+        const greedyRegex = /```edit\s*([\s\S]*)```/g;
+        for (const regexMatch of content.matchAll(greedyRegex)) {
+            const edit = parseEditBlock(regexMatch[1]);
+            if (edit)
+                edits.push(edit);
+        }
+    }
+    // Strategy 3: No block markers at all — try parsing raw content directly
+    if (edits.length === 0) {
+        const edit = parseEditBlock(content);
+        if (edit)
+            edits.push(edit);
+    }
+    return edits;
+}
+/** Extract edits from legacy JSON format (backward compatibility) */
+export function extractEditsFromJSON(input) {
+    // Pattern 0: input is an array (edits passed directly instead of wrapped)
+    if (Array.isArray(input)) {
+        // Preserve array for validation
+        return input;
+    }
+    // Pattern 1: input has file_path, old_string, new_string at top level (missing edits array)
+    if (!Array.isArray(input.edits)) {
+        const keys = Object.keys(input);
+        // Check if the keys look like a single edit object (file_path + old_string + new_string)
+        const hasFilePath = typeof input.file_path === 'string';
+        const hasOldString = typeof input.old_string === 'string';
+        const hasNewString = typeof input.new_string === 'string';
+        if (hasFilePath && hasOldString && hasNewString) {
+            return [
+                {
+                    file_path: input.file_path,
+                    old_string: input.old_string,
+                    new_string: input.new_string,
+                },
+            ];
+        }
+        else if (hasFilePath && hasOldString) {
+            // Only file_path + old_string (missing new_string) — use a sentinel
+            // value so validation catches this as an error instead of silently deleting content.
+            return [
+                {
+                    file_path: input.file_path,
+                    old_string: input.old_string,
+                    new_string: input.new_string || '__MISSING_NEW_STRING__',
+                },
+            ];
+        }
+        else if (keys.length === 2 && hasFilePath && typeof input.new_string === 'string') {
+            // file_path + new_string but no old_string — treat as new file creation
+            return [
+                {
+                    file_path: input.file_path,
+                    old_string: '',
+                    new_string: input.new_string,
+                },
+            ];
+        }
+        else if (keys.length === 1 && hasFilePath) {
+            // Only file_path — maybe they meant create file with empty content?
+            return [{ file_path: input.file_path, old_string: '', new_string: '' }];
+        }
+        return [];
+    }
+    // If edits is an array (even empty), preserve for validation
+    if (Array.isArray(input.edits)) {
+        return input.edits;
+    }
+    return [];
+}
+//# sourceMappingURL=parser.js.map

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

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

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

@@ -0,0 +1,16 @@
+export type DiffLineType = 'delete' | 'insert' | 'equal';
+export interface DiffLine {
+    type: DiffLineType;
+    content: string;
+}
+export interface MatchPos {
+    index: number;
+    length: number;
+}
+export interface SingleEdit {
+    file_path: string;
+    old_string: string;
+    new_string: string;
+}
+export type Edit = SingleEdit;
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tools/edit/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAA;AAExD,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,MAAM,IAAI,GAAG,UAAU,CAAA"}

package/dist/tools/edit/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/tools/edit/types.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,5 @@
+import type { Tool } from '../types.js';
+/** Directory where plans are stored, relative to project root */
+export declare const PLAN_DIR = ".lonny";
+export declare function createWritePlanTool(cwd: string, onPlanWritten?: (display: string) => void | Promise<void>): Tool;
+//# sourceMappingURL=write_plan.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"write_plan.d.ts","sourceRoot":"","sources":["../../../src/tools/edit/write_plan.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,aAAa,CAAA;AAEnD,iEAAiE;AACjE,eAAO,MAAM,QAAQ,WAAW,CAAA;AAqBhC,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACxD,IAAI,CA4EN"}

package/dist/tools/edit/write_plan.js

@@ -0,0 +1,98 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import { fmtErr } from '../errors.js';
+/** Directory where plans are stored, relative to project root */
+export const PLAN_DIR = '.lonny';
+/** Maximum plan content size (1MB) */
+const MAX_CONTENT_SIZE = 1_000_000;
+function sanitizeFilename(name) {
+    const trimmed = name.trim();
+    if (!trimmed)
+        return '';
+    // Reject absolute paths (unix /foo or windows C:\foo) up front.
+    if (trimmed.startsWith('/') || trimmed.startsWith('\\') || /^[a-zA-Z]:/.test(trimmed))
+        return '';
+    // Reject path traversal.
+    if (trimmed.includes('..'))
+        return '';
+    // Normalize separators and strip any leading ".lonny/" the model may add.
+    const normalized = trimmed
+        .replace(/\\/g, '/')
+        .replace(/^\.lonny\//, '')
+        .replace(/^\/+/, '');
+    if (!normalized || normalized === '.')
+        return '';
+    return normalized;
+}
+export function createWritePlanTool(cwd, onPlanWritten) {
+    return {
+        definition: {
+            name: 'write_plan',
+            category: 'Edit',
+            group: 'Plan',
+            description: `Write a plan/todo document to the project's "${PLAN_DIR}/" folder. Use this in plan mode to persist the generated plan. The file is always created under "${PLAN_DIR}/" relative to the working directory; do NOT include the folder prefix in filename. Existing files with the same name will be overwritten.`,
+            parameters: {
+                filename: {
+                    type: 'string',
+                    description: 'File name (e.g. "plan.md" or "feature-x/plan.md"). Must NOT be absolute or contain "..". Will be placed under .lonny/.',
+                    required: true,
+                },
+                content: {
+                    type: 'string',
+                    description: 'Full markdown content of the plan, including the Plan section and Todo List.',
+                    required: true,
+                },
+            },
+        },
+        async execute(input) {
+            if (typeof input.filename !== 'string' || !input.filename) {
+                return { success: false, output: '', error: 'filename is required (string)' };
+            }
+            if (typeof input.content !== 'string') {
+                return { success: false, output: '', error: 'content is required (string)' };
+            }
+            const filename = input.filename;
+            const content = input.content;
+            // Check content size
+            if (content.length > MAX_CONTENT_SIZE) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `Content too large (max ${MAX_CONTENT_SIZE} bytes)`,
+                };
+            }
+            const safeName = sanitizeFilename(filename);
+            if (!safeName) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `Invalid filename: "${filename}". Use a relative name without ".." or absolute paths.`,
+                };
+            }
+            const planDir = path.resolve(cwd, PLAN_DIR);
+            const target = path.resolve(planDir, safeName);
+            const rel = path.relative(planDir, target);
+            if (rel.startsWith('..') || path.isAbsolute(rel) || rel === '') {
+                return { success: false, output: '', error: 'Resolved path escapes .lonny/ directory.' };
+            }
+            try {
+                await fs.mkdir(path.dirname(target), { recursive: true });
+                await fs.writeFile(target, content, 'utf8');
+                const display = path.relative(cwd, target).replace(/\\/g, '/');
+                await Promise.resolve(onPlanWritten?.(display));
+                return {
+                    success: true,
+                    output: `Wrote plan to ${display} (${Buffer.byteLength(content, 'utf8')} bytes)`,
+                };
+            }
+            catch (err) {
+                return {
+                    success: false,
+                    output: '',
+                    error: `Failed to write plan: ${fmtErr(err)}`,
+                };
+            }
+        },
+    };
+}
+//# sourceMappingURL=write_plan.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"write_plan.js","sourceRoot":"","sources":["../../../src/tools/edit/write_plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAGrC,iEAAiE;AACjE,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAA;AAEhC,sCAAsC;AACtC,MAAM,gBAAgB,GAAG,SAAS,CAAA;AAElC,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAC3B,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAA;IACvB,gEAAgE;IAChE,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAA;IAChG,yBAAyB;IACzB,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAA;IACrC,0EAA0E;IAC1E,MAAM,UAAU,GAAG,OAAO;SACvB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;SACzB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,GAAG;QAAE,OAAO,EAAE,CAAA;IAChD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,GAAW,EACX,aAAyD;IAEzD,OAAO;QACL,UAAU,EAAE;YACV,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,MAAM;YACb,WAAW,EAAE,gDAAgD,QAAQ,qGAAqG,QAAQ,4IAA4I;YAC9T,UAAU,EAAE;gBACV,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,wHAAwH;oBAC1H,QAAQ,EAAE,IAAI;iBACf;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,8EAA8E;oBAChF,QAAQ,EAAE,IAAI;iBACf;aACF;SACF;QACD,KAAK,CAAC,OAAO,CAAC,KAAK;YACjB,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAC1D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAA;YAC/E,CAAC;YACD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACtC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAA;YAC9E,CAAC;YAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;YAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;YAE7B,qBAAqB;YACrB,IAAI,OAAO,CAAC,MAAM,GAAG,gBAAgB,EAAE,CAAC;gBACtC,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,EAAE;oBACV,KAAK,EAAE,0BAA0B,gBAAgB,SAAS;iBAC3D,CAAA;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAA;YAC3C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,EAAE;oBACV,KAAK,EAAE,sBAAsB,QAAQ,wDAAwD;iBAC9F,CAAA;YACH,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;YAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YAC1C,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,EAAE,EAAE,CAAC;gBAC/D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,0CAA0C,EAAE,CAAA;YAC1F,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;gBACzD,MAAM,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;gBAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBAC9D,MAAM,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;gBAC/C,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,MAAM,EAAE,iBAAiB,OAAO,KAAK,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS;iBACjF,CAAA;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE,EAAE;oBACV,KAAK,EAAE,yBAAyB,MAAM,CAAC,GAAG,CAAC,EAAE;iBAC9C,CAAA;YACH,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/tools/edit.d.ts

@@ -1,21 +1,62 @@
 import type { FileReadTracker } from '../diff/apply.js';
 import type { Tool } from './types.js';
-export type DiffLineType = 'old' | 'new';
+export type DiffLineType = 'delete' | 'insert' | 'equal';
 export interface DiffLine {
-    lineNum: number;
     type: DiffLineType;
     content: string;
 }
-/** Compute diff lines (pure data, no rendering) */
-export declare function computeDiff(oldStr: string, newStr: string, startLine?: number): DiffLine[];
-/** Terminal renderer */
-export declare function renderDiffTerminal(lines: DiffLine[]): string;
+/** Compute diff lines using jest-diff for proper line-level diffs */
+export declare function computeDiff(oldStr: string, newStr: string): DiffLine[];
+/** Terminal renderer — unified-diff format with color */
+export declare function renderDiffTerminal(lines: DiffLine[], startLineNum?: number): string;
 /** HTML renderer for web output */
 export declare function renderDiffHtml(lines: DiffLine[]): string;
+/** Escape HTML special characters */
+export declare function escapeHtml(str: string): string;
 /**
- * Generate diff output (backward compatible).
- * Delegates to terminal renderer by default.
+ * Generate diff output using jest-diff.
+ * Returns terminal-colored unified-diff format with line numbers.
  */
-export declare function generateDiff(oldStr: string, newStr: string, startLine?: number): string;
+export declare function generateDiff(oldStr: string, newStr: string, startLineNum?: number): string;
+/**
+ * Generate diff with surrounding context lines (1 before, 1 after)
+ * and line numbers. Context lines are extracted from the full file content.
+ */
+export declare function generateDiffWithContext(fullContent: string, oldStr: string, newStr: string, matchIndex: number, matchLength: number): string;
+/**
+ * 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;
+interface MatchPos {
+    index: number;
+    length: number;
+}
+/**
+ * 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[];
+interface SingleEdit {
+    file_path: string;
+    old_string: string;
+    new_string: string;
+}
+type Edit = SingleEdit;
+/** Export for testing */
+export declare function parseMarkdownEdit(content: string): Edit[];
 export declare function createEditTool(applier: FileReadTracker, cwd: string): Tool;
+export {};
 //# sourceMappingURL=edit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,YAAY,CAAA;AAGlD,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,KAAK,CAAA;AAExC,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB;AAoBD,mDAAmD;AACnD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAI,GAAG,QAAQ,EAAE,CAarF;AAED,wBAAwB;AACxB,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAc5D;AAED,mCAAmC;AACnC,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAgBxD;AAWD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAI,GAAG,MAAM,CAGlF;AA4ED,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAwX1E"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/tools/edit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEvD,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,YAAY,CAAA;AAGlD,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAA;AAExD,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;CAChB;AA6BD,qEAAqE;AACrE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,CAgBtE;AAED,yDAAyD;AACzD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAoBnF;AAED,mCAAmC;AACnC,wBAAgB,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,CAcxD;AAED,qCAAqC;AACrC,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO9C;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAG1F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAClB,MAAM,CA6DR;AAED;;;;;;;;;GASG;AACH,yBAAyB;AACzB,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;;;GAOG;AACH,yBAAyB;AACzB,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,QAAQ,EAAE,CA2CnF;AAED,UAAU,UAAU;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,KAAK,IAAI,GAAG,UAAU,CAAA;AAEtB,yBAAyB;AACzB,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,CAoDzD;AA6DD,wBAAgB,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAoa1E"}