@empiricalrun/test-gen 0.72.0 → 0.73.1

package/dist/tools/delete-file.js

@@ -0,0 +1,83 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteFileTool = void 0;
+const promises_1 = require("fs/promises");
+const path_1 = __importDefault(require("path"));
+const zod_1 = require("zod");
+const git_1 = require("./executor/utils/git");
+const DeleteFileInputSchema = zod_1.z.object({
+    path: zod_1.z
+        .string()
+        .describe("The path to the file to delete (relative to the repository root). For example, tests/foo.spec.ts"),
+});
+exports.deleteFileTool = {
+    schema: {
+        name: "deleteFile",
+        description: `Delete a file from the filesystem.
+This tool will permanently remove the specified file.
+Use with caution as deleted files cannot be recovered.`,
+        parameters: DeleteFileInputSchema,
+    },
+    needsBrowser: false,
+    execute: async ({ input, repoPath, collectArtifacts, }) => {
+        try {
+            const filePath = path_1.default.join(repoPath, input.path);
+            // Validate that the file exists and is actually a file (not a directory)
+            try {
+                const stats = await (0, promises_1.stat)(filePath);
+                if (!stats.isFile()) {
+                    return {
+                        isError: true,
+                        result: `Error: '${input.path}' is not a file. Use a different tool to delete directories.`,
+                    };
+                }
+            }
+            catch (error) {
+                return {
+                    isError: true,
+                    result: `Error: File '${input.path}' does not exist.`,
+                };
+            }
+            const resolvedPath = path_1.default.resolve(filePath);
+            const resolvedRepoPath = path_1.default.resolve(repoPath);
+            if (!resolvedPath.startsWith(resolvedRepoPath)) {
+                return {
+                    isError: true,
+                    result: `Error: Cannot delete files outside the repository root.`,
+                };
+            }
+            await (0, promises_1.unlink)(filePath);
+            // Collect git patch artifact after deletion
+            if (collectArtifacts) {
+                try {
+                    const gitPatch = (0, git_1.getGitDiff)(input.path, repoPath);
+                    if (gitPatch.trim()) {
+                        const patchArtifact = {
+                            name: `${path_1.default.basename(input.path, path_1.default.extname(input.path))}_delete.patch`,
+                            contentType: "text/plain",
+                            data: Buffer.from(gitPatch, "utf-8"),
+                        };
+                        collectArtifacts([patchArtifact]);
+                    }
+                }
+                catch (error) {
+                    console.warn("Failed to create git patch artifact:", error);
+                }
+            }
+            return {
+                isError: false,
+                result: `Successfully deleted file: ${input.path}`,
+            };
+        }
+        catch (error) {
+            console.error("Error deleting file", error);
+            return {
+                isError: true,
+                result: error instanceof Error ? error.message : String(error),
+            };
+        }
+    },
+};

