@tyvm/knowhow 0.0.1

package/ts_build/src/agents/tools/modifyFile.js

@@ -0,0 +1,74 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modifyFile = void 0;
+const fs = __importStar(require("fs"));
+const diff_1 = require("diff");
+const readFile_1 = require("./readFile");
+const config_1 = require("../../config");
+const _1 = require(".");
+async function modifyFile(fileBlocks, filePath) {
+    try {
+        const exists = fs.existsSync(filePath);
+        const contentToUpdate = exists ? await (0, _1.readBlocks)(filePath) : [];
+        const edits = {};
+        const before = [...contentToUpdate];
+        const beforeContent = before.map((b) => b.content).join("");
+        for (const block of fileBlocks) {
+            if (!contentToUpdate[block.blockNumber]) {
+                contentToUpdate[block.blockNumber] = {
+                    blockNumber: block.blockNumber,
+                    content: "",
+                };
+            }
+            contentToUpdate[block.blockNumber].content = block.content;
+            edits[block.blockNumber] = contentToUpdate[block.blockNumber];
+        }
+        const newContent = contentToUpdate.map((b) => b.content).join("");
+        fs.writeFileSync(filePath, newContent);
+        const newBlocks = await (0, readFile_1.readFile)(filePath);
+        console.log("====BEFORE====");
+        console.log(beforeContent);
+        console.log("====AFTER====");
+        console.log(newContent);
+        const config = await (0, config_1.getConfig)();
+        const extension = filePath.split(".").pop();
+        const lintResult = await (0, _1.lintFile)(filePath);
+        return `
+    Your changes generated this diff:
+    ${(0, diff_1.createPatch)(filePath, beforeContent, newContent)}
+
+    ${lintResult && "Linting Result"}
+    ${lintResult || ""}
+
+    Are you sure that was correct? .
+    `;
+    }
+    catch (e) {
+        return e.message;
+    }
+}
+exports.modifyFile = modifyFile;
+//# sourceMappingURL=modifyFile.js.map

package/ts_build/src/agents/tools/modifyFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"modifyFile.js","sourceRoot":"","sources":["../../../../src/agents/tools/modifyFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,+BAAmC;AAGnC,yCAAsC;AACtC,yCAAyC;AACzC,wBAAyC;AAClC,KAAK,UAAU,UAAU,CAAC,UAAuB,EAAE,QAAgB;IACxE,IAAI;QACF,MAAM,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,IAAA,aAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5D,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE;YAC9B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBACvC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG;oBACnC,WAAW,EAAE,KAAK,CAAC,WAAW;oBAC9B,OAAO,EAAE,EAAE;iBACZ,CAAC;aACH;YAED,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC3D,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;SAC/D;QAED,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClE,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,CAAC;QAE3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAExB,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,GAAE,CAAC;QACjC,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAA,WAAQ,EAAC,QAAQ,CAAC,CAAC;QAE5C,OAAO;;MAEL,IAAA,kBAAW,EAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,CAAC;;MAEhD,UAAU,IAAI,gBAAgB;MAC9B,UAAU,IAAI,EAAE;;;KAGjB,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,CAAC,OAAO,CAAC;KAClB;AACH,CAAC;AA7CD,gCA6CC"}

package/ts_build/src/agents/tools/patch.d.ts

@@ -0,0 +1,21 @@
+export interface Hunk {
+    header: string;
+    originalStartLine: number;
+    originalLineCount: number;
+    newStartLine: number;
+    newLineCount: number;
+    lines: string[];
+    additions: string[];
+    subtractions: string[];
+    contextLines: string[];
+}
+export declare function parseHunks(patch: string): Hunk[];
+export declare function hunksToPatch(hunks: Hunk[]): string;
+export declare function hunkIsEmpty(hunk: Hunk): boolean;
+export declare function fixPatch(originalContent: string, patch: string): string;
+export declare function savePatchError(originalPatch: string, fixedPatch: string | null, fileContent: string, errorMsg: string): Promise<void>;
+export declare function patchFile(filePath: string, patch: string): Promise<string>;
+export declare function categorizeHunks(originalContent: string, patch: string): {
+    validHunks: Hunk[];
+    invalidHunks: Hunk[];
+};

