@empiricalrun/test-gen 0.71.2 → 0.73.0

package/dist/{utils → tools/executor/utils}/git.js

@@ -6,12 +6,10 @@ exports.checkoutBranch = checkoutBranch;
 exports.commitAsBotUser = commitAsBotUser;
 exports.getCurrentBranchName = getCurrentBranchName;
 exports.pullBranch = pullBranch;
-exports.commitFilesAndPushBranch = commitFilesAndPushBranch;
+exports.commitFilesAsBotUser = commitFilesAsBotUser;
 exports.getFilesChanged = getFilesChanged;
 exports.mergePullRequest = mergePullRequest;
-exports.deleteBranch = deleteBranch;
 const child_process_1 = require("child_process");
-const utils_1 = require("../tools/utils");
 const GIT_USER_NAME = "empiricalrun[bot]";
 const GIT_USER_EMAIL = "180257021+empiricalrun[bot]@users.noreply.github.com";
 function getGitDiff(filepath, cwd) {
@@ -39,22 +37,20 @@ function getGitDiffForNewFile(filepath, cwd) {
     }
 }
 async function checkoutBranch(branchName, cwd) {
-    // TODO: This assumes repoDir is process.cwd()
     try {
         (0, child_process_1.execSync)(`git checkout ${branchName}`, { cwd });
     }
     catch (e) {
-        // If branch doesn't exist, create it
         (0, child_process_1.execSync)(`git checkout -b ${branchName}`, { cwd });
     }
 }
