@code-yeongyu/senpi 0.74.0

package/dist/core/extensions/builtin/gpt-apply-patch/preview-format.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview-format.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/preview-format.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAEX,iBAAiB,EAEjB,qBAAqB,EACrB,eAAe,EACf,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAkB5C,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQpD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAWjE;AAcD,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,iBAAiB,EAC1B,GAAG,GAAE,MAAsB,EAC3B,QAAQ,GAAE,OAAc,GACtB,MAAM,CA8BR;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAMhE;AA4JD,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,qBAAqB,CA6BlH;AAED,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD;AAED,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,eAAe,EACtB,QAAQ,EAAE,OAAO,GACf,MAAM,CA6CR;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,MAAM,CAO5E","sourcesContent":["import path from \"node:path\";\nimport * as Diff from \"diff\";\nimport { getLanguageFromPath, highlightCode } from \"../../../../modes/interactive/theme/theme.js\";\nimport { parsePatch } from \"./parser.js\";\nimport { extractPatchedPaths } from \"./text.js\";\nimport type {\n\tApplyPatchOperation,\n\tApplyPatchPreview,\n\tApplyPatchPreviewFile,\n\tApplyPatchRenderState,\n\tApplyPatchTheme,\n} from \"./types.js\";\n\nexport const PATCH_PREVIEW_MAX_LINES = 16;\nexport const PATCH_PREVIEW_MAX_CHARS = 4000;\nconst PATCH_PREVIEW_HEAD_LINES = 8;\nconst PATCH_PREVIEW_TAIL_LINES = 8;\nconst applyPatchRenderStates = new Map<string, ApplyPatchRenderState>();\n\nfunction formatLineCountSummary(added: number, removed: number): string {\n\treturn `(+${added} -${removed})`;\n}\n\nfunction countLines(text: string): number {\n\tif (text.length === 0) return 0;\n\tlet lines = 1;\n\tfor (let index = 0; index < text.length; index++) {\n\t\tif (text.charCodeAt(index) === 10) lines += 1;\n\t}\n\treturn lines;\n}\n\nexport function truncatePreview(text: string): string {\n\tif (text.length <= PATCH_PREVIEW_MAX_CHARS && countLines(text) <= PATCH_PREVIEW_MAX_LINES) return text;\n\tconst lines = text.split(\"\\n\");\n\tconst head = lines.slice(0, PATCH_PREVIEW_HEAD_LINES);\n\tconst tail = lines.slice(-PATCH_PREVIEW_TAIL_LINES);\n\tlet preview = [...head, \"…\", ...tail].join(\"\\n\");\n\tif (preview.length > PATCH_PREVIEW_MAX_CHARS) preview = `${preview.slice(0, PATCH_PREVIEW_MAX_CHARS).trimEnd()}\\n…`;\n\treturn preview;\n}\n\nexport function displayPath(filePath: string, cwd: string): string {\n\tif (!path.isAbsolute(filePath)) return filePath;\n\tconst absoluteCwd = path.resolve(cwd);\n\tconst relativePath = path.relative(absoluteCwd, filePath);\n\tif (\n\t\trelativePath === \"\" ||\n\t\t(!relativePath.startsWith(`..${path.sep}`) && relativePath !== \"..\" && !path.isAbsolute(relativePath))\n\t) {\n\t\treturn relativePath || \".\";\n\t}\n\treturn filePath;\n}\n\nfunction formatPatchFilePath(file: ApplyPatchPreviewFile, cwd: string = process.cwd()): string {\n\tconst filePath = displayPath(file.filePath, cwd);\n\tif (!file.movePath) return filePath;\n\treturn `${filePath} → ${displayPath(file.movePath, cwd)}`;\n}\n\nfunction formatPatchOperation(operation: ApplyPatchOperation): string {\n\tif (operation === \"add\") return \"Added\";\n\tif (operation === \"delete\") return \"Deleted\";\n\treturn \"Edited\";\n}\n\nexport function formatPatchPreview(\n\tpreview: ApplyPatchPreview,\n\tcwd: string = process.cwd(),\n\texpanded: boolean = true,\n): string {\n\tconst lines: string[] = [];\n\tif (preview.files.length === 1) {\n\t\tconst file = preview.files[0];\n\t\tif (file) {\n\t\t\tlines.push(\n\t\t\t\t`• ${formatPatchOperation(file.operation)} ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`,\n\t\t\t);\n\t\t\tif (expanded && file.diff)\n\t\t\t\tlines.push(\n\t\t\t\t\t...truncatePreview(file.diff)\n\t\t\t\t\t\t.split(\"\\n\")\n\t\t\t\t\t\t.map((line) => `  ${line}`),\n\t\t\t\t);\n\t\t}\n\t\treturn lines.join(\"\\n\");\n\t}\n\n\tconst noun = preview.files.length === 1 ? \"file\" : \"files\";\n\tlines.push(`• Edited ${preview.files.length} ${noun} ${formatLineCountSummary(preview.added, preview.removed)}`);\n\tfor (const file of preview.files) {\n\t\tlines.push(`  └ ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`);\n\t\tif (expanded && file.diff)\n\t\t\tlines.push(\n\t\t\t\t...truncatePreview(file.diff)\n\t\t\t\t\t.split(\"\\n\")\n\t\t\t\t\t.map((line) => `    ${line}`),\n\t\t\t);\n\t}\n\treturn lines.join(\"\\n\");\n}\n\nexport function formatInFlightCallText(patchText: string): string {\n\tconst paths = extractPatchedPaths(patchText);\n\tif (paths.length === 0) return \"Patching\";\n\tconst noun = paths.length === 1 ? \"file\" : \"files\";\n\tconst count = paths.length > 1 ? ` (${paths.length} ${noun})` : \"\";\n\treturn `Patching${count}: ${paths.join(\", \")}`;\n}\n\ntype RenderableAddedDiffLine = { content: string; kind: \"added\"; lineNumber: string; sign: \"+\" };\ntype RenderableRemovedDiffLine = { content: string; kind: \"removed\"; lineNumber: string; sign: \"-\" };\ntype RenderableContextDiffLine = { content: string; kind: \"context\"; lineNumber: string; sign: \" \" };\ntype RenderableContentDiffLine = RenderableAddedDiffLine | RenderableContextDiffLine | RenderableRemovedDiffLine;\ntype RenderableDiffLine = RenderableContentDiffLine | { kind: \"meta\"; text: string };\n\nfunction parseRenderableDiffLine(line: string): RenderableDiffLine {\n\tconst match = line.match(/^([+\\- ])(\\s*\\d+)\\s(.*)$/);\n\tif (!match) return { kind: \"meta\", text: line };\n\n\tconst sign = match[1];\n\tconst lineNumber = match[2];\n\tif ((sign !== \"+\" && sign !== \"-\" && sign !== \" \") || lineNumber === undefined) return { kind: \"meta\", text: line };\n\n\tconst content = match[3] ?? \"\";\n\tif (sign === \"+\") return { content, kind: \"added\", lineNumber, sign };\n\tif (sign === \"-\") return { content, kind: \"removed\", lineNumber, sign };\n\treturn { content, kind: \"context\", lineNumber, sign };\n}\n\nfunction replaceTabs(text: string): string {\n\treturn text.replace(/\\t/g, \"   \");\n}\n\nfunction highlightDiffContent(content: string, filePath: string): string {\n\tconst plainContent = replaceTabs(content);\n\tconst language = getLanguageFromPath(filePath);\n\ttry {\n\t\treturn highlightCode(plainContent, language)[0] ?? plainContent;\n\t} catch {\n\t\treturn plainContent;\n\t}\n}\n\nfunction renderInlineDiff(\n\toldContent: string,\n\tnewContent: string,\n\ttheme: ApplyPatchTheme,\n): { added: string; removed: string } {\n\tconst parts = Diff.diffWords(replaceTabs(oldContent), replaceTabs(newContent));\n\tlet added = \"\";\n\tlet removed = \"\";\n\tlet firstAdded = true;\n\tlet firstRemoved = true;\n\n\tfor (const part of parts) {\n\t\tif (part.added) {\n\t\t\tlet value = part.value;\n\t\t\tif (firstAdded) {\n\t\t\t\tconst leadingWhitespace = value.match(/^(\\s*)/)?.[1] ?? \"\";\n\t\t\t\tadded += leadingWhitespace;\n\t\t\t\tvalue = value.slice(leadingWhitespace.length);\n\t\t\t\tfirstAdded = false;\n\t\t\t}\n\t\t\tif (value) added += theme.inverse(value);\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (part.removed) {\n\t\t\tlet value = part.value;\n\t\t\tif (firstRemoved) {\n\t\t\t\tconst leadingWhitespace = value.match(/^(\\s*)/)?.[1] ?? \"\";\n\t\t\t\tremoved += leadingWhitespace;\n\t\t\t\tvalue = value.slice(leadingWhitespace.length);\n\t\t\t\tfirstRemoved = false;\n\t\t\t}\n\t\t\tif (value) removed += theme.inverse(value);\n\t\t\tcontinue;\n\t\t}\n\n\t\tadded += part.value;\n\t\tremoved += part.value;\n\t}\n\n\treturn { added, removed };\n}\n\nfunction renderOpenCodeLikeDiffLine(\n\tline: RenderableContentDiffLine,\n\tfilePath: string,\n\ttheme: ApplyPatchTheme,\n\tcontentOverride?: string,\n): string {\n\tconst lineNumber = theme.fg(\"muted\", line.lineNumber);\n\tif (line.kind === \"context\") {\n\t\treturn `${theme.fg(\"toolDiffContext\", line.sign)}${lineNumber} ${highlightDiffContent(line.content, filePath)}`;\n\t}\n\n\tconst diffColor = line.kind === \"added\" ? \"toolDiffAdded\" : \"toolDiffRemoved\";\n\tconst background = line.kind === \"added\" ? \"toolSuccessBg\" : \"toolErrorBg\";\n\tconst content =\n\t\tcontentOverride === undefined\n\t\t\t? highlightDiffContent(line.content, filePath)\n\t\t\t: theme.fg(diffColor, replaceTabs(contentOverride));\n\tconst rendered = `${theme.fg(diffColor, line.sign)}${lineNumber} ${content}`;\n\treturn theme.bg(background, rendered);\n}\n\nfunction renderOpenCodeLikeDiff(diffText: string, filePath: string, theme: ApplyPatchTheme): string {\n\tconst parsedLines = diffText.split(\"\\n\").map(parseRenderableDiffLine);\n\tconst rendered: string[] = [];\n\tlet index = 0;\n\n\twhile (index < parsedLines.length) {\n\t\tconst line = parsedLines[index];\n\t\tif (!line) {\n\t\t\tindex++;\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (line.kind !== \"removed\") {\n\t\t\trendered.push(\n\t\t\t\tline.kind === \"meta\"\n\t\t\t\t\t? theme.fg(\"toolDiffContext\", line.text)\n\t\t\t\t\t: renderOpenCodeLikeDiffLine(line, filePath, theme),\n\t\t\t);\n\t\t\tindex++;\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst removedLines: RenderableRemovedDiffLine[] = [];\n\t\twhile (parsedLines[index]?.kind === \"removed\") {\n\t\t\tconst removedLine = parsedLines[index];\n\t\t\tif (removedLine?.kind === \"removed\") removedLines.push(removedLine);\n\t\t\tindex++;\n\t\t}\n\n\t\tconst addedLines: RenderableAddedDiffLine[] = [];\n\t\twhile (parsedLines[index]?.kind === \"added\") {\n\t\t\tconst addedLine = parsedLines[index];\n\t\t\tif (addedLine?.kind === \"added\") addedLines.push(addedLine);\n\t\t\tindex++;\n\t\t}\n\n\t\tconst pairedCount = Math.min(removedLines.length, addedLines.length);\n\t\tfor (let pairIndex = 0; pairIndex < pairedCount; pairIndex++) {\n\t\t\tconst removedLine = removedLines[pairIndex];\n\t\t\tconst addedLine = addedLines[pairIndex];\n\t\t\tif (!removedLine || !addedLine) continue;\n\n\t\t\tconst inline = renderInlineDiff(removedLine.content, addedLine.content, theme);\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(removedLine, filePath, theme, inline.removed));\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(addedLine, filePath, theme, inline.added));\n\t\t}\n\n\t\tfor (const removedLine of removedLines.slice(pairedCount))\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(removedLine, filePath, theme));\n\t\tfor (const addedLine of addedLines.slice(pairedCount))\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(addedLine, filePath, theme));\n\t}\n\n\treturn rendered.join(\"\\n\");\n}\n\nexport function getApplyPatchRenderState(toolCallId: string, cwd: string, patchText: string): ApplyPatchRenderState {\n\tconst existing = applyPatchRenderStates.get(toolCallId);\n\tif (existing && existing.cwd === cwd && existing.patchText === patchText) return existing;\n\n\tconst callText = formatInFlightCallText(patchText);\n\tlet collapsed = \"\";\n\tlet expanded = \"\";\n\ttry {\n\t\tconst hunks = parsePatch(patchText);\n\t\tif (hunks.length > 0) {\n\t\t\tconst files = hunks.map((hunk) => ({\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\tmovePath: hunk.type === \"update\" ? hunk.movePath : undefined,\n\t\t\t\toperation: hunk.type,\n\t\t\t\tdiff: \"\",\n\t\t\t\tadded: 0,\n\t\t\t\tremoved: 0,\n\t\t\t})) satisfies ApplyPatchPreviewFile[];\n\t\t\tconst preview: ApplyPatchPreview = { files, added: 0, removed: 0 };\n\t\t\tcollapsed = formatPatchPreview(preview, cwd, false);\n\t\t\texpanded = formatPatchPreview(preview, cwd, true);\n\t\t}\n\t} catch {\n\t\t// ignore incomplete patch text\n\t}\n\n\tconst nextState: ApplyPatchRenderState = { ...existing, cwd, patchText, callText, collapsed, expanded };\n\tapplyPatchRenderStates.set(toolCallId, nextState);\n\treturn nextState;\n}\n\nexport function clearApplyPatchRenderState(): void {\n\tapplyPatchRenderStates.clear();\n}\n\nexport function renderPatchPreview(\n\tpreview: ApplyPatchPreview,\n\tcwd: string,\n\ttheme: ApplyPatchTheme,\n\texpanded: boolean,\n): string {\n\tif (expanded) {\n\t\ttry {\n\t\t\tconst renderFile = (file: ApplyPatchPreviewFile, headerPrefix: string): string => {\n\t\t\t\tconst header = `• ${formatPatchOperation(file.operation)} ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`;\n\t\t\t\tif (!file.diff) {\n\t\t\t\t\treturn headerPrefix.length > 0\n\t\t\t\t\t\t? `${headerPrefix}${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`\n\t\t\t\t\t\t: header;\n\t\t\t\t}\n\n\t\t\t\tconst renderedDiff = renderOpenCodeLikeDiff(\n\t\t\t\t\ttruncatePreview(file.diff),\n\t\t\t\t\tfile.movePath ?? file.filePath,\n\t\t\t\t\ttheme,\n\t\t\t\t);\n\t\t\t\tif (headerPrefix.length > 0) {\n\t\t\t\t\tconst nestedHeader = `${headerPrefix}${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`;\n\t\t\t\t\treturn `${nestedHeader}\\n${renderedDiff\n\t\t\t\t\t\t.split(\"\\n\")\n\t\t\t\t\t\t.map((line) => `    ${line}`)\n\t\t\t\t\t\t.join(\"\\n\")}`;\n\t\t\t\t}\n\t\t\t\treturn `${header}\\n${renderedDiff}`;\n\t\t\t};\n\n\t\t\tif (preview.files.length === 1) {\n\t\t\t\tconst file = preview.files[0];\n\t\t\t\treturn file ? renderFile(file, \"\") : \"\";\n\t\t\t}\n\n\t\t\tconst noun = preview.files.length === 1 ? \"file\" : \"files\";\n\t\t\tconst renderedFiles = preview.files.map((file) => renderFile(file, \"  └ \")).join(\"\\n\");\n\t\t\tif (renderedFiles.length > 0) {\n\t\t\t\treturn `• Edited ${preview.files.length} ${noun} ${formatLineCountSummary(preview.added, preview.removed)}\\n${renderedFiles}`;\n\t\t\t}\n\t\t} catch {\n\t\t\t// fall back to manual themed line rendering\n\t\t}\n\t}\n\n\treturn formatPatchPreview(preview, cwd, expanded)\n\t\t.split(\"\\n\")\n\t\t.map((line) => renderPatchLine(line, theme))\n\t\t.join(\"\\n\");\n}\n\nexport function formatPendingPatchPaths(patchText: string): string {\n\tconst paths = extractPatchedPaths(patchText);\n\tif (paths.length === 0) return \"Applying patch...\";\n\treturn `Applying patch...\\n${paths.map((filePath) => `• ${filePath}`).join(\"\\n\")}`;\n}\n\nexport function renderPatchLine(line: string, theme: ApplyPatchTheme): string {\n\tconst trimmed = line.trimStart();\n\tif (trimmed.startsWith(\"+\")) return theme.fg(\"toolDiffAdded\", line);\n\tif (trimmed.startsWith(\"-\")) return theme.fg(\"toolDiffRemoved\", line);\n\tif (trimmed.startsWith(\"•\")) return theme.fg(\"toolTitle\", theme.bold(line));\n\tif (trimmed.startsWith(\"└\")) return theme.fg(\"accent\", line);\n\treturn theme.fg(\"toolDiffContext\", line);\n}\n"]}

