@hibanacloud/core 0.3.15

package/dist/src/utils/editHelper.js

@@ -0,0 +1,359 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Helpers for reconciling LLM-proposed edits with on-disk text.
+ *
+ * The normalization pipeline intentionally stays deterministic: we first try
+ * literal substring matches, then gradually relax comparison rules (smart
+ * quotes, em-dashes, trailing whitespace, etc.) until we either locate the
+ * exact slice from the file or conclude the edit cannot be applied.
+ */
+/* -------------------------------------------------------------------------- */
+/* Character-level normalization                                             */
+/* -------------------------------------------------------------------------- */
+const UNICODE_EQUIVALENT_MAP = {
+    // Hyphen variations → ASCII hyphen-minus.
+    '\u2010': '-',
+    '\u2011': '-',
+    '\u2012': '-',
+    '\u2013': '-',
+    '\u2014': '-',
+    '\u2015': '-',
+    '\u2212': '-',
+    // Curly single quotes → straight apostrophe.
+    '\u2018': "'",
+    '\u2019': "'",
+    '\u201A': "'",
+    '\u201B': "'",
+    // Curly double quotes → straight double quote.
+    '\u201C': '"',
+    '\u201D': '"',
+    '\u201E': '"',
+    '\u201F': '"',
+    // Whitespace variants → normal space.
+    '\u00A0': ' ',
+    '\u2002': ' ',
+    '\u2003': ' ',
+    '\u2004': ' ',
+    '\u2005': ' ',
+    '\u2006': ' ',
+    '\u2007': ' ',
+    '\u2008': ' ',
+    '\u2009': ' ',
+    '\u200A': ' ',
+    '\u202F': ' ',
+    '\u205F': ' ',
+    '\u3000': ' ',
+};
+function normalizeBasicCharacters(text) {
+    if (text === '') {
+        return text;
+    }
+    let normalized = '';
+    for (const char of text) {
+        normalized += UNICODE_EQUIVALENT_MAP[char] ?? char;
+    }
+    return normalized;
+}
+/**
+ * Removes trailing whitespace from each line while keeping the original newline
+ * separators intact.
+ */
+function stripTrailingWhitespacePreserveNewlines(text) {
+    const pieces = text.split(/(\r\n|\n|\r)/);
+    let result = '';
+    for (let i = 0; i < pieces.length; i++) {
+        const segment = pieces[i];
+        if (segment === undefined) {
+            continue;
+        }
+        if (i % 2 === 0) {
+            result += segment.trimEnd();
+        }
+        else {
+            result += segment;
+        }
+    }
+    return result;
+}
+/**
+ * Comparison passes become progressively more forgiving, making it possible to
+ * match when only trailing whitespace differs. Leading whitespace (indentation)
+ * is always preserved to avoid matching at incorrect scope levels.
+ */
+const LINE_COMPARISON_PASSES = [
+    (value) => value,
+    (value) => value.trimEnd(),
+];
+function normalizeLineForComparison(value) {
+    return normalizeBasicCharacters(value).trimEnd();
+}
+/**
+ * Finds the first index where {@link pattern} appears within {@link lines} once
+ * both sequences are transformed in the same way.
+ */
+function seekSequenceWithTransform(lines, pattern, transform) {
+    if (pattern.length === 0) {
+        return 0;
+    }
+    if (pattern.length > lines.length) {
+        return null;
+    }
+    outer: for (let i = 0; i <= lines.length - pattern.length; i++) {
+        for (let p = 0; p < pattern.length; p++) {
+            if (transform(lines[i + p]) !== transform(pattern[p])) {
+                continue outer;
+            }
+        }
+        return i;
+    }
+    return null;
+}
+function buildLineIndex(text) {
+    const lines = text.split('\n');
+    const offsets = new Array(lines.length + 1);
+    let cursor = 0;
+    for (let i = 0; i < lines.length; i++) {
+        offsets[i] = cursor;
+        cursor += lines[i].length;
+        if (i < lines.length - 1) {
+            cursor += 1; // Account for the newline that split() removed.
+        }
+    }
+    offsets[lines.length] = text.length;
+    return { lines, offsets };
+}
+/**
+ * Reconstructs the original characters for the matched lines, optionally
+ * preserving the newline that follows the final line.
+ */
+function sliceFromLines(text, offsets, lines, startLine, lineCount, includeTrailingNewline) {
+    if (lineCount === 0) {
+        return includeTrailingNewline ? '\n' : '';
+    }
+    const startIndex = offsets[startLine] ?? 0;
+    const lastLineIndex = startLine + lineCount - 1;
+    const lastLineStart = offsets[lastLineIndex] ?? 0;
+    let endIndex = lastLineStart + (lines[lastLineIndex]?.length ?? 0);
+    if (includeTrailingNewline) {
+        const nextLineStart = offsets[startLine + lineCount];
+        if (nextLineStart !== undefined) {
+            endIndex = nextLineStart;
+        }
+        else if (text.endsWith('\n')) {
+            endIndex = text.length;
+        }
+    }
+    return text.slice(startIndex, endIndex);
+}
+function findLineBasedMatch(haystack, needle) {
+    const { lines, offsets } = buildLineIndex(haystack);
+    const patternLines = needle.split('\n');
+    const endsWithNewline = needle.endsWith('\n');
+    if (patternLines.length === 0) {
+        return null;
+    }
+    const attemptMatch = (candidate) => {
+        for (const pass of LINE_COMPARISON_PASSES) {
+            const idx = seekSequenceWithTransform(lines, candidate, pass);
+            if (idx !== null) {
+                return idx;
+            }
+        }
+        return seekSequenceWithTransform(lines, candidate, normalizeLineForComparison);
+    };
+    let matchIndex = attemptMatch(patternLines);
+    if (matchIndex !== null) {
+        return {
+            slice: sliceFromLines(haystack, offsets, lines, matchIndex, patternLines.length, endsWithNewline),
+            removedTrailingFinalEmptyLine: false,
+        };
+    }
+    if (patternLines.at(-1) === '') {
+        const trimmedPattern = patternLines.slice(0, -1);
+        if (trimmedPattern.length === 0) {
+            return null;
+        }
+        matchIndex = attemptMatch(trimmedPattern);
+        if (matchIndex !== null) {
+            return {
+                slice: sliceFromLines(haystack, offsets, lines, matchIndex, trimmedPattern.length, false),
+                removedTrailingFinalEmptyLine: true,
+            };
+        }
+    }
+    return null;
+}
+/* -------------------------------------------------------------------------- */
+/* Slice discovery                                                           */
+/* -------------------------------------------------------------------------- */
+function findMatchedSlice(haystack, needle) {
+    if (needle === '') {
+        return null;
+    }
+    const literalIndex = haystack.indexOf(needle);
+    if (literalIndex !== -1) {
+        return {
+            slice: haystack.slice(literalIndex, literalIndex + needle.length),
+            removedTrailingFinalEmptyLine: false,
+        };
+    }
+    const normalizedHaystack = normalizeBasicCharacters(haystack);
+    const normalizedNeedleChars = normalizeBasicCharacters(needle);
+    const normalizedIndex = normalizedHaystack.indexOf(normalizedNeedleChars);
+    if (normalizedIndex !== -1) {
+        return {
+            slice: haystack.slice(normalizedIndex, normalizedIndex + needle.length),
+            removedTrailingFinalEmptyLine: false,
+        };
+    }
+    return findLineBasedMatch(haystack, needle);
+}
+/**
+ * Returns the literal slice from {@link haystack} that best corresponds to the
+ * provided {@link needle}, or {@code null} when no match is found.
+ */
+/* -------------------------------------------------------------------------- */
+/* Replacement helpers                                                       */
+/* -------------------------------------------------------------------------- */
+function removeTrailingNewline(text) {
+    if (text.endsWith('\r\n')) {
+        return text.slice(0, -2);
+    }
+    if (text.endsWith('\n') || text.endsWith('\r')) {
+        return text.slice(0, -1);
+    }
+    return text;
+}
+function adjustNewStringForTrailingLine(newString, removedTrailingLine) {
+    return removedTrailingLine ? removeTrailingNewline(newString) : newString;
+}
+/**
+ * Runs the core normalization pipeline:
+ *   1. Strip trailing whitespace copied from numbered output.
+ *   2. Attempt to find the literal text inside {@link fileContent}.
+ *   3. If found through a relaxed match (smart quotes, line trims, etc.),
+ *      return the canonical slice from disk so later replacements operate on
+ *      exact bytes.
+ */
+export function normalizeEditStrings(fileContent, oldString, newString) {
+    const trimmedNewString = stripTrailingWhitespacePreserveNewlines(newString);
+    if (fileContent === null || oldString === '') {
+        return {
+            oldString,
+            newString: trimmedNewString,
+        };
+    }
+    const canonicalOriginal = findMatchedSlice(fileContent, oldString);
+    if (canonicalOriginal !== null) {
+        return {
+            oldString: canonicalOriginal.slice,
+            newString: adjustNewStringForTrailingLine(trimmedNewString, canonicalOriginal.removedTrailingFinalEmptyLine),
+        };
+    }
+    return {
+        oldString,
+        newString: trimmedNewString,
+    };
+}
+/**
+ * When deleting text and the on-disk content contains the same substring with a
+ * trailing newline, automatically consume that newline so the removal does not
+ * leave a blank line behind.
+ */
+export function maybeAugmentOldStringForDeletion(fileContent, oldString, newString) {
+    if (fileContent === null ||
+        oldString === '' ||
+        newString !== '' ||
+        oldString.endsWith('\n')) {
+        return oldString;
+    }
+    const candidate = `${oldString}\n`;
+    return fileContent.includes(candidate) ? candidate : oldString;
+}
+/**
+ * Counts the number of non-overlapping occurrences of {@link substr} inside
+ * {@link source}. Returns 0 when the substring is empty.
+ */
+export function countOccurrences(source, substr) {
+    if (substr === '') {
+        return 0;
+    }
+    let count = 0;
+    let index = source.indexOf(substr);
+    while (index !== -1) {
+        count++;
+        index = source.indexOf(substr, index + substr.length);
+    }
+    return count;
+}
+const SNIPPET_CONTEXT_LINES = 4;
+const SNIPPET_MAX_LINES = 1000;
+/**
+ * Extracts a snippet from the edited file showing the changed region with
+ * surrounding context. This compares the old and new content line-by-line
+ * from both ends to locate the changed region.
+ *
+ * @param oldContent The original file content before the edit (null for new files)
+ * @param newContent The new file content after the edit
+ * @param contextLines Number of context lines to show before and after the change
+ * @returns Snippet information, or null if no meaningful snippet can be extracted
+ */
+export function extractEditSnippet(oldContent, newContent) {
+    const newLines = newContent.split('\n');
+    const totalLines = newLines.length;
+    if (oldContent === null) {
+        return {
+            startLine: 1,
+            endLine: totalLines,
+            totalLines,
+            content: newContent,
+        };
+    }
+    // No changes case
+    if (oldContent === newContent || !newContent) {
+        return null;
+    }
+    const oldLines = oldContent.split('\n');
+    // Find the first line that differs from the start
+    let firstDiffLine = 0;
+    const minLength = Math.min(oldLines.length, newLines.length);
+    while (firstDiffLine < minLength) {
+        if (oldLines[firstDiffLine] !== newLines[firstDiffLine]) {
+            break;
+        }
+        firstDiffLine++;
+    }
+    // Find the first line that differs from the end
+    let oldEndIndex = oldLines.length - 1;
+    let newEndIndex = newLines.length - 1;
+    while (oldEndIndex >= firstDiffLine && newEndIndex >= firstDiffLine) {
+        if (oldLines[oldEndIndex] !== newLines[newEndIndex]) {
+            break;
+        }
+        oldEndIndex--;
+        newEndIndex--;
+    }
+    // The changed region in the new content is from firstDiffLine to newEndIndex (inclusive)
+    // Convert to 1-indexed line numbers
+    const changeStart = firstDiffLine + 1;
+    const changeEnd = newEndIndex + 1;
+    // If the change region is too large, don't generate a snippet
+    if (changeEnd - changeStart > SNIPPET_MAX_LINES) {
+        return null;
+    }
+    // Calculate snippet bounds with context
+    const snippetStart = Math.max(1, changeStart - SNIPPET_CONTEXT_LINES);
+    const snippetEnd = Math.min(totalLines, changeEnd + SNIPPET_CONTEXT_LINES);
+    const snippetLines = newLines.slice(snippetStart - 1, snippetEnd);
+    return {
+        startLine: snippetStart,
+        endLine: snippetEnd,
+        totalLines,
+        content: snippetLines.join('\n'),
+    };
+}
+//# sourceMappingURL=editHelper.js.map

