@yemi33/minions 0.1.1639 → 0.1.1640

package/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
-## 0.1.1639 (2026-04-30)
+## 0.1.1640 (2026-04-30)
+
+### Fixes
+- surface unresolved pr branches
+
+## 0.1.1638 (2026-04-30)
 
 ### Fixes
-- auto-link agent-created PRs to work items (#1904)
 -  Playbook 'fix' / 'review' gates items forever when pr_branch is unresolved (closes #1899) (#1901)
 
 ## 0.1.1637 (2026-04-30)

package/dashboard/js/render-prs.js

@@ -18,6 +18,9 @@ function prRow(pr) {
   const buildLabel = pr.buildFixEscalated ? 'escalated (' + (pr.buildFixAttempts || '?') + ' fixes)' : (pr.buildStatus || 'none') + (pr._buildStatusStale ? ' (stale)' : '');
   const statusClass = pr.status === 'merged' ? 'merged' : pr.status === 'abandoned' ? 'rejected' : pr.status === 'active' ? 'active' : 'draft';
   const statusLabel = pr.status || 'active';
+  const branchError = pr._branchResolutionError?.reason || '';
+  const branchLabel = pr.branch || (branchError ? 'missing branch' : '—');
+  const branchClass = 'pr-branch' + (branchError ? ' branch-missing' : '');
   const url = pr.url || '#';
   const prId = pr.id || '—';
   const pendingReason = pr._pendingReason ? String(pr._pendingReason) : '';
@@ -28,7 +31,7 @@ function prRow(pr) {
     '<td><span class="pr-id">' + escapeHtml(String(prId)) + '</span></td>' +
     '<td><a class="pr-title" href="' + escapeHtml(safeUrl(url)) + '" target="_blank" rel="noopener">' + escapeHtml(pr.title || 'Untitled') + '</a>' + (pr.description ? '<div class="pr-desc">' + escapeHtml(pr.description.length > 120 ? pr.description.slice(0, 120) + '...' : pr.description) + '</div>' : '') + '</td>' +
     '<td><span class="pr-agent">' + escapeHtml(pr.agent || '—') + '</span></td>' +
-    '<td><span class="pr-branch">' + escapeHtml(pr.branch || '—') + '</span>' + pendingReasonHtml + '</td>' +
+    '<td><span class="' + branchClass + '"' + (branchError ? ' title="' + escapeHtml(branchError) + '"' : '') + '>' + escapeHtml(branchLabel) + '</span>' + pendingReasonHtml + '</td>' +
     '<td><span class="pr-badge ' + reviewClass + '"' + (reviewTitle ? ' title="' + escapeHtml(reviewTitle) + '"' : '') + '>' + escapeHtml(reviewLabel) + '</span></td>' +
     '<td>' + (sq.reviewer && sq.status !== 'waiting' ? '<span class="pr-agent" title="' + escapeHtml(sq.note || '') + '">' + escapeHtml(sq.reviewer) + '</span>' : sq.reviewer && sq.status === 'waiting' ? '<span class="pr-agent" style="color:var(--muted)" title="Vote pending confirmation">' + escapeHtml(sq.reviewer) + '…</span>' : pr.reviewedBy && pr.reviewedBy.length ? '<span class="pr-agent">' + escapeHtml(pr.reviewedBy.join(', ')) + '</span>' : '<span style="color:var(--muted);font-size:11px">—</span>') + '</td>' +
     '<td><span class="pr-badge ' + buildClass + '">' + escapeHtml(buildLabel) + '</span></td>' +

package/dashboard/styles.css

@@ -262,6 +262,7 @@
   .pr-id { color: var(--muted); font-family: Consolas, monospace; font-size: var(--text-base); }
   .pr-agent { font-size: var(--text-base); color: var(--text); }
   .pr-branch { font-family: Consolas, monospace; font-size: var(--text-sm); color: var(--muted); background: var(--bg); padding: var(--space-1) var(--space-3); border-radius: 3px; border: 1px solid var(--border); }
+  .pr-branch.branch-missing { color: var(--red); border-color: var(--red); background: rgba(248,81,73,0.12); }
   .pr-badge { font-size: var(--text-sm); font-weight: 600; padding: var(--space-1) var(--space-4); border-radius: var(--radius-xl); text-transform: uppercase; letter-spacing: 0.5px; white-space: nowrap; }
   .pr-badge.draft { background: rgba(139,148,158,0.15); color: var(--muted); border: 1px solid var(--border); }
   .pr-badge.active { background: rgba(88,166,255,0.15); color: var(--blue); border: 1px solid var(--blue); }

package/dashboard.js

@@ -5927,6 +5927,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
             if (prData.description) pr.description = prData.description.slice(0, 500);
             if (!pr.branch && prData.branch) {
               pr.branch = prData.branch;
+              if (pr._branchResolutionError) delete pr._branchResolutionError;
               if (pr._pendingReason === 'missing_pr_branch') delete pr._pendingReason;
             }
             if (pr.agent === 'human' && prData.author) pr.agent = prData.author;

package/engine/ado.js

@@ -357,6 +357,14 @@ async function pollPrStatus(config) {
 
     const prData = await adoFetch(`${repoBase}?api-version=7.1`, token);
 
+    const sourceBranch = stripRefsHeads(prData.sourceRefName);
+    if (sourceBranch && pr.branch !== sourceBranch) {
+      pr.branch = sourceBranch;
+      if (pr._branchResolutionError) delete pr._branchResolutionError;
+      if (pr._pendingReason === 'missing_pr_branch') delete pr._pendingReason;
+      updated = true;
+    }
+
     let newStatus = pr.status;
     if (prData.status === 'completed') newStatus = PR_STATUS.MERGED;
     else if (prData.status === 'abandoned') newStatus = PR_STATUS.ABANDONED;
@@ -405,12 +413,6 @@ async function pollPrStatus(config) {
       pr._adoSourceCommit = sourceCommit;
       updated = true;
     }
-    const sourceBranch = stripRefsHeads(prData.sourceRefName);
-    if (!pr.branch && sourceBranch) {
-      pr.branch = sourceBranch;
-      if (pr._pendingReason === 'missing_pr_branch') delete pr._pendingReason;
-      updated = true;
-    }
 
     const reviewers = prData.reviewers || [];
     const votes = reviewers.map(r => r.vote).filter(v => v !== undefined);
@@ -795,6 +797,7 @@ async function reconcilePrs(config) {
         }
         if (existing && !existing.branch && branch) {
           existing.branch = branch;
+          if (existing._branchResolutionError) delete existing._branchResolutionError;
           if (existing._pendingReason === 'missing_pr_branch') delete existing._pendingReason;
           metadataUpdated++;
         }

package/engine/copilot-models.json

@@ -1,5 +1,5 @@
 {
   "runtime": "copilot",
   "models": null,
-  "cachedAt": "2026-04-30T16:35:01.979Z"
+  "cachedAt": "2026-04-30T17:09:32.809Z"
 }

package/engine/github.js

@@ -284,6 +284,7 @@ async function forEachActiveGhPr(config, callback) {
             if (pr.agent === 'human' && prData.user?.login) pr.agent = prData.user.login;
             if (!pr.branch && prData.head?.ref) {
               pr.branch = prData.head.ref;
+              if (pr._branchResolutionError) delete pr._branchResolutionError;
               if (pr._pendingReason === 'missing_pr_branch') delete pr._pendingReason;
             }
           }
@@ -327,6 +328,14 @@ async function pollPrStatus(config) {
 
     let updated = false;
 
+    const headBranch = prData.head?.ref ? String(prData.head.ref).trim() : '';
+    if (headBranch && pr.branch !== headBranch) {
+      pr.branch = headBranch;
+      if (pr._branchResolutionError) delete pr._branchResolutionError;
+      if (pr._pendingReason === 'missing_pr_branch') delete pr._pendingReason;
+      updated = true;
+    }
+
     // Map GitHub PR state to minions status
     let newStatus = pr.status;
     if (prData.merged) newStatus = PR_STATUS.MERGED;
@@ -703,6 +712,7 @@ async function reconcilePrs(config) {
         }
         if (existing && !existing.branch && branch) {
           existing.branch = branch;
+          if (existing._branchResolutionError) delete existing._branchResolutionError;
           if (existing._pendingReason === 'missing_pr_branch') delete existing._pendingReason;
           metadataUpdated++;
         }

package/engine.js

@@ -1982,56 +1982,99 @@ function clearPendingHumanFeedbackFlag(projectMeta, prId) {
 
 const PR_PENDING_MISSING_BRANCH = 'missing_pr_branch';
 
-function getPrDispatchBranch(pr) {
-  return typeof pr?.branch === 'string' ? pr.branch.trim() : '';
+function normalizePrBranch(value) {
+  const raw = value == null ? '' : String(value).trim();
+  if (!raw) return '';
+  return raw.replace(/^refs\/heads\//i, '');
 }
 
-function mutatePrPendingReason(project, pr, mutator) {
-  const prPath = projectPrPath(project);
-  let changed = false;
-  mutatePullRequests(prPath, prs => {
-    const target = shared.findPrRecord(prs, pr, project);
-    if (!target) return prs;
-    changed = mutator(target) === true;
-    return prs;
-  });
-  return changed;
+function resolvePrBranch(pr) {
+  if (!pr || typeof pr !== 'object') return '';
+  const candidates = [
+    pr.branch,
+    pr.pr_branch,
+    pr.prBranch,
+    pr.sourceRefName,
+    pr.sourceBranch,
+    pr.sourceRef,
+    pr.headRefName,
+    pr.head?.ref,
+  ];
+  for (const candidate of candidates) {
+    const branch = normalizePrBranch(candidate);
+    if (branch) return branch;
+  }
+  return '';
 }
 
-function markPrMissingBranch(project, pr, action) {
-  if (pr._pendingReason === PR_PENDING_MISSING_BRANCH) return false;
-  const changed = mutatePrPendingReason(project, pr, target => {
-    if (target._pendingReason === PR_PENDING_MISSING_BRANCH) return false;
-    target._pendingReason = PR_PENDING_MISSING_BRANCH;
-    return true;
-  });
-  if (changed) {
+// Unified branch-resolution state writer: when branch is found, persist it and
+// clear BOTH the structured _branchResolutionError (red-badge UI) and the
+// _pendingReason marker (dashboard pending-reason vocabulary). When branch is
+// missing, set BOTH fields so the dashboard can surface the gate via either
+// rendering path.
+function updatePrBranchResolutionState(project, pr, { branch = '', reason = '' } = {}) {
+  let changed = false;
+  try {
+    mutatePullRequests(projectPrPath(project), prs => {
+      const target = shared.findPrRecord(prs, pr, project);
+      if (!target) return;
+      if (branch) {
+        if (target.branch !== branch) {
+          target.branch = branch;
+          changed = true;
+        }
+        if (target._branchResolutionError) {
+          delete target._branchResolutionError;
+          changed = true;
+        }
+        if (target._pendingReason === PR_PENDING_MISSING_BRANCH) {
+          delete target._pendingReason;
+          changed = true;
+        }
+        return;
+      }
+      if (reason) {
+        const currentReason = target._branchResolutionError?.reason || '';
+        if (currentReason !== reason) {
+          target._branchResolutionError = { reason, at: ts() };
+          changed = true;
+        }
+        if (target._pendingReason !== PR_PENDING_MISSING_BRANCH) {
+          target._pendingReason = PR_PENDING_MISSING_BRANCH;
+          changed = true;
+        }
+      }
+    });
+  } catch (e) {
+    log('warn', `mark PR branch resolution state for ${pr?.id || 'unknown PR'}: ${e.message}`);
+  }
+  if (branch) {
+    pr.branch = branch;
+    if (pr._branchResolutionError) delete pr._branchResolutionError;
+    if (pr._pendingReason === PR_PENDING_MISSING_BRANCH) delete pr._pendingReason;
+  } else if (reason && changed) {
+    pr._branchResolutionError = { reason, at: ts() };
     pr._pendingReason = PR_PENDING_MISSING_BRANCH;
-    log('warn', `PR ${pr.id}: cannot dispatch ${action} — missing pr_branch; waiting for PR metadata enrichment`);
   }
   return changed;
 }
 
-function clearPrMissingBranch(project, pr) {
-  if (pr._pendingReason !== PR_PENDING_MISSING_BRANCH) return false;
-  const changed = mutatePrPendingReason(project, pr, target => {
-    if (target._pendingReason !== PR_PENDING_MISSING_BRANCH) return false;
-    delete target._pendingReason;
-    return true;
-  });
-  if (changed) delete pr._pendingReason;
-  return changed;
-}
-
-function canDispatchPrBranch(project, pr, action) {
-  if (getPrDispatchBranch(pr)) {
-    clearPrMissingBranch(project, pr);
-    return true;
+function ensurePrBranchForDispatch(project, pr, automationType) {
+  const branch = resolvePrBranch(pr);
+  if (branch) {
+    if (pr.branch !== branch || pr._branchResolutionError || pr._pendingReason === PR_PENDING_MISSING_BRANCH) {
+      updatePrBranchResolutionState(project, pr, { branch });
+    }
+    return branch;
+  }
+  const reason = `Cannot dispatch ${automationType} for ${shared.getPrDisplayId(pr)}: missing pr_branch/source branch metadata. Link or refresh the PR so the source branch is known.`;
+  if (updatePrBranchResolutionState(project, pr, { reason })) {
+    log('warn', `PR ${pr.id}: ${reason}`);
   }
-  markPrMissingBranch(project, pr, action);
-  return false;
+  return '';
 }
 
+
 /**
  * Scan pull-requests.json for PRs needing review or fixes
  */
@@ -2073,10 +2116,10 @@ async function discoverFromPrs(config, project) {
     const prDisplayId = shared.getPrDisplayId(pr);
     const prCanonicalId = shared.getCanonicalPrId(project, pr, pr.url || '');
     if (activePrIds.has(prCanonicalId)) continue; // Skip PRs with active dispatch (prevent race)
-    if (getPrDispatchBranch(pr)) clearPrMissingBranch(project, pr);
+    const prBranchForMutex = resolvePrBranch(pr);
     // Branch mutex: skip if PR branch is locked by any active dispatch (cross-type collision)
-    if (pr.branch && isBranchActive(pr.branch)) {
-      log('info', `Branch mutex: skipping PR ${pr.id} dispatch — branch ${pr.branch} locked by another agent`);
+    if (prBranchForMutex && isBranchActive(prBranchForMutex)) {
+      log('info', `Branch mutex: skipping PR ${pr.id} dispatch — branch ${prBranchForMutex} locked by another agent`);
       continue;
     }
     // Skip human-authored PRs not linked to any work item — only auto-manage agent PRs
@@ -2114,7 +2157,6 @@ async function discoverFromPrs(config, project) {
     if (needsReview) {
       const key = `review-${project?.name || 'default'}-${prDisplayId}`;
       if (isAlreadyDispatched(key) || isOnCooldown(key, cooldownMs)) continue;
-      if (!canDispatchPrBranch(project, pr, 'review')) continue;
 
       // Pre-dispatch live vote check — cached reviewStatus may be stale (poll lag ~6 min)
       try {
@@ -2139,11 +2181,13 @@ async function discoverFromPrs(config, project) {
 
       const agentId = resolveAgent('review', config);
       if (!agentId) continue;
+      const prBranch = ensurePrBranchForDispatch(project, pr, 'review');
+      if (!prBranch) continue;
 
       const item = buildPrDispatch(agentId, config, project, pr, 'review', {
-        pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: pr.branch || '',
+        pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
         pr_author: pr.agent || '', pr_url: pr.url || '',
-      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
+      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) { newWork.push(item); }
     }
 
@@ -2158,7 +2202,6 @@ async function discoverFromPrs(config, project) {
       // Skip isAlreadyDispatched — fixedAfterReview/lastReviewedAt already dedupe; the 1hr
       // completed-dispatch window would block legitimate re-reviews within the hour after a fix
       if (isOnCooldown(key, cooldownMs)) continue;
-      if (!canDispatchPrBranch(project, pr, 're-review')) continue;
 
       // Pre-dispatch live vote check — cached 'waiting' may be stale if reviewer already acted
       try {
@@ -2181,11 +2224,13 @@ async function discoverFromPrs(config, project) {
 
       const agentId = resolveAgent('review', config);
       if (!agentId) continue;
+      const prBranch = ensurePrBranchForDispatch(project, pr, 're-review');
+      if (!prBranch) continue;
 
       const item = buildPrDispatch(agentId, config, project, pr, 'review', {
-        pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: pr.branch || '',
+        pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
         pr_author: pr.agent || '', pr_url: pr.url || '',
-      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
+      }, `Review ${pr.id}: ${pr.title}`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) { newWork.push(item); }
     }
 
@@ -2195,14 +2240,15 @@ async function discoverFromPrs(config, project) {
     if (evalLoopEnabled && reviewStatus === 'changes-requested' && !awaitingReReview && !evalEscalated) {
       const key = `fix-${project?.name || 'default'}-${prDisplayId}`;
       if (isAlreadyDispatched(key) || isOnCooldown(key, cooldownMs)) continue;
-      if (!canDispatchPrBranch(project, pr, 'fix')) continue;
       const agentId = resolveAgent('fix', config, { authorAgent: pr.agent });
       if (!agentId) continue;
+      const prBranch = ensurePrBranchForDispatch(project, pr, 'fix');
+      if (!prBranch) continue;
 
       const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
-        pr_id: pr.id, pr_branch: pr.branch || '',
+        pr_id: pr.id, pr_branch: prBranch,
         review_note: pr.minionsReview?.note || pr.reviewNote || 'See PR thread comments',
-      }, `Fix ${pr.id}: ${pr.title || ''} — review feedback`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
+      }, `Fix ${pr.id}: ${pr.title || ''} — review feedback`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) {
         newWork.push(item); setCooldown(key); fixDispatched = true;
         // Increment review→fix cycle counter
@@ -2235,9 +2281,10 @@ async function discoverFromPrs(config, project) {
         }
         continue;
       }
-      if (!canDispatchPrBranch(project, pr, 'human-feedback fix')) continue;
       const agentId = resolveAgent('fix', config, { authorAgent: pr.agent });
       if (!agentId) continue;
+      const prBranch = ensurePrBranchForDispatch(project, pr, 'human-feedback fix');
+      if (!prBranch) continue;
 
       const coalesced = [...staleCoalesced, ...getCoalescedContexts(key)];
       let reviewNote = pr.humanFeedback.feedbackContent || 'See PR thread comments';
@@ -2247,10 +2294,10 @@ async function discoverFromPrs(config, project) {
       }
 
       const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
-        pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: pr.branch || '',
+        pr_id: pr.id, pr_number: prNumber, pr_title: pr.title || '', pr_branch: prBranch,
         reviewer: 'Human Reviewer',
         review_note: reviewNote,
-      }, `Fix ${pr.id}: ${pr.title || ''} — human feedback`, { dispatchKey: key, source: 'pr-human-feedback', pr, branch: pr.branch, project: projMeta });
+      }, `Fix ${pr.id}: ${pr.title || ''} — human feedback`, { dispatchKey: key, source: 'pr-human-feedback', pr, branch: prBranch, project: projMeta });
       if (item) { newWork.push(item); fixDispatched = true; }
     }
 
@@ -2283,7 +2330,6 @@ async function discoverFromPrs(config, project) {
 
       const key = `build-fix-${project?.name || 'default'}-${prDisplayId}`;
       if (fixThrottled || isAlreadyDispatched(key) || isOnCooldown(key, cooldownMs)) continue;
-      if (!canDispatchPrBranch(project, pr, 'build fix')) continue;
 
       // Pre-dispatch live build check — cached buildStatus may be stale: ADO can
       // recompute the merge commit when master moves and pollPrStatus deliberately
@@ -2319,6 +2365,8 @@ async function discoverFromPrs(config, project) {
 
       const agentId = resolveAgent('fix', config, { authorAgent: pr.agent });
       if (!agentId) continue;
+      const prBranch = ensurePrBranchForDispatch(project, pr, 'build-fix');
+      if (!prBranch) continue;
 
       let reviewNote = `Build is failing: ${pr.buildFailReason || 'Check CI pipeline for details'}. Fix the build errors and push.`;
       if (pr.buildErrorLog) {
@@ -2326,9 +2374,9 @@ async function discoverFromPrs(config, project) {
       }
 
       const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
-        pr_id: pr.id, pr_branch: pr.branch || '',
+        pr_id: pr.id, pr_branch: prBranch,
         review_note: reviewNote,
-      }, `Fix build failure on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
+      }, `Fix build failure on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
       if (item) {
         newWork.push(item); setCooldown(key); fixDispatched = true;
         // Increment build fix attempts counter
@@ -2368,7 +2416,6 @@ async function discoverFromPrs(config, project) {
       const conflictFixedAt = pr._conflictFixedAt;
       const withinLag = conflictFixedAt && Date.now() - new Date(conflictFixedAt).getTime() < 10 * 60 * 1000;
       if (!withinLag && !fixThrottled && !isAlreadyDispatched(key) && !isOnCooldown(key, cooldownMs)) {
-        if (!canDispatchPrBranch(project, pr, 'conflict fix')) continue;
         // Pre-dispatch live conflict check — cached `_mergeConflict` may be
         // stale: ADO/GitHub recompute mergeStatus asynchronously (1–5 min lag),
         // so a successful upstream merge can leave the flag set even after the
@@ -2395,10 +2442,12 @@ async function discoverFromPrs(config, project) {
         if (!liveSkip) {
           const agentId = resolveAgent('fix', config, { authorAgent: pr.agent });
           if (agentId) {
+            const prBranch = ensurePrBranchForDispatch(project, pr, 'conflict-fix');
+            if (!prBranch) continue;
             const item = buildPrDispatch(agentId, config, project, pr, 'fix', {
-              pr_id: pr.id, pr_branch: pr.branch || '',
+              pr_id: pr.id, pr_branch: prBranch,
               review_note: `This PR has merge conflicts with the target branch. Resolve the conflicts:\n\n1. Pull latest from main/master\n2. Resolve all conflicts (prefer PR branch changes unless main has critical fixes)\n3. Build and test after resolving\n4. Push the resolved branch`,
-            }, `Fix merge conflicts on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, source: 'pr', pr, branch: pr.branch, project: projMeta });
+            }, `Fix merge conflicts on ${pr.id}: ${pr.title || ''}`, { dispatchKey: key, source: 'pr', pr, branch: prBranch, project: projMeta });
             if (item) {
               newWork.push(item);
               setCooldown(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.1639",
+  "version": "0.1.1640",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"