@empiricalrun/test-gen 0.77.0 → 0.78.1

package/dist/tools/{issues → issues-v1}/create-issue.js

@@ -2,33 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIssueTool = void 0;
 const zod_1 = require("zod");
-const metadata_schema_1 = require("./metadata-schema");
 const utils_1 = require("./utils");
 const createIssueSchema = zod_1.z.object({
     title: zod_1.z.string().describe("A short, descriptive title for the issue"),
     description: zod_1.z
         .string()
-        .describe("A detailed description of the issue. Include context, steps to reproduce, expected vs actual behavior, and any relevant information."),
+        .describe("A concise description that includes failing line, diagnosis summary (gathered from going through test run report attachments), and reasoning for issue_type."),
     issue_type: zod_1.z
         .enum(["app", "test", "unknown"])
         .describe("The type of issue. Options: app, test, unknown. You can use 'unknown' if you are unsure about the type."),
     test_issue_prompt: zod_1.z
         .string()
         .optional()
-        .describe("A prompt that suggests how to fix test type issues. This prompt is used to modify the test to adapt to the new state of the app."),
-    ...metadata_schema_1.issueMetadataFields,
+        .describe("A prompt that suggests how to fix test type issues. This prompt is used to modify the test to adapt to the new state of the application. Provide URLs for build and run reports where the issue originated, so that the developer can understand full context."),
 });
 exports.createIssueTool = {
     schema: {
         name: "createIssue",
-        description: `This tool allows you to create an issue in the project's issue tracking system. You MUST check if a similar issue already exists with the list issue before creating a new one.`,
+        description: `This tool allows you to create an issue in the project's issue tracking system. You MUST check if a similar issue already exists with the list issues tool before creating a new one.`,
         parameters: createIssueSchema,
     },
     needsBrowser: false,
     isInlineTool: true,
     execute: async ({ input, apiClient, chatSession }) => {
         try {
-            const { title, description, issue_type = "unknown", test_issue_prompt, test_cases_affected = [], test_run_info = [], } = input;
+            const { title, description, issue_type = "unknown", test_issue_prompt, } = input;
             if (!chatSession?.id) {
                 throw new Error("Cannot create issue without a chat session ID.");
             }
@@ -44,8 +42,6 @@ exports.createIssueTool = {
                 issue_type,
                 test_issue_prompt,
                 triage_session_id: chatSession?.id,
-                test_cases_affected,
-                test_run_info,
             });
             if (!response.data?.issue) {
                 return {
@@ -55,7 +51,7 @@ exports.createIssueTool = {
             }
             const issue = response.data?.issue;
             const baseUrl = apiClient.getBaseUrl();
-            const issueUrl = `${baseUrl}/issues?issueId=${issue?.id}`;
+            const issueUrl = `${baseUrl}/issues/${issue?.id}`;
             const result = `Successfully created issue #${issue?.id}: ${issue?.title}
   Issue URL: ${issueUrl}
   Issue JSON:

package/dist/tools/issues-v1/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/issues-v1/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/tools/issues-v1/list-issues.d.ts

@@ -0,0 +1,3 @@
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
+export declare const listIssuesTool: Tool;
+//# sourceMappingURL=list-issues.d.ts.map

package/dist/tools/issues-v1/list-issues.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-issues.d.ts","sourceRoot":"","sources":["../../../src/tools/issues-v1/list-issues.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AAKlE,eAAO,MAAM,cAAc,EAAE,IA2B5B,CAAC"}

package/dist/tools/issues-v1/update-issue.d.ts

@@ -0,0 +1,3 @@
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
+export declare const updateIssueTool: Tool;
+//# sourceMappingURL=update-issue.d.ts.map

package/dist/tools/issues-v1/update-issue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-issue.d.ts","sourceRoot":"","sources":["../../../src/tools/issues-v1/update-issue.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AAsBlE,eAAO,MAAM,eAAe,EAAE,IAwD7B,CAAC"}

package/dist/tools/{issues → issues-v1}/update-issue.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateIssueTool = void 0;
 const zod_1 = require("zod");
-const metadata_schema_1 = require("./metadata-schema");
 const utils_1 = require("./utils");
 const updateIssueSchema = zod_1.z.object({
     id: zod_1.z.number().describe("The ID of the issue to update"),
@@ -19,7 +18,6 @@ const updateIssueSchema = zod_1.z.object({
         .string()
         .optional()
         .describe("Updated test issue prompt"),
-    ...metadata_schema_1.issueMetadataFields,
 });
 exports.updateIssueTool = {
     schema: {
@@ -31,7 +29,7 @@ exports.updateIssueTool = {
     isInlineTool: true,
     execute: async ({ input, apiClient }) => {
         try {
-            const { id, title, description, issue_type, test_issue_prompt, test_cases_affected, test_run_info, } = input;
+            const { id, title, description, issue_type, test_issue_prompt } = input;
             if (!apiClient) {
                 throw new Error("Dashboard API client is not available.");
             }
@@ -48,12 +46,6 @@ exports.updateIssueTool = {
             if (test_issue_prompt !== undefined) {
                 updateData.test_issue_prompt = test_issue_prompt;
             }
-            if (test_cases_affected !== undefined && test_cases_affected.length > 0) {
-                updateData.test_cases_affected = test_cases_affected;
-            }
-            if (test_run_info !== undefined && test_run_info.length > 0) {
-                updateData.test_run_info = test_run_info;
-            }
             const response = await (0, utils_1.updateIssue)(apiClient, id, updateData);
             if (!response.data?.issue) {
                 return {

package/dist/tools/{issues → issues-v1}/utils.d.ts

@@ -1,4 +1,5 @@
-import type { CreateIssueApiResponse, GetIssuesApiResponse, IDashboardAPIClient, Issue, UpdateIssueApiResponse } from "@empiricalrun/shared-types";
+import type { IDashboardAPIClient } from "@empiricalrun/shared-types/api/base";
+import type { CreateIssueApiResponse, GetIssuesApiResponse, Issue, UpdateIssueApiResponse } from "@empiricalrun/shared-types/api/issues";
 export declare function fetchIssues(apiClient: IDashboardAPIClient): Promise<GetIssuesApiResponse<Issue>>;
 export declare function createIssue(apiClient: IDashboardAPIClient, issueData: Omit<Issue, "id" | "created_at" | "updated_at" | "status" | "project_id">): Promise<CreateIssueApiResponse<Issue>>;
 export declare function updateIssue(apiClient: IDashboardAPIClient, issueId: number, updateData: Partial<Omit<Issue, "id" | "created_at" | "updated_at" | "project_id">>): Promise<UpdateIssueApiResponse<Issue>>;

package/dist/tools/issues-v1/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/tools/issues-v1/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EACtB,oBAAoB,EACpB,KAAK,EACL,sBAAsB,EACvB,MAAM,uCAAuC,CAAC;AAE/C,wBAAsB,WAAW,CAC/B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAStC;AAED,wBAAsB,WAAW,CAC/B,SAAS,EAAE,mBAAmB,EAC9B,SAAS,EAAE,IAAI,CACb,KAAK,EACL,IAAI,GAAG,YAAY,GAAG,YAAY,GAAG,QAAQ,GAAG,YAAY,CAC7D,GACA,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CASxC;AAED,wBAAsB,WAAW,CAC/B,SAAS,EAAE,mBAAmB,EAC9B,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,OAAO,CACjB,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,YAAY,GAAG,YAAY,GAAG,YAAY,CAAC,CAC/D,GACA,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CASxC"}

package/dist/tools/issues-v2/create-issue.d.ts

@@ -0,0 +1,3 @@
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
+export declare const createIssueTool: Tool;
+//# sourceMappingURL=create-issue.d.ts.map

package/dist/tools/issues-v2/create-issue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-issue.d.ts","sourceRoot":"","sources":["../../../src/tools/issues-v2/create-issue.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AA6ClE,eAAO,MAAM,eAAe,EAAE,IAwE7B,CAAC"}

package/dist/tools/issues-v2/create-issue.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createIssueTool = void 0;
+const zod_1 = require("zod");
+const createIssueSchema = zod_1.z.object({
+    title: zod_1.z.string().describe("A short, descriptive title for the issue"),
+    description: zod_1.z
+        .string()
+        .describe("A concise description that includes failing line, diagnosis summary (gathered from going through test run report attachments), and reasoning for issue_type."),
+    issue_type: zod_1.z
+        .enum(["app", "test", "unknown"])
+        .describe("The type of issue. Options: app, test, unknown. You can use 'unknown' if you are unsure about the type."),
+    test_issue_prompt: zod_1.z
+        .string()
+        .optional()
+        .describe("A prompt that suggests how to fix test type issues. This prompt is used to modify the test to adapt to the new state of the application. Provide URLs for build and run reports where the issue originated, so that the developer can understand full context."),
+    diagnosis_id: zod_1.z
+        .string()
+        .describe("12 character random string that identifies a failing test case in a test run, which is where this issue was detected."),
+});
+async function createIssue(apiClient, issueData) {
+    const response = await apiClient.request(`/api/diagnosis/${issueData.diagnosis_id}/triage`, { method: "POST", body: issueData });
+    if (!response || !response.data || !response.data.issue) {
+        throw new Error("Failed to create issue: No response data received.");
+    }
+    return response;
+}
+exports.createIssueTool = {
+    schema: {
+        name: "createIssue",
+        description: `This tool allows you to create an issue in the project's issue tracking system. You MUST check if a similar issue already exists with the list issues tool before creating a new one.`,
+        parameters: createIssueSchema,
+    },
+    needsBrowser: false,
+    isInlineTool: true,
+    execute: async ({ input, apiClient, chatSession }) => {
+        try {
+            const { title, description, issue_type = "unknown", test_issue_prompt, diagnosis_id, } = input;
+            if (!chatSession?.id) {
+                throw new Error("Cannot create issue without a chat session ID.");
+            }
+            if (issue_type === "test" && !test_issue_prompt) {
+                throw new Error("test_issue_prompt is required for test type issues.");
+            }
+            if (!diagnosis_id) {
+                throw new Error("diagnosis_id is required.");
+            }
+            if (!apiClient) {
+                throw new Error("Dashboard API client is not available.");
+            }
+            const response = await createIssue(apiClient, {
+                action: "created",
+                title,
+                issue_type,
+                description,
+                diagnosis_id,
+                test_issue_prompt,
+                triage_session_id: chatSession.id,
+            });
+            if (!response.data?.issue) {
+                return {
+                    isError: true,
+                    result: `Failed to create issue: ${response.error?.message}`,
+                };
+            }
+            const issue = response.data?.issue;
+            const baseUrl = apiClient.getBaseUrl();
+            const issueUrl = `${baseUrl}/issues/${issue?.id}`;
+            const result = `Successfully created issue #${issue?.id}: ${issue?.title}
+  Issue URL: ${issueUrl}
+  Issue JSON:
+  ${JSON.stringify(issue, null, 2)}
+  `;
+            return {
+                isError: false,
+                result,
+            };
+        }
+        catch (error) {
+            return {
+                isError: true,
+                result: `Failed to create issue: ${error instanceof Error ? error.message : String(error)}`,
+            };
+        }
+    },
+};

package/dist/tools/issues-v2/update-issue.d.ts

@@ -0,0 +1,3 @@
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
+export declare const updateIssueTool: Tool;
+//# sourceMappingURL=update-issue.d.ts.map

package/dist/tools/issues-v2/update-issue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-issue.d.ts","sourceRoot":"","sources":["../../../src/tools/issues-v2/update-issue.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AAuClE,eAAO,MAAM,eAAe,EAAE,IAmE7B,CAAC"}

package/dist/tools/issues-v2/update-issue.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateIssueTool = void 0;
+const zod_1 = require("zod");
+const updateIssueSchema = zod_1.z.object({
+    id: zod_1.z.number().describe("The ID of the issue to update"),
+    title: zod_1.z.string().optional().describe("Updated title of the issue"),
+    description: zod_1.z
+        .string()
+        .optional()
+        .describe("Updated description of the issue"),
+    issue_type: zod_1.z
+        .enum(["app", "test", "unknown"])
+        .optional()
+        .describe("Updated issue type"),
+    test_issue_prompt: zod_1.z
+        .string()
+        .optional()
+        .describe("Updated test issue prompt"),
+    diagnosis_id: zod_1.z
+        .string()
+        .describe("12 character random string that identifies a failing test case in a test run, which is where this issue was detected."),
+});
+async function updateIssue(apiClient, issueData) {
+    const response = await apiClient.request(`/api/diagnosis/${issueData.diagnosis_id}/triage`, { method: "POST", body: issueData });
+    if (!response || !response.data || !response.data.issue) {
+        throw new Error("Failed to create issue: No response data received.");
+    }
+    return response;
+}
+exports.updateIssueTool = {
+    schema: {
+        name: "updateIssue",
+        description: `This tool allows you to update an existing issue in the project's issue tracking system. You can update the title, description, issue type, or test issue prompt. Use this tool to update existing issue to prevent duplication of issues.`,
+        parameters: updateIssueSchema,
+    },
+    needsBrowser: false,
+    isInlineTool: true,
+    execute: async ({ input, apiClient }) => {
+        try {
+            const { id: issue_id, title, description, issue_type, test_issue_prompt, diagnosis_id, } = input;
+            if (!apiClient) {
+                throw new Error("Dashboard API client is not available.");
+            }
+            const updateData = {
+                action: "updated",
+                issue_id,
+                diagnosis_id,
+            };
+            if (title !== undefined) {
+                updateData.title = title;
+            }
+            if (description !== undefined) {
+                updateData.description = description;
+            }
+            if (issue_type !== undefined) {
+                updateData.issue_type = issue_type;
+            }
+            if (test_issue_prompt !== undefined) {
+                updateData.test_issue_prompt = test_issue_prompt;
+            }
+            const response = await updateIssue(apiClient, updateData);
+            if (!response.data?.issue) {
+                return {
+                    isError: true,
+                    result: `Failed to update issue: ${response.error?.message}`,
+                };
+            }
+            const issue = response.data?.issue;
+            const result = `Successfully updated issue #${issue?.id}: ${issue?.title}
+  
+  Updated Issue JSON:
+  ${JSON.stringify(issue, null, 2)}
+  `;
+            return {
+                isError: false,
+                result,
+            };
+        }
+        catch (error) {
+            return {
+                isError: true,
+                result: `Failed to update issue: ${error instanceof Error ? error.message : String(error)}`,
+            };
+        }
+    },
+};

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

@@ -1,3 +1,3 @@
-import type { Tool } from "@empiricalrun/shared-types";
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
 export declare const listEnvironmentsTool: Tool;
 //# sourceMappingURL=list-environments.d.ts.map

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,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGvD,eAAO,MAAM,oBAAoB,EAAE,IAgDlC,CAAC"}
+{"version":3,"file":"list-environments.d.ts","sourceRoot":"","sources":["../../src/tools/list-environments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uCAAuC,CAAC;AAGlE,eAAO,MAAM,oBAAoB,EAAE,IAgDlC,CAAC"}

package/dist/tools/list-tests-and-projects/index.d.ts

@@ -1,4 +1,4 @@
-import { Tool } from "@empiricalrun/shared-types";
+import { Tool } from "@empiricalrun/shared-types/chat-agent";
 export declare const objectAsString: (obj: any) => string;
 export declare function parseObjectString(objectString: string): any;
 export declare const listProjectsTool: Tool;

package/dist/tools/list-tests-and-projects/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/list-tests-and-projects/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AAgB9D,eAAO,MAAM,cAAc,GAAI,KAAK,GAAG,WAKnC,CAAC;AAEL,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAkB3D;AAED,eAAO,MAAM,gBAAgB,EAAE,IAY9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,IAgBrC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/list-tests-and-projects/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,uCAAuC,CAAC;AAgBzE,eAAO,MAAM,cAAc,GAAI,KAAK,GAAG,WAKnC,CAAC;AAEL,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,GAAG,CAkB3D;AAED,eAAO,MAAM,gBAAgB,EAAE,IAY9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,IA0BrC,CAAC"}

package/dist/tools/list-tests-and-projects/index.js

@@ -49,9 +49,19 @@ exports.listTestsForProjectTool = {
     execute: async ({ repoPath, input, }) => {
         const data = await (0, test_run_1.listProjectsAndTests)(repoPath);
         const projectToFilter = input.project;
-        return {
-            isError: false,
-            result: JSON.stringify(data.projectsToTestCases[projectToFilter]),
-        };
+        const listOfTestsForProject = data.projectsToTestCases[projectToFilter];
+        if (!listOfTestsForProject) {
+            const validProjects = Object.keys(data.projectsToTestCases).join(", ");
+            return {
+                isError: false,
+                result: `No test cases found for project ${projectToFilter}. Test cases exist for projects: ${validProjects}`,
+            };
+        }
+        else {
+            return {
+                isError: false,
+                result: JSON.stringify(listOfTestsForProject),
+            };
+        }
     },
 };

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

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

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

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

package/dist/tools/merge-conflicts/index.js

@@ -9,9 +9,9 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const merge_conflicts_1 = require("../definitions/merge-conflicts");
 const git_1 = require("../executor/utils/git");
-function runMergeMain(repoPath) {
+function runMerge(repoPath, targetBranch) {
     try {
-        (0, child_process_1.execSync)("git merge --no-ff origin/main -m 'Merge remote-tracking branch origin/main [skip ci]'", { stdio: "pipe", cwd: repoPath });
+        (0, child_process_1.execSync)(`git merge --no-ff origin/${targetBranch} -m 'Merge remote-tracking branch origin/${targetBranch} [skip ci]'`, { stdio: "pipe", cwd: repoPath });
         return "CLEAN";
     }
     catch (error) {
@@ -42,26 +42,39 @@ function getConflictedFilesWithContents(repoPath) {
 }
 exports.mergeConflictsTool = {
     ...merge_conflicts_1.mergeConflictsTool,
-    execute: async ({ repoPath }) => {
+    execute: async ({ repoPath, chatSession }) => {
+        const targetBranch = chatSession?.baseBranchName || "main";
         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 });
+            (0, child_process_1.execSync)(`git remote set-branches --add origin ${targetBranch}`, {
+                cwd: repoPath,
+            });
+            (0, child_process_1.execSync)(`git fetch origin ${targetBranch}`, { cwd: repoPath });
+            // Configure git user for merge
+            (0, child_process_1.execSync)(`git config user.name "${git_1.GIT_USER_NAME}"`, { cwd: repoPath });
+            (0, child_process_1.execSync)(`git config user.email "${git_1.GIT_USER_EMAIL}"`, { cwd: repoPath });
             // Run merge command and commit (with or without conflict)
-            const mergeResult = runMergeMain(repoPath);
+            const mergeResult = runMerge(repoPath, targetBranch);
             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.`,
+                    result: `Merge from ${targetBranch} was successful, without any conflicts.`,
                 };
             }
             else if (mergeResult === "CONFLICTS") {
                 const files = getConflictedFilesWithContents(repoPath);
+                const filePaths = Object.keys(files);
+                if (filePaths.length === 0) {
+                    return {
+                        isError: true,
+                        result: `Merge failed with exit code 1, but no conflicted files were found.`,
+                    };
+                }
                 (0, git_1.stageAndCommitFilesAsBotUser)({
-                    commitMessage: "Merge from main with conflicts",
-                    files: Object.keys(files),
+                    commitMessage: `Merge from ${targetBranch} with conflicts`,
+                    files: filePaths,
                     repoPath,
                 });
                 (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
@@ -71,7 +84,7 @@ exports.mergeConflictsTool = {
                     .join("\n\n");
                 return {
                     isError: false,
-                    result: `Merge from main is committed, with conflicts. Use text edit tools to resolve them.\n\n${filesResult}`,
+                    result: `Merge from ${targetBranch} is committed, with conflicts. Use text edit tools to resolve them.\n\n${filesResult}`,
                 };
             }
             else {

package/dist/tools/rename-file/index.d.ts

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

package/dist/tools/rename-file/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/rename-file/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AAQnE,eAAO,MAAM,cAAc,EAAE,IA6E5B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/rename-file/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAc,MAAM,uCAAuC,CAAC;AAQ9E,eAAO,MAAM,cAAc,EAAE,IA4E5B,CAAC"}

package/dist/tools/rename-file/index.js

@@ -64,7 +64,6 @@ exports.renameFileTool = {
             }
             stageFile(oldFilePath);
             stageFile(newFilePath);
-            // Run TypeScript compilation check
             const tscResult = await (0, web_1.runTypescriptCompiler)(repoPath);
             if (!tscResult.success) {
                 return {

package/dist/tools/review-pull-request/index.d.ts

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

package/dist/tools/review-pull-request/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/review-pull-request/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AAU9D,eAAO,MAAM,qBAAqB,EAAE,IAiGnC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/review-pull-request/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EAEL,MAAM,uCAAuC,CAAC;AAU/C,eAAO,MAAM,qBAAqB,EAAE,IA0FnC,CAAC"}

package/dist/tools/review-pull-request/index.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reviewPullRequestTool = void 0;
-const state_1 = require("../../agent/chat/state");
 const code_review_1 = require("../../agent/code-review");
 const executor_1 = require("../../agent/code-review/executor");
+const file_info_1 = require("../../file-info");
 const review_pull_request_1 = require("../definitions/review-pull-request");
-const CODE_REVIEW_MODEL = "claude-sonnet-4-20250514";
+const CODE_REVIEW_MODEL = "claude-sonnet-4-5-20250929";
 exports.reviewPullRequestTool = {
     ...review_pull_request_1.reviewPullRequestTool,
-    execute: async ({ input, apiClient, chatSession, environmentOverrides, trace, featureFlags, repoPath, }) => {
+    execute: async ({ input, apiClient, environmentOverrides, trace, featureFlags, repoPath, }) => {
         try {
             const { sessionUrl } = input;
             if (!sessionUrl) {
@@ -22,15 +22,6 @@ exports.reviewPullRequestTool = {
                     isError: true,
                     result: "API Client not available",
                 };
-            // creating chat state to pass to model
-            const userPrompt = `Review this session: ${sessionUrl}`;
-            const chatState = (0, state_1.createChatState)({
-                userPrompt,
-                attachments: [],
-                existingState: undefined,
-                selectedModel: CODE_REVIEW_MODEL,
-                error: null,
-            });
             const span = trace?.span({
                 name: "code-review-agent",
                 input: {
@@ -39,7 +30,7 @@ exports.reviewPullRequestTool = {
                 },
             });
             const codeReviewToolExecutor = new executor_1.CodeReviewToolExecutor({
-                chatSession: chatSession || null,
+                chatSession: null,
                 repoPath,
                 apiClient,
                 trace: span,
@@ -49,15 +40,18 @@ exports.reviewPullRequestTool = {
             const agentParams = {
                 featureFlags: [],
                 selectedModel: CODE_REVIEW_MODEL,
-                chatState,
+                chatState: undefined,
                 toolExecutor: codeReviewToolExecutor,
                 trace: span,
+                repoInfoBuilder: () => (0, file_info_1.getFileInfoFromFS)(repoPath),
             };
             const agent = new code_review_1.CodeReviewAgent({ ...agentParams });
+            // Push the review prompt to the agent
+            const userPrompt = `Review this session: ${sessionUrl}`;
+            agent.pushUserMessage([{ text: userPrompt }]);
             while (!agent.askUserForInput) {
                 await agent.runLoop({
                     reporter: async () => { },
-                    trace: span,
                 });
             }
             const agentResult = agent.getResult();

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

@@ -1,3 +1,3 @@
-import type { Tool } from "@empiricalrun/shared-types";
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
 export declare const runTestTool: Tool;
 //# sourceMappingURL=run-test.d.ts.map

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,EAAU,IAAI,EAAc,MAAM,4BAA4B,CAAC;AA0C3E,eAAO,MAAM,WAAW,EAAE,IA4GzB,CAAC"}
+{"version":3,"file":"run-test.d.ts","sourceRoot":"","sources":["../../src/tools/run-test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,IAAI,EAEL,MAAM,uCAAuC,CAAC;AA0C/C,eAAO,MAAM,WAAW,EAAE,IA4GzB,CAAC"}

package/dist/tools/test-gen-browser.d.ts

@@ -1,3 +1,3 @@
-import type { Tool } from "@empiricalrun/shared-types";
+import type { Tool } from "@empiricalrun/shared-types/chat-agent";
 export declare const generateTestWithBrowserAgent: Tool;
 //# sourceMappingURL=test-gen-browser.d.ts.map

package/dist/tools/test-gen-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-gen-browser.d.ts","sourceRoot":"","sources":["../../src/tools/test-gen-browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAiB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAqBtE,eAAO,MAAM,4BAA4B,EAAE,IA+L1C,CAAC"}
+{"version":3,"file":"test-gen-browser.d.ts","sourceRoot":"","sources":["../../src/tools/test-gen-browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,IAAI,EACL,MAAM,uCAAuC,CAAC;AAqB/C,eAAO,MAAM,4BAA4B,EAAE,IAmO1C,CAAC"}