package/dist/core/extensions/builtin/gpt-apply-patch/preview-format.js

@@ -0,0 +1,306 @@
+import path from "node:path";
+import * as Diff from "diff";
+import { getLanguageFromPath, highlightCode } from "../../../../modes/interactive/theme/theme.js";
+import { parsePatch } from "./parser.js";
+import { extractPatchedPaths } from "./text.js";
+export const PATCH_PREVIEW_MAX_LINES = 16;
+export const PATCH_PREVIEW_MAX_CHARS = 4000;
+const PATCH_PREVIEW_HEAD_LINES = 8;
+const PATCH_PREVIEW_TAIL_LINES = 8;
+const applyPatchRenderStates = new Map();
+function formatLineCountSummary(added, removed) {
+    return `(+${added} -${removed})`;
+}
+function countLines(text) {
+    if (text.length === 0)
+        return 0;
+    let lines = 1;
+    for (let index = 0; index < text.length; index++) {
+        if (text.charCodeAt(index) === 10)
+            lines += 1;
+    }
+    return lines;
+}
+export function truncatePreview(text) {
+    if (text.length <= PATCH_PREVIEW_MAX_CHARS && countLines(text) <= PATCH_PREVIEW_MAX_LINES)
+        return text;
+    const lines = text.split("\n");
+    const head = lines.slice(0, PATCH_PREVIEW_HEAD_LINES);
+    const tail = lines.slice(-PATCH_PREVIEW_TAIL_LINES);
+    let preview = [...head, "…", ...tail].join("\n");
+    if (preview.length > PATCH_PREVIEW_MAX_CHARS)
+        preview = `${preview.slice(0, PATCH_PREVIEW_MAX_CHARS).trimEnd()}\n…`;
+    return preview;
+}
+export function displayPath(filePath, cwd) {
+    if (!path.isAbsolute(filePath))
+        return filePath;
+    const absoluteCwd = path.resolve(cwd);
+    const relativePath = path.relative(absoluteCwd, filePath);
+    if (relativePath === "" ||
+        (!relativePath.startsWith(`..${path.sep}`) && relativePath !== ".." && !path.isAbsolute(relativePath))) {
+        return relativePath || ".";
+    }
+    return filePath;
+}
+function formatPatchFilePath(file, cwd = process.cwd()) {
+    const filePath = displayPath(file.filePath, cwd);
+    if (!file.movePath)
+        return filePath;
+    return `${filePath} → ${displayPath(file.movePath, cwd)}`;
+}
+function formatPatchOperation(operation) {
+    if (operation === "add")
+        return "Added";
+    if (operation === "delete")
+        return "Deleted";
+    return "Edited";
+}
+export function formatPatchPreview(preview, cwd = process.cwd(), expanded = true) {
+    const lines = [];
+    if (preview.files.length === 1) {
+        const file = preview.files[0];
+        if (file) {
+            lines.push(`• ${formatPatchOperation(file.operation)} ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`);
+            if (expanded && file.diff)
+                lines.push(...truncatePreview(file.diff)
+                    .split("\n")
+                    .map((line) => `  ${line}`));
+        }
+        return lines.join("\n");
+    }
+    const noun = preview.files.length === 1 ? "file" : "files";
+    lines.push(`• Edited ${preview.files.length} ${noun} ${formatLineCountSummary(preview.added, preview.removed)}`);
+    for (const file of preview.files) {
+        lines.push(`  └ ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`);
+        if (expanded && file.diff)
+            lines.push(...truncatePreview(file.diff)
+                .split("\n")
+                .map((line) => `    ${line}`));
+    }
+    return lines.join("\n");
+}
+export function formatInFlightCallText(patchText) {
+    const paths = extractPatchedPaths(patchText);
+    if (paths.length === 0)
+        return "Patching";
+    const noun = paths.length === 1 ? "file" : "files";
+    const count = paths.length > 1 ? ` (${paths.length} ${noun})` : "";
+    return `Patching${count}: ${paths.join(", ")}`;
+}
+function parseRenderableDiffLine(line) {
+    const match = line.match(/^([+\- ])(\s*\d+)\s(.*)$/);
+    if (!match)
+        return { kind: "meta", text: line };
+    const sign = match[1];
+    const lineNumber = match[2];
+    if ((sign !== "+" && sign !== "-" && sign !== " ") || lineNumber === undefined)
+        return { kind: "meta", text: line };
+    const content = match[3] ?? "";
+    if (sign === "+")
+        return { content, kind: "added", lineNumber, sign };
+    if (sign === "-")
+        return { content, kind: "removed", lineNumber, sign };
+    return { content, kind: "context", lineNumber, sign };
+}
+function replaceTabs(text) {
+    return text.replace(/\t/g, "   ");
+}
+function highlightDiffContent(content, filePath) {
+    const plainContent = replaceTabs(content);
+    const language = getLanguageFromPath(filePath);
+    try {
+        return highlightCode(plainContent, language)[0] ?? plainContent;
+    }
+    catch {
+        return plainContent;
+    }
+}
+function renderInlineDiff(oldContent, newContent, theme) {
+    const parts = Diff.diffWords(replaceTabs(oldContent), replaceTabs(newContent));
+    let added = "";
+    let removed = "";
+    let firstAdded = true;
+    let firstRemoved = true;
+    for (const part of parts) {
+        if (part.added) {
+            let value = part.value;
+            if (firstAdded) {
+                const leadingWhitespace = value.match(/^(\s*)/)?.[1] ?? "";
+                added += leadingWhitespace;
+                value = value.slice(leadingWhitespace.length);
+                firstAdded = false;
+            }
+            if (value)
+                added += theme.inverse(value);
+            continue;
+        }
+        if (part.removed) {
+            let value = part.value;
+            if (firstRemoved) {
+                const leadingWhitespace = value.match(/^(\s*)/)?.[1] ?? "";
+                removed += leadingWhitespace;
+                value = value.slice(leadingWhitespace.length);
+                firstRemoved = false;
+            }
+            if (value)
+                removed += theme.inverse(value);
+            continue;
+        }
+        added += part.value;
+        removed += part.value;
+    }
+    return { added, removed };
+}
+function renderOpenCodeLikeDiffLine(line, filePath, theme, contentOverride) {
+    const lineNumber = theme.fg("muted", line.lineNumber);
+    if (line.kind === "context") {
+        return `${theme.fg("toolDiffContext", line.sign)}${lineNumber} ${highlightDiffContent(line.content, filePath)}`;
+    }
+    const diffColor = line.kind === "added" ? "toolDiffAdded" : "toolDiffRemoved";
+    const background = line.kind === "added" ? "toolSuccessBg" : "toolErrorBg";
+    const content = contentOverride === undefined
+        ? highlightDiffContent(line.content, filePath)
+        : theme.fg(diffColor, replaceTabs(contentOverride));
+    const rendered = `${theme.fg(diffColor, line.sign)}${lineNumber} ${content}`;
+    return theme.bg(background, rendered);
+}
+function renderOpenCodeLikeDiff(diffText, filePath, theme) {
+    const parsedLines = diffText.split("\n").map(parseRenderableDiffLine);
+    const rendered = [];
+    let index = 0;
+    while (index < parsedLines.length) {
+        const line = parsedLines[index];
+        if (!line) {
+            index++;
+            continue;
+        }
+        if (line.kind !== "removed") {
+            rendered.push(line.kind === "meta"
+                ? theme.fg("toolDiffContext", line.text)
+                : renderOpenCodeLikeDiffLine(line, filePath, theme));
+            index++;
+            continue;
+        }
+        const removedLines = [];
+        while (parsedLines[index]?.kind === "removed") {
+            const removedLine = parsedLines[index];
+            if (removedLine?.kind === "removed")
+                removedLines.push(removedLine);
+            index++;
+        }
+        const addedLines = [];
+        while (parsedLines[index]?.kind === "added") {
+            const addedLine = parsedLines[index];
+            if (addedLine?.kind === "added")
+                addedLines.push(addedLine);
+            index++;
+        }
+        const pairedCount = Math.min(removedLines.length, addedLines.length);
+        for (let pairIndex = 0; pairIndex < pairedCount; pairIndex++) {
+            const removedLine = removedLines[pairIndex];
+            const addedLine = addedLines[pairIndex];
+            if (!removedLine || !addedLine)
+                continue;
+            const inline = renderInlineDiff(removedLine.content, addedLine.content, theme);
+            rendered.push(renderOpenCodeLikeDiffLine(removedLine, filePath, theme, inline.removed));
+            rendered.push(renderOpenCodeLikeDiffLine(addedLine, filePath, theme, inline.added));
+        }
+        for (const removedLine of removedLines.slice(pairedCount))
+            rendered.push(renderOpenCodeLikeDiffLine(removedLine, filePath, theme));
+        for (const addedLine of addedLines.slice(pairedCount))
+            rendered.push(renderOpenCodeLikeDiffLine(addedLine, filePath, theme));
+    }
+    return rendered.join("\n");
+}
+export function getApplyPatchRenderState(toolCallId, cwd, patchText) {
+    const existing = applyPatchRenderStates.get(toolCallId);
+    if (existing && existing.cwd === cwd && existing.patchText === patchText)
+        return existing;
+    const callText = formatInFlightCallText(patchText);
+    let collapsed = "";
+    let expanded = "";
+    try {
+        const hunks = parsePatch(patchText);
+        if (hunks.length > 0) {
+            const files = hunks.map((hunk) => ({
+                filePath: hunk.filePath,
+                movePath: hunk.type === "update" ? hunk.movePath : undefined,
+                operation: hunk.type,
+                diff: "",
+                added: 0,
+                removed: 0,
+            }));
+            const preview = { files, added: 0, removed: 0 };
+            collapsed = formatPatchPreview(preview, cwd, false);
+            expanded = formatPatchPreview(preview, cwd, true);
+        }
+    }
+    catch {
+        // ignore incomplete patch text
+    }
+    const nextState = { ...existing, cwd, patchText, callText, collapsed, expanded };
+    applyPatchRenderStates.set(toolCallId, nextState);
+    return nextState;
+}
+export function clearApplyPatchRenderState() {
+    applyPatchRenderStates.clear();
+}
+export function renderPatchPreview(preview, cwd, theme, expanded) {
+    if (expanded) {
+        try {
+            const renderFile = (file, headerPrefix) => {
+                const header = `• ${formatPatchOperation(file.operation)} ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`;
+                if (!file.diff) {
+                    return headerPrefix.length > 0
+                        ? `${headerPrefix}${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`
+                        : header;
+                }
+                const renderedDiff = renderOpenCodeLikeDiff(truncatePreview(file.diff), file.movePath ?? file.filePath, theme);
+                if (headerPrefix.length > 0) {
+                    const nestedHeader = `${headerPrefix}${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`;
+                    return `${nestedHeader}\n${renderedDiff
+                        .split("\n")
+                        .map((line) => `    ${line}`)
+                        .join("\n")}`;
+                }
+                return `${header}\n${renderedDiff}`;
+            };
+            if (preview.files.length === 1) {
+                const file = preview.files[0];
+                return file ? renderFile(file, "") : "";
+            }
+            const noun = preview.files.length === 1 ? "file" : "files";
+            const renderedFiles = preview.files.map((file) => renderFile(file, "  └ ")).join("\n");
+            if (renderedFiles.length > 0) {
+                return `• Edited ${preview.files.length} ${noun} ${formatLineCountSummary(preview.added, preview.removed)}\n${renderedFiles}`;
+            }
+        }
+        catch {
+            // fall back to manual themed line rendering
+        }
+    }
+    return formatPatchPreview(preview, cwd, expanded)
+        .split("\n")
+        .map((line) => renderPatchLine(line, theme))
+        .join("\n");
+}
+export function formatPendingPatchPaths(patchText) {
+    const paths = extractPatchedPaths(patchText);
+    if (paths.length === 0)
+        return "Applying patch...";
+    return `Applying patch...\n${paths.map((filePath) => `• ${filePath}`).join("\n")}`;
+}
+export function renderPatchLine(line, theme) {
+    const trimmed = line.trimStart();
+    if (trimmed.startsWith("+"))
+        return theme.fg("toolDiffAdded", line);
+    if (trimmed.startsWith("-"))
+        return theme.fg("toolDiffRemoved", line);
+    if (trimmed.startsWith("•"))
+        return theme.fg("toolTitle", theme.bold(line));
+    if (trimmed.startsWith("└"))
+        return theme.fg("accent", line);
+    return theme.fg("toolDiffContext", line);
+}
+//# sourceMappingURL=preview-format.js.map

