@yemi33/minions 0.1.2103 → 0.1.2105

package/dashboard.js

@@ -3329,8 +3329,12 @@ function normalizeMeetingParticipants(participants) {
 
 
 function getWorkItemPrRef(input) {
-  if (!input || typeof input !== 'object') return null;
-  return input.targetPr || input.pr || input.prId || input.prNumber || input.pullRequest || input.sourcePr || input.prUrl || null;
+  // Delegates to shared.extractWorkItemPrRef so the dashboard's WI-create
+  // path detects PR pointers in references[*].url / meta.pr_followup /
+  // description text — not just the canonical structured fields — and routes
+  // the dispatch to the existing PR branch instead of a fresh `work/<wi-id>`
+  // parallel branch (issue #2999 / W-mpx6i5kh000ac040).
+  return shared.extractWorkItemPrRef(input);
 }
 
 function isPrTargetedWorkType(workType) {
@@ -3341,17 +3345,11 @@ function trimTrailingPrRefPunctuation(value) {
   return String(value || '').replace(/[),.;:]+$/g, '');
 }
 
+// Thin wrapper over shared.extractPrRefFromText so callers in dashboard.js
+// keep their existing import shape while the canonical regex + extraction
+// logic lives in engine/shared.js (issue #2999 / W-mpx6i5kh000ac040).
 function extractPrRefFromText(value) {
-  const text = String(value || '');
-  if (!text.trim()) return null;
-  const urlMatch = text.match(/https?:\/\/[^\s<>()]+(?:\/pull\/\d+|\/pullrequest\/\d+)[^\s<>()]*/i);
-  if (urlMatch) return trimTrailingPrRefPunctuation(urlMatch[0]);
-  const canonicalMatch = text.match(/\b(?:github|ado):[^\s#]+#\d+\b/i);
-  if (canonicalMatch) return canonicalMatch[0];
-  const legacyMatch = text.match(/\bPR-(\d+)\b/i);
-  if (legacyMatch) return legacyMatch[1];
-  const numberMatch = text.match(/\b(?:pr|pull\s+request|pullrequest)\s*#?\s*(\d+)\b/i);
-  return numberMatch ? numberMatch[1] : null;
+  return shared.extractPrRefFromText(value);
 }
 
 

package/engine/shared.js

@@ -4300,6 +4300,70 @@ function parsePrUrl(url) {
   return parseGitHubPrUrl(url) || parseAdoPrUrl(url);
 }
 
+// ─── PR reference extraction from work-item bodies (W-mpx6i5kh000ac040) ─────
+//
+// `extractPrRefFromText` scans free-form text (description, comment bodies,
+// release notes) for the first PR reference it can recognise: a GitHub or ADO
+// PR URL, a canonical `github:owner/repo#N` / `ado:org/proj/repo#N` id, or a
+// legacy `PR-<n>` token. Returns null when nothing parseable is found.
+//
+// `extractWorkItemPrRef` is the engine + dashboard's single source of truth
+// for "does this work-item target an existing PR?". It checks the canonical
+// structured fields first (current behaviour preserved), then falls back to
+// `references[*].url`, `meta.pr_followup.parent_pr_url`, and finally a text
+// scan of the title/description. Returning a truthy ref keeps `linkedPr` /
+// `isPrTargeted` paths intact and prevents PR-feedback fix WIs from being
+// dispatched on a fresh `work/<wi-id>` branch when only the description /
+// references[] carried the PR pointer (issue #2999).
+function _trimTrailingPrRefPunctuation(value) {
+  return String(value || '').replace(/[),.;:]+$/g, '');
+}
+
+function extractPrRefFromText(value) {
+  const text = String(value || '');
+  if (!text.trim()) return null;
+  const urlMatch = text.match(/https?:\/\/[^\s<>()]+(?:\/pull\/\d+|\/pullrequest\/\d+)[^\s<>()]*/i);
+  if (urlMatch) return _trimTrailingPrRefPunctuation(urlMatch[0]);
+  const canonicalMatch = text.match(/\b(?:github|ado):[^\s#]+#\d+\b/i);
+  if (canonicalMatch) return canonicalMatch[0];
+  const legacyMatch = text.match(/\bPR-(\d+)\b/i);
+  if (legacyMatch) return legacyMatch[1];
+  const numberMatch = text.match(/\b(?:pr|pull\s+request|pullrequest)\s*#?\s*(\d+)\b/i);
+  return numberMatch ? numberMatch[1] : null;
+}
+
+function extractWorkItemPrRef(item) {
+  if (!item || typeof item !== 'object') return null;
+  const structured = item.targetPr
+    || item.pr
+    || item.pr_id
+    || item.prId
+    || item.sourcePr
+    || item.pullRequest
+    || item.prUrl
+    || item.prNumber;
+  if (structured) return structured;
+  // references[*].url — manual /api/work-items callers often supply the PR
+  // pointer here when no structured prId/targetPr is known up front.
+  if (Array.isArray(item.references)) {
+    for (const ref of item.references) {
+      const url = ref && typeof ref === 'object' ? ref.url : null;
+      const fromUrl = extractPrRefFromText(url);
+      if (fromUrl) return fromUrl;
+    }
+  }
+  // meta.pr_followup.parent_pr_url — set by playbooks/templates/followup-dispatch.md.
+  const followupUrl = item?.meta?.pr_followup?.parent_pr_url;
+  if (followupUrl) {
+    const fromFollowup = extractPrRefFromText(followupUrl);
+    if (fromFollowup) return fromFollowup;
+  }
+  // Last resort: scan description + title for a PR URL / canonical id.
+  const fromDescription = extractPrRefFromText(item.description);
+  if (fromDescription) return fromDescription;
+  return extractPrRefFromText(item.title) || null;
+}
+
 function getProjectPrScope(project) {
   if (!project) return '';
   const host = String(project.repoHost || '').toLowerCase();
@@ -5632,6 +5696,8 @@ module.exports = {
   parseGitHubPrUrl, // exported for testing
   parseAdoPrUrl, // exported for testing
   parsePrUrl, // exported for testing
+  extractPrRefFromText,
+  extractWorkItemPrRef,
   getProjectPrScope,
   getPrNumber,
   getPrDisplayId,

package/engine.js

@@ -5583,8 +5583,13 @@ function renderProjectWorkItemPromptForAgent(item, workType, agentId, config, pr
 }
 
 function getWorkItemPrRef(item) {
-  if (!item || typeof item !== 'object') return null;
-  return item.targetPr || item.pr || item.pr_id || item.sourcePr || item.pullRequest || item.prUrl || item.prNumber || null;
+  // Delegates to shared.extractWorkItemPrRef so engine + dashboard agree on
+  // which work-item fields count as PR pointers — covers structured fields,
+  // references[*].url, meta.pr_followup.parent_pr_url, and description text
+  // (issue #2999 / W-mpx6i5kh000ac040). Defence in depth: even if a manual
+  // /api/work-items create slipped through without structured PR fields, the
+  // engine still detects the PR pointer here at dispatch time.
+  return shared.extractWorkItemPrRef(item);
 }
 
 function resolveWorkItemPrRecord(item, project) {

package/package.json

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

package/playbooks/fix.md

@@ -46,6 +46,10 @@ Before editing, split the feedback into:
 
 Before starting work, run `git status` and verify the worktree is clean and on the expected branch (`{{pr_branch}}`). If the worktree is dirty or on the wrong branch, report the issue and stop.
 
+### Branch-mismatch guard (issue #2999)
+
+If your task description, `references[]`, or the PR thread clearly identifies an existing PR but your checkout branch does **not** match the PR's source branch — for example you are on `work/W-…` while the task references PR `!5284819` (source branch `yemishin/task-hub-symphony-gate`) — **stop immediately**. Do not branch off master, do not replay the PR's commits onto a fresh branch, and do not open a duplicate PR. Emit a non-retryable completion (`failure_class: "branch-mismatch"`, `retryable: false`) with the referenced PR id and the actual branch you found, so the engine and the operator can re-dispatch on the correct branch. The canonical bad incident is in issue #2999 — manual fix WI `W-mpwxgd4v00078c06` opened duplicate ADO PR `!5288540` instead of patching `!5284819`.
+
 ## Working Style
 
 Use subagents only for genuinely parallel, independent tasks. For sequential work, single-file edits, searches, and file reads, work directly — do not spawn subagents.

package/playbooks/shared-rules.md

@@ -64,6 +64,17 @@ Application:
 - When you create a work item programmatically (API, plan-to-prd, scripts), set the WI's `branch` (or PRD `feature_branch`) to the conventional name so the engine creates the worktree on the right branch from the start. `dashboard.js` derives this automatically when callers omit `branch`.
 - The legacy `feat/<id>-<slug>` and bare `work/<id>` formats are deprecated; the engine no longer falls back to them.
 
+### PR-fix exception (DO NOT branch off master)
+
+For a `type: "fix"` work item that targets an existing PR, the engine reuses the PR's **source branch** (e.g. `yemishin/task-hub-symphony-gate`) instead of derivingthe `user/<loginname>/<wi-id>-<slug>` form. PR pointers are detected from any of:
+
+- Structured fields: `targetPr`, `pr_id`, `prUrl`, `prNumber`, `pullRequest`, `sourcePr`
+- `references[*].url` (manual `/api/work-items` callers usually pass the PR pointer here)
+- `meta.pr_followup.parent_pr_url` (follow-up dispatch template)
+- A PR URL or canonical `github:owner/repo#N` / `ado:org/proj/repo#N` id in the `description` text
+
+If you are running a fix task and `{{pr_branch}}` is populated, your worktree is already on that branch — push the fix commit there and do **not** create a new PR. If `{{pr_branch}}` is empty but the task description / references clearly point at an existing PR, **stop** and emit a non-retryable completion (`failure_class: 'branch-mismatch'`) instead of branching off master and opening a duplicate PR. See issue #2999 for the canonical bad incident (ADO PR `!5284819` → duplicate `!5288540`).
+
 ## Engine Rules (apply to all tasks)
 
 **Context compaction:** Your context window may be compacted mid-task by Claude's infrastructure. If you notice your earlier conversation history appears truncated or summarized, this is normal and expected. Do not interpret compaction as a signal to stop early or wrap up. Continue working toward your task objective — all relevant instructions and state remain available.