@tarcisiopgs/lisa 1.39.1 → 1.40.0

package/dist/{chunk-6ZSLFM6X.js → chunk-C2Y2NO6I.js}

@@ -1138,6 +1138,13 @@ async function checkoutBaseBranches(config, workspace) {
 function sleep(ms) {
   return new Promise((resolve12) => setTimeout(resolve12, ms));
 }
+async function interruptibleSleep(ms) {
+  const end = Date.now() + ms;
+  while (Date.now() < end) {
+    if (isShuttingDown() || hasUserQuitFromWatchPrompt()) return;
+    await sleep(Math.min(1e3, end - Date.now()));
+  }
+}
 async function waitIfPaused() {
   while (isLoopPaused()) {
     await sleep(500);
@@ -1191,24 +1198,56 @@ function emptyCommitFailure(result) {
 async function pullBaseBranch(config) {
   const workspace = resolve3(config.workspace);
   const baseBranch = config.base_branch;
-  const repoPaths = [workspace];
+  const repoPaths = [];
   if (config.repos.length > 0) {
     for (const repo of config.repos) {
       repoPaths.push(resolve3(workspace, repo.path));
     }
+  } else {
+    repoPaths.push(workspace);
   }
   for (const repoPath of repoPaths) {
     try {
+      await execa("git", ["checkout", baseBranch], {
+        cwd: repoPath,
+        reject: true,
+        timeout: 15e3
+      });
       await execa("git", ["pull", "--ff-only", "origin", baseBranch], {
         cwd: repoPath,
         reject: true,
         timeout: 3e4
       });
-    } catch (err) {
-      warn(`Failed to pull ${baseBranch} in ${repoPath}: ${formatError(err)}`);
+    } catch {
+      try {
+        await execa("git", ["fetch", "origin", baseBranch], {
+          cwd: repoPath,
+          reject: true,
+          timeout: 3e4
+        });
+        await execa("git", ["reset", "--hard", `origin/${baseBranch}`], {
+          cwd: repoPath,
+          reject: true,
+          timeout: 15e3
+        });
+      } catch (err) {
+        warn(`Failed to pull ${baseBranch} in ${repoPath}: ${formatError(err)}`);
+      }
     }
   }
 }
+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}`);
+  }
+}
 function appendSessionLog(logFile, result) {
   try {
     appendFileSync(
@@ -1450,6 +1489,7 @@ async function recoverOrphanIssues(source, config) {
     );
     try {
       await source.updateStatus(orphan.id, config.source_config.pick_from, config.source_config);
+      kanbanEmitter.emit("issue:reverted", orphan.id);
       ok(`Recovered orphan ${orphan.id}`);
     } catch (err) {
       error(`Failed to recover orphan ${orphan.id}: ${formatError(err)}`);
@@ -3213,6 +3253,7 @@ async function runNativeWorktreeSession(config, issue, logFile, session, models,
     }
   }
   if (worktreePath) await cleanupWorktree(repoPath, worktreePath);
+  await autoMergePr(prUrl, issue.id, config);
   await reporter.finish([prUrl]);
   ok(`Session ${session} complete for ${issue.id}`);
   return {
@@ -3490,6 +3531,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 reporter.finish([prUrl]);
   updateSessionState(workspace, issue.id, "done");
   removeSessionRecord(workspace, issue.id);
@@ -3648,7 +3690,11 @@ async function runConcurrentLoop(config, source, models, workspace, opts) {
             );
             kanbanEmitter.emit("work:watching");
             setTitle("Lisa \u2014 watching...");
-            await sleep(WATCH_POLL_INTERVAL_MS);
+            await interruptibleSleep(WATCH_POLL_INTERVAL_MS);
+            if (hasUserQuitFromWatchPrompt() || isShuttingDown()) {
+              noMoreIssues = true;
+              break;
+            }
             kanbanEmitter.emit("work:watch-resume");
           }
           break;
@@ -4019,6 +4065,7 @@ async function runBranchSession(config, issue, logFile, session, models, source,
       }
     }
   }
+  await autoMergePr(prUrl, issue.id, config);
   await reporter.finish([prUrl]);
   ok(`Session ${session} complete for ${issue.id}`);
   return {
@@ -4121,7 +4168,10 @@ async function runSequentialLoop(config, source, models, workspace, opts) {
           ok(`Resuming watch mode (polling every ${WATCH_POLL_INTERVAL_MS / 1e3}s)...`);
           kanbanEmitter.emit("work:watching");
           setTitle("Lisa \u2014 watching...");
-          await sleep(WATCH_POLL_INTERVAL_MS);
+          await interruptibleSleep(WATCH_POLL_INTERVAL_MS);
+          if (hasUserQuitFromWatchPrompt() || isShuttingDown()) {
+            break;
+          }
           kanbanEmitter.emit("work:watch-resume");
           session--;
           continue;
@@ -4131,7 +4181,10 @@ async function runSequentialLoop(config, source, models, workspace, opts) {
         );
         kanbanEmitter.emit("work:watching");
         setTitle("Lisa \u2014 watching...");
-        await sleep(WATCH_POLL_INTERVAL_MS);
+        await interruptibleSleep(WATCH_POLL_INTERVAL_MS);
+        if (hasUserQuitFromWatchPrompt() || isShuttingDown()) {
+          break;
+        }
         kanbanEmitter.emit("work:watch-resume");
         session--;
         continue;

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   runLoop,
   saveConfig,
   validateConfig
-} from "./chunk-6ZSLFM6X.js";
+} from "./chunk-C2Y2NO6I.js";
 import {
   CliError,
   buildExecutionWaves,
@@ -708,6 +708,12 @@ This will cause Lisa to re-pick the issue on recovery. Consider using a differen
     });
     prReviewers = Array.isArray(reviewerValue) ? reviewerValue : reviewerValue.split(",").map((s) => s.trim()).filter(Boolean);
   }
+  const wantAutoMerge = await clack.confirm({
+    message: "Auto-merge PRs after CI passes?",
+    initialValue: initial?.pr?.auto_merge ?? false
+  });
+  if (clack.isCancel(wantAutoMerge)) return process.exit(0);
+  const autoMerge = wantAutoMerge === true;
   const cfg = {
     provider: providerName,
     provider_options: {
@@ -734,7 +740,12 @@ This will cause Lisa to re-pick the issue on recovery. Consider using a differen
     repos,
     loop: { cooldown: 10, max_sessions: 0 },
     ...reviewMonitorEnabled ? { review_monitor: { enabled: true } } : {},
-    ...prReviewers.length ? { pr: { reviewers: prReviewers } } : {}
+    ...prReviewers.length || autoMerge ? {
+      pr: {
+        ...prReviewers.length ? { reviewers: prReviewers } : {},
+        ...autoMerge ? { auto_merge: true } : {}
+      }
+    } : {}
   };
   saveConfig(cfg);
   clack.outro(
@@ -1850,7 +1861,7 @@ async function reviewAndCreate(plan2, planPath, opts) {
     log("Run `lisa run` when ready.");
     return;
   }
-  const { runLoop: runLoop2 } = await import("./loop-OVECVY75.js");
+  const { runLoop: runLoop2 } = await import("./loop-Y6YS76TH.js");
   const waves = buildExecutionWaves(plan2.issues);
   const maxWaveSize = Math.max(...waves.map((w) => w.length));
   await runLoop2(config2, {

package/dist/{loop-OVECVY75.js → loop-Y6YS76TH.js}

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

package/package.json

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