@empiricalrun/test-gen 0.53.6 → 0.53.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/test-gen
 
+## 0.53.8
+
+### Patch Changes
+
+- ba5422f: fix: push intermediate file system changes to remote branch for chat agent
+
+## 0.53.7
+
+### Patch Changes
+
+- 4f14f11: fix: handle git remote urls that have access tokens in them
+
 ## 0.53.6
 
 ### Patch Changes

package/dist/agent/chat/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/agent/chat/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAoB,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAgBhE,wBAAsB,kBAAkB,CAAC,EACvC,mBAAmB,EACnB,aAAa,EACb,oBAAoB,GACrB,EAAE;IACD,aAAa,EAAE,mBAAmB,CAAC;IACnC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,iBAoFA;AA+BD,wBAAsB,wBAAwB,CAAC,EAC7C,aAAa,EACb,aAAa,GACd,EAAE;IACD,aAAa,EAAE,mBAAmB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;CACvB,iBA8BA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/agent/chat/index.ts"],"names":[],"mappings":"AAYA,OAAO,EAAoB,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAgBhE,wBAAsB,kBAAkB,CAAC,EACvC,mBAAmB,EACnB,aAAa,EACb,oBAAoB,GACrB,EAAE;IACD,aAAa,EAAE,mBAAmB,CAAC;IACnC,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,iBAoFA;AAqBD,wBAAsB,wBAAwB,CAAC,EAC7C,aAAa,EACb,aAAa,GACd,EAAE;IACD,aAAa,EAAE,mBAAmB,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;CACvB,iBA+BA"}

package/dist/agent/chat/index.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runChatAgentForDashboard = exports.runChatAgentForCLI = void 0;
 const llm_1 = require("@empiricalrun/llm");
-const child_process_1 = require("child_process");
 const picocolors_1 = require("picocolors");
 const human_in_the_loop_1 = require("../../human-in-the-loop");
+const git_1 = require("../../utils/git");
 const agent_loop_1 = require("./agent-loop");
 const model_1 = require("./model");
 const state_1 = require("./state");
@@ -112,21 +112,11 @@ async function getChatSessionFromDashboard(chatSessionId) {
     const data = await response.json();
     return data.data.chat_session;
 }