package/dist/core/extensions/builtin/gpt-apply-patch/preview-format.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview-format.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/preview-format.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAShD,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAC1C,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAC5C,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAiC,CAAC;AAExE,SAAS,sBAAsB,CAAC,KAAa,EAAE,OAAe,EAAU;IACvE,OAAO,KAAK,KAAK,KAAK,OAAO,GAAG,CAAC;AAAA,CACjC;AAED,SAAS,UAAU,CAAC,IAAY,EAAU;IACzC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAChC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE;YAAE,KAAK,IAAI,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,KAAK,CAAC;AAAA,CACb;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAU;IACrD,IAAI,IAAI,CAAC,MAAM,IAAI,uBAAuB,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,uBAAuB;QAAE,OAAO,IAAI,CAAC;IACvG,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,wBAAwB,CAAC,CAAC;IACpD,IAAI,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,KAAG,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,OAAO,CAAC,MAAM,GAAG,uBAAuB;QAAE,OAAO,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC,CAAC,OAAO,EAAE,OAAK,CAAC;IACpH,OAAO,OAAO,CAAC;AAAA,CACf;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,GAAW,EAAU;IAClE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IAChD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC1D,IACC,YAAY,KAAK,EAAE;QACnB,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,YAAY,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EACrG,CAAC;QACF,OAAO,YAAY,IAAI,GAAG,CAAC;IAC5B,CAAC;IACD,OAAO,QAAQ,CAAC;AAAA,CAChB;AAED,SAAS,mBAAmB,CAAC,IAA2B,EAAE,GAAG,GAAW,OAAO,CAAC,GAAG,EAAE,EAAU;IAC9F,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjD,IAAI,CAAC,IAAI,CAAC,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACpC,OAAO,GAAG,QAAQ,QAAM,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC;AAAA,CAC1D;AAED,SAAS,oBAAoB,CAAC,SAA8B,EAAU;IACrE,IAAI,SAAS,KAAK,KAAK;QAAE,OAAO,OAAO,CAAC;IACxC,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAC7C,OAAO,QAAQ,CAAC;AAAA,CAChB;AAED,MAAM,UAAU,kBAAkB,CACjC,OAA0B,EAC1B,GAAG,GAAW,OAAO,CAAC,GAAG,EAAE,EAC3B,QAAQ,GAAY,IAAI,EACf;IACT,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,IAAI,EAAE,CAAC;YACV,KAAK,CAAC,IAAI,CACT,OAAK,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CACjI,CAAC;YACF,IAAI,QAAQ,IAAI,IAAI,CAAC,IAAI;gBACxB,KAAK,CAAC,IAAI,CACT,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;qBAC3B,KAAK,CAAC,IAAI,CAAC;qBACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAC5B,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC3D,KAAK,CAAC,IAAI,CAAC,cAAY,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,IAAI,sBAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjH,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClC,KAAK,CAAC,IAAI,CAAC,SAAO,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxG,IAAI,QAAQ,IAAI,IAAI,CAAC,IAAI;YACxB,KAAK,CAAC,IAAI,CACT,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC3B,KAAK,CAAC,IAAI,CAAC;iBACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAC9B,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAAA,CACxB;AAED,MAAM,UAAU,sBAAsB,CAAC,SAAiB,EAAU;IACjE,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,UAAU,CAAC;IAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IACnD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,MAAM,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,OAAO,WAAW,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAAA,CAC/C;AAQD,SAAS,uBAAuB,CAAC,IAAY,EAAsB;IAClE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACrD,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEhD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACtB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,CAAC,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEpH,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACtE,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACxE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AAAA,CACtD;AAED,SAAS,WAAW,CAAC,IAAY,EAAU;IAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAAA,CAClC;AAED,SAAS,oBAAoB,CAAC,OAAe,EAAE,QAAgB,EAAU;IACxE,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,CAAC;QACJ,OAAO,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,YAAY,CAAC;IACrB,CAAC;AAAA,CACD;AAED,SAAS,gBAAgB,CACxB,UAAkB,EAClB,UAAkB,EAClB,KAAsB,EACe;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/E,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,YAAY,GAAG,IAAI,CAAC;IAExB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACvB,IAAI,UAAU,EAAE,CAAC;gBAChB,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC3D,KAAK,IAAI,iBAAiB,CAAC;gBAC3B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAC9C,UAAU,GAAG,KAAK,CAAC;YACpB,CAAC;YACD,IAAI,KAAK;gBAAE,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACzC,SAAS;QACV,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YACvB,IAAI,YAAY,EAAE,CAAC;gBAClB,MAAM,iBAAiB,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC3D,OAAO,IAAI,iBAAiB,CAAC;gBAC7B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAC9C,YAAY,GAAG,KAAK,CAAC;YACtB,CAAC;YACD,IAAI,KAAK;gBAAE,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC3C,SAAS;QACV,CAAC;QAED,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC;QACpB,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC;IACvB,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAAA,CAC1B;AAED,SAAS,0BAA0B,CAClC,IAA+B,EAC/B,QAAgB,EAChB,KAAsB,EACtB,eAAwB,EACf;IACT,MAAM,UAAU,GAAG,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;IACjH,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAC9E,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,aAAa,CAAC;IAC3E,MAAM,OAAO,GACZ,eAAe,KAAK,SAAS;QAC5B,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC9C,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC;IAC7E,OAAO,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAAA,CACtC;AAED,SAAS,sBAAsB,CAAC,QAAgB,EAAE,QAAgB,EAAE,KAAsB,EAAU;IACnG,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,KAAK,EAAE,CAAC;YACR,SAAS;QACV,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,QAAQ,CAAC,IAAI,CACZ,IAAI,CAAC,IAAI,KAAK,MAAM;gBACnB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC;gBACxC,CAAC,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CACpD,CAAC;YACF,KAAK,EAAE,CAAC;YACR,SAAS;QACV,CAAC;QAED,MAAM,YAAY,GAAgC,EAAE,CAAC;QACrD,OAAO,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,WAAW,EAAE,IAAI,KAAK,SAAS;gBAAE,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACpE,KAAK,EAAE,CAAC;QACT,CAAC;QAED,MAAM,UAAU,GAA8B,EAAE,CAAC;QACjD,OAAO,WAAW,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACrC,IAAI,SAAS,EAAE,IAAI,KAAK,OAAO;gBAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC5D,KAAK,EAAE,CAAC;QACT,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QACrE,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC;YAC9D,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS;gBAAE,SAAS;YAEzC,MAAM,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC/E,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACxF,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,KAAK,MAAM,WAAW,IAAI,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC;YACxD,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QACzE,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,KAAK,CAAC,WAAW,CAAC;YACpD,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAAA,CAC3B;AAED,MAAM,UAAU,wBAAwB,CAAC,UAAkB,EAAE,GAAW,EAAE,SAAiB,EAAyB;IACnH,MAAM,QAAQ,GAAG,sBAAsB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxD,IAAI,QAAQ,IAAI,QAAQ,CAAC,GAAG,KAAK,GAAG,IAAI,QAAQ,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAE1F,MAAM,QAAQ,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACnD,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gBAC5D,SAAS,EAAE,IAAI,CAAC,IAAI;gBACpB,IAAI,EAAE,EAAE;gBACR,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC;aACV,CAAC,CAAmC,CAAC;YACtC,MAAM,OAAO,GAAsB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;YACnE,SAAS,GAAG,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YACpD,QAAQ,GAAG,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC;IACF,CAAC;IAAC,MAAM,CAAC;QACR,+BAA+B;IAChC,CAAC;IAED,MAAM,SAAS,GAA0B,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;IACxG,sBAAsB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAClD,OAAO,SAAS,CAAC;AAAA,CACjB;AAED,MAAM,UAAU,0BAA0B,GAAS;IAClD,sBAAsB,CAAC,KAAK,EAAE,CAAC;AAAA,CAC/B;AAED,MAAM,UAAU,kBAAkB,CACjC,OAA0B,EAC1B,GAAW,EACX,KAAsB,EACtB,QAAiB,EACR;IACT,IAAI,QAAQ,EAAE,CAAC;QACd,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,CAAC,IAA2B,EAAE,YAAoB,EAAU,EAAE,CAAC;gBACjF,MAAM,MAAM,GAAG,OAAK,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjJ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChB,OAAO,YAAY,CAAC,MAAM,GAAG,CAAC;wBAC7B,CAAC,CAAC,GAAG,YAAY,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;wBACxG,CAAC,CAAC,MAAM,CAAC;gBACX,CAAC;gBAED,MAAM,YAAY,GAAG,sBAAsB,CAC1C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAC1B,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAC9B,KAAK,CACL,CAAC;gBACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7B,MAAM,YAAY,GAAG,GAAG,YAAY,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5H,OAAO,GAAG,YAAY,KAAK,YAAY;yBACrC,KAAK,CAAC,IAAI,CAAC;yBACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC;yBAC5B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChB,CAAC;gBACD,OAAO,GAAG,MAAM,KAAK,YAAY,EAAE,CAAC;YAAA,CACpC,CAAC;YAEF,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9B,OAAO,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,CAAC;YAED,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC3D,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,QAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,OAAO,cAAY,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,IAAI,sBAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,aAAa,EAAE,CAAC;YAC/H,CAAC;QACF,CAAC;QAAC,MAAM,CAAC;YACR,4CAA4C;QAC7C,CAAC;IACF,CAAC;IAED,OAAO,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC;SAC/C,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SAC3C,IAAI,CAAC,IAAI,CAAC,CAAC;AAAA,CACb;AAED,MAAM,UAAU,uBAAuB,CAAC,SAAiB,EAAU;IAClE,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,mBAAmB,CAAC;IACnD,OAAO,sBAAsB,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAK,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAAA,CACnF;AAED,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,KAAsB,EAAU;IAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACjC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACpE,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IACtE,IAAI,OAAO,CAAC,UAAU,CAAC,KAAG,CAAC;QAAE,OAAO,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,IAAI,OAAO,CAAC,UAAU,CAAC,KAAG,CAAC;QAAE,OAAO,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;AAAA,CACzC","sourcesContent":["import path from \"node:path\";\nimport * as Diff from \"diff\";\nimport { getLanguageFromPath, highlightCode } from \"../../../../modes/interactive/theme/theme.js\";\nimport { parsePatch } from \"./parser.js\";\nimport { extractPatchedPaths } from \"./text.js\";\nimport type {\n\tApplyPatchOperation,\n\tApplyPatchPreview,\n\tApplyPatchPreviewFile,\n\tApplyPatchRenderState,\n\tApplyPatchTheme,\n} from \"./types.js\";\n\nexport const PATCH_PREVIEW_MAX_LINES = 16;\nexport const PATCH_PREVIEW_MAX_CHARS = 4000;\nconst PATCH_PREVIEW_HEAD_LINES = 8;\nconst PATCH_PREVIEW_TAIL_LINES = 8;\nconst applyPatchRenderStates = new Map<string, ApplyPatchRenderState>();\n\nfunction formatLineCountSummary(added: number, removed: number): string {\n\treturn `(+${added} -${removed})`;\n}\n\nfunction countLines(text: string): number {\n\tif (text.length === 0) return 0;\n\tlet lines = 1;\n\tfor (let index = 0; index < text.length; index++) {\n\t\tif (text.charCodeAt(index) === 10) lines += 1;\n\t}\n\treturn lines;\n}\n\nexport function truncatePreview(text: string): string {\n\tif (text.length <= PATCH_PREVIEW_MAX_CHARS && countLines(text) <= PATCH_PREVIEW_MAX_LINES) return text;\n\tconst lines = text.split(\"\\n\");\n\tconst head = lines.slice(0, PATCH_PREVIEW_HEAD_LINES);\n\tconst tail = lines.slice(-PATCH_PREVIEW_TAIL_LINES);\n\tlet preview = [...head, \"…\", ...tail].join(\"\\n\");\n\tif (preview.length > PATCH_PREVIEW_MAX_CHARS) preview = `${preview.slice(0, PATCH_PREVIEW_MAX_CHARS).trimEnd()}\\n…`;\n\treturn preview;\n}\n\nexport function displayPath(filePath: string, cwd: string): string {\n\tif (!path.isAbsolute(filePath)) return filePath;\n\tconst absoluteCwd = path.resolve(cwd);\n\tconst relativePath = path.relative(absoluteCwd, filePath);\n\tif (\n\t\trelativePath === \"\" ||\n\t\t(!relativePath.startsWith(`..${path.sep}`) && relativePath !== \"..\" && !path.isAbsolute(relativePath))\n\t) {\n\t\treturn relativePath || \".\";\n\t}\n\treturn filePath;\n}\n\nfunction formatPatchFilePath(file: ApplyPatchPreviewFile, cwd: string = process.cwd()): string {\n\tconst filePath = displayPath(file.filePath, cwd);\n\tif (!file.movePath) return filePath;\n\treturn `${filePath} → ${displayPath(file.movePath, cwd)}`;\n}\n\nfunction formatPatchOperation(operation: ApplyPatchOperation): string {\n\tif (operation === \"add\") return \"Added\";\n\tif (operation === \"delete\") return \"Deleted\";\n\treturn \"Edited\";\n}\n\nexport function formatPatchPreview(\n\tpreview: ApplyPatchPreview,\n\tcwd: string = process.cwd(),\n\texpanded: boolean = true,\n): string {\n\tconst lines: string[] = [];\n\tif (preview.files.length === 1) {\n\t\tconst file = preview.files[0];\n\t\tif (file) {\n\t\t\tlines.push(\n\t\t\t\t`• ${formatPatchOperation(file.operation)} ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`,\n\t\t\t);\n\t\t\tif (expanded && file.diff)\n\t\t\t\tlines.push(\n\t\t\t\t\t...truncatePreview(file.diff)\n\t\t\t\t\t\t.split(\"\\n\")\n\t\t\t\t\t\t.map((line) => `  ${line}`),\n\t\t\t\t);\n\t\t}\n\t\treturn lines.join(\"\\n\");\n\t}\n\n\tconst noun = preview.files.length === 1 ? \"file\" : \"files\";\n\tlines.push(`• Edited ${preview.files.length} ${noun} ${formatLineCountSummary(preview.added, preview.removed)}`);\n\tfor (const file of preview.files) {\n\t\tlines.push(`  └ ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`);\n\t\tif (expanded && file.diff)\n\t\t\tlines.push(\n\t\t\t\t...truncatePreview(file.diff)\n\t\t\t\t\t.split(\"\\n\")\n\t\t\t\t\t.map((line) => `    ${line}`),\n\t\t\t);\n\t}\n\treturn lines.join(\"\\n\");\n}\n\nexport function formatInFlightCallText(patchText: string): string {\n\tconst paths = extractPatchedPaths(patchText);\n\tif (paths.length === 0) return \"Patching\";\n\tconst noun = paths.length === 1 ? \"file\" : \"files\";\n\tconst count = paths.length > 1 ? ` (${paths.length} ${noun})` : \"\";\n\treturn `Patching${count}: ${paths.join(\", \")}`;\n}\n\ntype RenderableAddedDiffLine = { content: string; kind: \"added\"; lineNumber: string; sign: \"+\" };\ntype RenderableRemovedDiffLine = { content: string; kind: \"removed\"; lineNumber: string; sign: \"-\" };\ntype RenderableContextDiffLine = { content: string; kind: \"context\"; lineNumber: string; sign: \" \" };\ntype RenderableContentDiffLine = RenderableAddedDiffLine | RenderableContextDiffLine | RenderableRemovedDiffLine;\ntype RenderableDiffLine = RenderableContentDiffLine | { kind: \"meta\"; text: string };\n\nfunction parseRenderableDiffLine(line: string): RenderableDiffLine {\n\tconst match = line.match(/^([+\\- ])(\\s*\\d+)\\s(.*)$/);\n\tif (!match) return { kind: \"meta\", text: line };\n\n\tconst sign = match[1];\n\tconst lineNumber = match[2];\n\tif ((sign !== \"+\" && sign !== \"-\" && sign !== \" \") || lineNumber === undefined) return { kind: \"meta\", text: line };\n\n\tconst content = match[3] ?? \"\";\n\tif (sign === \"+\") return { content, kind: \"added\", lineNumber, sign };\n\tif (sign === \"-\") return { content, kind: \"removed\", lineNumber, sign };\n\treturn { content, kind: \"context\", lineNumber, sign };\n}\n\nfunction replaceTabs(text: string): string {\n\treturn text.replace(/\\t/g, \"   \");\n}\n\nfunction highlightDiffContent(content: string, filePath: string): string {\n\tconst plainContent = replaceTabs(content);\n\tconst language = getLanguageFromPath(filePath);\n\ttry {\n\t\treturn highlightCode(plainContent, language)[0] ?? plainContent;\n\t} catch {\n\t\treturn plainContent;\n\t}\n}\n\nfunction renderInlineDiff(\n\toldContent: string,\n\tnewContent: string,\n\ttheme: ApplyPatchTheme,\n): { added: string; removed: string } {\n\tconst parts = Diff.diffWords(replaceTabs(oldContent), replaceTabs(newContent));\n\tlet added = \"\";\n\tlet removed = \"\";\n\tlet firstAdded = true;\n\tlet firstRemoved = true;\n\n\tfor (const part of parts) {\n\t\tif (part.added) {\n\t\t\tlet value = part.value;\n\t\t\tif (firstAdded) {\n\t\t\t\tconst leadingWhitespace = value.match(/^(\\s*)/)?.[1] ?? \"\";\n\t\t\t\tadded += leadingWhitespace;\n\t\t\t\tvalue = value.slice(leadingWhitespace.length);\n\t\t\t\tfirstAdded = false;\n\t\t\t}\n\t\t\tif (value) added += theme.inverse(value);\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (part.removed) {\n\t\t\tlet value = part.value;\n\t\t\tif (firstRemoved) {\n\t\t\t\tconst leadingWhitespace = value.match(/^(\\s*)/)?.[1] ?? \"\";\n\t\t\t\tremoved += leadingWhitespace;\n\t\t\t\tvalue = value.slice(leadingWhitespace.length);\n\t\t\t\tfirstRemoved = false;\n\t\t\t}\n\t\t\tif (value) removed += theme.inverse(value);\n\t\t\tcontinue;\n\t\t}\n\n\t\tadded += part.value;\n\t\tremoved += part.value;\n\t}\n\n\treturn { added, removed };\n}\n\nfunction renderOpenCodeLikeDiffLine(\n\tline: RenderableContentDiffLine,\n\tfilePath: string,\n\ttheme: ApplyPatchTheme,\n\tcontentOverride?: string,\n): string {\n\tconst lineNumber = theme.fg(\"muted\", line.lineNumber);\n\tif (line.kind === \"context\") {\n\t\treturn `${theme.fg(\"toolDiffContext\", line.sign)}${lineNumber} ${highlightDiffContent(line.content, filePath)}`;\n\t}\n\n\tconst diffColor = line.kind === \"added\" ? \"toolDiffAdded\" : \"toolDiffRemoved\";\n\tconst background = line.kind === \"added\" ? \"toolSuccessBg\" : \"toolErrorBg\";\n\tconst content =\n\t\tcontentOverride === undefined\n\t\t\t? highlightDiffContent(line.content, filePath)\n\t\t\t: theme.fg(diffColor, replaceTabs(contentOverride));\n\tconst rendered = `${theme.fg(diffColor, line.sign)}${lineNumber} ${content}`;\n\treturn theme.bg(background, rendered);\n}\n\nfunction renderOpenCodeLikeDiff(diffText: string, filePath: string, theme: ApplyPatchTheme): string {\n\tconst parsedLines = diffText.split(\"\\n\").map(parseRenderableDiffLine);\n\tconst rendered: string[] = [];\n\tlet index = 0;\n\n\twhile (index < parsedLines.length) {\n\t\tconst line = parsedLines[index];\n\t\tif (!line) {\n\t\t\tindex++;\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (line.kind !== \"removed\") {\n\t\t\trendered.push(\n\t\t\t\tline.kind === \"meta\"\n\t\t\t\t\t? theme.fg(\"toolDiffContext\", line.text)\n\t\t\t\t\t: renderOpenCodeLikeDiffLine(line, filePath, theme),\n\t\t\t);\n\t\t\tindex++;\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst removedLines: RenderableRemovedDiffLine[] = [];\n\t\twhile (parsedLines[index]?.kind === \"removed\") {\n\t\t\tconst removedLine = parsedLines[index];\n\t\t\tif (removedLine?.kind === \"removed\") removedLines.push(removedLine);\n\t\t\tindex++;\n\t\t}\n\n\t\tconst addedLines: RenderableAddedDiffLine[] = [];\n\t\twhile (parsedLines[index]?.kind === \"added\") {\n\t\t\tconst addedLine = parsedLines[index];\n\t\t\tif (addedLine?.kind === \"added\") addedLines.push(addedLine);\n\t\t\tindex++;\n\t\t}\n\n\t\tconst pairedCount = Math.min(removedLines.length, addedLines.length);\n\t\tfor (let pairIndex = 0; pairIndex < pairedCount; pairIndex++) {\n\t\t\tconst removedLine = removedLines[pairIndex];\n\t\t\tconst addedLine = addedLines[pairIndex];\n\t\t\tif (!removedLine || !addedLine) continue;\n\n\t\t\tconst inline = renderInlineDiff(removedLine.content, addedLine.content, theme);\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(removedLine, filePath, theme, inline.removed));\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(addedLine, filePath, theme, inline.added));\n\t\t}\n\n\t\tfor (const removedLine of removedLines.slice(pairedCount))\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(removedLine, filePath, theme));\n\t\tfor (const addedLine of addedLines.slice(pairedCount))\n\t\t\trendered.push(renderOpenCodeLikeDiffLine(addedLine, filePath, theme));\n\t}\n\n\treturn rendered.join(\"\\n\");\n}\n\nexport function getApplyPatchRenderState(toolCallId: string, cwd: string, patchText: string): ApplyPatchRenderState {\n\tconst existing = applyPatchRenderStates.get(toolCallId);\n\tif (existing && existing.cwd === cwd && existing.patchText === patchText) return existing;\n\n\tconst callText = formatInFlightCallText(patchText);\n\tlet collapsed = \"\";\n\tlet expanded = \"\";\n\ttry {\n\t\tconst hunks = parsePatch(patchText);\n\t\tif (hunks.length > 0) {\n\t\t\tconst files = hunks.map((hunk) => ({\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\tmovePath: hunk.type === \"update\" ? hunk.movePath : undefined,\n\t\t\t\toperation: hunk.type,\n\t\t\t\tdiff: \"\",\n\t\t\t\tadded: 0,\n\t\t\t\tremoved: 0,\n\t\t\t})) satisfies ApplyPatchPreviewFile[];\n\t\t\tconst preview: ApplyPatchPreview = { files, added: 0, removed: 0 };\n\t\t\tcollapsed = formatPatchPreview(preview, cwd, false);\n\t\t\texpanded = formatPatchPreview(preview, cwd, true);\n\t\t}\n\t} catch {\n\t\t// ignore incomplete patch text\n\t}\n\n\tconst nextState: ApplyPatchRenderState = { ...existing, cwd, patchText, callText, collapsed, expanded };\n\tapplyPatchRenderStates.set(toolCallId, nextState);\n\treturn nextState;\n}\n\nexport function clearApplyPatchRenderState(): void {\n\tapplyPatchRenderStates.clear();\n}\n\nexport function renderPatchPreview(\n\tpreview: ApplyPatchPreview,\n\tcwd: string,\n\ttheme: ApplyPatchTheme,\n\texpanded: boolean,\n): string {\n\tif (expanded) {\n\t\ttry {\n\t\t\tconst renderFile = (file: ApplyPatchPreviewFile, headerPrefix: string): string => {\n\t\t\t\tconst header = `• ${formatPatchOperation(file.operation)} ${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`;\n\t\t\t\tif (!file.diff) {\n\t\t\t\t\treturn headerPrefix.length > 0\n\t\t\t\t\t\t? `${headerPrefix}${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`\n\t\t\t\t\t\t: header;\n\t\t\t\t}\n\n\t\t\t\tconst renderedDiff = renderOpenCodeLikeDiff(\n\t\t\t\t\ttruncatePreview(file.diff),\n\t\t\t\t\tfile.movePath ?? file.filePath,\n\t\t\t\t\ttheme,\n\t\t\t\t);\n\t\t\t\tif (headerPrefix.length > 0) {\n\t\t\t\t\tconst nestedHeader = `${headerPrefix}${formatPatchFilePath(file, cwd)} ${formatLineCountSummary(file.added, file.removed)}`;\n\t\t\t\t\treturn `${nestedHeader}\\n${renderedDiff\n\t\t\t\t\t\t.split(\"\\n\")\n\t\t\t\t\t\t.map((line) => `    ${line}`)\n\t\t\t\t\t\t.join(\"\\n\")}`;\n\t\t\t\t}\n\t\t\t\treturn `${header}\\n${renderedDiff}`;\n\t\t\t};\n\n\t\t\tif (preview.files.length === 1) {\n\t\t\t\tconst file = preview.files[0];\n\t\t\t\treturn file ? renderFile(file, \"\") : \"\";\n\t\t\t}\n\n\t\t\tconst noun = preview.files.length === 1 ? \"file\" : \"files\";\n\t\t\tconst renderedFiles = preview.files.map((file) => renderFile(file, \"  └ \")).join(\"\\n\");\n\t\t\tif (renderedFiles.length > 0) {\n\t\t\t\treturn `• Edited ${preview.files.length} ${noun} ${formatLineCountSummary(preview.added, preview.removed)}\\n${renderedFiles}`;\n\t\t\t}\n\t\t} catch {\n\t\t\t// fall back to manual themed line rendering\n\t\t}\n\t}\n\n\treturn formatPatchPreview(preview, cwd, expanded)\n\t\t.split(\"\\n\")\n\t\t.map((line) => renderPatchLine(line, theme))\n\t\t.join(\"\\n\");\n}\n\nexport function formatPendingPatchPaths(patchText: string): string {\n\tconst paths = extractPatchedPaths(patchText);\n\tif (paths.length === 0) return \"Applying patch...\";\n\treturn `Applying patch...\\n${paths.map((filePath) => `• ${filePath}`).join(\"\\n\")}`;\n}\n\nexport function renderPatchLine(line: string, theme: ApplyPatchTheme): string {\n\tconst trimmed = line.trimStart();\n\tif (trimmed.startsWith(\"+\")) return theme.fg(\"toolDiffAdded\", line);\n\tif (trimmed.startsWith(\"-\")) return theme.fg(\"toolDiffRemoved\", line);\n\tif (trimmed.startsWith(\"•\")) return theme.fg(\"toolTitle\", theme.bold(line));\n\tif (trimmed.startsWith(\"└\")) return theme.fg(\"accent\", line);\n\treturn theme.fg(\"toolDiffContext\", line);\n}\n"]}

