@dunnewold-labs/mr-manager 0.4.39 → 0.4.40

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.39",
+  version: "0.4.40",
   description: "Mr. Manager - Task and project management CLI",
   bin: {
     mr: "./dist/index.mjs"
@@ -5893,25 +5893,37 @@ var reviewCommand = new Command25("review").description("Run an automated code r
       }
     }
     log(`Reviewing branch: ${paint8("cyan", branch)} against ${paint8("dim", baseBranch)}`);
-    try {
-      diff = execSync5(`git diff ${baseBranch}...${branch} -- . ':!*.lock' ':!package-lock.json' ':!pnpm-lock.yaml'`, {
-        cwd: projectPath,
-        encoding: "utf-8",
-        maxBuffer: 10 * 1024 * 1024
-      }).trim();
-    } catch (err) {
+    const pathspec = `-- . ':!*.lock' ':!package-lock.json' ':!pnpm-lock.yaml'`;
+    const tryDiff = (range) => {
       try {
-        execSync5(`git fetch origin ${baseBranch}`, { cwd: projectPath, encoding: "utf-8", stdio: "pipe" });
-        diff = execSync5(`git diff origin/${baseBranch}...${branch} -- . ':!*.lock' ':!package-lock.json' ':!pnpm-lock.yaml'`, {
+        return execSync5(`git diff ${range} ${pathspec}`, {
           cwd: projectPath,
           encoding: "utf-8",
-          maxBuffer: 10 * 1024 * 1024
+          maxBuffer: 10 * 1024 * 1024,
+          stdio: ["ignore", "pipe", "pipe"]
         }).trim();
       } catch {
-        logErr(`Failed to get diff between ${baseBranch} and ${branch}: ${err.message}`);
-        process.exit(1);
+        return null;
+      }
+    };
+    const tryFetch = (ref) => {
+      try {
+        execSync5(`git fetch origin ${ref}`, { cwd: projectPath, encoding: "utf-8", stdio: "pipe" });
+      } catch {
       }
+    };
+    let result = tryDiff(`${baseBranch}...${branch}`);
+    if (result === null) {
+      tryFetch(baseBranch);
+      tryFetch(branch);
+      result = tryDiff(`origin/${baseBranch}...${branch}`) ?? tryDiff(`origin/${baseBranch}...origin/${branch}`) ?? tryDiff(`${baseBranch}...origin/${branch}`);
+    }
+    if (result === null) {
+      logErr(`Failed to get diff between ${baseBranch} and ${branch} in ${projectPath}.`);
+      logErr(`Branch may not exist locally or on origin. Try fetching it manually, or attach a PR URL to the review.`);
+      process.exit(1);
     }
+    diff = result;
   }
   log(`Project: ${paint8("cyan", project.name)}`);
   if (!diff) {

package/package.json

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