package/dist/src/utils/editHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"editHelper.js","sourceRoot":"","sources":["../../../src/utils/editHelper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;GAOG;AAEH,gFAAgF;AAChF,+EAA+E;AAC/E,gFAAgF;AAEhF,MAAM,sBAAsB,GAA2B;IACrD,0CAA0C;IAC1C,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,6CAA6C;IAC7C,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,+CAA+C;IAC/C,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,sCAAsC;IACtC,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,GAAG;CACd,CAAC;AAEF,SAAS,wBAAwB,CAAC,IAAY;IAC5C,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,UAAU,IAAI,sBAAsB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IACrD,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,SAAS,uCAAuC,CAAC,IAAY;IAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC1C,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,SAAS;QACX,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAChB,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,OAAO,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAWD;;;;GAIG;AACH,MAAM,sBAAsB,GAAqC;IAC/D,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;IAChB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE;CAC3B,CAAC;AAEF,SAAS,0BAA0B,CAAC,KAAa;IAC/C,OAAO,wBAAwB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;AACnD,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAChC,KAAe,EACf,OAAiB,EACjB,SAAoC;IAEpC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtD,SAAS,KAAK,CAAC;YACjB,CAAC;QACH,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAIlC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAI,KAAK,CAAS,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACpD,IAAI,MAAM,GAAG,CAAC,CAAC;IAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,CAAC,CAAC,gDAAgD;QAC/D,CAAC;IACH,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;IAEpC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC5B,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CACrB,IAAY,EACZ,OAAiB,EACjB,KAAe,EACf,SAAiB,EACjB,SAAiB,EACjB,sBAA+B;IAE/B,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,QAAQ,GAAG,aAAa,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;IAEnE,IAAI,sBAAsB,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;QACrD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,QAAQ,GAAG,aAAa,CAAC;QAC3B,CAAC;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,kBAAkB,CACzB,QAAgB,EAChB,MAAc;IAEd,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE9C,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,CAAC,SAAmB,EAAiB,EAAE;QAC1D,KAAK,MAAM,IAAI,IAAI,sBAAsB,EAAE,CAAC;YAC1C,MAAM,GAAG,GAAG,yBAAyB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YAC9D,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,OAAO,GAAG,CAAC;YACb,CAAC;QACH,CAAC;QACD,OAAO,yBAAyB,CAC9B,KAAK,EACL,SAAS,EACT,0BAA0B,CAC3B,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO;YACL,KAAK,EAAE,cAAc,CACnB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,UAAU,EACV,YAAY,CAAC,MAAM,EACnB,eAAe,CAChB;YACD,6BAA6B,EAAE,KAAK;SACrC,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC/B,MAAM,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,OAAO;gBACL,KAAK,EAAE,cAAc,CACnB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,UAAU,EACV,cAAc,CAAC,MAAM,EACrB,KAAK,CACN;gBACD,6BAA6B,EAAE,IAAI;aACpC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,gFAAgF;AAChF,+EAA+E;AAC/E,gFAAgF;AAEhF,SAAS,gBAAgB,CACvB,QAAgB,EAChB,MAAc;IAEd,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;QACxB,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC;YACjE,6BAA6B,EAAE,KAAK;SACrC,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC1E,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;YACvE,6BAA6B,EAAE,KAAK;SACrC,CAAC;IACJ,CAAC;IAED,OAAO,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,gFAAgF;AAChF,+EAA+E;AAC/E,gFAAgF;AAEhF,SAAS,qBAAqB,CAAC,IAAY;IACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,8BAA8B,CACrC,SAAiB,EACjB,mBAA4B;IAE5B,OAAO,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5E,CAAC;AAOD;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,WAA0B,EAC1B,SAAiB,EACjB,SAAiB;IAEjB,MAAM,gBAAgB,GAAG,uCAAuC,CAAC,SAAS,CAAC,CAAC;IAE5E,IAAI,WAAW,KAAK,IAAI,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;QAC7C,OAAO;YACL,SAAS;YACT,SAAS,EAAE,gBAAgB;SAC5B,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACnE,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;QAC/B,OAAO;YACL,SAAS,EAAE,iBAAiB,CAAC,KAAK;YAClC,SAAS,EAAE,8BAA8B,CACvC,gBAAgB,EAChB,iBAAiB,CAAC,6BAA6B,CAChD;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS;QACT,SAAS,EAAE,gBAAgB;KAC5B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gCAAgC,CAC9C,WAA0B,EAC1B,SAAiB,EACjB,SAAiB;IAEjB,IACE,WAAW,KAAK,IAAI;QACpB,SAAS,KAAK,EAAE;QAChB,SAAS,KAAK,EAAE;QAChB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EACxB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,SAAS,IAAI,CAAC;IACnC,OAAO,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAc,EAAE,MAAc;IAC7D,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;QAClB,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,OAAO,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACpB,KAAK,EAAE,CAAC;QACR,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAgBD,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAChC,UAAyB,EACzB,UAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;IAEnC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO;YACL,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,UAAU;YACnB,UAAU;YACV,OAAO,EAAE,UAAU;SACpB,CAAC;IACJ,CAAC;IAED,kBAAkB;IAClB,IAAI,UAAU,KAAK,UAAU,IAAI,CAAC,UAAU,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAExC,kDAAkD;IAClD,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE7D,OAAO,aAAa,GAAG,SAAS,EAAE,CAAC;QACjC,IAAI,QAAQ,CAAC,aAAa,CAAC,KAAK,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACxD,MAAM;QACR,CAAC;QACD,aAAa,EAAE,CAAC;IAClB,CAAC;IAED,gDAAgD;IAChD,IAAI,WAAW,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IACtC,IAAI,WAAW,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAEtC,OAAO,WAAW,IAAI,aAAa,IAAI,WAAW,IAAI,aAAa,EAAE,CAAC;QACpE,IAAI,QAAQ,CAAC,WAAW,CAAC,KAAK,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACpD,MAAM;QACR,CAAC;QACD,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,CAAC;IAChB,CAAC;IAED,yFAAyF;IACzF,oCAAoC;IACpC,MAAM,WAAW,GAAG,aAAa,GAAG,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,WAAW,GAAG,CAAC,CAAC;IAElC,8DAA8D;IAC9D,IAAI,SAAS,GAAG,WAAW,GAAG,iBAAiB,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wCAAwC;IACxC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,qBAAqB,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,GAAG,qBAAqB,CAAC,CAAC;IAE3E,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;IAElE,OAAO;QACL,SAAS,EAAE,YAAY;QACvB,OAAO,EAAE,UAAU;QACnB,UAAU;QACV,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;KACjC,CAAC;AACJ,CAAC"}

