staklink 0.3.30 → 0.3.32

package/dist/proxy-server.cjs

@@ -48424,6 +48424,7 @@ async function findAndLoadPm2Config(workspaceRoot2, log_cb) {
 async function findPm2Config(workspaceRoot2, log_cb) {
   log_cb?.(`Searching for PM2 config in workspace: ${workspaceRoot2}`);
   const configPaths = [
+    "/workspaces/.pod-config/.user-dockerfile/pm2.config.js",
     path.join(workspaceRoot2, "pm2.config.js"),
     path.join(workspaceRoot2, ".devcontainer", "pm2.config.js")
   ];
@@ -56418,7 +56419,7 @@ var SSEManager = class {
 var sseManager = new SSEManager();
 
 // src/proxy/version.ts
-var VERSION = "0.3.30";
+var VERSION = "0.3.32";
 
 // node_modules/uuid/dist/esm/stringify.js
 var byteToHex = [];
@@ -102315,6 +102316,22 @@ Stderr: ${error82.stderr}`
       throw new Error(`Failed to get PR checks for #${prNumber}: ${error82}`);
     }
   }
+  /**
+   * Wait for CI checks to appear on a PR
+   */
+  async waitForChecksToExist(prNumber, timeout = 3e4, interval = 2e3) {
+    const start = Date.now();
+    while (Date.now() - start < timeout) {
+      const checks = await this.getPRChecks(prNumber);
+      if (checks.length > 0) {
+        console.log(`=> Found ${checks.length} CI check(s) for PR #${prNumber}`);
+        return true;
+      }
+      await new Promise((r) => setTimeout(r, interval));
+    }
+    console.log(`=> No CI checks found for PR #${prNumber} within ${timeout}ms`);
+    return false;
+  }
   /**
    * Get repo info
    */
@@ -103309,8 +103326,6 @@ ${diff.trim()}`);
             } catch (diffError) {
               console.warn(`=> Could not check commit diff: ${diffError}`);
             }
-            console.log(`=> Waiting for GitHub to process push...`);
-            await new Promise((resolve3) => setTimeout(resolve3, 2e3));
             const gh = new GitHubCLI(
               code.git_credentials.auth_data.token,
               currentBranch2,
@@ -103338,16 +103353,22 @@ ${diff.trim()}`);
             }
             if (autoMerge) {
               try {
-                console.log(`=> Enabling auto-merge for PR #${prNumber}...`);
-                await gh.mergePR(prNumber, {
-                  auto: true,
-                  method: "squash",
-                  deleteBranch: true
-                });
-                console.log(`=> Auto-merge enabled for PR #${prNumber}`);
+                console.log(`=> Waiting for CI checks to appear for PR #${prNumber}...`);
+                const hasChecks = await gh.waitForChecksToExist(prNumber, 3e4);
+                if (hasChecks) {
+                  console.log(`=> Enabling auto-merge for PR #${prNumber}...`);
+                  await gh.mergePR(prNumber, {
+                    auto: true,
+                    method: "squash",
+                    deleteBranch: true
+                  });
+                  console.log(`=> Auto-merge enabled for PR #${prNumber}`);
+                } else {
+                  console.log(`=> No CI checks found, skipping auto-merge for PR #${prNumber}`);
+                }
               } catch (autoMergeError) {
                 console.error(
-                  `=> Failed to enable auto-merge for PR #${prNumber}:`,
+                  `=> Failed to auto-merge PR #${prNumber}:`,
                   autoMergeError
                 );
               }

package/dist/staklink-cli.cjs

@@ -3920,6 +3920,7 @@ async function findAndLoadPm2Config(workspaceRoot2, log_cb) {
 async function findPm2Config(workspaceRoot2, log_cb) {
   log_cb?.(`Searching for PM2 config in workspace: ${workspaceRoot2}`);
   const configPaths = [
+    "/workspaces/.pod-config/.user-dockerfile/pm2.config.js",
     path.join(workspaceRoot2, "pm2.config.js"),
     path.join(workspaceRoot2, ".devcontainer", "pm2.config.js")
   ];
@@ -10905,7 +10906,7 @@ var glob = Object.assign(glob_, {
 glob.glob = glob;
 
 // src/proxy/version.ts
-var VERSION = "0.3.30";
+var VERSION = "0.3.32";
 
 // 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.30",
+  "version": "0.3.32",
   "type": "module",
   "publisher": "stakwork",
   "engines": {