staklink 0.3.15 → 0.3.17

package/dist/proxy-server.cjs

@@ -33610,11 +33610,15 @@ var Repo = class {
   }
   async branchExists(branch) {
     try {
-      const localCheck = await this.execCommand(`git show-ref --verify --quiet refs/heads/${branch}`).catch(() => null);
+      const localCheck = await this.execCommand(
+        `git show-ref --verify --quiet refs/heads/${branch}`
+      ).catch(() => null);
       if (localCheck !== null) {
         return true;
       }
-      const remoteCheck = await this.execCommand(`git ls-remote --heads origin ${branch}`).catch(() => "");
+      const remoteCheck = await this.execCommand(
+        `git ls-remote --heads origin ${branch}`
+      ).catch(() => "");
       return remoteCheck.trim().length > 0;
     } catch (e) {
       return false;
@@ -33635,6 +33639,9 @@ var Repo = class {
     }
     return branchName;
   }
+  async checkout(branch) {
+    return this.execCommand(`git checkout ${branch}`);
+  }
   async checkoutNew(branch) {
     return this.execCommand(`git checkout -b ${branch}`);
   }
@@ -33928,7 +33935,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.15";
+var VERSION = "0.3.17";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -80323,6 +80330,7 @@ async function startProxyServer() {
       const shouldCommit = req.query.commit === "true";
       const commits = [];
       const prs = {};
+      const branches = {};
       console.log(`=> Commit requested: ${shouldCommit}`);
       console.log(`=> PR creation requested: ${createPR}`);
       console.log(
@@ -80332,28 +80340,50 @@ async function startProxyServer() {
         const repo = await NewRepo(r.url);
         const repoName = getRepoNameFromUrl(r.url);
         const stashCreated = await repo.stashDevcontainer();
+        const requestedBranch = await repo.generateUniqueBranchName(r.branch_name);
+        let currentBranch = (await repo.printCurrentBranch()).trim();
+        console.log(`=> Current branch: ${currentBranch}`);
+        console.log(`=> Requested branch: ${requestedBranch}`);
+        if (currentBranch !== requestedBranch) {
+          const branchExists = await repo.branchExists(requestedBranch);
+          if (branchExists) {
+            console.log(`=> Switching to existing branch: ${requestedBranch}`);
+            await repo.checkout(requestedBranch);
+          } else {
+            console.log(`=> Creating new branch from current position: ${requestedBranch}`);
+            await repo.checkoutNew(requestedBranch);
+          }
+        } else {
+          console.log(`=> Already on correct branch: ${requestedBranch}`);
+        }
         if (shouldCommit) {
           console.log(`=> COMMIT to ${r.url}`);
           console.log(`=> COMMIT in ${repo.printcwd()}`);
-          const isOnMain = await repo.isOnMainBranch();
-          const isOnBaseBranch = await repo.isOnBranch(r.base_branch);
-          if (isOnMain || isOnBaseBranch) {
-            const uniqueBranchName = await repo.generateUniqueBranchName(r.branch_name);
-            if (uniqueBranchName !== r.branch_name) {
-              console.log(`=> Branch ${r.branch_name} exists, using ${uniqueBranchName} instead`);
-            }
-            console.log(`=> CHECKOUT to new branch: ${uniqueBranchName}`);
-            await repo.checkoutNew(uniqueBranchName);
+          const status = await repo.execCommand("git status --porcelain");
+          if (status.trim()) {
+            console.log(`=> Found uncommitted changes, committing...`);
+            await repo.addAll();
+            currentBranch = (await repo.printCurrentBranch()).trim();
+            console.log(`=> COMMIT to ${r.url} on branch: ${currentBranch}`);
+            await repo.commitWithCredentials(
+              r.commit_name,
+              code.git_credentials
+            );
+            console.log(`=> Commit successful`);
+          } else {
+            console.log(
+              `=> No uncommitted changes, skipping commit (may have been committed by agent)`
+            );
           }
-          await repo.addAll();
-          const currentBranch = (await repo.printCurrentBranch()).trim();
-          console.log(`=> COMMIT to ${r.url} on branch: ${currentBranch}`);
-          await repo.commitWithCredentials(r.commit_name, code.git_credentials);
         }
         console.log(`=> PUSH to ${r.url}`);
         await repo.pushCurrentBranchWithCredentials(code.git_credentials);
+        console.log(`=> Push successful`);
         const link = await repo.getLatestCommitLink();
         commits.push(link);
+        currentBranch = (await repo.printCurrentBranch()).trim();
+        branches[repoName] = currentBranch;
+        console.log(`=> Branch for ${repoName}: ${currentBranch}`);
         if (stashCreated) {
           await repo.popDevcontainerStash();
         }
@@ -80372,10 +80402,10 @@ async function startProxyServer() {
             const currentBranchRaw = await repo.execCommand(
               "git rev-parse --abbrev-ref HEAD"
             );
-            const currentBranch = currentBranchRaw.trim();
-            console.log(`=> Current branch: ${currentBranch}`);
+            const currentBranch2 = currentBranchRaw.trim();
+            console.log(`=> Current branch: ${currentBranch2}`);
             const baseBranch = r.base_branch || "main";
-            if (currentBranch === baseBranch) {
+            if (currentBranch2 === baseBranch) {
               console.log(
                 `=> Cannot create PR: currently on base branch (${baseBranch})`
               );
@@ -80388,9 +80418,9 @@ async function startProxyServer() {
               );
               if (!diff.trim()) {
                 console.log(
-                  `=> No commits between ${baseBranch} and ${currentBranch}`
+                  `=> No commits between ${baseBranch} and ${currentBranch2}`
                 );
-                prs[repoName] = `Error: No commits to create PR - ${currentBranch} is up to date with ${baseBranch}`;
+                prs[repoName] = `Error: No commits to create PR - ${currentBranch2} is up to date with ${baseBranch}`;
                 continue;
               }
               console.log(`=> Commits to include in PR:
@@ -80402,7 +80432,7 @@ ${diff.trim()}`);
             await new Promise((resolve3) => setTimeout(resolve3, 2e3));
             const gh = new GitHubCLI(
               code.git_credentials.auth_data.token,
-              currentBranch,
+              currentBranch2,
               repoLocation
             );
             await gh.init();
@@ -80412,8 +80442,8 @@ ${diff.trim()}`);
               prs[repoName] = existingPR.url;
             } else {
               const pr = await gh.createPR({
-                title: r.commit_name || `Changes from ${currentBranch}`,
-                body: `Automated PR from branch ${currentBranch}`,
+                title: r.commit_name || `Changes from ${currentBranch2}`,
+                body: `Automated PR from branch ${currentBranch2}`,
                 base: baseBranch,
                 draft: false
               });
@@ -80427,7 +80457,7 @@ ${diff.trim()}`);
           }
         }
       }
-      const response = { success: true, commits };
+      const response = { success: true, commits, branches };
       if (createPR) {
         response.prs = prs;
       }

package/dist/staklink-cli.cjs

@@ -10905,7 +10905,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.3.15";
+var VERSION = "0.3.17";
 
 // src/cli.ts
 var STAKLINK_PROXY = "staklink-proxy";

package/package.json

@@ -2,7 +2,7 @@
   "name": "staklink",
   "displayName": "staklink",
   "description": "staklink process manager",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "type": "module",
   "publisher": "stakwork",
   "engines": {