package/dist/core/extensions/builtin/gpt-apply-patch/preview.d.ts

@@ -0,0 +1,7 @@
+import type { ApplyPatchPreview, ApplyPatchProgress, ApplyPatchToolDetails, ParsedPatch } from "./types.js";
+export declare function createPatchPreview(cwd: string, hunks: ParsedPatch[]): Promise<ApplyPatchPreview>;
+export declare function createPendingPatchUpdate(cwd: string, patchText: string, progress?: ApplyPatchProgress, previewOverride?: ApplyPatchPreview): Promise<{
+    text: string;
+    details: ApplyPatchToolDetails | undefined;
+}>;
+//# sourceMappingURL=preview.d.ts.map

package/dist/core/extensions/builtin/gpt-apply-patch/preview.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/preview.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACX,iBAAiB,EAEjB,kBAAkB,EAClB,qBAAqB,EACrB,WAAW,EACX,MAAM,YAAY,CAAC;AAYpB,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA+BtG;AAED,wBAAsB,wBAAwB,CAC7C,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,eAAe,CAAC,EAAE,iBAAiB,GACjC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,qBAAqB,GAAG,SAAS,CAAA;CAAE,CAAC,CAyBvE","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { parsePatch } from \"./parser.js\";\nimport { createPatchDiff } from \"./patch-diff.js\";\nimport { replaceChunks } from \"./patch-replace.js\";\nimport { formatPatchPreview, formatPendingPatchPaths } from \"./preview-format.js\";\nimport type {\n\tApplyPatchPreview,\n\tApplyPatchPreviewFile,\n\tApplyPatchProgress,\n\tApplyPatchToolDetails,\n\tParsedPatch,\n} from \"./types.js\";\nimport { resolvePatchPath } from \"./workspace.js\";\n\nasync function readExistingFileForPreview(absolutePath: string): Promise<string> {\n\ttry {\n\t\treturn await readFile(absolutePath, \"utf-8\");\n\t} catch (error) {\n\t\tif (error && typeof error === \"object\" && \"code\" in error && error.code === \"ENOENT\") return \"\";\n\t\tthrow error;\n\t}\n}\n\nexport async function createPatchPreview(cwd: string, hunks: ParsedPatch[]): Promise<ApplyPatchPreview> {\n\tconst files: ApplyPatchPreviewFile[] = [];\n\tfor (const hunk of hunks) {\n\t\tconst absolutePath = resolvePatchPath(cwd, hunk.filePath);\n\t\tif (hunk.type === \"add\") {\n\t\t\tconst oldContent = await readExistingFileForPreview(absolutePath);\n\t\t\tconst diff = createPatchDiff(oldContent, hunk.content);\n\t\t\tfiles.push({ filePath: hunk.filePath, operation: oldContent.length > 0 ? \"update\" : \"add\", ...diff });\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (hunk.type === \"delete\") {\n\t\t\tconst oldContent = await readFile(absolutePath, \"utf-8\");\n\t\t\tconst diff = createPatchDiff(oldContent, \"\");\n\t\t\tfiles.push({ filePath: hunk.filePath, operation: \"delete\", ...diff });\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst oldContent = await readFile(absolutePath, \"utf-8\");\n\t\tconst newContent =\n\t\t\thunk.chunks.length === 0 ? oldContent : replaceChunks(oldContent, hunk.filePath, hunk.chunks).content;\n\t\tif (hunk.movePath) resolvePatchPath(cwd, hunk.movePath);\n\t\tconst diff = createPatchDiff(oldContent, newContent);\n\t\tfiles.push({ filePath: hunk.filePath, movePath: hunk.movePath, operation: \"update\", ...diff });\n\t}\n\n\treturn {\n\t\tfiles,\n\t\tadded: files.reduce((sum, file) => sum + file.added, 0),\n\t\tremoved: files.reduce((sum, file) => sum + file.removed, 0),\n\t};\n}\n\nexport async function createPendingPatchUpdate(\n\tcwd: string,\n\tpatchText: string,\n\tprogress?: ApplyPatchProgress,\n\tpreviewOverride?: ApplyPatchPreview,\n): Promise<{ text: string; details: ApplyPatchToolDetails | undefined }> {\n\tconst title = progress\n\t\t? `Applying patch (${progress.applied + progress.failed}/${progress.total})...`\n\t\t: \"Applying patch...\";\n\tif (previewOverride) {\n\t\treturn {\n\t\t\ttext: `${title}\\n${formatPatchPreview(previewOverride)}`,\n\t\t\tdetails: { preview: previewOverride, progress },\n\t\t};\n\t}\n\n\ttry {\n\t\tconst hunks = parsePatch(patchText);\n\t\tif (hunks.length === 0) return { text: title, details: progress ? { progress } : undefined };\n\t\tconst preview = await createPatchPreview(cwd, hunks);\n\t\tif (preview.files.some((file) => file.diff.trim().length > 0)) {\n\t\t\treturn { text: `${title}\\n${formatPatchPreview(preview)}`, details: { preview, progress } };\n\t\t}\n\t} catch {\n\t\treturn {\n\t\t\ttext: progress ? title : formatPendingPatchPaths(patchText),\n\t\t\tdetails: progress ? { progress } : undefined,\n\t\t};\n\t}\n\treturn { text: progress ? title : formatPendingPatchPaths(patchText), details: progress ? { progress } : undefined };\n}\n"]}