-async function commitAsBotUser(commitMessage, cwd) {
+function commitAsBotUser(commitMessage, cwd) {
     const status = (0, child_process_1.execSync)("git status --porcelain", {
         encoding: "utf-8",
         cwd,
     });
     if (!status) {
-        return false; // Nothing to commit
+        return false;
     }
     const commitMessageWithSkipCi = `${commitMessage} [skip ci]`;
     (0, child_process_1.execSync)(`git -c user.name="${GIT_USER_NAME}" -c user.email="${GIT_USER_EMAIL}" commit -m "${commitMessageWithSkipCi}"`, { cwd });
@@ -71,12 +67,11 @@ async function getCurrentBranchName(repoPath) {
 async function pullBranch(branchName, cwd) {
     (0, child_process_1.execSync)(`git pull origin ${branchName}`, { cwd });
 }
-async function commitFilesAndPushBranch({ commitMessage, branchName, files, repoPath, }) {
+function commitFilesAsBotUser({ commitMessage, files, repoPath, }) {
     (0, child_process_1.execSync)(`git add ${files.join(" ")}`, { cwd: repoPath });
-    await commitAsBotUser(commitMessage, repoPath);
-    (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
+    commitAsBotUser(commitMessage, repoPath);
 }
-async function getFilesChanged(cwd) {
+function getFilesChanged(cwd) {
     const output = (0, child_process_1.execSync)("git status --porcelain --untracked-files", {
         cwd,
     }).toString();
@@ -87,20 +82,19 @@ async function getFilesChanged(cwd) {
         .filter((fileName) => fileName != "");
     return filesChanged;
 }
-async function mergePullRequest({ repoName, prNumber, apiKey, }) {
-    const url = `${utils_1.GITHUB_API_BASE}/${repoName}/pulls/${prNumber}/merge`;
+async function mergePullRequest({ repoName, prNumber, apiClient, }) {
+    const url = `/repos/empirical-run/${repoName}/pulls/${prNumber}/merge`;
     const mergeBody = {
         merge_method: "squash",
     };
     try {
-        const response = await (0, utils_1.callGitHubProxy)({
+        const data = await apiClient.callGitHubProxy({
             method: "PUT",
             url: url,
             body: mergeBody,
-            apiKey,
         });
-        if (!response?.merged) {
-            console.log(`PR #${prNumber} for ${repoName} could not be merged: ${response.message}`);
+        if (!data?.merged) {
+            console.log(`PR #${prNumber} for ${repoName} could not be merged: ${data.message}`);
             return false;
         }
         console.log(`Merged PR #${prNumber} for ${repoName} via proxy`);
@@ -111,22 +105,3 @@ async function mergePullRequest({ repoName, prNumber, apiKey, }) {
         return false;
     }
 }
-async function deleteBranch({ repoName, branchName, apiKey, }) {
-    const url = `${utils_1.GITHUB_API_BASE}/${repoName}/git/refs/heads/${branchName}`;
-    try {
-        await (0, utils_1.callGitHubProxy)({
-            method: "DELETE",
-            url: url,
-            apiKey,
-        });
-        console.log(`Deleted branch ${branchName} from ${repoName} via proxy`);
-    }
-    catch (error) {
-        if (error.message?.includes("422")) {
-            console.log(`Branch ${branchName} likely already deleted or never existed on ${repoName}.`);
-        }
-        else {
-            console.error(`Error deleting branch ${branchName} from ${repoName} via proxy: ${error.message}`);
-        }
-    }
-}

package/dist/tools/executor/utils/index.d.ts

@@ -0,0 +1,77 @@
+import { IDashboardAPIClient } from "@empiricalrun/shared-types";
+export interface GitHubRepoInfo {
+    owner: string;
+    repo: string;
+}
+export declare function parseGitHubUrl(url: string): GitHubRepoInfo;
+export interface PullRequestInfo {
+    number: number;
+    html_url: string;
+    head: {
+        ref: string;
+        sha: string;
+    };
+    base: {
+        ref: string;
+        sha: string;
+    };
+    state: string;
+    title: string;
+    body: string;
+    created_at: string;
+    updated_at: string;
+    closed_at: string;
+    merged_at: string;
+    merge_commit_sha: string;
+    commits: number;
+    additions: number;
+    deletions: number;
+    changed_files: number;
+    user: {
+        login: string;
+    };
+    mergeable_state: "clean" | "dirty" | "unstable" | "unknown";
+}
+export declare function getExistingPR({ owner, repo, branchName, apiClient, }: {
+    owner: string;
+    repo: string;
+    branchName: string;
+    apiClient: IDashboardAPIClient;
+}): Promise<PullRequestInfo | null>;
+export declare function getMergeableState({ owner, repo, pullRequest, apiClient, }: {
+    owner: string;
+    repo: string;
+    pullRequest: PullRequestInfo;
+    apiClient: IDashboardAPIClient;
+}): Promise<"clean" | "dirty" | "unstable" | "unknown">;
+export declare function getMergeableStateDescription(state: "clean" | "dirty" | "unstable" | "unknown" | string): string;
+export declare function createPullRequest({ owner, repo, title, head, base, body, labels, apiClient, }: {
+    owner: string;
+    repo: string;
+    title: string;
+    head: string;
+    base?: string;
+    body: string;
+    labels?: string[];
+    apiClient: IDashboardAPIClient;
+}): Promise<PullRequestInfo>;
+export declare function updatePullRequest({ owner, repo, prNumber, body, apiClient, }: {
+    owner: string;
+    repo: string;
+    prNumber: number;
+    body?: string;
+    apiClient: IDashboardAPIClient;
+}): Promise<PullRequestInfo>;
+export declare function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiClient, }: {
+    owner: string;
+    repo: string;
+    branchName: string;
+    title: string;
+    body: string;
+    labels?: string[];
+    apiClient: IDashboardAPIClient;
+}): Promise<{
+    pr: PullRequestInfo;
+    isNew: boolean;
+}>;
+//# sourceMappingURL=index.d.ts.map

package/dist/tools/executor/utils/index.d.ts.map

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

package/dist/tools/executor/utils/index.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseGitHubUrl = parseGitHubUrl;
+exports.getExistingPR = getExistingPR;
+exports.getMergeableState = getMergeableState;
+exports.getMergeableStateDescription = getMergeableStateDescription;
+exports.createPullRequest = createPullRequest;
+exports.updatePullRequest = updatePullRequest;
+exports.findOrCreatePullRequest = findOrCreatePullRequest;
+function parseGitHubUrl(url) {
+    const githubIndex = url.indexOf("github.com");
+    if (githubIndex === -1) {
+        throw new Error("Invalid GitHub repository URL");
+    }
+    const [owner, repo] = url
+        .substring(githubIndex + "github.com/".length)
+        .replace(".git", "")
+        .split("/");
+    if (!owner || !repo) {
+        throw new Error("Invalid GitHub repository URL format - missing owner or repo");
+    }
+    return { owner, repo };
+}
+async function getExistingPR({ owner, repo, branchName, apiClient, }) {
+    const prs = await apiClient.callGitHubProxy({
+        method: "GET",
+        url: `/repos/${owner}/${repo}/pulls`,
+        body: {
+            head: `${owner}:${branchName}`,
+            state: "open",
+        },
+    });
+    return prs?.find((pr) => pr.head.ref === branchName) || null;
+}
+async function getMergeableState({ owner, repo, pullRequest, apiClient, }) {
+    if (pullRequest.mergeable_state !== "unknown") {
+        return pullRequest.mergeable_state;
+    }
+    const maxAttempts = 10;
+    let attempts = 0;
+    while (attempts < maxAttempts) {
+        await new Promise((resolve) => setTimeout(resolve, 5_000));
+        attempts++;
+        try {
+            const updatedPR = await apiClient.callGitHubProxy({
+                method: "GET",
+                url: `/repos/${owner}/${repo}/pulls/${pullRequest.number}`,
+            });
+            if (updatedPR.mergeable_state !== "unknown") {
+                return updatedPR.mergeable_state;
+            }
+        }
+        catch (error) {
+            console.warn(`Failed to fetch PR mergeable state (attempt ${attempts}):`, error);
+        }
+    }
+    return "unknown";
+}
+function getMergeableStateDescription(state) {
+    switch (state) {
+        case "clean":
+            return "The pull request is mergeable without conflicts.";
+        case "dirty":
+            return "The pull request has merge conflicts that must be resolved.";
+        case "unstable":
+            return "The pull request has failing or pending required status checks.";
+        case "unknown":
+            return "The mergeability of the pull request is still being calculated.";
+        default:
+            return `The pull request has mergeable state: ${state}.`;
+    }
+}
+async function createPullRequest({ owner, repo, title, head, base = "main", body, labels, apiClient, }) {
+    const createPrBody = {
+        title,
+        head,
+        base,
+        body,
+        ...(labels && { labels }),
+    };
+    const pr = await apiClient.callGitHubProxy({
+        method: "POST",
+        url: `/repos/${owner}/${repo}/pulls`,
+        body: createPrBody,
+    });
+    if (!pr || !("number" in pr)) {
+        throw new Error(`Failed to create PR or PR number missing in response.`);
+    }
+    return pr;
+}
+async function updatePullRequest({ owner, repo, prNumber, body, apiClient, }) {
+    const updateBody = {};
+    if (body)
+        updateBody.body = body;
+    return await apiClient.callGitHubProxy({
+        method: "PATCH",
+        url: `/repos/${owner}/${repo}/pulls/${prNumber}`,
+        body: updateBody,
+    });
+}
+async function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiClient, }) {
+    const existingPR = await getExistingPR({
+        owner,
+        repo,
+        branchName,
+        apiClient,
+    });
+    if (existingPR) {
+        return { pr: existingPR, isNew: false };
+    }
+    const newPR = await createPullRequest({
+        owner,
+        repo,
+        title,
+        head: branchName,
+        body,
+        labels,
+        apiClient,
+    });
+    return { pr: newPR, isNew: true };
+}

package/dist/tools/executor/utils/pr-description.d.ts

@@ -0,0 +1,4 @@
+import type { ChatSessionInfo } from "@empiricalrun/shared-types";
+export declare function generateSessionMetadata(chatSession: ChatSessionInfo | null): string;
+export declare function addMetadataToPRDescription(description: string, chatSession: ChatSessionInfo | null): string;
+//# sourceMappingURL=pr-description.d.ts.map

package/dist/tools/executor/utils/pr-description.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-description.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/pr-description.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,eAAe,GAAG,IAAI,GAClC,MAAM,CASR;AAED,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,eAAe,GAAG,IAAI,GAClC,MAAM,CAWR"}

package/dist/tools/executor/utils/pr-description.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateSessionMetadata = generateSessionMetadata;
+exports.addMetadataToPRDescription = addMetadataToPRDescription;
+function generateSessionMetadata(chatSession) {
+    if (!chatSession) {
+        return "";
+    }
+    let userInfo = "";
+    if (chatSession.createdBy) {
+        userInfo = ` by ${chatSession.createdBy}`;
+    }
+    return `PR created from [session #${chatSession.id}](${chatSession.url})${userInfo}`;
+}
+function addMetadataToPRDescription(description, chatSession) {
+    const timestamp = new Date()
+        .toISOString()
+        .replace("T", " ")
+        .replace("Z", " UTC");
+    const sessionInfo = chatSession
+        ? `\n\n${generateSessionMetadata(chatSession)}`
+        : "";
+    return `${description}${sessionInfo}\n\n<sup>Updated at ${timestamp}</sup>`;
+}

package/dist/tools/fetch-image/index.d.ts

@@ -0,0 +1,3 @@
+import { Tool } from "@empiricalrun/shared-types";
+export declare const fetchImageTool: Tool;
+//# sourceMappingURL=index.d.ts.map

package/dist/tools/fetch-image/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/fetch-image/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA8B,MAAM,4BAA4B,CAAC;AAS9E,eAAO,MAAM,cAAc,EAAE,IAiD5B,CAAC"}

package/dist/tools/fetch-image/index.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchImageTool = void 0;
+const zod_1 = require("zod");
+const SUPPORTED_CONTENT_TYPES = ["image/png", "image/jpeg"];
+const fetchImageSchema = zod_1.z.object({
+    url: zod_1.z.string(),
+});
+exports.fetchImageTool = {
+    schema: {
+        name: "fetchImage",
+        description: "Use this tool to fetch image data from any valid URL. It takes an image URL as input and returns the image in base64 format. Automatically call this tool when a user provides an image link or message containing a URL pointing to an image, so that you can view or analyze the image content effectively",
+        parameters: fetchImageSchema,
+    },
+    needsBrowser: false,
+    execute: async ({ input }) => {
+        const { url } = input;
+        try {
+            const response = await fetch(url);
+            if (!response.ok) {
+                console.error(`Failed to fetch image from ${url}: ${response.statusText}`);
+                return {
+                    result: `Failed to fetch image from ${url}: ${response.statusText}`,
+                    isError: true,
+                };
+            }
+            const contentType = response.headers.get("content-type");
+            if (!contentType || !SUPPORTED_CONTENT_TYPES.includes(contentType)) {
+                const errorMessage = `Invalid content type: ${contentType}. URL must return an image.`;
+                console.error(errorMessage);
+                return {
+                    result: errorMessage,
+                    isError: true,
+                };
+            }
+            const buffer = await response.arrayBuffer();
+            const base64 = Buffer.from(buffer).toString("base64");
+            return {
+                result: [
+                    {
+                        type: contentType,
+                        base64Data: base64,
+                    },
+                ],
+                isError: false,
+            };
+        }
+        catch (error) {
+            console.error("Error fetching image", error);
+            return {
+                result: `Error fetching image: ${error}`,
+                isError: true,
+            };
+        }
+    },
+};

package/dist/tools/grep/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/grep/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AA8HpC,eAAO,MAAM,QAAQ,EAAE,IA4BtB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/grep/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AA8HnE,eAAO,MAAM,QAAQ,EAAE,IAkBtB,CAAC"}

package/dist/tools/grep/index.js

@@ -125,7 +125,7 @@ Search is case insensitive and regex patterns are not supported.`,
         parameters: GrepInputSchema,
     },
     needsBrowser: false,
-    execute: async ({ input, repoPath, }) => {
+    execute: async ({ input, repoPath }) => {
         if ((0, ripgrep_1.isRgAvailable)()) {
             return usingRipgrep(input, repoPath);
         }

package/dist/tools/index.d.ts

@@ -0,0 +1,4 @@
+import { ServicePayload, SupportedChatModels } from "@empiricalrun/shared-types";
+export declare function availableTools(model?: SupportedChatModels): import("@empiricalrun/shared-types").ToolDefinition[];
+export declare function sendToolRequestToRemoteQueue(payload: ServicePayload): Promise<void>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACd,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAkBpC,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,mBAAmB,yDAoBzD;AAUD,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,cAAc,iBAoBzE"}

package/dist/tools/index.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.availableTools = availableTools;
+exports.sendToolRequestToRemoteQueue = sendToolRequestToRemoteQueue;
+const chat_1 = require("@empiricalrun/llm/chat");
+const SQSClient_1 = require("../utils/SQSClient");
+const commit_and_create_pr_1 = require("./commit-and-create-pr");
+const run_test_1 = require("./definitions/run-test");
+const str_replace_editor_1 = require("./definitions/str_replace_editor");
+const test_gen_browser_1 = require("./definitions/test-gen-browser");
+const delete_file_1 = require("./delete-file");
+const diagnosis_fetcher_1 = require("./diagnosis-fetcher");
+const download_build_1 = require("./download-build");
+const fetch_image_1 = require("./fetch-image");
+const grep_1 = require("./grep");
+const list_environments_1 = require("./list-environments");
+const merge_conflicts_1 = require("./merge-conflicts");
+const test_run_fetcher_1 = require("./test-run-fetcher");
+const upgrade_packages_1 = require("./upgrade-packages");
+const queue_1 = require("./utils/queue");
+function availableTools(model) {
+    // TODO: Keep this list in sync with the ToolExecutor
+    const tools = [
+        run_test_1.runTestTool,
+        test_gen_browser_1.generateTestWithBrowserAgent,
+        grep_1.grepTool,
+        test_run_fetcher_1.fetchTestRunReportTool,
+        diagnosis_fetcher_1.fetchDiagnosisReportTool,
+        commit_and_create_pr_1.createPullRequestTool,
+        merge_conflicts_1.mergeConflictsTool,
+        list_environments_1.listEnvironmentsTool,
+        download_build_1.downloadBuildTool,
+        upgrade_packages_1.upgradePackagesTool,
+        fetch_image_1.fetchImageTool,
+        delete_file_1.deleteFileTool,
+    ];
+    if (model && (0, chat_1.getProviderForModel)(model) !== "claude") {
+        tools.push(...Object.values(str_replace_editor_1.textEditorTools));
+    }
+    return tools;
+}
+function toolsNeedBrowser(toolCalls) {
+    const allTools = availableTools();
+    return toolCalls.some((toolCall) => allTools.find((t) => t.schema.name === toolCall.name)?.needsBrowser);
+}
+async function sendToolRequestToRemoteQueue(payload) {
+    const needsBrowser = toolsNeedBrowser(payload.toolCalls);
+    const queueUrl = (0, queue_1.getQueueUrl)(payload.toolCalls, needsBrowser);
+    if (!queueUrl) {
+        throw new Error(`queueUrl is required for remote execution.`);
+    }
+    const region = process.env.AWS_REGION;
+    const accessKeyId = process.env.AWS_ACCESS_KEY_ID;
+    const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY;
+    if (!region || !accessKeyId || !secretAccessKey) {
+        throw new Error("AWS_REGION, AWS_ACCESS_KEY_ID, and AWS_SECRET_ACCESS_KEY must be set");
+    }
+    const sqs = new SQSClient_1.SQSClient(region, accessKeyId, secretAccessKey);
+    await sqs.sendMessage(queueUrl, payload);
+}

package/dist/tools/list-environments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-environments.d.ts","sourceRoot":"","sources":["../../src/tools/list-environments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,IAAI,EAEL,MAAM,4BAA4B,CAAC;AAKpC,eAAO,MAAM,oBAAoB,EAAE,IAsDlC,CAAC"}
+{"version":3,"file":"list-environments.d.ts","sourceRoot":"","sources":["../../src/tools/list-environments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGvD,eAAO,MAAM,oBAAoB,EAAE,IA2ClC,CAAC"}

package/dist/tools/list-environments.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listEnvironmentsTool = void 0;
 const zod_1 = require("zod");
-const utils_1 = require("./utils");
 exports.listEnvironmentsTool = {
     schema: {
         name: "listEnvironments",
@@ -10,13 +9,11 @@ exports.listEnvironmentsTool = {
         parameters: zod_1.z.object({}),
     },
     needsBrowser: false,
-    execute: async ({ apiKey, }) => {
+    execute: async ({ apiClient }) => {
         let response;
         try {
-            response = await (0, utils_1.makeDashboardRequest)({
-                path: `/api/environments/list`,
+            response = await apiClient.request(`/api/environments/list`, {
                 method: "GET",
-                apiKey,
             });
         }
         catch (error) {

package/dist/tools/merge-conflicts.d.ts

@@ -0,0 +1,3 @@
+import type { Tool } from "@empiricalrun/shared-types";
+export declare const mergeConflictsTool: Tool;
+//# sourceMappingURL=merge-conflicts.d.ts.map

package/dist/tools/merge-conflicts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conflicts.d.ts","sourceRoot":"","sources":["../../src/tools/merge-conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AA6CvD,eAAO,MAAM,kBAAkB,EAAE,IAgEhC,CAAC"}

package/dist/tools/merge-conflicts.js

@@ -0,0 +1,107 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeConflictsTool = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const zod_1 = require("zod");
+const git_1 = require("./executor/utils/git");
+function runMergeMain(repoPath) {
+    try {
+        (0, child_process_1.execSync)("git merge --no-ff origin/main", { stdio: "pipe", cwd: repoPath });
+        return "CLEAN";
+    }
+    catch (error) {
+        // Check if it's a merge conflict (exit code 1) vs other errors
+        if (error.status === 1) {
+            return "CONFLICTS";
+        }
+        throw error;
+    }
+}
+function getConflictedFilesWithContents(repoPath) {
+    const output = (0, child_process_1.execSync)("git diff --name-only --diff-filter=U", {
+        encoding: "utf8",
+        stdio: "pipe",
+        cwd: repoPath,
+    });
+    const fileNames = output
+        .trim()
+        .split("\n")
+        .filter((file) => file.length > 0);
+    const filesWithContents = {};
+    fileNames.forEach((fileName) => {
+        const fullPath = path_1.default.join(repoPath, fileName);
+        const content = fs_1.default.readFileSync(fullPath, "utf8");
+        filesWithContents[fileName] = content;
+    });
+    return filesWithContents;
+}
+const mergeConflictsToolScheme = zod_1.z.object({});
+exports.mergeConflictsTool = {
+    schema: {
+        name: "checkForMergeConflicts",
+        description: `This tool runs the git merge command to merge main into your
+current working branch with the following command.
+
+\`\`\`
+git merge --no-ff origin/main
+\`\`\`
+
+If this commands fails with merge conflicts, it will still create a dirty commit
+that has merge conflicts, which can be resolved with the file editing tools that you are
+provided with.
+`,
+        parameters: mergeConflictsToolScheme,
+    },
+    needsBrowser: false,
+    execute: async ({ repoPath }) => {
+        try {
+            // Fetch main branch (git clone runs --single-branch), and then run merge
+            (0, child_process_1.execSync)("git remote set-branches --add origin main", { cwd: repoPath });
+            (0, child_process_1.execSync)("git fetch origin main", { cwd: repoPath });
+            // Run merge command and commit (with or without conflict)
+            const mergeResult = runMergeMain(repoPath);
+            const branchName = await (0, git_1.getCurrentBranchName)(repoPath);
+            if (mergeResult === "CLEAN") {
+                (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
+                return {
+                    isError: false,
+                    result: `Merge from main was successful, without any conflicts.`,
+                };
+            }
+            else if (mergeResult === "CONFLICTS") {
+                const files = getConflictedFilesWithContents(repoPath);
+                (0, git_1.commitFilesAsBotUser)({
+                    commitMessage: "Merge from main with conflicts",
+                    files: Object.keys(files),
+                    repoPath,
+                });
+                (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
+                // TODO: This can be same as file view result
+                const filesResult = Object.entries(files)
+                    .map(([fileName, content]) => `File: ${fileName}\n\n\`\`\`\n${content}\n\`\`\``)
+                    .join("\n\n");
+                return {
+                    isError: false,
+                    result: `Merge from main is committed, with conflicts. Use text edit tools to resolve them.\n\n${filesResult}`,
+                };
+            }
+            else {
+                return {
+                    isError: true,
+                    result: `An unknown error has occured.`,
+                };
+            }
+        }
+        catch (error) {
+            return {
+                isError: true,
+                result: `Failed to run merge conflicts tool: ${error instanceof Error ? error.message : String(error)}`,
+            };
+        }
+    },
+};

package/dist/tools/run-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-test.d.ts","sourceRoot":"","sources":["../../src/tools/run-test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AA2DnE,eAAO,MAAM,WAAW,EAAE,IAqFzB,CAAC"}
+{"version":3,"file":"run-test.d.ts","sourceRoot":"","sources":["../../src/tools/run-test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AA0CnE,eAAO,MAAM,WAAW,EAAE,IAiFzB,CAAC"}