@dunnewold-labs/mr-manager 0.4.23 → 0.4.24

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.23",
+  version: "0.4.24",
   description: "Mr. Manager - Task and project management CLI",
   bin: {
     mr: "./dist/index.mjs"
@@ -1744,7 +1744,7 @@ async function extractPrUrlFromUpdates(taskId) {
   return null;
 }
 function checkPrStatus(prUrl, repoDir, vcs = "github") {
-  const cmd = vcs === "gitlab" ? `glab mr view "${prUrl}" --output json 2>/dev/null` : `gh pr view "${prUrl}" --json merged,mergeable,isDraft,statusCheckRollup,reviewDecision 2>/dev/null`;
+  const cmd = vcs === "gitlab" ? `glab mr view "${prUrl}" --output json 2>/dev/null` : `gh pr view "${prUrl}" --json merged,mergeable 2>/dev/null`;
   return new Promise((resolve9) => {
     exec(cmd, { cwd: repoDir }, (err, stdout) => {
       if (err || !stdout.trim()) {
@@ -1754,18 +1754,15 @@ function checkPrStatus(prUrl, repoDir, vcs = "github") {
       try {
         const data = JSON.parse(stdout.trim());
         if (vcs === "gitlab") {
-          const merged = data.state === "merged";
-          const hasConflicts = data.has_conflicts === true;
-          const isMergeable = !merged && data.state === "opened" && !hasConflicts && !data.draft && (data.merge_status === "can_be_merged" || data.merge_status === "can_be_merged_rebase");
-          resolve9({ merged, hasConflicts, isMergeable });
+          resolve9({
+            merged: data.state === "merged",
+            hasConflicts: data.has_conflicts === true
+          });
         } else {
-          const merged = data.merged === true;
-          const hasConflicts = data.mergeable === "CONFLICTING";
-          const checks = data.statusCheckRollup ?? [];
-          const allChecksPassed = checks.length === 0 || checks.every((c12) => c12.state === "SUCCESS" || c12.state === "NEUTRAL" || c12.state === "SKIPPED");
-          const noChangesRequested = data.reviewDecision !== "CHANGES_REQUESTED";
-          const isMergeable = !merged && !hasConflicts && !data.isDraft && data.mergeable === "MERGEABLE" && allChecksPassed && noChangesRequested;
-          resolve9({ merged, hasConflicts, isMergeable });
+          resolve9({
+            merged: data.merged === true,
+            hasConflicts: data.mergeable === "CONFLICTING"
+          });
         }
       } catch {
         resolve9(null);
@@ -1773,14 +1770,6 @@ function checkPrStatus(prUrl, repoDir, vcs = "github") {
     });
   });
 }
-function mergePrViaCli(prUrl, repoDir, vcs = "github") {
-  const cmd = vcs === "gitlab" ? `glab mr merge "${prUrl}" --squash --remove-source-branch 2>&1` : `gh pr merge "${prUrl}" --squash --delete-branch 2>&1`;
-  return new Promise((resolve9) => {
-    exec(cmd, { cwd: repoDir }, (err) => {
-      resolve9(!err);
-    });
-  });
-}
 function buildPrototypeSection(protoRefs, workingDir) {
   if (protoRefs.length === 0) return "";
   const sections = [
@@ -4135,7 +4124,8 @@ ${divider}`);
         const prefix = taskTag(sid);
         const prLabel = task.link.includes("gitlab") ? "MR" : "PR";
         const vcs = task.link.includes("gitlab") ? "gitlab" : "github";
-        const repoDir = findDirectoryForProject(config, task.projectId, rootDir) ?? rootDir;
+        const repoDir = findDirectoryForProject(config, task.projectId, rootDir);
+        if (!repoDir) continue;
         const status = await checkPrStatus(task.link, repoDir, vcs);
         if (!status) continue;
         if (status.merged) {
@@ -4152,26 +4142,6 @@ ${divider}`);
           }
           continue;
         }
-        if (task.autoMerge && status.isMergeable) {
-          logInfo(prefix, `Auto-merging ${prLabel} for "${paint("bold", task.title)}"`);
-          const mergeOk = await mergePrViaCli(task.link, repoDir, vcs);
-          if (mergeOk) {
-            logSuccess(prefix, `${prLabel} auto-merged \u2014 completing "${paint("bold", task.title)}"`);
-            try {
-              await api.patch(`/api/tasks/${task.id}`, {
-                status: "completed",
-                completedAt: (/* @__PURE__ */ new Date()).toISOString(),
-                inProgressSince: null
-              });
-              await postTaskUpdate(task.id, `${prLabel} auto-merged and task completed`, "system");
-            } catch (err) {
-              logError(prefix, `Failed to complete task after auto-merge: ${err.message}`);
-            }
-          } else {
-            logWarn(prefix, `Auto-merge of ${prLabel} failed for "${paint("bold", task.title)}" \u2014 will retry next poll`);
-          }
-          continue;
-        }
         if (status.hasConflicts) {
           logWarn(prefix, `${prLabel} has merge conflicts \u2014 re-dispatching agent for "${paint("bold", task.title)}"`);
           try {

package/package.json

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