@yemi33/minions 0.1.2263 → 0.1.2265

package/dashboard/slim/js/plans.js

@@ -184,7 +184,8 @@
     }
     var prdBySource = {};
     for (var j = 0; j < prds.length; j++) {
-      if (prds[j].sourcePlan) prdBySource[prds[j].sourcePlan] = prds[j];
+      var sp = prds[j].sourcePlan;
+      if (sp) prdBySource[sp.replace(/^plans\//, '')] = prds[j];
     }
     var cards = [];
     var claimedPrd = {};

package/engine/lifecycle.js

@@ -371,9 +371,19 @@ function checkPlanCompletion(meta, config) {
         return `### ${w.id}: ${(w.title || 'Untitled').replace('Implement: ', '')}\n${criteria ? '**Acceptance Criteria:**\n' + criteria : ''}`;
       }).join('\n\n');
 
-      const prSummary = prs.map(pr =>
-        `- ${pr.id}: ${pr.title || ''} (branch: \`${pr.branch || '?'}\`) ${pr.url || ''}`
-      ).join('\n') || '_No PRs surfaced for this project — verify the worktree directly._';
+      // Supplement the active-PR scan with WI-level _prUrl entries
+      // (e.g. PRs that were merged and left the active filter but had
+      // _prUrl stamped via stampWiPrRef at completion time).
+      const prUrlsAlreadyListed = new Set(prs.map(pr => pr.url).filter(Boolean));
+      const wiPrLines = itemsForProject
+        .filter(w => w._prUrl && !prUrlsAlreadyListed.has(w._prUrl))
+        .map(w => `- ${w._pr || w._prUrl}: (branch: \`${w.branch || '?'}\`) ${w._prUrl}`);
+      const prSummary = [
+        ...prs.map(pr =>
+          `- ${pr.id}: ${pr.title || ''} (branch: \`${pr.branch || '?'}\`) ${pr.url || ''}`
+        ),
+        ...wiPrLines,
+      ].join('\n') || '_No PRs surfaced for this project — verify the worktree directly._';
 
       const sharedBranchNote = isSharedBranch
         ? `\n**Shared-branch plan** — all changes are already on branch \`${plan.feature_branch}\`. Use this branch directly for the E2E PR instead of creating a new \`e2e/\` branch. Check if a PR already exists for this branch before creating one.\n`
@@ -767,6 +777,26 @@ function syncPrdItemStatus(itemId, status, sourcePlan) {
   } catch (err) { log('warn', `PRD status sync: ${err.message}`); }
 }
 
+// W-mqtplpk6001oe6d5 — stamp workItemId back onto the PRD item when its
+// materialised WI completes. dashboard/render-prd.js reads
+// i.workItemId || i._workItemId || i.work_item_id || i.id — writing this
+// field makes the back-reference explicit and avoids relying on id equality.
+function stampPrdItemWorkItemId(itemId, sourcePlan) {
+  if (!itemId || !sourcePlan) return;
+  try {
+    const fpath = path.join(PRD_DIR, sourcePlan);
+    if (!fs.existsSync(fpath)) return;
+    const plan = safeJsonNoRestore(fpath);
+    const feature = plan?.missing_features?.find(f => f.id === itemId);
+    if (!feature || feature.workItemId === itemId) return;
+    mutateJsonFileLocked(fpath, (fresh) => {
+      const f = fresh?.missing_features?.find(x => x.id === itemId);
+      if (f && f.workItemId !== itemId) f.workItemId = itemId;
+      return fresh;
+    }, { skipWriteIfUnchanged: true });
+  } catch (err) { log('warn', `stampPrdItemWorkItemId: ${err.message}`); }
+}
+
 // ─── PRD Backward-Scan Reconciliation (#929, #984) ─────────────────────────
 // Proactive counterpart to syncPrdItemStatus. Scans all active PRDs and:
 // 1. Promotes "missing" items to "updated" when a done work item already exists (#929)
@@ -1363,6 +1393,80 @@ async function _ensurePrEnrollmentForCompletedItem(meta, config) {
   }
 }
 
