@yemi33/minions 0.1.1626 → 0.1.1628

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.1628 (2026-04-29)
+
+### Features
+- prevent stale PR redispatch
+
+### Fixes
+- ADO PR helpers prefer az CLI with MCP fallback (#1833)
+
 ## 0.1.1626 (2026-04-29)
 
 ### Fixes

package/engine/copilot-models.json

@@ -1,5 +1,5 @@
 {
   "runtime": "copilot",
   "models": null,
-  "cachedAt": "2026-04-29T17:24:34.532Z"
+  "cachedAt": "2026-04-29T18:06:23.658Z"
 }

package/engine/dispatch.js

@@ -12,7 +12,7 @@ const { setCooldownFailure } = require('./cooldown');
 const { safeJson, safeWrite, safeReadDir, mutateJsonFileLocked, mutateWorkItems,
   mutatePullRequests, getProjects, projectWorkItemsPath, projectPrPath, log, ts, dateStamp,
   sidecarDispatchPrompt, deleteDispatchPromptSidecar,
-  WI_STATUS, DISPATCH_RESULT, ENGINE_DEFAULTS, AGENT_STATUS, FAILURE_CLASS } = shared;
+  WI_STATUS, DISPATCH_RESULT, ENGINE_DEFAULTS, AGENT_STATUS, FAILURE_CLASS, PR_STATUS } = shared;
 const { getConfig, getDispatch, DISPATCH_PATH, INBOX_DIR } = queries;
 
 const MINIONS_DIR = shared.MINIONS_DIR;
@@ -91,6 +91,64 @@ function addToDispatch(item) {
   return item.id;
 }
 