package/dist/core/extensions/builtin/gpt-apply-patch/preview.js

@@ -0,0 +1,73 @@
+import { readFile } from "node:fs/promises";
+import { parsePatch } from "./parser.js";
+import { createPatchDiff } from "./patch-diff.js";
+import { replaceChunks } from "./patch-replace.js";
+import { formatPatchPreview, formatPendingPatchPaths } from "./preview-format.js";
+import { resolvePatchPath } from "./workspace.js";
+async function readExistingFileForPreview(absolutePath) {
+    try {
+        return await readFile(absolutePath, "utf-8");
+    }
+    catch (error) {
+        if (error && typeof error === "object" && "code" in error && error.code === "ENOENT")
+            return "";
+        throw error;
+    }
+}
+export async function createPatchPreview(cwd, hunks) {
+    const files = [];
+    for (const hunk of hunks) {
+        const absolutePath = resolvePatchPath(cwd, hunk.filePath);
+        if (hunk.type === "add") {
+            const oldContent = await readExistingFileForPreview(absolutePath);
+            const diff = createPatchDiff(oldContent, hunk.content);
+            files.push({ filePath: hunk.filePath, operation: oldContent.length > 0 ? "update" : "add", ...diff });
+            continue;
+        }
+        if (hunk.type === "delete") {
+            const oldContent = await readFile(absolutePath, "utf-8");
+            const diff = createPatchDiff(oldContent, "");
+            files.push({ filePath: hunk.filePath, operation: "delete", ...diff });
+            continue;
+        }
+        const oldContent = await readFile(absolutePath, "utf-8");
+        const newContent = hunk.chunks.length === 0 ? oldContent : replaceChunks(oldContent, hunk.filePath, hunk.chunks).content;
+        if (hunk.movePath)
+            resolvePatchPath(cwd, hunk.movePath);
+        const diff = createPatchDiff(oldContent, newContent);
+        files.push({ filePath: hunk.filePath, movePath: hunk.movePath, operation: "update", ...diff });
+    }
+    return {
+        files,
+        added: files.reduce((sum, file) => sum + file.added, 0),
+        removed: files.reduce((sum, file) => sum + file.removed, 0),
+    };
+}
+export async function createPendingPatchUpdate(cwd, patchText, progress, previewOverride) {
+    const title = progress
+        ? `Applying patch (${progress.applied + progress.failed}/${progress.total})...`
+        : "Applying patch...";
+    if (previewOverride) {
+        return {
+            text: `${title}\n${formatPatchPreview(previewOverride)}`,
+            details: { preview: previewOverride, progress },
+        };
+    }
+    try {
+        const hunks = parsePatch(patchText);
+        if (hunks.length === 0)
+            return { text: title, details: progress ? { progress } : undefined };
+        const preview = await createPatchPreview(cwd, hunks);
+        if (preview.files.some((file) => file.diff.trim().length > 0)) {
+            return { text: `${title}\n${formatPatchPreview(preview)}`, details: { preview, progress } };
+        }
+    }
+    catch {
+        return {
+            text: progress ? title : formatPendingPatchPaths(patchText),
+            details: progress ? { progress } : undefined,
+        };
+    }
+    return { text: progress ? title : formatPendingPatchPaths(patchText), details: progress ? { progress } : undefined };
+}
+//# sourceMappingURL=preview.js.map