-async function checkoutBranch(branchName) {
-    // TODO: This assumes repoDir is process.cwd()
-    try {
-        (0, child_process_1.execSync)(`git checkout ${branchName}`);
-    }
-    catch (e) {
-        // If branch doesn't exist, create it
-        (0, child_process_1.execSync)(`git checkout -b ${branchName}`);
-    }
-}
 async function runChatAgentForDashboard({ chatSessionId, selectedModel, }) {
     const chatSession = await getChatSessionFromDashboard(chatSessionId);
     const chatState = chatSession.chat_state;
     const branchName = chatSession.branch_name;
-    await checkoutBranch(branchName);
+    await (0, git_1.checkoutBranch)(branchName);
     let chatModel = (0, model_1.createChatModel)(chatState.messages, selectedModel);
     let reporterFunc = async (chatState, latest) => {
         const response = await fetch(`${DASHBOARD_DOMAIN}/api/chat-sessions/${chatSessionId}`, {
@@ -148,5 +138,6 @@ async function runChatAgentForDashboard({ chatSessionId, selectedModel, }) {
         selectedModel,
         reporter: reporterFunc,
     });
+    await (0, git_1.commitLocalAndPushBranchToRemote)(branchName);
 }
 exports.runChatAgentForDashboard = runChatAgentForDashboard;

package/dist/tools/commit-and-create-pr.d.ts

@@ -1,3 +1,9 @@
 import type { Tool } from "@empiricalrun/llm/chat";
+interface GitHubRepoInfo {
+    owner: string;
+    repo: string;
+}
+export declare function parseGitHubUrl(url: string): GitHubRepoInfo;
 export declare const commitAndPushChangesTool: Tool;
+export {};
 //# sourceMappingURL=commit-and-create-pr.d.ts.map

package/dist/tools/commit-and-create-pr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-and-create-pr.d.ts","sourceRoot":"","sources":["../../src/tools/commit-and-create-pr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAyBnD,eAAO,MAAM,wBAAwB,EAAE,IAwFtC,CAAC"}
+{"version":3,"file":"commit-and-create-pr.d.ts","sourceRoot":"","sources":["../../src/tools/commit-and-create-pr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAQnD,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAiB1D;AAiBD,eAAO,MAAM,wBAAwB,EAAE,IAkFtC,CAAC"}

package/dist/tools/commit-and-create-pr.js

@@ -3,13 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commitAndPushChangesTool = void 0;
+exports.commitAndPushChangesTool = exports.parseGitHubUrl = void 0;
 const child_process_1 = require("child_process");
 const crypto_1 = __importDefault(require("crypto"));
 const zod_1 = require("zod");
+const git_1 = require("../utils/git");
 const utils_1 = require("./utils");
-const GIT_USER_NAME = "empiricalrun[bot]";
-const GIT_USER_EMAIL = "180257021+empiricalrun[bot]@users.noreply.github.com";
+function parseGitHubUrl(url) {
+    const githubIndex = url.indexOf("github.com");
+    if (githubIndex === -1) {
+        throw new Error("Invalid GitHub repository URL");
+    }
+    const [owner, repo] = url
+        .substring(githubIndex + "github.com/".length)
+        .replace(".git", "")
+        .split("/");
+    if (!owner || !repo) {
+        throw new Error("Invalid GitHub repository URL format - missing owner or repo");
+    }
+    return { owner, repo };
+}
+exports.parseGitHubUrl = parseGitHubUrl;
 const CommitAndPushChangesSchema = zod_1.z.object({
     commitMessage: zod_1.z
         .string()
@@ -52,15 +66,11 @@ Returns the URL of the created or updated pull request.`,
             for (const file of modifiedFiles) {
                 (0, child_process_1.execSync)(`git add "${file}"`);
             }
-            // Use -c flag to set config just for this commit
-            (0, child_process_1.execSync)(`git -c user.name="${GIT_USER_NAME}" -c user.email="${GIT_USER_EMAIL}" commit -m "${commitMessage} [skip ci]"`);
+            await (0, git_1.commitAsBotUser)(commitMessage);
             const repoUrl = (0, child_process_1.execSync)("git config --get remote.origin.url")
                 .toString()
                 .trim();
-            const [owner, repo] = repoUrl
-                .replace("https://github.com/", "")
-                .replace(".git", "")
-                .split("/");
+            const { owner, repo } = parseGitHubUrl(repoUrl);
             const existingPRs = (await (0, utils_1.callGitHubProxy)({
                 method: "GET",
                 url: `https://api.github.com/repos/${owner}/${repo}/pulls`,

package/dist/utils/git.d.ts

@@ -1,2 +1,5 @@
 export declare function getGitDiff(filepath: string): string;
+export declare function checkoutBranch(branchName: string): Promise<void>;
+export declare function commitAsBotUser(commitMessage: string): Promise<void>;
+export declare function commitLocalAndPushBranchToRemote(branchName: string): Promise<void>;
 //# sourceMappingURL=git.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKnD"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAKA,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKnD;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,MAAM,iBAQtD;AAED,wBAAsB,eAAe,CAAC,aAAa,EAAE,MAAM,iBAS1D;AAED,wBAAsB,gCAAgC,CAAC,UAAU,EAAE,MAAM,iBAIxE"}

package/dist/utils/git.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGitDiff = void 0;
+exports.commitLocalAndPushBranchToRemote = exports.commitAsBotUser = exports.checkoutBranch = exports.getGitDiff = void 0;
 const child_process_1 = require("child_process");
+const GIT_USER_NAME = "empiricalrun[bot]";
+const GIT_USER_EMAIL = "180257021+empiricalrun[bot]@users.noreply.github.com";
 function getGitDiff(filepath) {
     const diff = (0, child_process_1.execSync)(`git diff ${filepath}`, {
         encoding: "utf-8",
@@ -9,3 +11,29 @@ function getGitDiff(filepath) {
     return diff;
 }
 exports.getGitDiff = getGitDiff;
+async function checkoutBranch(branchName) {
+    // TODO: This assumes repoDir is process.cwd()
+    try {
+        (0, child_process_1.execSync)(`git checkout ${branchName}`);
+    }
+    catch (e) {
+        // If branch doesn't exist, create it
+        (0, child_process_1.execSync)(`git checkout -b ${branchName}`);
+    }
+}
+exports.checkoutBranch = checkoutBranch;
+async function commitAsBotUser(commitMessage) {
+    const status = (0, child_process_1.execSync)("git status --porcelain", { encoding: "utf-8" });
+    if (!status) {
+        return; // Nothing to commit
+    }
+    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}"`);
+}
+exports.commitAsBotUser = commitAsBotUser;
+async function commitLocalAndPushBranchToRemote(branchName) {
+    (0, child_process_1.execSync)(`git add .`);
+    await commitAsBotUser("Intermediate commit from @empiricalrun/test-gen");
+    (0, child_process_1.execSync)(`git push origin ${branchName}`);
+}
+exports.commitLocalAndPushBranchToRemote = commitLocalAndPushBranchToRemote;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-gen",
-  "version": "0.53.6",
+  "version": "0.53.8",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -56,9 +56,9 @@
     "tsx": "^4.16.2",
     "typescript": "^5.3.3",
     "zod": "^3.23.8",
-    "@empiricalrun/llm": "^0.14.5",
     "@empiricalrun/r2-uploader": "^0.3.8",
-    "@empiricalrun/test-run": "^0.7.6"
+    "@empiricalrun/test-run": "^0.7.6",
+    "@empiricalrun/llm": "^0.14.5"
   },
   "devDependencies": {
     "@playwright/test": "1.47.1",