package/dist/tools/diagnosis-fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnosis-fetcher.d.ts","sourceRoot":"","sources":["../../src/tools/diagnosis-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAe,MAAM,4BAA4B,CAAC;AAepE,eAAO,MAAM,wBAAwB,EAAE,IAsFtC,CAAC"}
+{"version":3,"file":"diagnosis-fetcher.d.ts","sourceRoot":"","sources":["../../src/tools/diagnosis-fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAavD,eAAO,MAAM,wBAAwB,EAAE,IAiFtC,CAAC"}

package/dist/tools/diagnosis-fetcher.js

@@ -7,7 +7,6 @@ exports.fetchDiagnosisReportTool = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
-const utils_1 = require("./executor/utils");
 const DiagnosisSchema = zod_1.z.object({
     diagnosisUrl: zod_1.z
         .string()
@@ -20,9 +19,7 @@ exports.fetchDiagnosisReportTool = {
         parameters: DiagnosisSchema,
     },
     needsBrowser: false,
-    execute: async (params) => {
-        const { input } = params;
-        const { repoPath, apiKey } = params;
+    execute: async ({ input, repoPath, apiClient }) => {
         const { diagnosisUrl } = input;
         // Extract the slug from the URL - it's the part after the last '--'
         const slug = diagnosisUrl.split("--").pop();
@@ -34,9 +31,8 @@ exports.fetchDiagnosisReportTool = {
         }
         let data = null;
         try {
-            data = await (0, utils_1.makeDashboardRequest)({
-                path: `/api/diagnosis/${slug}/detailed`,
-                apiKey,
+            data = await apiClient.request(`/api/diagnosis/${slug}/detailed`, {
+                method: "GET",
             });
         }
         catch (error) {

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

@@ -1,23 +1,20 @@
 import { TraceClient } from "@empiricalrun/llm";
 import { PendingToolCall, ToolResult } from "@empiricalrun/llm/chat";
-import { SupportedChatModels, Tool, ToolExecute } from "@empiricalrun/shared-types";
+import { ChatSessionInfo, IDashboardAPIClient, ToolExecute } from "@empiricalrun/shared-types";
 export declare class ToolExecutor {
-    tools: Tool[];
     toolExecutors: Record<string, ToolExecute>;
-    chatSessionId: number | null;
-    selectedModel: SupportedChatModels;
+    chatSession: ChatSessionInfo | null;
     branchName: string;
     repoPath: string;
-    apiKey: string | undefined;
+    apiClient: IDashboardAPIClient;
     trace?: TraceClient;
     featureFlags: string[];
     environmentOverrides: Record<string, string>;
-    constructor({ chatSessionId, selectedModel, branchName, repoPath, apiKey, trace, featureFlags, environmentOverrides, }: {
-        chatSessionId: number | null;
-        selectedModel: SupportedChatModels;
+    constructor({ chatSession, branchName, repoPath, apiClient, trace, featureFlags, environmentOverrides, }: {
+        chatSession: ChatSessionInfo | null;
         branchName: string;
         repoPath: string;
-        apiKey: string | undefined;
+        apiClient: IDashboardAPIClient;
         trace?: TraceClient;
         featureFlags: string[];
         environmentOverrides?: Record<string, string>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/executor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAEL,eAAe,EACf,UAAU,EACX,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,mBAAmB,EACnB,IAAI,EACJ,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAkBpC,qBAAa,YAAY;IACvB,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAM;IAChD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEjC,EACV,aAAa,EACb,aAAa,EACb,UAAU,EACV,QAAQ,EACR,MAAM,EACN,KAAK,EACL,YAAY,EACZ,oBAAyB,GAC1B,EAAE;QACD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;QAC7B,aAAa,EAAE,mBAAmB,CAAC;QACnC,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC/C;IAoCK,OAAO,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAyEnE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/executor/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAEL,eAAe,EACf,mBAAmB,EACnB,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAqBpC,qBAAa,YAAY;IACvB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAM;IAChD,WAAW,EAAE,eAAe,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,mBAAmB,CAAC;IAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAEjC,EACV,WAAW,EACX,UAAU,EACV,QAAQ,EACR,SAAS,EACT,KAAK,EACL,YAAY,EACZ,oBAAyB,GAC1B,EAAE;QACD,WAAW,EAAE,eAAe,GAAG,IAAI,CAAC;QACpC,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,mBAAmB,CAAC;QAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC/C;IAkCK,OAAO,CAAC,SAAS,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;CAqEnE"}

package/dist/tools/executor/index.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolExecutor = void 0;
-const chat_1 = require("@empiricalrun/llm/chat");
 const artifacts_1 = require("../../artifacts");
 const commit_and_create_pr_1 = require("../commit-and-create-pr");
+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 run_test_1 = require("../run-test");
 const str_replace_editor_1 = require("../str_replace_editor");
 const test_gen_browser_1 = require("../test-gen-browser");
@@ -15,50 +17,46 @@ const test_run_fetcher_1 = require("../test-run-fetcher");
 const upgrade_packages_1 = require("../upgrade-packages");
 const checkpoint_1 = require("./utils/checkpoint");
 class ToolExecutor {
-    tools = [];
     toolExecutors = {};
-    chatSessionId;
-    selectedModel;
+    chatSession;
     branchName;
     repoPath;
-    apiKey;
+    apiClient;
     trace;
     featureFlags;
     environmentOverrides;
-    constructor({ chatSessionId, selectedModel, branchName, repoPath, apiKey, trace, featureFlags, environmentOverrides = {}, }) {
-        this.chatSessionId = chatSessionId;
-        this.selectedModel = selectedModel;
+    constructor({ chatSession, branchName, repoPath, apiClient, trace, featureFlags, environmentOverrides = {}, }) {
+        this.chatSession = chatSession;
         this.branchName = branchName;
         this.trace = trace;
         this.repoPath = repoPath;
-        this.apiKey = apiKey;
+        this.apiClient = apiClient;
         this.featureFlags = featureFlags;
         this.environmentOverrides = environmentOverrides;
-        this.tools = [
+        const tools = [
             grep_1.grepTool,
             run_test_1.runTestTool,
             test_run_fetcher_1.fetchTestRunReportTool,
             diagnosis_fetcher_1.fetchDiagnosisReportTool,
             test_gen_browser_1.generateTestWithBrowserAgent,
             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,
+            ...str_replace_editor_1.textEditorTools,
         ];
-        if ((0, chat_1.getProviderForModel)(this.selectedModel) !== "claude") {
-            this.tools.push(...str_replace_editor_1.textEditorTools);
-        }
-        this.tools.forEach((tool) => {
+        tools.forEach((tool) => {
             this.toolExecutors[tool.schema.name] = tool.execute;
         });
-        if ((0, chat_1.getProviderForModel)(this.selectedModel) === "claude") {
-            this.toolExecutors = {
-                ...this.toolExecutors,
-                // Support for Claude 3x and 4: They use different tool names
-                str_replace_editor: str_replace_editor_1.strReplaceEditorExecutor,
-                str_replace_based_edit_tool: str_replace_editor_1.strReplaceEditorExecutor,
-            };
-        }
+        this.toolExecutors = {
+            ...this.toolExecutors,
+            // Support for Claude 3x and 4: They use different tool names
+            str_replace_editor: str_replace_editor_1.strReplaceEditorExecutor,
+            str_replace_based_edit_tool: str_replace_editor_1.strReplaceEditorExecutor,
+        };
     }
     async execute(toolCalls) {
         const executeSpan = this.trace?.span({
@@ -76,7 +74,6 @@ class ToolExecutor {
                 uploadArtifactsQueue.addTask(artifactsInput).catch((error) => {
                     console.error("Error collecting artifacts:", error);
                 });
-                return;
             };
             const toolExecutor = this.toolExecutors[toolCall.name];
             if (!toolExecutor) {
@@ -89,16 +86,13 @@ class ToolExecutor {
                 span?.end({ output: errorResult });
                 continue;
             }
-            if (!this.apiKey) {
-                throw new Error("API key is required for tool execution");
-            }
             try {
                 const result = await toolExecutor({
                     input: toolCall.input,
                     repoPath: this.repoPath,
-                    apiKey: this.apiKey,
+                    apiClient: this.apiClient,
                     trace: this.trace,
-                    chatSessionId: this.chatSessionId,
+                    chatSession: this.chatSession,
                     collectArtifacts: collectArtifactsFn,
                     environmentOverrides: this.environmentOverrides,
                     featureFlags: this.featureFlags,
@@ -117,7 +111,7 @@ class ToolExecutor {
                 span?.end({ output: errorResult });
             }
         }
-        await (0, checkpoint_1.createCheckpoint)({
+        (0, checkpoint_1.createCommitCheckpoint)({
             toolCalls,
             branchName: this.branchName,
             repoPath: this.repoPath,

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

@@ -1,7 +1,7 @@
 import { PendingToolCall } from "@empiricalrun/llm/chat";
-export declare function createCheckpoint({ toolCalls, branchName, repoPath, }: {
+export declare function createCommitCheckpoint({ toolCalls, branchName, repoPath, }: {
     toolCalls: PendingToolCall[];
     branchName: string;
     repoPath: string;
-}): Promise<void>;
+}): void;
 //# sourceMappingURL=checkpoint.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,wBAAsB,gBAAgB,CAAC,EACrC,SAAS,EACT,UAAU,EACV,QAAQ,GACT,EAAE;IACD,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAyBA"}
+{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAKzD,wBAAgB,sBAAsB,CAAC,EACrC,SAAS,EACT,UAAU,EACV,QAAQ,GACT,EAAE;IACD,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,QA0BA"}

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCheckpoint = createCheckpoint;
+exports.createCommitCheckpoint = createCommitCheckpoint;
+const child_process_1 = require("child_process");
 const git_1 = require("./git");
-async function createCheckpoint({ toolCalls, branchName, repoPath, }) {
-    const filesChanged = await (0, git_1.getFilesChanged)(repoPath);
+function createCommitCheckpoint({ toolCalls, branchName, repoPath, }) {
+    const filesChanged = (0, git_1.getFilesChanged)(repoPath);
     const toolsWithUpdatedFiles = toolCalls
         .filter((tc) => "path" in tc.input &&
         tc.input.path &&
@@ -15,11 +16,11 @@ async function createCheckpoint({ toolCalls, branchName, repoPath, }) {
     const filesToCommit = toolsWithUpdatedFiles.map((tool) => tool.path);
     if (toolsWithUpdatedFiles.length > 0) {
         let commitMessage = `${toolsWithUpdatedFiles.map((tool) => `${tool.name} on ${tool.path}`).join(", ")}`;
-        await (0, git_1.commitFilesAndPushBranch)({
+        (0, git_1.commitFilesAsBotUser)({
             commitMessage,
-            branchName,
             files: filesToCommit,
             repoPath,
         });
+        (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
     }
 }

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

@@ -1,24 +1,19 @@
+import { IDashboardAPIClient } from "@empiricalrun/shared-types";
 export declare function getGitDiff(filepath: string, cwd: string): string;
 export declare function getGitDiffForNewFile(filepath: string, cwd: string): string;
 export declare function checkoutBranch(branchName: string, cwd: string): Promise<void>;
-export declare function commitAsBotUser(commitMessage: string, cwd: string): Promise<boolean>;
+export declare function commitAsBotUser(commitMessage: string, cwd: string): boolean;
 export declare function getCurrentBranchName(repoPath: string): Promise<string>;
 export declare function pullBranch(branchName: string, cwd: string): Promise<void>;
-export declare function commitFilesAndPushBranch({ commitMessage, branchName, files, repoPath, }: {
+export declare function commitFilesAsBotUser({ commitMessage, files, repoPath, }: {
     commitMessage: string;
-    branchName: string;
     files: string[];
     repoPath: string;
-}): Promise<void>;
-export declare function getFilesChanged(cwd: string): Promise<string[]>;
-export declare function mergePullRequest({ repoName, prNumber, apiKey, }: {
+}): void;
+export declare function getFilesChanged(cwd: string): string[];
+export declare function mergePullRequest({ repoName, prNumber, apiClient, }: {
     repoName: string;
     prNumber: number;
-    apiKey: string;
+    apiClient: IDashboardAPIClient;
 }): Promise<boolean>;
-export declare function deleteBranch({ repoName, branchName, apiKey, }: {
-    repoName: string;
-    branchName: string;
-    apiKey: string;
-}): Promise<void>;
 //# sourceMappingURL=git.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/git.ts"],"names":[],"mappings":"AAOA,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAe1E;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAQnE;AAED,wBAAsB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,oBAcvE;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,mBAO1D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAE/D;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,aAAa,EACb,UAAU,EACV,KAAK,EACL,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAIA;AAED,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,qBAUhD;AAED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,QAAQ,EACR,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,oBA+BA;AAED,wBAAsB,YAAY,CAAC,EACjC,QAAQ,EACR,UAAU,EACV,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,iBAoBA"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMjE,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAe1E;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAMnE;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,WAcjE;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,mBAO1D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAE/D;AAED,wBAAgB,oBAAoB,CAAC,EACnC,aAAa,EACb,KAAK,EACL,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,QAGA;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,YAU1C;AAED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,QAAQ,EACR,SAAS,GACV,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,mBAAmB,CAAC;CAChC,oBA8BA"}

package/dist/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 index_1 = require("./index");
 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 = `${index_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, index_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 = `${index_1.GITHUB_API_BASE}/${repoName}/git/refs/heads/${branchName}`;
-    try {
-        await (0, index_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

@@ -1,16 +1,4 @@
-export declare function makeDashboardRequest<T>({ path, method, body, apiKey, }: {
-    path: string;
-    method?: string;
-    body?: any;
-    apiKey: string;
-}): Promise<T>;
-export declare function callGitHubProxy<T>({ method, url, body, apiKey, }: {
-    method: string;
-    url: string;
-    body?: any;
-    apiKey: string;
-}): Promise<T>;
-export declare const GITHUB_API_BASE = "https://api.github.com/repos/empirical-run";
+import { IDashboardAPIClient } from "@empiricalrun/shared-types";
 export interface GitHubRepoInfo {
     owner: string;
     repo: string;
@@ -21,15 +9,43 @@ export interface PullRequestInfo {
     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 findExistingPR({ owner, repo, branchName, apiKey, }: {
+export declare function getExistingPR({ owner, repo, branchName, apiClient, }: {
     owner: string;
     repo: string;
     branchName: string;
-    apiKey: string;
+    apiClient: IDashboardAPIClient;
 }): Promise<PullRequestInfo | null>;
-export declare function createPullRequest({ owner, repo, title, head, base, body, labels, apiKey, }: {
+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;
@@ -37,23 +53,23 @@ export declare function createPullRequest({ owner, repo, title, head, base, body
     base?: string;
     body: string;
     labels?: string[];
-    apiKey: string;
+    apiClient: IDashboardAPIClient;
 }): Promise<PullRequestInfo>;
-export declare function updatePullRequest({ owner, repo, prNumber, body, apiKey, }: {
+export declare function updatePullRequest({ owner, repo, prNumber, body, apiClient, }: {
     owner: string;
     repo: string;
     prNumber: number;
     body?: string;
-    apiKey: string;
+    apiClient: IDashboardAPIClient;
 }): Promise<PullRequestInfo>;
-export declare function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiKey, }: {
+export declare function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiClient, }: {
     owner: string;
     repo: string;
     branchName: string;
     title: string;
     body: string;
     labels?: string[];
-    apiKey: string;
+    apiClient: IDashboardAPIClient;
 }): Promise<{
     pr: PullRequestInfo;
     isNew: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/index.ts"],"names":[],"mappings":"AAAA,wBAAsB,oBAAoB,CAAC,CAAC,EAAE,EAC5C,IAAI,EACJ,MAAc,EACd,IAAI,EACJ,MAAM,GACP,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,CAAC,CAAC,CAmBb;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,EACvC,MAAM,EACN,GAAG,EACH,IAAI,EACJ,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,CAAC,CAAC,CAYb;AAGD,eAAO,MAAM,eAAe,+CAA+C,CAAC;AAG5E,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAiB1D;AAGD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CACvB;AAED,wBAAsB,cAAc,CAAC,EACnC,KAAK,EACL,IAAI,EACJ,UAAU,EACV,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAYlC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,KAAK,EACL,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,IAAa,EACb,IAAI,EACJ,MAAM,EACN,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,eAAe,CAAC,CAqB3B;AAED,wBAAsB,iBAAiB,CAAC,EACtC,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,eAAe,CAAC,CAU3B;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,KAAK,EACL,IAAI,EACJ,UAAU,EACV,KAAK,EACL,IAAI,EACJ,MAAM,EACN,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAyBnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/index.ts"],"names":[],"mappings":"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"}