package/dist/core/extensions/builtin/gpt-apply-patch/preview.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/preview.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { parsePatch } from \"./parser.js\";\nimport { createPatchDiff } from \"./patch-diff.js\";\nimport { replaceChunks } from \"./patch-replace.js\";\nimport { formatPatchPreview, formatPendingPatchPaths } from \"./preview-format.js\";\nimport type {\n\tApplyPatchPreview,\n\tApplyPatchPreviewFile,\n\tApplyPatchProgress,\n\tApplyPatchToolDetails,\n\tParsedPatch,\n} from \"./types.js\";\nimport { resolvePatchPath } from \"./workspace.js\";\n\nasync function readExistingFileForPreview(absolutePath: string): Promise<string> {\n\ttry {\n\t\treturn await readFile(absolutePath, \"utf-8\");\n\t} catch (error) {\n\t\tif (error && typeof error === \"object\" && \"code\" in error && error.code === \"ENOENT\") return \"\";\n\t\tthrow error;\n\t}\n}\n\nexport async function createPatchPreview(cwd: string, hunks: ParsedPatch[]): Promise<ApplyPatchPreview> {\n\tconst files: ApplyPatchPreviewFile[] = [];\n\tfor (const hunk of hunks) {\n\t\tconst absolutePath = resolvePatchPath(cwd, hunk.filePath);\n\t\tif (hunk.type === \"add\") {\n\t\t\tconst oldContent = await readExistingFileForPreview(absolutePath);\n\t\t\tconst diff = createPatchDiff(oldContent, hunk.content);\n\t\t\tfiles.push({ filePath: hunk.filePath, operation: oldContent.length > 0 ? \"update\" : \"add\", ...diff });\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (hunk.type === \"delete\") {\n\t\t\tconst oldContent = await readFile(absolutePath, \"utf-8\");\n\t\t\tconst diff = createPatchDiff(oldContent, \"\");\n\t\t\tfiles.push({ filePath: hunk.filePath, operation: \"delete\", ...diff });\n\t\t\tcontinue;\n\t\t}\n\n\t\tconst oldContent = await readFile(absolutePath, \"utf-8\");\n\t\tconst newContent =\n\t\t\thunk.chunks.length === 0 ? oldContent : replaceChunks(oldContent, hunk.filePath, hunk.chunks).content;\n\t\tif (hunk.movePath) resolvePatchPath(cwd, hunk.movePath);\n\t\tconst diff = createPatchDiff(oldContent, newContent);\n\t\tfiles.push({ filePath: hunk.filePath, movePath: hunk.movePath, operation: \"update\", ...diff });\n\t}\n\n\treturn {\n\t\tfiles,\n\t\tadded: files.reduce((sum, file) => sum + file.added, 0),\n\t\tremoved: files.reduce((sum, file) => sum + file.removed, 0),\n\t};\n}\n\nexport async function createPendingPatchUpdate(\n\tcwd: string,\n\tpatchText: string,\n\tprogress?: ApplyPatchProgress,\n\tpreviewOverride?: ApplyPatchPreview,\n): Promise<{ text: string; details: ApplyPatchToolDetails | undefined }> {\n\tconst title = progress\n\t\t? `Applying patch (${progress.applied + progress.failed}/${progress.total})...`\n\t\t: \"Applying patch...\";\n\tif (previewOverride) {\n\t\treturn {\n\t\t\ttext: `${title}\\n${formatPatchPreview(previewOverride)}`,\n\t\t\tdetails: { preview: previewOverride, progress },\n\t\t};\n\t}\n\n\ttry {\n\t\tconst hunks = parsePatch(patchText);\n\t\tif (hunks.length === 0) return { text: title, details: progress ? { progress } : undefined };\n\t\tconst preview = await createPatchPreview(cwd, hunks);\n\t\tif (preview.files.some((file) => file.diff.trim().length > 0)) {\n\t\t\treturn { text: `${title}\\n${formatPatchPreview(preview)}`, details: { preview, progress } };\n\t\t}\n\t} catch {\n\t\treturn {\n\t\t\ttext: progress ? title : formatPendingPatchPaths(patchText),\n\t\t\tdetails: progress ? { progress } : undefined,\n\t\t};\n\t}\n\treturn { text: progress ? title : formatPendingPatchPaths(patchText), details: progress ? { progress } : undefined };\n}\n"]}

