@link-assistant/hive-mind 1.2.8 → 1.2.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @link-assistant/hive-mind
 
+## 1.2.9
+
+### Patch Changes
+
+- b5e047a: Fix branch checkout error showing null/null instead of actual repository URL
+  - Pass owner/repo/prNumber to branch error handlers for accurate error messages
+  - Add upstream remote fallback when PR branch not found in origin (handles bot PRs)
+  - Add case study documentation for issue #1120
+
 ## 1.2.8
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/solve.branch.lib.mjs

@@ -100,7 +100,7 @@ export function detectBranchFormat(branchName) {
   return null;
 }
 
-export async function createOrCheckoutBranch({ isContinueMode, prBranch, issueNumber, tempDir, defaultBranch, argv, log, formatAligned, $, crypto }) {
+export async function createOrCheckoutBranch({ isContinueMode, prBranch, issueNumber, tempDir, defaultBranch, argv, log, formatAligned, $, crypto, owner, repo, prNumber }) {
   // Create a branch for the issue or checkout existing PR branch
   let branchName;
   let checkoutResult;
@@ -136,11 +136,11 @@ export async function createOrCheckoutBranch({ isContinueMode, prBranch, issueNu
       const { handleBranchCheckoutError } = branchErrors;
       await handleBranchCheckoutError({
         branchName,
-        prNumber: null, // Will be set later
+        prNumber,
         errorOutput,
         issueUrl: argv['issue-url'] || argv._[0],
-        owner: null, // Will be set later
-        repo: null, // Will be set later
+        owner,
+        repo,
         tempDir,
         argv,
         formatAligned,
@@ -154,8 +154,8 @@ export async function createOrCheckoutBranch({ isContinueMode, prBranch, issueNu
         branchName,
         errorOutput,
         tempDir,
-        owner: null, // Will be set later
-        repo: null, // Will be set later
+        owner,
+        repo,
         formatAligned,
         log,
       });
@@ -193,9 +193,9 @@ export async function createOrCheckoutBranch({ isContinueMode, prBranch, issueNu
       isContinueMode,
       branchName,
       actualBranch,
-      prNumber: null, // Will be set later
-      owner: null, // Will be set later
-      repo: null, // Will be set later
+      prNumber,
+      owner,
+      repo,
       tempDir,
       formatAligned,
       log,

package/src/solve.mjs

@@ -553,6 +553,9 @@ try {
     formatAligned,
     $,
     crypto,
+    owner,
+    repo,
+    prNumber,
   });
 
   // Auto-merge default branch to pull request branch if enabled

package/src/solve.repository.lib.mjs

@@ -1208,6 +1208,41 @@ export const checkoutPrBranch = async (tempDir, branchName, prForkRemote, prFork
   } else {
     // Branch doesn't exist locally, try to checkout from remote
     checkoutResult = await $({ cwd: tempDir })`git checkout -b ${branchName} ${remoteName}/${branchName}`;
+
+    // If checkout from origin failed, try upstream remote as fallback
+    // This handles the case where we're in fork mode but the PR branch exists in upstream
+    // (e.g., a bot created PR in the upstream repo, not a fork PR)
+    if (checkoutResult.code !== 0 && remoteName === 'origin') {
+      await log(`${formatAligned('🔄', 'Branch not in origin:', 'Checking upstream remote...')}`);
+
+      // Check if upstream remote exists
+      const upstreamCheckResult = await $({ cwd: tempDir })`git remote get-url upstream 2>/dev/null`;
+      if (upstreamCheckResult.code === 0) {
+        // Fetch from upstream to ensure we have the latest branches
+        await log(`${formatAligned('📥', 'Fetching from upstream:', 'Looking for PR branch...')}`);
+        const fetchUpstreamResult = await $({ cwd: tempDir })`git fetch upstream`;
+
+        if (fetchUpstreamResult.code === 0) {
+          // Check if branch exists in upstream
+          const upstreamBranchCheckResult = await $({ cwd: tempDir })`git show-ref --verify --quiet refs/remotes/upstream/${branchName}`;
+
+          if (upstreamBranchCheckResult.code === 0) {
+            await log(`${formatAligned('✅', 'Found branch in upstream:', `upstream/${branchName}`)}`);
+            // Try to checkout from upstream instead
+            checkoutResult = await $({ cwd: tempDir })`git checkout -b ${branchName} upstream/${branchName}`;
+
+            if (checkoutResult.code === 0) {
+              await log(`${formatAligned('ℹ️', 'Note:', 'PR branch was in upstream repository, not your fork')}`);
+              await log(`${formatAligned('', '', 'This can happen when a bot creates a PR directly in the main repository')}`);
+            }
+          } else {
+            await log(`${formatAligned('⚠️', 'Branch not found:', `Not in origin or upstream remotes`)}`, { level: 'warning' });
+          }
+        } else {
+          await log(`${formatAligned('⚠️', 'Warning:', 'Failed to fetch from upstream')}`, { level: 'warning' });
+        }
+      }
+    }
   }
 
   return checkoutResult;