@dunnewold-labs/mr-manager 0.4.44 → 0.4.46

package/dist/index.mjs

@@ -185,7 +185,7 @@ import { fileURLToPath } from "url";
 // cli/package.json
 var package_default = {
   name: "@dunnewold-labs/mr-manager",
-  version: "0.4.44",
+  version: "0.4.46",
   description: "Mr. Manager - Task and project management CLI",
   bin: {
     mr: "./dist/index.mjs"
@@ -1826,6 +1826,20 @@ function checkPrStatus(prUrl, repoDir, vcs = "github") {
     });
   });
 }
+function mergePrViaCli(prUrl, repoDir, vcs = "github") {
+  const cmd = vcs === "gitlab" ? `glab mr merge "${prUrl}" --yes --squash --remove-source-branch 2>&1` : `gh pr merge "${prUrl}" --squash --delete-branch 2>&1`;
+  return new Promise((resolve9) => {
+    exec(cmd, { cwd: repoDir }, (err, stdout, stderr) => {
+      if (err) {
+        const raw = (stderr || stdout || err.message).toString().trim();
+        const tail = raw.split("\n").slice(-3).join(" ").trim();
+        resolve9({ ok: false, error: tail || err.message });
+        return;
+      }
+      resolve9({ ok: true });
+    });
+  });
+}
 function buildPrototypeSection(protoRefs, workingDir) {
   if (protoRefs.length === 0) return "";
   const sections = [
@@ -3194,6 +3208,15 @@ var watchCommand = new Command9("watch").description(
                   ...prUrl ? { link: prUrl } : {}
                 });
                 logSuccess(prefix, `"${paint("bold", task.title)}" marked ready for review`);
+                if (prUrl && currentTask.autoMergeEnabled) {
+                  try {
+                    await api.post(`/api/tasks/${task.id}/auto-merge`, {});
+                    await api.patch(`/api/tasks/${task.id}`, { autoMergeEnabled: false });
+                    logDispatch(prefix, `Auto-merge preference detected \u2014 sanity review queued`);
+                  } catch (err) {
+                    logError(prefix, `Failed to queue auto-merge: ${err.message}`);
+                  }
+                }
                 if (noMrRequested) {
                   await postTaskUpdate(task.id, `No ${prLabel} required: ${noMrDescription}`, "system");
                 }
@@ -4370,6 +4393,86 @@ ${divider}`);
           } catch (err) {
             logError(prefix, `Failed to re-queue task for conflict resolution: ${err.message}`);
           }
+          continue;
+        }
+        if (task.autoMergeEnabled) {
+          try {
+            await api.post(`/api/tasks/${task.id}/auto-merge`, {});
+            await api.patch(`/api/tasks/${task.id}`, { autoMergeEnabled: false });
+            logDispatch(prefix, `Auto-merge preference detected \u2014 sanity review queued`);
+          } catch (err) {
+            logError(prefix, `Failed to queue auto-merge: ${err.message}`);
+          }
+        }
+      }
+      let completedAutoMergeReviews = [];
+      try {
+        completedAutoMergeReviews = await api.get("/api/reviews?status=completed&limit=20");
+      } catch (err) {
+        logError(watchTag(), `Failed to fetch completed reviews: ${err.message}`);
+      }
+      for (const review of completedAutoMergeReviews) {
+        if (!review.autoMergeTaskId || review.autoMergeStatus !== "pending") continue;
+        const taskId = review.autoMergeTaskId;
+        const sid = shortId(review.id);
+        const prefix = `${paint("blue", `[auto-merge:${sid}]`)}`;
+        const repoDir = findDirectoryForProject(config, review.projectId, rootDir);
+        if (!repoDir) {
+          logWarn(prefix, `No local repo for project ${review.projectId} \u2014 cannot auto-merge`);
+          try {
+            await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "blocked" });
+            await postTaskUpdate(taskId, `Auto-merge blocked: no local checkout found for this project`, "system");
+          } catch {
+          }
+          continue;
+        }
+        const findings = review.findings ?? [];
+        const blocking = findings.filter((f) => f.severity === "critical" || f.severity === "high");
+        if (blocking.length > 0) {
+          logWarn(prefix, `Auto-merge blocked \u2014 ${blocking.length} ${blocking.length === 1 ? "issue" : "issues"} flagged`);
+          const lines = blocking.slice(0, 10).map((f) => `- **${f.severity}**: ${f.title}${f.file ? ` (\`${f.file}${f.line ? `:${f.line}` : ""}\`)` : ""}`);
+          const summaryBlock = review.summary ? `${review.summary}
+
+` : "";
+          const message = `Auto-merge blocked \u2014 sanity review flagged ${blocking.length} blocking issue${blocking.length === 1 ? "" : "s"}.
+
+${summaryBlock}${lines.join("\n")}`;
+          try {
+            await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "blocked" });
+            await postTaskUpdate(taskId, message, "system");
+          } catch (err) {
+            logError(prefix, `Failed to record auto-merge block: ${err.message}`);
+          }
+          continue;
+        }
+        if (!review.branchUrl) {
+          logWarn(prefix, `No PR/MR URL on review \u2014 cannot auto-merge`);
+          try {
+            await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "blocked" });
+            await postTaskUpdate(taskId, `Auto-merge blocked: review is missing the PR/MR URL`, "system");
+          } catch {
+          }
+          continue;
+        }
+        const vcs = review.branchUrl.includes("gitlab") ? "gitlab" : "github";
+        const prLabel = vcs === "gitlab" ? "MR" : "PR";
+        logDispatch(prefix, `Sanity review clean \u2014 merging ${prLabel} ${paint("cyan", review.branchUrl)}`);
+        const mergeResult = await mergePrViaCli(review.branchUrl, repoDir, vcs);
+        if (!mergeResult.ok) {
+          logError(prefix, `Auto-merge failed: ${mergeResult.error}`);
+          try {
+            await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "failed" });
+            await postTaskUpdate(taskId, `Auto-merge failed: ${mergeResult.error}`, "system");
+          } catch {
+          }
+          continue;
+        }
+        try {
+          await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "merged" });
+          await postTaskUpdate(taskId, `Auto-merge complete \u2014 sanity review passed and ${prLabel} merged`, "system");
+          logSuccess(prefix, `Auto-merge complete for ${prLabel}`);
+        } catch (err) {
+          logError(prefix, `Failed to record auto-merge success: ${err.message}`);
         }
       }
     } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dunnewold-labs/mr-manager",
-  "version": "0.4.44",
+  "version": "0.4.46",
   "description": "Mr. Manager - Task and project management CLI",
   "bin": {
     "mr": "./dist/index.mjs"