package/ts_build/src/agents/tools/patch.js

@@ -0,0 +1,443 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.categorizeHunks = exports.patchFile = exports.savePatchError = exports.fixPatch = exports.hunkIsEmpty = exports.hunksToPatch = exports.parseHunks = void 0;
+const fs = __importStar(require("fs"));
+const diff_1 = require("diff");
+const utils_1 = require("../../utils");
+const lintFile_1 = require("./lintFile");
+function findAllLineNumbers(fullText, searchText) {
+    const lines = (0, utils_1.splitByNewLines)(fullText);
+    const search = searchText.startsWith("+") || searchText.startsWith("-")
+        ? searchText.slice(1).trim()
+        : searchText.trim();
+    if (!search)
+        return [];
+    const lineNumbers = [];
+    lines.forEach((line, index) => {
+        if (line.trim() === search) {
+            lineNumbers.push(index + 1);
+        }
+    });
+    return lineNumbers;
+}
+function findClosestNumber(numbers, goal) {
+    if (!numbers || numbers.length === 0) {
+        return undefined;
+    }
+    return numbers.reduce((prev, curr) => {
+        return Math.abs(curr - goal) < Math.abs(prev - goal) ? curr : prev;
+    });
+}
+function findSequenceIndex(haystack, needle) {
+    if (!needle || needle.length === 0) {
+        return -1;
+    }
+    if (!haystack || needle.length > haystack.length) {
+        return -1;
+    }
+    let haystackIndex = 0;
+    while (haystackIndex <= haystack.length - needle.length) {
+        const potentialStartIndex = haystack.indexOf(needle[0], haystackIndex);
+        if (potentialStartIndex === -1) {
+            return -1;
+        }
+        if (potentialStartIndex > haystack.length - needle.length) {
+            return -1;
+        }
+        let sequenceMatches = true;
+        for (let needleIndex = 1; needleIndex < needle.length; needleIndex++) {
+            if (haystack[potentialStartIndex + needleIndex] !== needle[needleIndex]) {
+                sequenceMatches = false;
+                break;
+            }
+        }
+        if (sequenceMatches) {
+            return potentialStartIndex;
+        }
+        haystackIndex = potentialStartIndex + 1;
+    }
+    return -1;
+}
+function parseHunks(patch) {
+    const patchLines = (0, utils_1.splitByNewLines)(patch);
+    const hunks = [];
+    let currentHunkLines = [];
+    let currentHeader = "";
+    let originalStart = 0, originalCount = 0, newStart = 0, newCount = 0;
+    for (const line of patchLines) {
+        if (line.startsWith("@@")) {
+            if (currentHeader) {
+                const additions = currentHunkLines.filter((l) => l.startsWith("+"));
+                const subtractions = currentHunkLines.filter((l) => l.startsWith("-"));
+                const contextLines = currentHunkLines.filter((l) => l.startsWith(" "));
+                hunks.push({
+                    header: currentHeader,
+                    originalStartLine: originalStart,
+                    originalLineCount: originalCount,
+                    newStartLine: newStart,
+                    newLineCount: newCount,
+                    lines: currentHunkLines,
+                    additions,
+                    subtractions,
+                    contextLines,
+                });
+            }
+            currentHeader = line;
+            currentHunkLines = [];
+            const match = line.match(/@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+            if (match) {
+                originalStart = parseInt(match[1], 10);
+                originalCount = parseInt(match[2] || "1", 10);
+                newStart = parseInt(match[3], 10);
+                newCount = parseInt(match[4] || "1", 10);
+            }
+            else {
+                originalStart = 0;
+                originalCount = 0;
+                newStart = 0;
+                newCount = 0;
+                console.warn("Could not parse hunk header:", line);
+            }
+        }
+        else if (currentHeader &&
+            (line.startsWith(" ") ||
+                line.startsWith("+") ||
+                line.startsWith("-") ||
+                line === "\")) {
+            currentHunkLines.push(line);
+        }
+    }
+    if (currentHeader) {
+        const additions = currentHunkLines.filter((l) => l.startsWith("+"));
+        const subtractions = currentHunkLines.filter((l) => l.startsWith("-"));
+        const contextLines = currentHunkLines.filter((l) => l.startsWith(" "));
+        hunks.push({
+            header: currentHeader,
+            originalStartLine: originalStart,
+            originalLineCount: originalCount,
+            newStartLine: newStart,
+            newLineCount: newCount,
+            lines: currentHunkLines,
+            additions,
+            subtractions,
+            contextLines,
+        });
+    }
+    return hunks;
+}
+exports.parseHunks = parseHunks;
+function hunksToPatch(hunks) {
+    const noNewLineMessage = "\";
+    return hunks
+        .map((hunk) => {
+        let lines = [...hunk.lines];
+        let endsWithNoNewline = false;
+        if (lines[lines.length - 1]?.trim() === noNewLineMessage.trim()) {
+            endsWithNoNewline = true;
+            lines = lines.slice(0, -1);
+        }
+        let hunkContent = lines.join("\n");
+        if (endsWithNoNewline) {
+            hunkContent += "\n" + noNewLineMessage;
+        }
+        return [hunk.header, hunkContent].join("\n");
+    })
+        .join("\n");
+}
+exports.hunksToPatch = hunksToPatch;
+function hunkIsEmpty(hunk) {
+    const noLines = hunk.lines.length === 0;
+    const noChanges = hunk.additions.length === 0 && hunk.subtractions.length === 0;
+    const additionsText = hunk.additions.map((l) => l.slice(1)).join("\n");
+    const subtractionsText = hunk.subtractions.map((l) => l.slice(1)).join("\n");
+    const noEffectiveChange = additionsText === subtractionsText;
+    return noLines || noChanges || noEffectiveChange;
+}
+exports.hunkIsEmpty = hunkIsEmpty;
+const CONTEXT_LINES = 3;
+function fixSingleHunk(hunk, originalContent) {
+    const originalLines = (0, utils_1.splitByNewLines)(originalContent);
+    const deletionLinesContent = hunk.subtractions.map((l) => l.slice(1));
+    const additionLinesContent = hunk.additions.map((l) => l.slice(1));
+    let actualOriginalStartLine = -1;
+    if (deletionLinesContent.length > 0) {
+        const deletionStartIndex = findSequenceIndex(originalLines, deletionLinesContent);
+        if (deletionStartIndex !== -1) {
+            actualOriginalStartLine = deletionStartIndex + 1;
+            console.log(`Anchor found via deletion sequence at line ${actualOriginalStartLine}`);
+        }
+    }
+    if (actualOriginalStartLine === -1 &&
+        deletionLinesContent.length === 0 &&
+        additionLinesContent.length > 0) {
+        let precedingContextLine = "";
+        for (const line of hunk.lines) {
+            if (line.startsWith("+"))
+                break;
+            if (line.startsWith(" ")) {
+                precedingContextLine = line.slice(1);
+            }
+        }
+        if (precedingContextLine) {
+            const potentialLines = findAllLineNumbers(originalContent, precedingContextLine);
+            const closestLine = findClosestNumber(potentialLines, hunk.originalStartLine);
+            if (closestLine !== undefined) {
+                actualOriginalStartLine = closestLine + 1;
+                console.log(`Anchor found via preceding context '${precedingContextLine}' targeting line ${actualOriginalStartLine}`);
+            }
+        }
+    }
+    if (actualOriginalStartLine === -1) {
+        console.warn("Could not determine anchor point for hunk:", hunk.header);
+        let fallbackAnchorFound = false;
+        for (let i = 0; i < hunk.lines.length; i++) {
+            const line = hunk.lines[i];
+            if (line.startsWith("+"))
+                continue;
+            const lineContent = line.slice(1);
+            const potentialLines = findAllLineNumbers(originalContent, lineContent);
+            if (potentialLines.length > 0) {
+                const closestLine = findClosestNumber(potentialLines, hunk.originalStartLine + i);
+                if (closestLine !== undefined) {
+                    let offset = 0;
+                    for (let j = 0; j < i; j++) {
+                        if (!hunk.lines[j].startsWith("+")) {
+                            offset++;
+                        }
+                    }
+                    actualOriginalStartLine = closestLine - offset;
+                    console.log(`Fallback anchor found via line '${lineContent}' near ${hunk.originalStartLine}, estimated start: ${actualOriginalStartLine}`);
+                    fallbackAnchorFound = true;
+                    break;
+                }
+            }
+        }
+        if (!fallbackAnchorFound) {
+            console.error("Failed to find any anchor for hunk:", hunk.header);
+            return null;
+        }
+    }
+    actualOriginalStartLine = Math.max(1, actualOriginalStartLine);
+    const contextBeforeStartLine = Math.max(0, actualOriginalStartLine - CONTEXT_LINES - 1);
+    const contextBeforeEndLine = Math.max(0, actualOriginalStartLine - 1);
+    const contextBefore = originalLines
+        .slice(contextBeforeStartLine, contextBeforeEndLine)
+        .map((l) => ` ${l}`);
+    const originalContentEndLine = actualOriginalStartLine + deletionLinesContent.length;
+    const contextAfterStartLine = originalContentEndLine - 1;
+    const contextAfterEndLine = Math.min(originalLines.length, contextAfterStartLine + CONTEXT_LINES);
+    const contextAfter = originalLines
+        .slice(contextAfterStartLine, contextAfterEndLine)
+        .map((l) => ` ${l}`);
+    const newHunkLines = [
+        ...contextBefore,
+        ...hunk.subtractions,
+        ...hunk.additions,
+        ...contextAfter,
+    ];
+    const newOriginalStart = contextBefore.length > 0
+        ? actualOriginalStartLine - contextBefore.length
+        : actualOriginalStartLine;
+    const newOriginalCount = contextBefore.length + hunk.subtractions.length + contextAfter.length;
+    const newNewStart = newOriginalStart;
+    const newNewCount = contextBefore.length + hunk.additions.length + contextAfter.length;
+    const finalOriginalStart = Math.max(1, newOriginalStart);
+    const finalOriginalCount = Math.max(1, newOriginalCount);
+    const finalNewStart = Math.max(1, newNewStart);
+    const finalNewCount = Math.max(1, newNewCount);
+    const displayOriginalCount = originalLines.length === 0 && newOriginalCount === 0
+        ? 0
+        : finalOriginalCount;
+    const displayNewCount = originalLines.length === 0 && newNewCount === 0 ? 0 : finalNewCount;
+    const newHeader = `@@ -${finalOriginalStart},${displayOriginalCount} +${finalNewStart},${displayNewCount} @@`;
+    const fixedHunk = {
+        header: newHeader,
+        originalStartLine: finalOriginalStart,
+        originalLineCount: displayOriginalCount,
+        newStartLine: finalNewStart,
+        newLineCount: displayNewCount,
+        lines: newHunkLines,
+        additions: hunk.additions,
+        subtractions: hunk.subtractions,
+        contextLines: [...contextBefore, ...contextAfter],
+    };
+    if (hunkIsEmpty(fixedHunk)) {
+        console.log("Hunk became empty after fixing:", fixedHunk.header);
+        return null;
+    }
+    return fixedHunk;
+}
+function fixPatch(originalContent, patch) {
+    const originalHunks = parseHunks(patch);
+    const fixedHunks = [];
+    console.log(`Attempting to fix ${originalHunks.length} hunks...`);
+    for (const hunk of originalHunks) {
+        console.log(`\nProcessing Hunk: ${hunk.header}`);
+        try {
+            const fixed = fixSingleHunk(hunk, originalContent);
+            if (fixed) {
+                console.log(`Successfully fixed. New header: ${fixed.header}`);
+                fixedHunks.push(fixed);
+            }
+            else {
+                console.warn(`Could not fix hunk, discarding: ${hunk.header}`);
+            }
+        }
+        catch (error) {
+            console.error(`Error fixing hunk ${hunk.header}:`, error);
+        }
+    }
+    const needsNoNewlineSuffix = !originalContent.endsWith("\n") && fixedHunks.length > 0;
+    let finalPatch = hunksToPatch(fixedHunks);
+    if (fixedHunks.length > 0) {
+        const lastHunk = fixedHunks[fixedHunks.length - 1];
+        const lastLine = lastHunk.lines[lastHunk.lines.length - 1];
+        if (patch.includes("\") &&
+            !lastLine?.endsWith("\n") &&
+            !finalPatch.endsWith("\")) {
+        }
+    }
+    if (patch.endsWith("\n") &&
+        !finalPatch.endsWith("\n") &&
+        finalPatch.length > 0) {
+        finalPatch += "\n";
+    }
+    return finalPatch;
+}
+exports.fixPatch = fixPatch;
+async function savePatchError(originalPatch, fixedPatch, fileContent, errorMsg) {
+    const dirName = ".knowhow/tools/patchFile";
+    const fileName = "errors.json";
+    const filePath = `${dirName}/${fileName}`;
+    try {
+        if (!(await (0, utils_1.fileExists)(filePath))) {
+            await (0, utils_1.mkdir)(dirName, { recursive: true });
+            await (0, utils_1.writeFile)(filePath, "[]");
+        }
+        let errors = [];
+        try {
+            errors = JSON.parse(await (0, utils_1.readFile)(filePath, "utf8"));
+            if (!Array.isArray(errors))
+                errors = [];
+        }
+        catch (readError) {
+            console.error("Error reading patch error log, starting fresh.", readError);
+            errors = [];
+        }
+        errors.push({
+            timestamp: new Date().toISOString(),
+            error: errorMsg,
+            originalPatch,
+            fixedPatch,
+            fileContent,
+        });
+        await (0, utils_1.writeFile)(filePath, JSON.stringify(errors, null, 2));
+    }
+    catch (logError) {
+        console.error("Failed to save patch error information:", logError);
+    }
+}
+exports.savePatchError = savePatchError;
+async function patchFile(filePath, patch) {
+    let originalContent = "";
+    try {
+        if (!fs.existsSync(filePath)) {
+            console.log(`File ${filePath} does not exist. Attempting to apply patch as creation.`);
+            originalContent = "";
+        }
+        else {
+            originalContent = await (0, utils_1.readFile)(filePath, "utf8");
+        }
+        let updatedContent = (0, diff_1.applyPatch)(originalContent, patch);
+        let appliedPatch = patch;
+        if (updatedContent === false) {
+            console.warn("Initial patch apply failed. Attempting to fix patch...");
+            let fixedPatch = null;
+            try {
+                fixedPatch = fixPatch(originalContent, patch);
+                console.log("--- Attempted Fixed Patch ---");
+                console.log(fixedPatch || "<Fixing resulted in empty patch>");
+                console.log("---------------------------");
+            }
+            catch (fixError) {
+                console.error("Error during fixPatch execution:", fixError);
+                await savePatchError(patch, null, originalContent, `fixPatch function errored: ${fixError.message}`);
+                return `An error occured while trying to fix the patch: ${fixError.message}`;
+            }
+            if (!fixedPatch || fixedPatch.trim() === "") {
+                console.error("Patch could not be fixed or resulted in an empty patch.");
+                await savePatchError(patch, fixedPatch, originalContent, "Patch fix resulted in empty or null patch.");
+                return `Patch failed to apply and could not be fixed or resulted in no changes.`;
+            }
+            updatedContent = (0, diff_1.applyPatch)(originalContent, fixedPatch);
+            appliedPatch = fixedPatch;
+            if (updatedContent === false && !fixedPatch.endsWith("\n")) {
+                console.log("Applying fixed patch failed, trying with added newline...");
+                fixedPatch += "\n";
+                updatedContent = (0, diff_1.applyPatch)(originalContent, fixedPatch);
+                appliedPatch = fixedPatch;
+            }
+            if (updatedContent === false) {
+                console.error("Applying the *fixed* patch also failed.");
+                await savePatchError(patch, fixedPatch, originalContent, "Fixed patch also failed to apply.");
+                return "Patch failed to apply even after attempting to fix it.";
+            }
+            else {
+                console.log("Successfully applied the *fixed* patch.");
+            }
+        }
+        else {
+            console.log("Successfully applied the original patch.");
+        }
+        await (0, utils_1.writeFile)(filePath, updatedContent);
+        let lintResult = "";
+        try {
+            lintResult = await (0, lintFile_1.lintFile)(filePath);
+        }
+        catch (lintError) {
+            console.warn("Linting failed after patching:", lintError);
+            lintResult = `Linting after patch failed: ${lintError.message}`;
+        }
+        return `Patch applied successfully.${filePath ? ` Use readFile on ${filePath} to verify changes.` : ""}
+${lintResult ? "\nLinting Result:\n" + lintResult : ""}`.trim();
+    }
+    catch (e) {
+        console.error(`Error in patchFile function for ${filePath}:`, e);
+        if (!String(e.message).includes("Patch failed to apply")) {
+            await savePatchError(patch, null, originalContent, `Unexpected error in patchFile: ${e.message}`);
+        }
+        return `An error occured while applying the patch: ${e.message}`;
+    }
+}
+exports.patchFile = patchFile;
+function categorizeHunks(originalContent, patch) {
+    const hunks = parseHunks(patch);
+    const validHunks = hunks.filter((hunk) => (0, diff_1.applyPatch)(originalContent, hunksToPatch([hunk])));
+    const invalidHunks = hunks.filter((hunk) => !(0, diff_1.applyPatch)(originalContent, hunksToPatch([hunk])));
+    return { validHunks, invalidHunks };
+}
+exports.categorizeHunks = categorizeHunks;
+//# sourceMappingURL=patch.js.map

package/ts_build/src/agents/tools/patch.js.map

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

package/ts_build/src/agents/tools/readBlocks.d.ts

@@ -0,0 +1,2 @@
+import { FileBlock } from "./types/fileblock";
+export declare function readBlocks(filePath: string, blockNumbers?: number[]): Promise<FileBlock[]>;

package/ts_build/src/agents/tools/readBlocks.js

@@ -0,0 +1,59 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readBlocks = void 0;
+const fs = __importStar(require("fs"));
+const BLOCK_SIZE = 500;
+async function readBlocks(filePath, blockNumbers = []) {
+    const text = fs.readFileSync(filePath, "utf8");
+    const lines = text.split("");
+    const blocks = [];
+    let index = 0;
+    let lineCount = 0;
+    while (lines.length > 0) {
+        const block = lines.splice(0, BLOCK_SIZE).join("");
+        blocks.push({
+            blockNumber: index,
+            content: block,
+            startLine: lineCount + 1,
+        });
+        index++;
+        lineCount += block.split("\n").length;
+        if (blocks.length > 20 && lines.length > 160000) {
+            blocks.push({
+                blockNumber: index,
+                content: "File trimmed. Too large to display",
+                startLine: lineCount + 1,
+            });
+            break;
+        }
+    }
+    if (blockNumbers.length === 0) {
+        return blocks;
+    }
+    return blocks.filter((block) => blockNumbers.includes(block.blockNumber));
+}
+exports.readBlocks = readBlocks;
+//# sourceMappingURL=readBlocks.js.map

package/ts_build/src/agents/tools/readBlocks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readBlocks.js","sourceRoot":"","sources":["../../../../src/agents/tools/readBlocks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAGzB,MAAM,UAAU,GAAG,GAAG,CAAC;AAChB,KAAK,UAAU,UAAU,CAC9B,QAAgB,EAChB,eAAyB,EAAE;IAE3B,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,EAAiB,CAAC;IAEjC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,SAAS,GAAG,CAAC,CAAC;IAClB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC;YACV,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,SAAS,GAAG,CAAC;SACzB,CAAC,CAAC;QACH,KAAK,EAAE,CAAC;QACR,SAAS,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;QAEtC,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,IAAI,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE;YAC/C,MAAM,CAAC,IAAI,CAAC;gBACV,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,oCAAoC;gBAC7C,SAAS,EAAE,SAAS,GAAG,CAAC;aACzB,CAAC,CAAC;YACH,MAAM;SACP;KACF;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,MAAM,CAAC;KACf;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;AAC5E,CAAC;AApCD,gCAoCC"}

package/ts_build/src/agents/tools/readFile.d.ts

@@ -0,0 +1 @@
+export declare function readFile(filePath: string): Promise<string>;