staklink 0.3.87 → 0.3.89

package/dist/proxy-server.cjs

@@ -60834,8 +60834,17 @@ var Repo = class {
       };
       try {
         const { stdout, stderr } = await exec4(command, execOpts);
-        return stdout || stderr;
+        if (stdout && stdout.trim()) {
+          return stdout;
+        }
+        return stderr || "";
       } catch (error87) {
+        const execError = error87;
+        if (execError.killed && execError.signal === "SIGTERM") {
+          error(`=> Command timed out after ${execOpts.timeout}ms: ${command}`);
+        } else {
+          error(`=> Command failed: ${command}`, execError.stderr || error87);
+        }
         throw error87;
       }
     });
@@ -60923,10 +60932,16 @@ var Repo = class {
     return branchName;
   }
   async checkout(branch) {
-    return this.execCommand(`git checkout ${branch}`);
+    log(`=> git checkout ${branch}`);
+    const result = await this.execCommand(`git checkout ${branch}`);
+    log(`=> checkout result: ${result.trim()}`);
+    return result;
   }
   async checkoutNew(branch) {
-    return this.execCommand(`git checkout -b ${branch}`);
+    log(`=> git checkout -b ${branch}`);
+    const result = await this.execCommand(`git checkout -b ${branch}`);
+    log(`=> checkoutNew result: ${result.trim()}`);
+    return result;
   }
   async addAll() {
     log("addAll in", this.cwd);
@@ -60938,13 +60953,21 @@ var Repo = class {
     return this.execCommand(`git commit -m "${sanitized}"`);
   }
   async push(branch = "master") {
-    return this.execCommand(`git push origin ${branch}`);
+    log(`=> Executing: git push origin ${branch}`);
+    try {
+      const result = await this.execCommand(`git push origin ${branch}`, { timeout: 6e4 });
+      log(`=> Push result: ${result}`);
+      return result;
+    } catch (error87) {
+      error(`=> Push failed:`, error87);
+      throw error87;
+    }
   }
   async pull(branch = "master") {
-    return this.execCommand(`git pull origin ${branch}`);
+    return this.execCommand(`git pull origin ${branch}`, { timeout: 6e4 });
   }
   async fetchLatest() {
-    return this.execCommand("git fetch origin");
+    return this.execCommand("git fetch origin", { timeout: 6e4 });
   }
   // Enhanced fetch method that accepts user credentials
   async fetchLatestWithCredentials(credentials) {
@@ -61055,6 +61078,7 @@ var Repo = class {
   }
   async setUserCredentials(credentials) {
     this.originalRemoteUrl = await this.getRemoteUrl();
+    log(`=> setUserCredentials: originalRemoteUrl=${this.originalRemoteUrl}`);
     let authenticatedUrl;
     switch (credentials.provider) {
       case "github":
@@ -61065,6 +61089,11 @@ var Repo = class {
           /https:\/\/.*@github\.com\//,
           `https://${credentials.auth_data.token}@github.com/`
         );
+        if (authenticatedUrl.startsWith("git@github.com:")) {
+          const repoPath = authenticatedUrl.replace("git@github.com:", "").replace(/\.git$/, "");
+          authenticatedUrl = `https://${credentials.auth_data.token}@github.com/${repoPath}.git`;
+          log(`=> Converted SSH URL to HTTPS`);
+        }
         break;
       case "gitlab":
         authenticatedUrl = this.originalRemoteUrl.replace(
@@ -61074,6 +61103,11 @@ var Repo = class {
           /https:\/\/.*@gitlab\.com\//,
           `https://oauth2:${credentials.auth_data.token}@gitlab.com/`
         );
+        if (authenticatedUrl.startsWith("git@gitlab.com:")) {
+          const repoPath = authenticatedUrl.replace("git@gitlab.com:", "").replace(/\.git$/, "");
+          authenticatedUrl = `https://oauth2:${credentials.auth_data.token}@gitlab.com/${repoPath}.git`;
+          log(`=> Converted SSH URL to HTTPS`);
+        }
         break;
       case "bitbucket":
         authenticatedUrl = this.originalRemoteUrl.replace(
@@ -61083,10 +61117,17 @@ var Repo = class {
           /https:\/\/.*@bitbucket\.org\//,
           `https://${credentials.auth_data.username}:${credentials.auth_data.token}@bitbucket.org/`
         );
+        if (authenticatedUrl.startsWith("git@bitbucket.org:")) {
+          const repoPath = authenticatedUrl.replace("git@bitbucket.org:", "").replace(/\.git$/, "");
+          authenticatedUrl = `https://${credentials.auth_data.username}:${credentials.auth_data.token}@bitbucket.org/${repoPath}.git`;
+          log(`=> Converted SSH URL to HTTPS`);
+        }
         break;
       default:
         throw new Error(`Unsupported provider: ${credentials.provider}`);
     }
+    const maskedUrl = authenticatedUrl.replace(/\/\/[^@]+@/, "//***@");
+    log(`=> setUserCredentials: setting remote URL to ${maskedUrl}`);
     await this.setRemoteUrl(authenticatedUrl);
     await this.setUserConfig(credentials);
   }
@@ -61102,14 +61143,18 @@ var Repo = class {
   // by pulling with rebase and pushing again
   async pushCurrentBranchWithCredentials(credentials) {
     const currentBranch = (await this.printCurrentBranch()).trim();
+    log(`=> pushCurrentBranchWithCredentials: branch=${currentBranch}, hasCredentials=${!!credentials}`);
     try {
       if (credentials) {
         await this.setUserCredentials(credentials);
+        log(`=> Credentials set for push`);
       }
       try {
         const result = await this.push(currentBranch);
+        log(`=> pushCurrentBranchWithCredentials succeeded`);
         return result;
       } catch (pushError) {
+        error(`=> pushCurrentBranchWithCredentials caught error:`, 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) {
@@ -61213,7 +61258,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.87";
+var VERSION = "0.3.89";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];

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.87";
+var VERSION = "0.3.89";
 
 // src/goose.ts
 var import_child_process = require("child_process");

package/package.json

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