@tarcisiopgs/lisa 1.40.1 → 1.40.2

package/dist/{chunk-V65N7YWX.js → chunk-BI6MR2UP.js}

@@ -1238,17 +1238,48 @@ async function pullBaseBranch(config) {
     }
   }
 }
+var AUTO_MERGE_CI_TIMEOUT_MS = 10 * 60 * 1e3;
+var AUTO_MERGE_POLL_MS = 15e3;
 async function autoMergePr(prUrl, issueId, config) {
   if (!config.pr?.auto_merge) return;
-  log(`Auto-merging PR for ${issueId}...`);
-  const { mergePr } = await import("./merge-NWSEV3FR.js");
-  const result = await mergePr(prUrl);
-  if (result.success) {
-    ok(`Auto-merged: ${prUrl}`);
-    kanbanEmitter.emit("issue:merged", issueId);
-  } else {
-    warn(`Auto-merge failed for ${issueId}: ${result.error}`);
+  const { checkPrCiStatus, mergePr } = await import("./merge-NWSEV3FR.js");
+  log(`Waiting for CI before auto-merge of ${issueId}...`);
+  kanbanEmitter.emit("issue:ci-status", issueId, "pending");
+  const deadline = Date.now() + AUTO_MERGE_CI_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    if (isShuttingDown() || hasUserQuitFromWatchPrompt()) return;
+    const ciStatus = await checkPrCiStatus(prUrl);
+    if (ciStatus === "passing") {
+      kanbanEmitter.emit("issue:ci-status", issueId, "passing");
+      log(`CI passed for ${issueId}. Auto-merging...`);
+      const result = await mergePr(prUrl);
+      if (result.success) {
+        ok(`Auto-merged: ${prUrl}`);
+        kanbanEmitter.emit("issue:merged", issueId);
+      } else {
+        warn(`Auto-merge failed for ${issueId}: ${result.error}`);
+      }
+      return;
+    }
+    if (ciStatus === "failing") {
+      kanbanEmitter.emit("issue:ci-status", issueId, "failing");
+      warn(`CI failed for ${issueId}. Skipping auto-merge.`);
+      return;
+    }
+    if (ciStatus === "unknown") {
+      log(`No CI checks found for ${issueId}. Auto-merging...`);
+      const result = await mergePr(prUrl);
+      if (result.success) {
+        ok(`Auto-merged: ${prUrl}`);
+        kanbanEmitter.emit("issue:merged", issueId);
+      } else {
+        warn(`Auto-merge failed for ${issueId}: ${result.error}`);
+      }
+      return;
+    }
+    await sleep(AUTO_MERGE_POLL_MS);
   }
+  warn(`CI did not complete within timeout for ${issueId}. Skipping auto-merge.`);
 }
 function appendSessionLog(logFile, result) {
   try {

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   runLoop,
   saveConfig,
   validateConfig
-} from "./chunk-V65N7YWX.js";
+} from "./chunk-BI6MR2UP.js";
 import {
   CliError,
   buildExecutionWaves,
@@ -1861,7 +1861,7 @@ async function reviewAndCreate(plan2, planPath, opts) {
     log("Run `lisa run` when ready.");
     return;
   }
-  const { runLoop: runLoop2 } = await import("./loop-CSJRDKQU.js");
+  const { runLoop: runLoop2 } = await import("./loop-RWZJG7BG.js");
   const waves = buildExecutionWaves(plan2.issues);
   const maxWaveSize = Math.max(...waves.map((w) => w.length));
   await runLoop2(config2, {

package/dist/{loop-CSJRDKQU.js → loop-RWZJG7BG.js}

@@ -4,7 +4,7 @@ import {
   cleanupEventListeners,
   runDemoLoop,
   runLoop
-} from "./chunk-V65N7YWX.js";
+} from "./chunk-BI6MR2UP.js";
 import {
   WATCH_POLL_INTERVAL_MS
 } from "./chunk-YTUZFCU2.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarcisiopgs/lisa",
-  "version": "1.40.1",
+  "version": "1.40.2",
   "description": "Autonomous issue resolver",
   "keywords": [
     "loop",