+// W-mqtplpk6001oe6d5 — stamp _pr/_prUrl/_prNumber onto the WI record at
+// completion time so the PRD-progress view shows the linked PR and
+// enforceVerifyPrContract's fast-path (item._pr || item._prUrl) succeeds
+// without waiting for the next reconcileItemsWithPrs tick.
+function stampWiPrRef(meta, config) {
+  if (!meta || !meta.item || !meta.item.id) return;
+  // No-op when already stamped — preserve any value set by earlier paths.
+  if (meta.item._pr && meta.item._prUrl) return;
+  const itemId = meta.item.id;
+  const projects = (config && Array.isArray(config.projects))
+    ? config.projects : shared.getProjects(config || {});
+
+  // 1. Search each project's pull-requests.json.
+  let found = null;
+  for (const p of projects) {
+    const pr = safeJsonArr(projectPrPath(p)).find(
+      r => Array.isArray(r.prdItems) && r.prdItems.includes(itemId)
+    );
+    if (pr) { found = pr; break; }
+  }
+
+  // 2. Fall back to central pull-requests.json.
+  if (!found) {
+    found = safeJsonArr(path.join(MINIONS_DIR, 'pull-requests.json')).find(
+      r => Array.isArray(r.prdItems) && r.prdItems.includes(itemId)
+    );
+  }
+
+  // 3. Fall back to pr-links index (catches cases where prdItems wasn't
+  //    populated but a pr-links entry links the PR to this WI).
+  if (!found) {
+    const prLinks = getPrLinks();
+    const linkedPrId = Object.keys(prLinks).find(id => (prLinks[id] || []).includes(itemId));
+    if (linkedPrId) {
+      for (const p of projects) {
+        const pr = safeJsonArr(projectPrPath(p)).find(r => r.id === linkedPrId);
+        if (pr) { found = pr; break; }
+      }
+      if (!found) {
+        found = safeJsonArr(path.join(MINIONS_DIR, 'pull-requests.json')).find(r => r.id === linkedPrId);
+      }
+      // Worst case: only the canonical ID is known — at least stamp _pr.
+      if (!found) found = { id: linkedPrId };
+    }
+  }
+
+  if (!found) return;
+
+  const prId = found.id;
+  const prUrl = found.url;
+  const prNumber = found.prNumber ?? found.number ?? null;
+
+  // Stamp the on-disk WI record.
+  const wiPath = resolveWorkItemPath(meta);
+  if (wiPath) {
+    try {
+      mutateWorkItems(wiPath, items => {
+        const wi = items.find(i => i.id === itemId);
+        if (wi && !wi._pr) {
+          if (prId) wi._pr = prId;
+          if (prUrl) wi._prUrl = prUrl;
+          if (prNumber != null) wi._prNumber = prNumber;
+        }
+        return items;
+      });
+    } catch (err) { log('warn', `stampWiPrRef on-disk: ${err.message}`); }
+  }
+
+  // Also update meta.item in-memory so enforceVerifyPrContract fast-path passes.
+  if (!meta.item._pr && prId) meta.item._pr = prId;
+  if (!meta.item._prUrl && prUrl) meta.item._prUrl = prUrl;
+  if (!meta.item._prNumber && prNumber != null) meta.item._prNumber = prNumber;
+}
+
 function isPrAttachmentRequired(type, item, meta = {}) {
   if (!item?.id || item.skipPr) return false;
   // SETUP (W-mpbi6f2q00104957) is implicitly PR-exempt — the type itself
@@ -4933,6 +5037,9 @@ async function runPostCompletionHooks(dispatchItem, agentId, code, stdout, confi
     await _ensurePrEnrollmentForCompletedItem(meta, config);
   } catch (err) { log('warn', `PR enrollment back-fill: ${err.message}`); }
 
+  // W-mqtplpk6001oe6d5 — stamp _pr/_prUrl/_prNumber onto WI at completion time.
+  try { stampWiPrRef(meta, config); } catch (err) { log('warn', `stampWiPrRef: ${err.message}`); }
+
   // Structured completion may report PR even when regex didn't find it
   const scHasPr = structuredCompletion && structuredCompletion.pr && structuredCompletion.pr !== 'N/A';
   if (scHasPr && prsCreatedCount === 0) {
@@ -5241,6 +5348,10 @@ async function runPostCompletionHooks(dispatchItem, agentId, code, stdout, confi
       meta._noopReason = noopRationale.slice(0, 500);
     }
     updateWorkItemStatus(meta, WI_STATUS.DONE, '');
+    // W-mqtplpk6001oe6d5 — back-stamp workItemId onto the PRD item now that WI is done.
+    if (meta.item.sourcePlan) {
+      try { stampPrdItemWorkItemId(meta.item.id, meta.item.sourcePlan); } catch (err) { log('warn', `stampPrdItemWorkItemId: ${err.message}`); }
+    }
     promoteCompletionArtifacts(meta, agentId, dispatchItem.id, structuredCompletion, { resultSummary });
   }
   // Failure retry is handled by completeDispatch in dispatch.js — not duplicated here.
@@ -6084,4 +6195,7 @@ module.exports = {
   // W-mq5uzmc6001d708f — post-hoc PR enrollment for orphan `_pr` pointers.
   enrollPrFromCanonicalId,
   _setEnrollmentGhRunnerForTest,
+  // W-mqtplpk6001oe6d5 — stamp PR ref + workItemId onto WI and PRD item at completion time.
+  stampWiPrRef,
+  stampPrdItemWorkItemId,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2263",
+  "version": "0.1.2265",
   "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"