@tarcisiopgs/lisa 1.40.1 → 1.41.0

package/dist/{chunk-V65N7YWX.js → chunk-4TXH7PTM.js}

@@ -19,10 +19,10 @@ import {
   readContext,
   resolveModels,
   runWithFallback
-} from "./chunk-YTUZFCU2.js";
+} from "./chunk-LTVASWBM.js";
 import {
   kanbanEmitter
-} from "./chunk-SOV2YONG.js";
+} from "./chunk-ZHB4S7SP.js";
 import {
   appendPlatformAttribution,
   appendPlatformProofOfWork,
@@ -1238,16 +1238,53 @@ async function pullBaseBranch(config) {
     }
   }
 }
-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}`);
+var AUTO_MERGE_CI_TIMEOUT_MS = 10 * 60 * 1e3;
+var AUTO_MERGE_POLL_MS = 15e3;
+async function autoMergeAllPrs(prUrls, issueId, config) {
+  if (!config.pr?.auto_merge || prUrls.length === 0) return;
+  const { checkPrCiStatus, mergePr } = await import("./merge-NWSEV3FR.js");
+  kanbanEmitter.emit("issue:auto-merge-status", issueId, "waiting");
+  kanbanEmitter.emit("issue:ci-status", issueId, "pending");
+  log(
+    `Waiting for CI before auto-merge of ${issueId} (${prUrls.length} PR${prUrls.length > 1 ? "s" : ""})...`
+  );
+  const mergeOnePr = async (prUrl) => {
+    const deadline = Date.now() + AUTO_MERGE_CI_TIMEOUT_MS;
+    while (Date.now() < deadline) {
+      if (isShuttingDown() || hasUserQuitFromWatchPrompt()) {
+        return { url: prUrl, success: false, error: "shutdown" };
+      }
+      const ciStatus = await checkPrCiStatus(prUrl);
+      if (ciStatus === "passing" || ciStatus === "unknown") {
+        const result = await mergePr(prUrl);
+        if (result.success) {
+          ok(`Merged: ${prUrl}`);
+          return { url: prUrl, success: true };
+        }
+        return { url: prUrl, success: false, error: result.error };
+      }
+      if (ciStatus === "failing") {
+        return { url: prUrl, success: false, error: "CI failed" };
+      }
+      await sleep(AUTO_MERGE_POLL_MS);
+    }
+    return { url: prUrl, success: false, error: "CI timeout" };
+  };
+  kanbanEmitter.emit("issue:auto-merge-status", issueId, "merging");
+  const results = await Promise.all(prUrls.map(mergeOnePr));
+  const allMerged = results.every((r) => r.success);
+  const failed = results.filter((r) => !r.success);
+  if (allMerged) {
+    kanbanEmitter.emit("issue:ci-status", issueId, "passing");
+    kanbanEmitter.emit("issue:auto-merge-status", issueId, "merged");
     kanbanEmitter.emit("issue:merged", issueId);
+    ok(`All ${prUrls.length} PRs auto-merged for ${issueId}`);
   } else {
-    warn(`Auto-merge failed for ${issueId}: ${result.error}`);
+    kanbanEmitter.emit("issue:ci-status", issueId, "failing");
+    kanbanEmitter.emit("issue:auto-merge-status", issueId, "failed");
+    for (const f of failed) {
+      warn(`Auto-merge failed for ${f.url}: ${f.error}`);
+    }
   }
 }
 function appendSessionLog(logFile, result) {
@@ -2743,6 +2780,33 @@ function extractPrUrlFromOutput(output) {
   }
   return null;
 }
+function extractAllPrUrlsFromOutput(output) {
+  const patterns = [
+    /https?:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+/g,
+    /https?:\/\/[^/]*gitlab[^/]*\/[^/].+?\/-\/merge_requests\/\d+/g,
+    /https?:\/\/bitbucket\.org\/[^/]+\/[^/]+\/pull-requests\/\d+/g
+  ];
+  const urls = /* @__PURE__ */ new Set();
+  for (const pattern of patterns) {
+    for (const match of output.matchAll(pattern)) {
+      urls.add(match[0]);
+    }
+  }
+  return [...urls];
+}
+function readAllManifestPrUrls(filePath) {
+  if (!existsSync6(filePath)) return [];
+  try {
+    const parsed = JSON.parse(readFileSync6(filePath, "utf-8").trim());
+    if (Array.isArray(parsed)) {
+      return parsed.map((m) => m.prUrl).filter((url) => !!url);
+    }
+    const single = parsed;
+    return single.prUrl ? [single.prUrl] : [];
+  } catch {
+    return [];
+  }
+}
 function readPlanFile(filePath) {
   if (!existsSync6(filePath)) return null;
   try {
@@ -3255,7 +3319,7 @@ async function runNativeWorktreeSession(config, issue, logFile, session, models,
     }
   }
   if (worktreePath) await cleanupWorktree(repoPath, worktreePath);
-  await autoMergePr(prUrl, issue.id, config);
+  await autoMergeAllPrs([prUrl], issue.id, config);
   await reporter.finish([prUrl]);
   ok(`Session ${session} complete for ${issue.id}`);
   return {
@@ -3533,7 +3597,7 @@ async function runManualWorktreeSession(config, issue, logFile, session, models,
   }
   await executeHook("before_remove", config.hooks, worktreePath, hookEnv);
   await cleanupWorktree(repoPath, worktreePath);
-  await autoMergePr(prUrl, issue.id, config);
+  await autoMergeAllPrs([prUrl], issue.id, config);
   await reporter.finish([prUrl]);
   updateSessionState(workspace, issue.id, "done");
   removeSessionRecord(workspace, issue.id);
@@ -3968,11 +4032,12 @@ async function runBranchSession(config, issue, logFile, session, models, source,
     return failureResult(result.providerUsed, result);
   }
   const manifest = readManifestFile(manifestPath);
+  const allManifestPrUrls = readAllManifestPrUrls(manifestPath);
   try {
     unlinkSync4(manifestPath);
   } catch {
   }
-  let prUrl = manifest?.prUrl;
+  let prUrl = manifest?.prUrl ?? allManifestPrUrls[0];
   if (!prUrl) {
     const extractedUrl = extractPrUrlFromOutput(result.output);
     if (extractedUrl) {
@@ -3980,6 +4045,12 @@ async function runBranchSession(config, issue, logFile, session, models, source,
       prUrl = extractedUrl;
     }
   }
+  const allPrUrls = new Set(allManifestPrUrls);
+  for (const url of extractAllPrUrlsFromOutput(result.output)) {
+    allPrUrls.add(url);
+  }
+  if (prUrl) allPrUrls.add(prUrl);
+  const prUrls = [...allPrUrls];
   if (!prUrl) {
     const hasChanges = await hasCodeChanges(workspace, config.base_branch);
     if (!hasChanges) {
@@ -4067,13 +4138,13 @@ async function runBranchSession(config, issue, logFile, session, models, source,
       }
     }
   }
-  await autoMergePr(prUrl, issue.id, config);
-  await reporter.finish([prUrl]);
+  await autoMergeAllPrs(prUrls, issue.id, config);
+  await reporter.finish(prUrls);
   ok(`Session ${session} complete for ${issue.id}`);
   return {
     success: true,
     providerUsed: result.providerUsed,
-    prUrls: [prUrl],
+    prUrls,
     fallback: result
   };
 }

package/dist/{chunk-RZ53EOAY.js → chunk-H2ATCMBI.js}

@@ -5,10 +5,10 @@ import {
   resolveModels,
   runWithFallback,
   saveLineage
-} from "./chunk-YTUZFCU2.js";
+} from "./chunk-LTVASWBM.js";
 import {
   normalizeLabels
-} from "./chunk-SOV2YONG.js";
+} from "./chunk-ZHB4S7SP.js";
 import {
   error,
   log,

package/dist/{chunk-YTUZFCU2.js → chunk-LTVASWBM.js}

@@ -6,7 +6,7 @@ import {
   createApiClient,
   kanbanEmitter,
   normalizeLabels
-} from "./chunk-SOV2YONG.js";
+} from "./chunk-ZHB4S7SP.js";
 import {
   buildPrCreateInstruction
 } from "./chunk-ZOVVFU7B.js";

package/dist/{chunk-SOV2YONG.js → chunk-ZHB4S7SP.js}

@@ -894,6 +894,11 @@ function useKanbanState(bellEnabled, initialCards = []) {
     const onCiStatus = (issueId, ciStatus) => {
       setCards((prev) => prev.map((c) => c.id === issueId ? { ...c, ciStatus } : c));
     };
+    const onAutoMergeStatus = (issueId, status) => {
+      setCards(
+        (prev) => prev.map((c) => c.id === issueId ? { ...c, autoMergeStatus: status } : c)
+      );
+    };
     const onReviewersUpdated = (issueId, reviewers) => {
       setCards((prev) => prev.map((c) => c.id === issueId ? { ...c, reviewers } : c));
     };
@@ -951,6 +956,7 @@ function useKanbanState(bellEnabled, initialCards = []) {
     kanbanEmitter.on("issue:log-file", onLogFile);
     kanbanEmitter.on("issue:substatus", onSubstatus);
     kanbanEmitter.on("issue:ci-status", onCiStatus);
+    kanbanEmitter.on("issue:auto-merge-status", onAutoMergeStatus);
     kanbanEmitter.on("issue:reviewers-updated", onReviewersUpdated);
     kanbanEmitter.on("issue:available-reviewers", onAvailableReviewers);
     kanbanEmitter.on("issue:output", onOutput);
@@ -1000,6 +1006,7 @@ function useKanbanState(bellEnabled, initialCards = []) {
       kanbanEmitter.off("issue:log-file", onLogFile);
       kanbanEmitter.off("issue:substatus", onSubstatus);
       kanbanEmitter.off("issue:ci-status", onCiStatus);
+      kanbanEmitter.off("issue:auto-merge-status", onAutoMergeStatus);
       kanbanEmitter.off("issue:reviewers-updated", onReviewersUpdated);
       kanbanEmitter.off("issue:available-reviewers", onAvailableReviewers);
       kanbanEmitter.off("issue:output", onOutput);

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   runLoop,
   saveConfig,
   validateConfig
-} from "./chunk-V65N7YWX.js";
+} from "./chunk-4TXH7PTM.js";
 import {
   CliError,
   buildExecutionWaves,
@@ -24,7 +24,7 @@ import {
   parseStructuredOutput,
   runPlanWizard,
   savePlan
-} from "./chunk-RZ53EOAY.js";
+} from "./chunk-H2ATCMBI.js";
 import {
   buildContextMdBlock,
   createProvider,
@@ -34,10 +34,10 @@ import {
   readContext,
   resolveModels,
   runWithFallback
-} from "./chunk-YTUZFCU2.js";
+} from "./chunk-LTVASWBM.js";
 import {
   kanbanEmitter
-} from "./chunk-SOV2YONG.js";
+} from "./chunk-ZHB4S7SP.js";
 import {
   isProofOfWorkEnabled,
   isSpecComplianceEnabled,
@@ -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-VITV7WGU.js");
   const waves = buildExecutionWaves(plan2.issues);
   const maxWaveSize = Math.max(...waves.map((w) => w.length));
   await runLoop2(config2, {
@@ -1957,6 +1957,7 @@ function resolveCard(card) {
         prUrls: card.prUrls,
         merged: card.merged,
         ciStatus: card.ciStatus,
+        autoMergeStatus: card.autoMergeStatus,
         logFile: card.logFile,
         outputLog: card.outputLogTail.join("\n")
       };
@@ -1984,6 +1985,7 @@ function resolveCard(card) {
     killed: card.killed,
     merged: card.merged,
     ciStatus: card.ciStatus,
+    autoMergeStatus: card.autoMergeStatus,
     logFile: card.logFile,
     outputLog: card.outputLogTail.join("\n")
   };
@@ -2072,6 +2074,12 @@ var KanbanPersistence = class {
       this.updateCard(issueId, { ciStatus });
       this.scheduleFlush();
     });
+    on("issue:auto-merge-status", (issueId, autoMergeStatus) => {
+      this.updateCard(issueId, {
+        autoMergeStatus
+      });
+      this.scheduleFlush();
+    });
     on("issue:reconcile-remove", (issueId) => {
       this.removeCard(issueId);
       this.scheduleFlush();
@@ -2237,7 +2245,7 @@ async function executeRun(args) {
     if (isTTY) {
       const { render } = await import("ink");
       const { createElement } = await import("react");
-      const { KanbanApp } = await import("./kanban-XCQ6QNOL.js");
+      const { KanbanApp } = await import("./kanban-QQ47VJUY.js");
       const demoConfig = {
         provider: "claude",
         source: "linear",
@@ -2337,7 +2345,7 @@ Add them to your ${shell} and run: source ${shell}`));
     const initialCards = persistence.load();
     persistedCards = initialCards;
     persistence.start();