package/dist/core/extensions/builtin/gpt-apply-patch/seek-sequence.d.ts

@@ -0,0 +1,6 @@
+export declare function seekSequenceWithFuzz(lines: string[], pattern: string[], start: number, eof: boolean): {
+    index: number;
+    fuzz: 0 | 1 | 100 | 10000;
+} | undefined;
+export declare function seekSequence(lines: string[], pattern: string[], start: number, eof: boolean): number | undefined;
+//# sourceMappingURL=seek-sequence.d.ts.map

package/dist/core/extensions/builtin/gpt-apply-patch/seek-sequence.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"seek-sequence.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/seek-sequence.ts"],"names":[],"mappings":"AASA,wBAAgB,oBAAoB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,EAAE,MAAM,EAAE,EACjB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,GACV;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,KAAK,CAAA;CAAE,GAAG,SAAS,CAoC1D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEhH","sourcesContent":["function normalizeSeekLine(line: string): string {\n\treturn line\n\t\t.trim()\n\t\t.replace(/[‐‑‒–—―−]/g, \"-\")\n\t\t.replace(/[‘’‚‛]/g, \"'\")\n\t\t.replace(/[“”„‟]/g, '\"')\n\t\t.replace(/[\\u00A0\\u2002-\\u200A\\u202F\\u205F\\u3000]/g, \" \");\n}\n\nexport function seekSequenceWithFuzz(\n\tlines: string[],\n\tpattern: string[],\n\tstart: number,\n\teof: boolean,\n): { index: number; fuzz: 0 | 1 | 100 | 10000 } | undefined {\n\tif (pattern.length === 0) {\n\t\treturn { index: start, fuzz: 0 };\n\t}\n\tif (pattern.length > lines.length) {\n\t\treturn undefined;\n\t}\n\n\tconst searchStart = eof && lines.length >= pattern.length ? lines.length - pattern.length : start;\n\tconst lastStart = lines.length - pattern.length;\n\tconst matches = (index: number, compare: (left: string, right: string) => boolean): boolean => {\n\t\tfor (let patternIndex = 0; patternIndex < pattern.length; patternIndex++) {\n\t\t\tconst line = lines[index + patternIndex];\n\t\t\tconst expected = pattern[patternIndex];\n\t\t\tif (line === undefined || expected === undefined || !compare(line, expected)) {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t}\n\t\treturn true;\n\t};\n\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => line === expected)) return { index, fuzz: 0 };\n\t}\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => line.trimEnd() === expected.trimEnd())) return { index, fuzz: 1 };\n\t}\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => line.trim() === expected.trim())) return { index, fuzz: 100 };\n\t}\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => normalizeSeekLine(line) === normalizeSeekLine(expected)))\n\t\t\treturn { index, fuzz: 10000 };\n\t}\n\n\treturn undefined;\n}\n\nexport function seekSequence(lines: string[], pattern: string[], start: number, eof: boolean): number | undefined {\n\treturn seekSequenceWithFuzz(lines, pattern, start, eof)?.index;\n}\n"]}

