@empiricalrun/test-gen 0.76.0 → 0.78.0

package/dist/tools/executor/index.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolExecutor = void 0;
-const artifacts_1 = require("../../artifacts");
-const file_1 = require("../../utils/file");
+const analyse_video_1 = require("../analyse-video");
 const create_pull_request_1 = require("../create-pull-request");
 const delete_file_1 = require("../delete-file");
 const diagnosis_fetcher_1 = require("../diagnosis-fetcher");
 const download_build_1 = require("../download-build");
-const extract_frames_from_video_1 = require("../extract-frames-from-video");
 const fetch_file_1 = require("../fetch-file");
 const fetch_last_successful_test_run_1 = require("../fetch-last-successful-test-run");
 const fetch_session_diff_1 = require("../fetch-session-diff");
-const fetch_video_analysis_1 = require("../fetch-video-analysis");
 const file_operations_1 = require("../file-operations");
 const grep_1 = require("../grep");
 const issues_1 = require("../issues");
@@ -27,24 +24,9 @@ const trace_dot_zip_1 = require("../trace-dot-zip");
 const triage_summary_1 = require("../triage-summary");
 const upgrade_packages_1 = require("../upgrade-packages");
 const view_failed_test_run_report_1 = require("../view-failed-test-run-report");
-const checkpoint_1 = require("./utils/checkpoint");
-class ToolExecutor {
-    toolExecutors = {};
-    chatSession;
-    branchName;
-    repoPath;
-    apiClient;
-    trace;
-    featureFlags;
-    environmentOverrides;
-    constructor({ chatSession, branchName, repoPath, apiClient, trace, featureFlags, environmentOverrides = {}, }) {
-        this.chatSession = chatSession;
-        this.branchName = branchName;
-        this.trace = trace;
-        this.repoPath = repoPath;
-        this.apiClient = apiClient;
-        this.featureFlags = featureFlags;
-        this.environmentOverrides = environmentOverrides;
+const base_1 = require("./base");
+class ToolExecutor extends base_1.BaseToolExecutor {
+    constructor(params) {
         // Found for "Tool Executor Tools List" and add any new tools to the list
         const tools = [
             grep_1.grepTool,
@@ -60,7 +42,7 @@ class ToolExecutor {
             download_build_1.downloadBuildTool,
             upgrade_packages_1.upgradePackagesTool,
             fetch_file_1.fetchFileTool,
-            fetch_video_analysis_1.fetchVideoAnalysis,
+            analyse_video_1.analyseVideo,
             delete_file_1.deleteFileTool,
             rename_file_1.renameFileTool,
             trace_dot_zip_1.traceDotZipTool,
@@ -69,87 +51,12 @@ class ToolExecutor {
             fetch_last_successful_test_run_1.fetchLastSuccessfulTestRunTool,
             triage_summary_1.sendTriageSummaryTool,
             list_tests_and_projects_1.listProjectsTool,
-            extract_frames_from_video_1.extractFramesFromVideo,
             fetch_session_diff_1.fetchSessionDiffTool,
             review_pull_request_1.reviewPullRequestTool,
+            list_tests_and_projects_1.listTestsForProjectTool,
             ...file_operations_1.textEditorTools,
         ];
-        tools.forEach((tool) => {
-            this.toolExecutors[tool.schema.name] = tool.execute;
-        });
-        this.toolExecutors = {
-            ...this.toolExecutors,
-            // Support for Claude 3x and 4: They use different tool names
-            str_replace_editor: file_operations_1.strReplaceEditorExecutor,
-            str_replace_based_edit_tool: file_operations_1.strReplaceEditorExecutor,
-        };
-    }
-    async execute(toolCalls) {
-        const executeSpan = this.trace?.span({
-            name: "execute_tools",
-            input: { toolCalls: toolCalls.map((tc) => ({ name: tc.name })) },
-        });
-        const toolResults = [];
-        for (const toolCall of toolCalls) {
-            const span = executeSpan?.span({
-                name: `tool: ${toolCall.name}`,
-                input: toolCall.input,
-            });
-            const uploadArtifactsQueue = new artifacts_1.UploadArtifactsQueue(this.repoPath, toolCall.id);
-            const collectArtifactsFn = (artifactsInput, cleanUpDir) => {
-                uploadArtifactsQueue
-                    .addTask(artifactsInput)
-                    .then(() => {
-                    if (cleanUpDir) {
-                        void (0, file_1.safeCleanupDirectory)(cleanUpDir);
-                    }
-                })
-                    .catch((error) => {
-                    console.error("Error collecting artifacts:", error);
-                });
-            };
-            const toolExecutor = this.toolExecutors[toolCall.name];
-            if (!toolExecutor) {
-                const errorResult = {
-                    isError: true,
-                    result: `Invalid function/tool call: ${toolCall.name} not found`,
-                    artifacts: null,
-                };
-                toolResults.push(errorResult);
-                span?.end({ output: errorResult });
-                continue;
-            }
-            try {
-                const result = await toolExecutor({
-                    input: toolCall.input,
-                    repoPath: this.repoPath,
-                    apiClient: this.apiClient,
-                    trace: this.trace,
-                    chatSession: this.chatSession,
-                    collectArtifacts: collectArtifactsFn,
-                    environmentOverrides: this.environmentOverrides,
-                    featureFlags: this.featureFlags,
-                });
-                const artifacts = await uploadArtifactsQueue.waitForCompletion();
-                toolResults.push({ ...result, artifacts });
-                span?.end({ output: result });
-            }
-            catch (error) {
-                const errorResult = {
-                    isError: true,
-                    result: error instanceof Error ? error.message : String(error),
-                    artifacts: null,
-                };
-                toolResults.push(errorResult);
-                span?.end({ output: errorResult });
-            }
-        }
-        (0, checkpoint_1.createCommitCheckpoint)({
-            branchName: this.branchName,
-            repoPath: this.repoPath,
-        });
-        executeSpan?.end({ output: { toolResults } });
-        return toolResults;
+        super({ ...params, tools });
     }
 }
 exports.ToolExecutor = ToolExecutor;

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

@@ -1,5 +1,5 @@
 export declare function createCommitCheckpoint({ branchName, repoPath, }: {
     branchName: string;
     repoPath: string;
-}): void;
+}): string | null;
 //# 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":"AAIA,wBAAgB,sBAAsB,CAAC,EACrC,UAAU,EACV,QAAQ,GACT,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,QAsBA"}
+{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../../src/tools/executor/utils/checkpoint.ts"],"names":[],"mappings":"AAIA,wBAAgB,sBAAsB,CAAC,EACrC,UAAU,EACV,QAAQ,GACT,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,GAAG,IAAI,CA2BhB"}

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

@@ -20,7 +20,11 @@ function createCommitCheckpoint({ branchName, repoPath, }) {
         });
         const commitMessage = commitMessages.join(", ");
         // Files are already staged by individual tools, just commit
-        (0, git_1.commitAsBotUser)(commitMessage, repoPath);
-        (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
+        const commitSha = (0, git_1.commitAsBotUser)(commitMessage, repoPath);
+        if (commitSha) {
+            (0, child_process_1.execSync)(`git push origin ${branchName}`, { cwd: repoPath });
+        }
+        return commitSha;
     }
+    return null;
 }

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

@@ -4,14 +4,14 @@ export declare function getGitDiffStaged(filepath: string, cwd: string): string;
 export declare function getGitDiffForStagedOrUnstaged(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): boolean;
+export declare function commitAsBotUser(commitMessage: string, cwd: string): string | null;
 export declare function getCurrentBranchName(repoPath: string): Promise<string>;
 export declare function pullBranch(branchName: string, cwd: string): Promise<void>;
 export declare function stageAndCommitFilesAsBotUser({ commitMessage, files, repoPath, }: {
     commitMessage: string;
     files: string[];
     repoPath: string;
-}): void;
+}): string | null;
 export type FileChange = {
     type: "added" | "modified" | "removed" | "renamed";
     path: string;

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":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAMjE,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMhE;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GACV,MAAM,CAaR;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,4BAA4B,CAAC,EAC3C,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,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,CA6CxD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAUrD;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"}
+{"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,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,GACV,MAAM,CAaR;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,CAC7B,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,GACV,MAAM,GAAG,IAAI,CAkBf;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,mBAO1D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAE/D;AAED,wBAAgB,4BAA4B,CAAC,EAC3C,aAAa,EACb,KAAK,EACL,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,GAAG,IAAI,CAGhB;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,CA6CxD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAUrD;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

@@ -74,11 +74,15 @@ function commitAsBotUser(commitMessage, cwd) {
         cwd,
     });
     if (!status) {
-        return false;
+        return null;
     }
     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 });