-    const { registerPlanBridge } = await import("./tui-bridge-GGH36LIH.js");
+    const { registerPlanBridge } = await import("./tui-bridge-EFC4OZZU.js");
     const cleanupPlan = registerPlanBridge(merged);
     onBeforeExit = () => {
       persistence.stop();
@@ -2345,7 +2353,7 @@ Add them to your ${shell} and run: source ${shell}`));
     };
     const { render } = await import("ink");
     const { createElement } = await import("react");
-    const { KanbanApp } = await import("./kanban-XCQ6QNOL.js");
+    const { KanbanApp } = await import("./kanban-QQ47VJUY.js");
     render(createElement(KanbanApp, { config: merged, initialCards }), { exitOnCtrlC: false });
   }
   await runLoop(merged, {

package/dist/{kanban-XCQ6QNOL.js → kanban-QQ47VJUY.js}

@@ -2,7 +2,7 @@
 import {
   kanbanEmitter,
   useKanbanState
-} from "./chunk-SOV2YONG.js";
+} from "./chunk-ZHB4S7SP.js";
 import {
   resetTitle,
   startSpinner,
@@ -141,10 +141,14 @@ function Card({
               "\u2714 ",
               formatElapsed(card.finishedAt - card.startedAt)
             ] }),
-            card.prUrls.length > 0 && /* @__PURE__ */ jsxs(Text, { color: card.merged ? "magenta" : "yellow", dimColor: true, children: [
-              card.merged ? "PR\u2714" : "PR",
-              card.ciStatus === "pending" ? "\u23F3" : card.ciStatus === "passing" ? "\u2714" : card.ciStatus === "failing" ? "\u2716" : ""
-            ] })
+            card.prUrls.length > 0 && /* @__PURE__ */ jsx(
+              Text,
+              {
+                color: card.autoMergeStatus === "failed" ? "red" : card.merged || card.autoMergeStatus === "merged" ? "magenta" : "yellow",
+                dimColor: true,
+                children: card.merged || card.autoMergeStatus === "merged" ? "PR\u2714" : card.autoMergeStatus === "waiting" || card.autoMergeStatus === "merging" ? "PR\u23F3" : card.autoMergeStatus === "failed" ? "PR\u2716" : "PR"
+              }
+            )
           ] }) : card.killed ? /* @__PURE__ */ jsx(Text, { color: "red", children: "KILLED" }) : card.skipped ? /* @__PURE__ */ jsx(Text, { color: "gray", children: "SKIPPED" }) : card.hasError && !card.killed && !card.skipped ? /* @__PURE__ */ jsx(Text, { color: "red", children: "FAILED" }) : (
             // Empty row for backlog and done-without-timing — maintains CARD_HEIGHT
             /* @__PURE__ */ jsx(Text, { children: " ".repeat(cardWidth) })
@@ -534,7 +538,8 @@ function IssueDetail({
   const prMetaRow = hasPrMeta ? 1 : 0;
   const pickerRows = showReviewerPicker ? Math.min((card.availableReviewers ?? []).length + 2, 12) : 0;
   const ciRow = card.ciStatus ? 1 : 0;
-  const headerOverhead = 6 + prCount + logFileRow + ciRow + prMetaRow + pickerRows;
+  const autoMergeRow = card.autoMergeStatus ? 1 : 0;
+  const headerOverhead = 6 + prCount + logFileRow + ciRow + autoMergeRow + prMetaRow + pickerRows;
   const bodyRows = Math.max(1, terminalRows - headerOverhead);
   const lines = useMemo(() => processOutputLines(card.outputLog), [card.outputLog]);
   const startLine = Math.max(0, lines.length - bodyRows - logScrollOffset);
@@ -609,6 +614,16 @@ function IssueDetail({
             }
           )
         ] }),
+        card.autoMergeStatus && /* @__PURE__ */ jsxs4(Box4, { marginTop: 0, children: [
+          /* @__PURE__ */ jsx4(Text4, { color: "gray", dimColor: true, children: "MERGE: " }),
+          /* @__PURE__ */ jsx4(
+            Text4,
+            {
+              color: card.autoMergeStatus === "merged" ? "magenta" : card.autoMergeStatus === "failed" ? "red" : "yellow",
+              children: card.autoMergeStatus === "merged" ? `\u2714 merged (${card.prUrls.length} PR${card.prUrls.length > 1 ? "s" : ""})` : card.autoMergeStatus === "failed" ? "\u2716 failed" : card.autoMergeStatus === "merging" ? "\u23F3 merging..." : "\u23F3 waiting for CI"
+            }
+          )
+        ] }),
         hasPrMeta && /* @__PURE__ */ jsxs4(Box4, { marginTop: 0, flexDirection: "row", children: [
           cardReviewers.length > 0 ? /* @__PURE__ */ jsxs4(Fragment2, { children: [
             /* @__PURE__ */ jsx4(Text4, { color: "cyan", dimColor: true, children: "REVIEWERS: " }),

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

@@ -4,11 +4,11 @@ import {
   cleanupEventListeners,
   runDemoLoop,
   runLoop
-} from "./chunk-V65N7YWX.js";
+} from "./chunk-4TXH7PTM.js";
 import {
   WATCH_POLL_INTERVAL_MS
-} from "./chunk-YTUZFCU2.js";
-import "./chunk-SOV2YONG.js";
+} from "./chunk-LTVASWBM.js";
+import "./chunk-ZHB4S7SP.js";
 import "./chunk-ZOVVFU7B.js";
 import "./chunk-3EOEDL3T.js";
 import "./chunk-7OCDGYDM.js";

package/dist/{tui-bridge-GGH36LIH.js → tui-bridge-EFC4OZZU.js}

@@ -6,15 +6,15 @@ import {
   markdownToIssue,
   parseStructuredOutput,
   savePlan
-} from "./chunk-RZ53EOAY.js";
+} from "./chunk-H2ATCMBI.js";
 import {
   createSource,
   resolveModels,
   runWithFallback
-} from "./chunk-YTUZFCU2.js";
+} from "./chunk-LTVASWBM.js";
 import {
   kanbanEmitter
-} from "./chunk-SOV2YONG.js";
+} from "./chunk-ZHB4S7SP.js";
 import "./chunk-ZOVVFU7B.js";
 import "./chunk-3EOEDL3T.js";
 import "./chunk-7OCDGYDM.js";

package/package.json

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