package/dist/core/extensions/builtin/gpt-apply-patch/seek-sequence.js

@@ -0,0 +1,49 @@
+function normalizeSeekLine(line) {
+    return line
+        .trim()
+        .replace(/[‐‑‒–—―−]/g, "-")
+        .replace(/[‘’‚‛]/g, "'")
+        .replace(/[“”„‟]/g, '"')
+        .replace(/[\u00A0\u2002-\u200A\u202F\u205F\u3000]/g, " ");
+}
+export function seekSequenceWithFuzz(lines, pattern, start, eof) {
+    if (pattern.length === 0) {
+        return { index: start, fuzz: 0 };
+    }
+    if (pattern.length > lines.length) {
+        return undefined;
+    }
+    const searchStart = eof && lines.length >= pattern.length ? lines.length - pattern.length : start;
+    const lastStart = lines.length - pattern.length;
+    const matches = (index, compare) => {
+        for (let patternIndex = 0; patternIndex < pattern.length; patternIndex++) {
+            const line = lines[index + patternIndex];
+            const expected = pattern[patternIndex];
+            if (line === undefined || expected === undefined || !compare(line, expected)) {
+                return false;
+            }
+        }
+        return true;
+    };
+    for (let index = searchStart; index <= lastStart; index++) {
+        if (matches(index, (line, expected) => line === expected))
+            return { index, fuzz: 0 };
+    }
+    for (let index = searchStart; index <= lastStart; index++) {
+        if (matches(index, (line, expected) => line.trimEnd() === expected.trimEnd()))
+            return { index, fuzz: 1 };
+    }
+    for (let index = searchStart; index <= lastStart; index++) {
+        if (matches(index, (line, expected) => line.trim() === expected.trim()))
+            return { index, fuzz: 100 };
+    }
+    for (let index = searchStart; index <= lastStart; index++) {
+        if (matches(index, (line, expected) => normalizeSeekLine(line) === normalizeSeekLine(expected)))
+            return { index, fuzz: 10000 };
+    }
+    return undefined;
+}
+export function seekSequence(lines, pattern, start, eof) {
+    return seekSequenceWithFuzz(lines, pattern, start, eof)?.index;
+}
+//# sourceMappingURL=seek-sequence.js.map

package/dist/core/extensions/builtin/gpt-apply-patch/seek-sequence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"seek-sequence.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/seek-sequence.ts"],"names":[],"mappings":"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","sourcesContent":["function normalizeSeekLine(line: string): string {\n\treturn line\n\t\t.trim()\n\t\t.replace(/[‐‑‒–—―−]/g, \"-\")\n\t\t.replace(/[‘’‚‛]/g, \"'\")\n\t\t.replace(/[“”„‟]/g, '\"')\n\t\t.replace(/[\\u00A0\\u2002-\\u200A\\u202F\\u205F\\u3000]/g, \" \");\n}\n\nexport function seekSequenceWithFuzz(\n\tlines: string[],\n\tpattern: string[],\n\tstart: number,\n\teof: boolean,\n): { index: number; fuzz: 0 | 1 | 100 | 10000 } | undefined {\n\tif (pattern.length === 0) {\n\t\treturn { index: start, fuzz: 0 };\n\t}\n\tif (pattern.length > lines.length) {\n\t\treturn undefined;\n\t}\n\n\tconst searchStart = eof && lines.length >= pattern.length ? lines.length - pattern.length : start;\n\tconst lastStart = lines.length - pattern.length;\n\tconst matches = (index: number, compare: (left: string, right: string) => boolean): boolean => {\n\t\tfor (let patternIndex = 0; patternIndex < pattern.length; patternIndex++) {\n\t\t\tconst line = lines[index + patternIndex];\n\t\t\tconst expected = pattern[patternIndex];\n\t\t\tif (line === undefined || expected === undefined || !compare(line, expected)) {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t}\n\t\treturn true;\n\t};\n\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => line === expected)) return { index, fuzz: 0 };\n\t}\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => line.trimEnd() === expected.trimEnd())) return { index, fuzz: 1 };\n\t}\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => line.trim() === expected.trim())) return { index, fuzz: 100 };\n\t}\n\tfor (let index = searchStart; index <= lastStart; index++) {\n\t\tif (matches(index, (line, expected) => normalizeSeekLine(line) === normalizeSeekLine(expected)))\n\t\t\treturn { index, fuzz: 10000 };\n\t}\n\n\treturn undefined;\n}\n\nexport function seekSequence(lines: string[], pattern: string[], start: number, eof: boolean): number | undefined {\n\treturn seekSequenceWithFuzz(lines, pattern, start, eof)?.index;\n}\n"]}

package/dist/core/extensions/builtin/gpt-apply-patch/streaming-parser.d.ts

@@ -0,0 +1,23 @@
+import type { ParsedPatch } from "./types.js";
+export declare class StreamingPatchParser {
+    private lineBuffer;
+    private mode;
+    private hunks;
+    pushDelta(delta: string): ParsedPatch[];
+    finish(): ParsedPatch[];
+    private snapshot;
+    private ensureUpdateHunkIsNotEmpty;
+    private handleHeader;
+    private startAdd;
+    private startDelete;
+    private startUpdate;
+    private currentUpdate;
+    private currentChunk;
+    private processLine;
+    private processStarted;
+    private processAdd;
+    private processDelete;
+    private processUpdate;
+    private pushUpdateLine;
+}
+//# sourceMappingURL=streaming-parser.d.ts.map