staklink 0.3.13 → 0.3.14

package/dist/proxy-server.cjs

@@ -33608,6 +33608,33 @@ var Repo = class {
       `git checkout -f $(git remote show origin | sed -n '/HEAD branch/s/.*: //p')`
     );
   }
+  async branchExists(branch) {
+    try {
+      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(() => "");
+      return remoteCheck.trim().length > 0;
+    } catch (e) {
+      return false;
+    }
+  }
+  async generateUniqueBranchName(baseBranchName) {
+    let branchName = baseBranchName;
+    while (await this.branchExists(branchName)) {
+      const parts = branchName.split("-");
+      const lastPart = parts[parts.length - 1];
+      const num = parseInt(lastPart, 10);
+      if (!isNaN(num) && lastPart === num.toString()) {
+        parts[parts.length - 1] = (num + 1).toString();
+        branchName = parts.join("-");
+      } else {
+        branchName = `${branchName}-2`;
+      }
+    }
+    return branchName;
+  }
   async checkoutNew(branch) {
     return this.execCommand(`git checkout -b ${branch}`);
   }
@@ -80311,11 +80338,16 @@ async function startProxyServer() {
           const isOnMain = await repo.isOnMainBranch();
           const isOnBaseBranch = await repo.isOnBranch(r.base_branch);
           if (isOnMain || isOnBaseBranch) {
-            console.log(`=> CHECKOUT to new branch: ${r.branch_name}`);
-            await repo.checkoutNew(r.branch_name);
+            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);
           }
           await repo.addAll();
-          console.log(`=> COMMIT to ${r.url} on branch: ${r.branch_name}`);
+          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}`);

package/package.json

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