-    return true;
+    const commitSha = (0, child_process_1.execSync)("git rev-parse HEAD", {
+        encoding: "utf-8",
+        cwd,
+    }).trim();
+    return commitSha;
 }
 async function getCurrentBranchName(repoPath) {
     const branchName = (0, child_process_1.execSync)("git branch --show-current", {
@@ -93,7 +97,7 @@ async function pullBranch(branchName, cwd) {
 }
 function stageAndCommitFilesAsBotUser({ commitMessage, files, repoPath, }) {
     (0, child_process_1.execSync)(`git add ${files.join(" ")}`, { cwd: repoPath });
-    commitAsBotUser(commitMessage, repoPath);
+    return commitAsBotUser(commitMessage, repoPath);
 }
 function getStagedFiles(cwd) {
     const output = (0, child_process_1.execSync)("git diff --cached --name-status", {

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

@@ -1,4 +1,4 @@
-import { IDashboardAPIClient } from "@empiricalrun/shared-types";
+import { IDashboardAPIClient, PendingToolCall, ToolResult } from "@empiricalrun/shared-types";
 export interface GitHubRepoInfo {
     owner: string;
     repo: string;
@@ -50,7 +50,7 @@ export declare function createPullRequest({ owner, repo, title, head, base, body
     repo: string;
     title: string;
     head: string;
-    base?: string;
+    base: string;
     body: string;
     labels?: string[];
     apiClient: IDashboardAPIClient;
@@ -62,16 +62,18 @@ export declare function updatePullRequest({ owner, repo, prNumber, body, apiClie
     body?: string;
     apiClient: IDashboardAPIClient;
 }): Promise<PullRequestInfo>;
-export declare function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiClient, }: {
+export declare function findOrCreatePullRequest({ owner, repo, branchName, title, body, base, labels, apiClient, }: {
     owner: string;
     repo: string;
     branchName: string;
     title: string;
     body: string;
+    base: string;
     labels?: string[];
     apiClient: IDashboardAPIClient;
 }): Promise<{
     pr: PullRequestInfo;
     isNew: boolean;
 }>;
+export declare function validateToolInput<T>(toolCall: PendingToolCall, schema: T): ToolResult | null;
 //# sourceMappingURL=index.d.ts.map

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":"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"}
+{"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

@@ -7,6 +7,7 @@ exports.getMergeableStateDescription = getMergeableStateDescription;
 exports.createPullRequest = createPullRequest;
 exports.updatePullRequest = updatePullRequest;
 exports.findOrCreatePullRequest = findOrCreatePullRequest;
+exports.validateToolInput = validateToolInput;
 function parseGitHubUrl(url) {
     const githubIndex = url.indexOf("github.com");
     if (githubIndex === -1) {
@@ -70,7 +71,7 @@ function getMergeableStateDescription(state) {
             return `The pull request has mergeable state: ${state}.`;
     }
 }
-async function createPullRequest({ owner, repo, title, head, base = "main", body, labels, apiClient, }) {
+async function createPullRequest({ owner, repo, title, head, base, body, labels, apiClient, }) {
     const createPrBody = {
         title,
         head,
@@ -98,7 +99,7 @@ async function updatePullRequest({ owner, repo, prNumber, body, apiClient, }) {
         body: updateBody,
     });
 }
-async function findOrCreatePullRequest({ owner, repo, branchName, title, body, labels, apiClient, }) {
+async function findOrCreatePullRequest({ owner, repo, branchName, title, body, base, labels, apiClient, }) {
     const existingPR = await getExistingPR({
         owner,
         repo,
@@ -113,9 +114,29 @@ async function findOrCreatePullRequest({ owner, repo, branchName, title, body, l
         repo,
         title,
         head: branchName,
+        base,
         body,
         labels,
         apiClient,
     });
     return { pr: newPR, isNew: true };
 }
+function validateToolInput(toolCall, schema) {
+    const { name: toolName, input } = toolCall;
+    const strictSchema = schema._def?.typeName === "ZodObject"
+        ? schema.strict()
+        : schema;
+    const validation = strictSchema.safeParse(input);
+    if (!validation.success) {
+        const errorMessage = [
+            `Schema validation failed for tool "${toolName}".`,
+            `\nValidation errors: ${JSON.stringify(validation.error.issues, null, 2)}`,
+        ].join("\n");
+        return {
+            isError: true,
+            result: errorMessage,
+            artifacts: null,
+        };
+    }
+    return null;
+}

package/dist/tools/fetch-session-diff/index.js

@@ -8,7 +8,7 @@ const SessionDiffInputSchema = zod_1.z.object({
 exports.fetchSessionDiffTool = {
     schema: {
         name: "fetchSessionDiff",
-        description: `Extracts the session url and returns the code diff for the session.`,
+        description: `Extracts the session url and returns the code diff for the session along with pull request title and description, if available.`,
         parameters: SessionDiffInputSchema,
     },
     needsBrowser: false,
@@ -26,7 +26,7 @@ exports.fetchSessionDiffTool = {
                 throw new Error("Dashboard API client is not available.");
             }
             const sessionId = sessionUrl.split("/").pop();
-            const sessionDiffApiUrl = `/api/chat-sessions/${sessionId}/diff`;
+            const sessionDiffApiUrl = `/api/chat-sessions/${sessionId}/diff?is_line_annotated=true`;
             const sessionDiff = await apiClient.request(sessionDiffApiUrl, {
                 method: "GET",
             });

package/dist/tools/file-operations/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAO1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,iBAAe,kBAAkB,CAAC,EAChC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CA0DtB;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAO1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,iBAAe,kBAAkB,CAAC,EAChC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAuDtB;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/tools/file-operations/create.js

@@ -8,7 +8,6 @@ const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const web_1 = require("../../bin/utils/platform/web");
-const git_helper_1 = require("./shared/git-helper");
 async function fileCreateExecutor({ input, filePath, absoluteFilePath, repoDir, collectArtifacts, }) {
     if (input.file_text === undefined || input.file_text === null) {
         return {
@@ -45,13 +44,11 @@ the required directories recursively for the new file.`,
     fs_1.default.writeFileSync(absoluteFilePath, input.file_text);
     // Stage the file
     (0, child_process_1.execSync)(`git add "${filePath}"`, { cwd: repoDir });
-    // Collect git patch artifact
-    await (0, git_helper_1.collectGitPatchArtifact)(filePath, repoDir, "create", collectArtifacts);
     let tscResult = await (0, web_1.runTypescriptCompiler)(repoDir);
     if (!tscResult.success) {
         return {
             result: `File ${filePath} has been created. However, type checks are failing with errors:\n\n${tscResult.errors.join("\n")}`,
-            isError: true,
+            isError: false,
         };
     }
     else {

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

@@ -11,5 +11,6 @@ declare function strReplaceEditorExecutor({ input, repoPath, collectArtifacts, a
     apiClient?: IDashboardAPIClient;
 }): Promise<ToolResult>;
 declare const textEditorTools: Tool[];
-export { strReplaceEditorExecutor, textEditorTools };
+declare const viewOnlyTools: Tool[];
+export { strReplaceEditorExecutor, textEditorTools, viewOnlyTools };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,IAAI,EAEJ,UAAU,EACX,MAAM,4BAA4B,CAAC;AAQpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD;;;GAGG;AACH,iBAAe,wBAAwB,CAAC,EACtC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,SAAS,GACV,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,GAAG,OAAO,CAAC,UAAU,CAAC,CAoDtB;AA+ED,QAAA,MAAM,eAAe,EAAE,IAAI,EAK1B,CAAC;AAEF,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,IAAI,EAEJ,UAAU,EACX,MAAM,4BAA4B,CAAC;AAQpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD;;;GAGG;AACH,iBAAe,wBAAwB,CAAC,EACtC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,SAAS,GACV,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,GAAG,OAAO,CAAC,UAAU,CAAC,CAoDtB;AAgFD,QAAA,MAAM,eAAe,EAAE,IAAI,EAK1B,CAAC;AAEF,QAAA,MAAM,aAAa,EAAE,IAAI,EAAmB,CAAC;AAE7C,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC"}

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.textEditorTools = void 0;
+exports.viewOnlyTools = exports.textEditorTools = void 0;
 exports.strReplaceEditorExecutor = strReplaceEditorExecutor;
 const path_1 = __importDefault(require("path"));
 const str_replace_editor_1 = require("../definitions/str_replace_editor");
@@ -127,6 +127,7 @@ const stringInsertTool = {
                 command: "insert",
                 path: input.path,
                 insert_line: input.insert_line,
+                insert_text: input.insert_text,
                 new_str: input.new_str,
             },
             repoPath,
@@ -141,3 +142,5 @@ const textEditorTools = [
     stringInsertTool,
 ];
 exports.textEditorTools = textEditorTools;
+const viewOnlyTools = [fileViewTool];
+exports.viewOnlyTools = viewOnlyTools;

package/dist/tools/file-operations/insert.d.ts

@@ -1,11 +1,10 @@
 import { CollectArtifacts, ToolResult } from "@empiricalrun/shared-types";
 import { StrReplaceInputParams } from "./shared/helpers";
-declare function fileInsertExecutor({ input, filePath, absoluteFilePath, repoDir, collectArtifacts, }: {
+export declare function fileInsertExecutor({ input, filePath, absoluteFilePath, repoDir, collectArtifacts, }: {
     input: StrReplaceInputParams;
     filePath: string;
     absoluteFilePath: string;
     repoDir: string;
     collectArtifacts?: CollectArtifacts;
 }): Promise<ToolResult>;
-export { fileInsertExecutor };
 //# sourceMappingURL=insert.d.ts.map

package/dist/tools/file-operations/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAM1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,iBAAe,kBAAkB,CAAC,EAChC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAwDtB;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAM1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAqDtB"}

package/dist/tools/file-operations/insert.js

@@ -7,7 +7,6 @@ exports.fileInsertExecutor = fileInsertExecutor;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const web_1 = require("../../bin/utils/platform/web");
-const git_helper_1 = require("./shared/git-helper");
 async function fileInsertExecutor({ input, filePath, absoluteFilePath, repoDir, collectArtifacts, }) {
     if (!fs_1.default.existsSync(absoluteFilePath)) {
         return {
@@ -46,13 +45,11 @@ async function fileInsertExecutor({ input, filePath, absoluteFilePath, repoDir,
     fs_1.default.writeFileSync(absoluteFilePath, lines.join("\n"));
     // Stage the file
     (0, child_process_1.execSync)(`git add "${filePath}"`, { cwd: repoDir });
-    // Collect git patch artifact
-    await (0, git_helper_1.collectGitPatchArtifact)(filePath, repoDir, "insert", collectArtifacts);
     let tscResult = await (0, web_1.runTypescriptCompiler)(repoDir);
     if (!tscResult.success) {
         return {
             result: `Insertion in file ${filePath} was applied. However, type checks are failing with errors:\n${tscResult.errors.join("\n")}`,
-            isError: true,
+            isError: false,
         };
     }
     else {

package/dist/tools/file-operations/replace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replace.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/replace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAM1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG9D,iBAAe,sBAAsB,CAAC,EACpC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAoFtB;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"replace.d.ts","sourceRoot":"","sources":["../../../src/tools/file-operations/replace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAM1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAG9D,iBAAe,sBAAsB,CAAC,EACpC,KAAK,EACL,QAAQ,EACR,gBAAgB,EAChB,OAAO,EACP,gBAAgB,GACjB,EAAE;IACD,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAwEtB;AAED,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/tools/file-operations/replace.js

@@ -7,7 +7,6 @@ exports.fileStrReplaceExecutor = fileStrReplaceExecutor;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const web_1 = require("../../bin/utils/platform/web");
-const git_helper_1 = require("./shared/git-helper");
 const helpers_1 = require("./shared/helpers");
 async function fileStrReplaceExecutor({ input, filePath, absoluteFilePath, repoDir, collectArtifacts, }) {
     if (!fs_1.default.existsSync(absoluteFilePath)) {
@@ -30,47 +29,44 @@ async function fileStrReplaceExecutor({ input, filePath, absoluteFilePath, repoD
         };
     }
     const content = fs_1.default.readFileSync(absoluteFilePath, "utf8");
-    // Normalize newlines in both the content and search string
+    // Normalize newlines in file content only
     const normalizedContent = content.replace(/\r\n/g, "\n");
-    const normalizedOldStr = input.old_str
-        .replace(/\\n/g, "\n")
-        .replace(/\r\n/g, "\n");
-    if (!normalizedContent.includes(normalizedOldStr)) {
+    const oldStr = input.old_str;
+    // Use literal split/join for replacement to avoid regex and escape sequence issues
+    const parts = normalizedContent.split(oldStr);
+    const occurrences = parts.length - 1;
+    if (occurrences === 0) {
         return {
             result: `old_str not found in file: ${filePath}`,
             isError: true,
         };
     }
-    else {
-        const escapedOldStr = (0, helpers_1.escapeRegExp)(normalizedOldStr);
-        const occurences = normalizedContent.match(new RegExp(escapedOldStr, "g"));
-        if (occurences && occurences.length > 1) {
-            const uniqueContexts = (0, helpers_1.getUniqueOccurences)(content, input.old_str);
-            if (uniqueContexts.length === 0) {
-                return {
-                    result: `Error: old_str found ${occurences.length} times in file: ${filePath}, but no unique contexts could be identified. Try using a more specific string.`,
-                    isError: true,
-                };
-            }
-            const uniqueContextsString = uniqueContexts
-                .map(({ uniqueContext, lineNumber }, idx) => `${idx + 1}. For occurence at line number ${lineNumber}, unique context is:\n\`\`\`\n${uniqueContext}\n\`\`\`\n`)
-                .join("\n");
+    else if (occurrences > 1) {
+        const uniqueContexts = (0, helpers_1.getUniqueOccurences)(content, input.old_str);
+        if (uniqueContexts.length === 0) {
             return {
-                result: `Error: old_str found ${occurences.length} times in file: ${filePath}. Please use one of these unique contexts instead:\n\n${uniqueContextsString}`,
+                result: `Error: old_str found ${occurrences} times in file: ${filePath}. Try using a more specific string.`,
                 isError: true,
             };
         }
-        const newContent = normalizedContent.replace(normalizedOldStr, input.new_str);
+        const uniqueContextsString = uniqueContexts
+            .map(({ uniqueContext, lineNumber }, idx) => `${idx + 1}. For occurence at line number ${lineNumber}, unique context is:\n\`\`\`\n${uniqueContext}\n\`\`\`\n`)
+            .join("\n");
+        return {
+            result: `Error: old_str found ${occurrences} times in file: ${filePath}. Please use one of these unique contexts instead:\n\n${uniqueContextsString}`,
+            isError: true,
+        };
+    }
+    else {
+        const newContent = parts.join(input.new_str);
         fs_1.default.writeFileSync(absoluteFilePath, newContent);
         // Stage the file
         (0, child_process_1.execSync)(`git add "${filePath}"`, { cwd: repoDir });
-        // Collect git patch artifact
-        await (0, git_helper_1.collectGitPatchArtifact)(filePath, repoDir, "replace", collectArtifacts);
         let tscResult = await (0, web_1.runTypescriptCompiler)(repoDir);
         if (!tscResult.success) {
             return {
                 result: `Edits to file ${filePath} have been applied. However, type checks are failing with errors:\n\n${tscResult.errors.join("\n")}`,
-                isError: true,
+                isError: false,
             };
         }
         else {

package/dist/tools/file-operations/shared/helpers.d.ts

@@ -8,12 +8,10 @@ export interface StrReplaceInputParams {
     insert_line?: number;
     insert_text?: string;
 }
-declare function formatLinesWithNumbers(content: string, viewRange?: [number, number]): string;
-declare function isBinaryFile(filePath: string): boolean;
-declare function getUniqueOccurences(contents: string, old_str: string): {
+export declare function formatLinesWithNumbers(content: string, viewRange?: [number, number]): string;
+export declare function isBinaryFile(filePath: string): boolean;
+export declare function getUniqueOccurences(contents: string, old_str: string): {
     uniqueContext: string;
     lineNumber: number;
 }[];
-declare function escapeRegExp(text: string): string;
-export { escapeRegExp, formatLinesWithNumbers, getUniqueOccurences, isBinaryFile, };
 //# sourceMappingURL=helpers.d.ts.map

package/dist/tools/file-operations/shared/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/tools/file-operations/shared/helpers.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAG9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAKnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,iBAAS,sBAAsB,CAC7B,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,MAAM,CAaR;AAED,iBAAS,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CA2D/C;AAED,iBAAS,mBAAmB,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,CAyDjD;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,UAEjC;AAED,OAAO,EACL,YAAY,EACZ,sBAAsB,EACtB,mBAAmB,EACnB,YAAY,GACb,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/tools/file-operations/shared/helpers.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IAGb,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAG9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,SAAS,CAAC,EAAE,MAAM,CAAC;IAKnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,MAAM,CAaR;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CA2DtD;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,EAAE,CAyDjD"}

package/dist/tools/file-operations/shared/helpers.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escapeRegExp = escapeRegExp;
 exports.formatLinesWithNumbers = formatLinesWithNumbers;
-exports.getUniqueOccurences = getUniqueOccurences;
 exports.isBinaryFile = isBinaryFile;
+exports.getUniqueOccurences = getUniqueOccurences;
 function formatLinesWithNumbers(content, viewRange) {
     const lines = content.split("\n");
     if (viewRange) {
@@ -128,6 +127,3 @@ function getUniqueOccurences(contents, old_str) {
     }
     return uniqueContexts;
 }
-function escapeRegExp(text) {
-    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-}

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,EAAE,IAAI,EAAc,MAAM,4BAA4B,CAAC;AA+HnE,eAAO,MAAM,QAAQ,EAAE,IAUtB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/grep/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAU,IAAI,EAAc,MAAM,4BAA4B,CAAC;AAkI3E,eAAO,MAAM,QAAQ,EAAE,IActB,CAAC"}