package/dist/src/utils/editHelper.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/utils/editHelper.test.js

@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { countOccurrences, maybeAugmentOldStringForDeletion, normalizeEditStrings, } from './editHelper.js';
+describe('normalizeEditStrings', () => {
+    const file = `const one = 1;
+const two = 2;
+`;
+    it('returns literal matches unchanged and trims new_string trailing whitespace', () => {
+        const result = normalizeEditStrings(file, 'const two = 2;', '  const two = 42;  ');
+        expect(result).toEqual({
+            oldString: 'const two = 2;',
+            newString: '  const two = 42;',
+        });
+    });
+    it('normalizes smart quotes to match on-disk text', () => {
+        const result = normalizeEditStrings("const greeting = 'Don't';\n", 'const greeting = ‘Don’t’;', 'const greeting = “Hello”;   ');
+        expect(result).toEqual({
+            oldString: "const greeting = 'Don't';",
+            newString: 'const greeting = “Hello”;',
+        });
+    });
+    it('falls back to original strings when no match is found', () => {
+        const result = normalizeEditStrings(file, 'missing text', 'replacement');
+        expect(result).toEqual({
+            oldString: 'missing text',
+            newString: 'replacement',
+        });
+    });
+    it('still trims new_string when editing a brand-new file', () => {
+        const result = normalizeEditStrings(null, '', 'new file contents   ');
+        expect(result).toEqual({
+            oldString: '',
+            newString: 'new file contents',
+        });
+    });
+    it('matches unicode dash variants', () => {
+        const result = normalizeEditStrings('const range = "1-2";\n', 'const range = "1\u20132";', 'const range = "3\u20135";   ');
+        expect(result).toEqual({
+            oldString: 'const range = "1-2";',
+            newString: 'const range = "3\u20135";',
+        });
+    });
+    it('matches when trailing whitespace differs only at line ends', () => {
+        const result = normalizeEditStrings('value = 1;\n', 'value = 1;   \n', 'value = 2;   \n');
+        expect(result).toEqual({
+            oldString: 'value = 1;\n',
+            newString: 'value = 2;\n',
+        });
+    });
+    it('treats non-breaking spaces as regular spaces', () => {
+        const result = normalizeEditStrings('const label = "hello world";\n', 'const label = "hello\u00a0world";', 'const label = "hi\u00a0world";');
+        expect(result).toEqual({
+            oldString: 'const label = "hello world";',
+            newString: 'const label = "hi\u00a0world";',
+        });
+    });
+    it('drops trailing newline from new content when the file lacks it', () => {
+        const result = normalizeEditStrings('console.log("hi")', 'console.log("hi")\n', 'console.log("bye")\n');
+        expect(result).toEqual({
+            oldString: 'console.log("hi")',
+            newString: 'console.log("bye")',
+        });
+    });
+});
+describe('countOccurrences', () => {
+    it('returns zero when substring empty or missing', () => {
+        expect(countOccurrences('abc', '')).toBe(0);
+        expect(countOccurrences('abc', 'z')).toBe(0);
+    });
+    it('counts non-overlapping occurrences', () => {
+        expect(countOccurrences('aaaa', 'aa')).toBe(2);
+    });
+});
+describe('maybeAugmentOldStringForDeletion', () => {
+    const file = 'console.log("hi")\nconsole.log("bye")\n';
+    it('appends newline when deleting text followed by newline', () => {
+        expect(maybeAugmentOldStringForDeletion(file, 'console.log("hi")', '')).toBe('console.log("hi")\n');
+    });
+    it('leaves strings untouched when not deleting', () => {
+        expect(maybeAugmentOldStringForDeletion(file, 'console.log("hi")', 'replacement')).toBe('console.log("hi")');
+    });
+    it('does not append newline when file lacks the variant', () => {
+        expect(maybeAugmentOldStringForDeletion('console.log("hi")', 'console.log("hi")', '')).toBe('console.log("hi")');
+    });
+    it('no-ops when the old string already ends with a newline', () => {
+        expect(maybeAugmentOldStringForDeletion(file, 'console.log("bye")\n', '')).toBe('console.log("bye")\n');
+    });
+});
+//# sourceMappingURL=editHelper.test.js.map

package/dist/src/utils/editHelper.test.js.map

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

package/dist/src/utils/editor.d.ts

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export type EditorType = 'vscode' | 'vscodium' | 'windsurf' | 'cursor' | 'vim' | 'neovim' | 'zed' | 'emacs' | 'trae';
+interface DiffCommand {
+    command: string;
+    args: string[];
+}
+export declare function checkHasEditorType(editor: EditorType): boolean;
+export declare function allowEditorTypeInSandbox(editor: EditorType): boolean;
+/**
+ * Check if the editor is valid and can be used.
+ * Returns false if preferred editor is not set / invalid / not available / not allowed in sandbox.
+ */
+export declare function isEditorAvailable(editor: string | undefined): boolean;
+/**
+ * Get the diff command for a specific editor.
+ */
+export declare function getDiffCommand(oldPath: string, newPath: string, editor: EditorType): DiffCommand | null;
+/**
+ * Opens a diff tool to compare two files.
+ * Terminal-based editors by default blocks parent process until the editor exits.
+ * GUI-based editors require args such as "--wait" to block parent process.
+ */
+export declare function openDiff(oldPath: string, newPath: string, editor: EditorType, onEditorClose: () => void): Promise<void>;
+export {};