staklink 0.3.71 → 0.3.73

package/dist/proxy-server.cjs

@@ -61136,16 +61136,40 @@ var Repo = class {
     await this.unsetUserConfig();
   }
   // Enhanced push method that accepts user credentials
+  // Automatically handles the case where remote has new commits (e.g., from GitHub rebase)
+  // by pulling with rebase and pushing again
   async pushCurrentBranchWithCredentials(credentials) {
     const currentBranch = (await this.printCurrentBranch()).trim();
     try {
       if (credentials) {
         await this.setUserCredentials(credentials);
       }
-      const result = await this.push(currentBranch);
-      return result;
-    } catch (e) {
-      throw e;
+      try {
+        const result = await this.push(currentBranch);
+        return result;
+      } catch (pushError) {
+        const errorMessage = pushError instanceof Error ? pushError.message : String(pushError);
+        const isRejectedDueToRemoteChanges = errorMessage.includes("[rejected]") || errorMessage.includes("non-fast-forward") || errorMessage.includes("Updates were rejected");
+        if (isRejectedDueToRemoteChanges) {
+          try {
+            await this.execCommand(
+              `git pull --rebase origin ${currentBranch}`
+            );
+          } catch (pullError) {
+            const status = await this.execCommand("git status");
+            if (status.includes("rebase in progress") || status.includes("Unmerged") || status.includes("both modified")) {
+              await this.execCommand("git rebase --abort");
+              throw new Error(
+                `Push failed: Remote has conflicting changes that cannot be automatically rebased. Please resolve conflicts manually.`
+              );
+            }
+            throw pullError;
+          }
+          const result = await this.push(currentBranch);
+          return result;
+        }
+        throw pushError;
+      }
     } finally {
       if (credentials) {
         await this.restoreOriginalCredentials();
@@ -61229,7 +61253,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.71";
+var VERSION = "0.3.73";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -61396,6 +61420,9 @@ The actual dev server is being run with pm2... so you can use pm2 logs to see de
 Don't try to write summaries or docs in .md file unless specifically asked to! Default to output text response to the user.
 
 Do not make branch / PR if not specifically asked to.
+
+The repo being worked on may have extensive testing! If asked to test, try limit stdout logs and only pay attention to stderr logs. Something like this for exampe: "npm run test:unit 2>&1 > /dev/null | tail -n 20". We need to be smart about minimizing token usage during testing!
+
 `;
 
 // node_modules/aieo/node_modules/zod/v4/classic/external.js

package/dist/staklink-cli.cjs

@@ -10967,7 +10967,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.3.71";
+var VERSION = "0.3.73";
 
 // 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.71",
+  "version": "0.3.73",
   "type": "module",
   "publisher": "stakwork",
   "engines": {