+function _resolveDispatchProject(projectRef, config) {
+  if (!projectRef) return null;
+  const projects = getProjects(config);
+  if (projectRef.name) {
+    const byName = projects.find(p => p.name === projectRef.name);
+    if (byName) return byName;
+  }
+  if (projectRef.localPath) {
+    const refPath = path.resolve(projectRef.localPath);
+    const byPath = projects.find(p => p.localPath && path.resolve(p.localPath) === refPath);
+    if (byPath) return byPath;
+  }
+  return projectRef;
+}
+
+function _isPrBackedDispatch(entry) {
+  return !!(entry?.meta?.pr && entry.meta?.project);
+}
+
+function getStalePrDispatchReason(entry, config) {
+  if (!_isPrBackedDispatch(entry)) return '';
+  const project = _resolveDispatchProject(entry.meta.project, config);
+  if (!project) return 'missing project metadata';
+
+  const tracked = shared.findPrRecord(queries.getPrs(project), entry.meta.pr, project);
+  const prLabel = entry.meta.pr?.id || entry.meta.pr?.url || entry.id;
+  if (!tracked) return `PR ${prLabel} is no longer tracked`;
+  if (tracked.status !== PR_STATUS.ACTIVE) return `PR ${tracked.id || prLabel} is ${tracked.status || 'missing status'}`;
+  if (tracked._contextOnly) return `PR ${tracked.id || prLabel} is context-only`;
+
+  const queuedBranch = entry.meta.branch || entry.meta.pr?.branch || '';
+  const trackedBranch = tracked.branch || '';
+  if (queuedBranch && trackedBranch && shared.sanitizeBranch(queuedBranch) !== shared.sanitizeBranch(trackedBranch)) {
+    return `PR ${tracked.id || prLabel} branch changed from ${queuedBranch} to ${trackedBranch}`;
+  }
+
+  return '';
+}
+
+function pruneStalePrDispatches(config = queries.getConfig()) {
+  const removed = [];
+  mutateDispatch((dispatch) => {
+    dispatch.pending = (dispatch.pending || []).filter(entry => {
+      const reason = getStalePrDispatchReason(entry, config);
+      if (!reason) return true;
+      removed.push({ entry, reason });
+      return false;
+    });
+    return dispatch;
+  });
+
+  for (const { entry, reason } of removed) {
+    try { deleteDispatchPromptSidecar(entry); } catch { /* cleanup best-effort */ }
+    log('info', `Dropped stale PR dispatch ${entry.id}: ${reason}`);
+  }
+  return removed.length;
+}
+
 // ─── Retryable Failure Classification ────────────────────────────────────────
 
 function isRetryableFailureReason(reason = '', failureClass = '') {
@@ -253,11 +311,16 @@ function completeDispatch(id, result = DISPATCH_RESULT.SUCCESS, reason = '', res
       if (prId && project) {
         try {
           const prsPath = projectPrPath(project);
+          let restored = false;
           mutatePullRequests(prsPath, prs => {
             const target = shared.findPrRecord(prs, { id: prId }, project);
-            if (target?.humanFeedback) target.humanFeedback.pendingFix = true;
+            if (target?.humanFeedback) {
+              target.humanFeedback.pendingFix = true;
+              restored = true;
+            }
           });
-          log('info', `Restored pendingFix=true on ${prId} after failed human-feedback fix`);
+          if (restored) log('info', `Restored pendingFix=true on ${prId} after failed human-feedback fix`);
+          else log('info', `Skipped pendingFix restore for ${prId} — PR is no longer tracked`);
         } catch (e) { log('warn', `restore pendingFix: ${e.message}`); }
       }
       // Clear completed dispatch entry so dedup doesn't block re-dispatch
@@ -424,6 +487,8 @@ module.exports = {
   completeDispatch,
   writeInboxAlert,
   updateAgentStatus,
+  getStalePrDispatchReason,
+  pruneStalePrDispatches,
   cancelPendingDispatchesForPr,
   cleanDispatchEntries,
   cancelPendingWorkItems,

package/engine/playbook.js

@@ -38,8 +38,17 @@ function getPrCreateInstructions(project) {
       `- Use --head to specify your feature branch name\n` +
       `- Include a meaningful --title and body file describing the changes`;
   }
-  // Default: Azure DevOps
-  return `Use \`mcp__azure-ado__repo_create_pull_request\`:\n- repositoryId: \`${repoId}\``;
+  // Default: Azure DevOps — prefer `az` CLI first, ADO MCP only as fallback
+  const adoOrg = project?.adoOrg || '';
+  const adoProject = project?.adoProject || '';
+  const repoName = project?.repoName || '';
+  const mainBranch = project?.localPath ? shared.resolveMainBranch(project.localPath, project.mainBranch) : (project?.mainBranch || 'main');
+  return `For Azure DevOps, use the \`az\` CLI first to create a pull request:\n` +
+    `- Run \`az devops configure --defaults organization=https://dev.azure.com/${adoOrg} project="${adoProject}"\` once per session if defaults are not yet set\n` +
+    `- Then: \`az repos pr create --repository "${repoName}" --source-branch <your-branch> --target-branch ${mainBranch} --title "PR title" --description @<body-file.md>\`\n` +
+    `- Use \`@<file>\` syntax for \`--description\` so Markdown, quotes, and newlines pass safely\n` +
+    `- Always set --target-branch to \`${mainBranch}\` (the main branch)\n\n` +
+    `If \`az\` is unavailable or insufficient for this operation, fall back to \`mcp__azure-ado__repo_create_pull_request\` with repositoryId \`${repoId}\`. Do not use \`gh\` for Azure DevOps repositories.`;
 }
 
 function getPrCommentInstructions(project) {
@@ -54,7 +63,12 @@ function getPrCommentInstructions(project) {
       `- Always set --repo to \`${org}/${repo}\` to target the correct repository\n` +
       `- Use --body-file so Markdown, quotes, and newlines are passed safely`;
   }
-  return `Use \`mcp__azure-ado__repo_create_pull_request_thread\`:\n- repositoryId: \`${repoId}\``;
+  // Azure DevOps — prefer `az` CLI first, ADO MCP only as fallback
+  const repoName = project?.repoName || '';
+  return `For Azure DevOps, use the \`az\` CLI first to post a comment on the PR:\n` +
+    `- Write the Markdown comment to a temporary file, then run: \`az repos pr comment create --pull-request-id <number> --content @<body-file.md>\` (substitute your project's repo \`${repoName}\` if not using \`az devops configure\` defaults)\n` +
+    `- Use \`@<file>\` syntax for \`--content\` so Markdown, quotes, and newlines pass safely\n\n` +
+    `If \`az repos pr comment\` is unavailable or insufficient (e.g. older az-devops extension, thread/status semantics needed), fall back to \`mcp__azure-ado__repo_create_pull_request_thread\` with repositoryId \`${repoId}\`. Do not use \`gh\` for Azure DevOps repositories.`;
 }
 
 function getPrFetchInstructions(project) {
@@ -72,7 +86,13 @@ function getPrFetchInstructions(project) {
       `- Or use \`gh pr checkout <number> --repo ${org}/${repo}\` to fetch and checkout in one step\n` +
       `- The base branch is \`${mainBranch}\``;
   }
-  return `Use \`mcp__azure-ado__repo_get_pull_request_by_id\` to fetch PR status.`;
+  // Azure DevOps — prefer `az` CLI first, ADO MCP only as fallback
+  const mainBranch = project?.localPath ? shared.resolveMainBranch(project.localPath, project.mainBranch) : (project?.mainBranch || 'main');
+  return `For Azure DevOps, use the \`az\` CLI first to fetch PR status:\n` +
+    `- \`az repos pr show --id <number>\` returns PR state, mergeStatus, source/target branches, vote summary, and policy/build evaluations\n` +
+    `- For the local branch: \`git fetch origin <branch-name>\` then inspect via \`git show\`/\`git diff\` (do NOT checkout in your main working tree)\n` +
+    `- The base branch is \`${mainBranch}\`\n\n` +
+    `If \`az\` is unavailable or insufficient, fall back to \`mcp__azure-ado__repo_get_pull_request_by_id\`. Do not use \`gh\` for Azure DevOps repositories.`;
 }
 
 function getPrVoteInstructions(project) {
@@ -90,7 +110,11 @@ function getPrVoteInstructions(project) {
       `- **Your comment body MUST start with \`VERDICT: APPROVE\` or \`VERDICT: REQUEST_CHANGES\`** on its own line — the engine parses this to record your vote\n` +
       `- Do NOT use \`--approve\` or \`--request-changes\` flags — they will fail`;
   }
-  return `Use \`mcp__azure-ado__repo_update_pull_request_reviewers\`:\n- repositoryId: \`${repoId}\`\n- Set your reviewer vote on the PR (10=approve, 5=approve-with-suggestions, -10=reject)`;
+  // Azure DevOps — prefer `az` CLI first, ADO MCP only as fallback
+  return `For Azure DevOps, use the \`az\` CLI first to set your reviewer vote:\n` +
+    `- \`az repos pr set-vote --id <number> --vote {approve | approve-with-suggestions | reject | reset | wait-for-author}\`\n` +
+    `- Pair the vote with \`az repos pr comment create --pull-request-id <number> --content @<verdict.md>\` so the verdict body is recorded as a thread comment\n\n` +
+    `If \`az\` is unavailable or insufficient, fall back to \`mcp__azure-ado__repo_update_pull_request_reviewers\` with repositoryId \`${repoId}\` (vote integers: 10=approve, 5=approve-with-suggestions, 0=no-vote, -5=wait-for-author, -10=reject). Do not use \`gh\` for Azure DevOps repositories.`;
 }
 
 function getRepoHostLabel(project) {
@@ -102,7 +126,7 @@ function getRepoHostLabel(project) {
 function getRepoHostToolRule(project) {
   const host = getRepoHost(project);
   if (host === 'github') return 'Use GitHub MCP tools or `gh` CLI for PR operations';
-  return 'Use Azure DevOps MCP tools (mcp__azure-ado__*) for PR operations — NEVER use gh CLI';
+  return 'For Azure DevOps, use the `az` CLI first for PR operations (e.g. `az repos pr create`, `az repos pr show`, `az repos pr comment`, `az repos pr set-vote`); use ADO MCP tools (`mcp__azure-ado__*`) only as a fallback when `az` is unavailable or insufficient. Do not use `gh` for Azure DevOps repositories.';
 }
 
 // ─── Task Context Resolution ────────────────────────────────────────────────

package/engine.js

@@ -102,7 +102,7 @@ const withFileLock = shared.withFileLock;
 // ─── Dispatch Management (extracted to engine/dispatch.js) ───────────────────
 
 const { mutateDispatch, addToDispatch, isRetryableFailureReason, completeDispatch,
-  writeInboxAlert, updateAgentStatus } = require('./engine/dispatch');
+  writeInboxAlert, updateAgentStatus, pruneStalePrDispatches } = require('./engine/dispatch');
 
 // ─── Timeout / Steering / Idle (extracted to engine/timeout.js) ──────────────
 
@@ -3639,6 +3639,7 @@ async function tickInner() {
     const maxC = config.engine?.maxConcurrent ?? ENGINE_DEFAULTS.maxConcurrent;
     setTempBudget(Math.max(0, maxC - activeCountPre));
   }
+  try { pruneStalePrDispatches(config); } catch (e) { log('warn', 'prune stale PR dispatches: ' + e.message); }
   let discoveryOk = true;
   try { await discoverWork(config); } catch (e) { log('warn', 'discoverWork: ' + e.message); discoveryOk = false; }
 
@@ -3915,7 +3916,7 @@ module.exports = {
   validateConfig,
 
   // Dispatch management (re-exported from engine/dispatch.js)
-  mutateDispatch, addToDispatch, isRetryableFailureReason, completeDispatch, writeInboxAlert, updateAgentStatus,
+  mutateDispatch, addToDispatch, isRetryableFailureReason, completeDispatch, writeInboxAlert, updateAgentStatus, pruneStalePrDispatches,
   activeProcesses, realActivityMap, engineRestartGraceExempt,
   get engineRestartGraceUntil() { return engineRestartGraceUntil; },
   set engineRestartGraceUntil(v) { engineRestartGraceUntil = v; },

package/package.json

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