@yemi33/minions 0.1.2316 → 0.1.2318

package/engine/dispatch.js

@@ -853,7 +853,19 @@ function completeDispatch(id, result = DISPATCH_RESULT.SUCCESS, reason = '', res
         completedWorkItemFailure = isCompletedWorkItemForFailure(liveWi);
       } catch (e) { log('warn', 'read live work item before retry: ' + e.message); }
     }
-    if (result === DISPATCH_RESULT.ERROR && item.meta?.dispatchKey && retryableFailure && !completedWorkItemFailure) {
+    // #634 — cooldown backoff bookkeeping is independent of the retry decision.
+    // `retryableFailure` (== `agentRetryable`) governs whether the engine will
+    // ever re-dispatch this work; `setCooldownFailure` governs how aggressively
+    // it backs off between attempts. Previously this was gated on
+    // `retryableFailure`, so a caller marking a failure `agentRetryable: false`
+    // (structural/non-retryable classes like LIVE_CHECKOUT_WORKTREE_CONFLICT,
+    // WORKSPACE_MANIFEST_REPO, INVALID_WORKDIR, etc.) skipped cooldown
+    // bookkeeping entirely — leaving only the flat 15-minute `isAlreadyDispatched`
+    // dedup window as the sole re-dispatch gate, so the identical doomed
+    // dispatch key looped forever every ~15 minutes with zero backoff. Always
+    // record the failure here so `isOnCooldown`'s exponential backoff applies
+    // regardless of whether the failure is retryable.
+    if (result === DISPATCH_RESULT.ERROR && item.meta?.dispatchKey && !completedWorkItemFailure) {
       setCooldownFailure(item.meta.dispatchKey);
     }
 

package/engine/github.js

@@ -690,6 +690,15 @@ async function forEachActiveGhPr(config, callback) {
       for (const { before, after } of updatedCentralRecords) {
         const idx = currentPrs.findIndex(p => p.id === after.id);
         if (idx >= 0) {
+          // W-mr3gr4wl0004b8e3: never downgrade reviewStatus from 'approved' — it's a
+          // permanent terminal state. Mirrors the project-local write-back guard above
+          // (github.js:561-563) and ado.js's project/central write-backs (ado.js:1211-1213,
+          // :1360-1362). applyPrFieldDelta only merges fields changed during a given poll
+          // cycle, so this guard is the sole race protection against a stale/out-of-order
+          // GitHub poll response downgrading an already-approved PR.
+          if (currentPrs[idx].reviewStatus === REVIEW_STATUS.APPROVED && after.reviewStatus !== REVIEW_STATUS.APPROVED) {
+            after.reviewStatus = REVIEW_STATUS.APPROVED;
+          }
           // W-mp5trwh60008386d: same merged-status guard as project-local PRs.
           if (currentPrs[idx].status === PR_STATUS.MERGED && after.status !== PR_STATUS.MERGED) {
             after.status = PR_STATUS.MERGED;

package/engine/pr-clone-keep.js

@@ -69,24 +69,9 @@ const GIT_OP_TIMEOUT_MS = 60 * 1000;
  * `PrActionError` (400) on missing/unrecognized input — mirrors the read-only,
  * choice-surface, and temp-clone paths so the dashboard reflects a 400, not a 500.
  */
-function _resolveRef(input) {
-  if (input && typeof input === 'object') {
-    if (input.host && input.slug && input.number) return input; // already normalized
-    if (input.ref && input.ref.host) return input.ref;          // plan/handle carrying a ref
-  }
-  const rawUrl = input && typeof input === 'object'
-    ? (typeof input.url === 'string' ? input.url.trim() : '')
-    : (typeof input === 'string' ? input.trim() : '');
-  if (!rawUrl) throw new PrActionError('url required');
-  const ref = prResolve.normalizePrRef(rawUrl);
-  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
-  return ref;
-}
+const _resolveRef = (input) => prResolve.resolvePrActionRef(input, PrActionError);
 
-function _prId(ref) {
-  if (!ref) return null;
-  return ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
-}
+const _prId = prResolve.prIdFromRef;
 
 /** Filesystem-safe slug for the persistent project dir name (from the repo name). */
 function _safeDirSlug(name) {

package/engine/pr-devbox.js

@@ -60,24 +60,9 @@ const DEFAULT_REMOTE_TMP_ROOT = 'C:/minions-devbox-tmp';
  * `PrActionError` (400) on missing/unrecognized input — mirrors the other
  * projectless paths so the dashboard reflects a 400, not a 500.
  */
-function _resolveRef(input) {
-  if (input && typeof input === 'object') {
-    if (input.host && input.slug && input.number) return input; // already normalized
-    if (input.ref && input.ref.host) return input.ref;          // plan/handle carrying a ref
-  }
-  const rawUrl = input && typeof input === 'object'
-    ? (typeof input.url === 'string' ? input.url.trim() : '')
-    : (typeof input === 'string' ? input.trim() : '');
-  if (!rawUrl) throw new PrActionError('url required');
-  const ref = prResolve.normalizePrRef(rawUrl);
-  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
-  return ref;
-}
+const _resolveRef = (input) => prResolve.resolvePrActionRef(input, PrActionError);
 
-function _prId(ref) {
-  if (!ref) return null;
-  return ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
-}
+const _prId = prResolve.prIdFromRef;
 
 /** Filesystem-safe slug for a PR id (used in the remote dir name). */
 function _safeDirSlug(prId) {

package/engine/pr-fix-target.js

@@ -143,21 +143,7 @@ function _routedRecord(plan, target, extra = {}) {
  * a normalized PR ref. Throws `PrActionError` (400) on missing/unrecognized input
  * so the dashboard handler reflects it as a 400 (matching the read-only path).
  */
-function _resolveRef(input) {
-  if (input && typeof input === 'object' && input.host && input.slug && input.number) {
-    return input; // already normalized
-  }
-  if (input && typeof input === 'object' && input.ref && input.ref.host) {
-    return input.ref; // a plan/handle carrying a ref
-  }
-  const rawUrl = input && typeof input === 'object'
-    ? (typeof input.url === 'string' ? input.url.trim() : '')
-    : (typeof input === 'string' ? input.trim() : '');
-  if (!rawUrl) throw new PrActionError('url required');
-  const ref = prResolve.normalizePrRef(rawUrl);
-  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
-  return ref;
-}
+const _resolveRef = (input) => prResolve.resolvePrActionRef(input, PrActionError);
 
 // ── Configured-project detection ──────────────────────────────────────────────
 
@@ -309,7 +295,7 @@ function buildPrFixTargetModal(plan) {
 function planPrFix(input = {}, opts = {}) {
   const ref = _resolveRef(input);
   const prUrl = opts.prUrl || (input && typeof input === 'object' ? input.url : undefined) || null;
-  const prId = ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
+  const prId = prResolve.prIdFromRef(ref);
 
   const project = findConfiguredProjectForRef(ref, opts.config);
   if (project) {

package/engine/pr-remote-patch.js

@@ -59,24 +59,9 @@ const REMOTE_PATCH_NO_VALIDATION_LABEL =
  * `PrActionError` (400) on missing/unrecognized input — mirrors the read-only,
  * choice-surface, and temp-clone paths so the dashboard reflects a 400, not 500.
  */
-function _resolveRef(input) {
-  if (input && typeof input === 'object') {
-    if (input.host && input.slug && input.number) return input; // already normalized
-    if (input.ref && input.ref.host) return input.ref;          // plan/handle carrying a ref
-  }
-  const rawUrl = input && typeof input === 'object'
-    ? (typeof input.url === 'string' ? input.url.trim() : '')
-    : (typeof input === 'string' ? input.trim() : '');
-  if (!rawUrl) throw new PrActionError('url required');
-  const ref = prResolve.normalizePrRef(rawUrl);
-  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
-  return ref;
-}
+const _resolveRef = (input) => prResolve.resolvePrActionRef(input, PrActionError);
 
-function _prId(ref) {
-  if (!ref) return null;
-  return ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
-}
+const _prId = prResolve.prIdFromRef;
 
 // ── Patch normalization (the trivial-single-file guardrail) ───────────────────
 

package/engine/pr-resolve.js

@@ -102,6 +102,42 @@ function normalizePrRef(input) {
   return _normalizeFromScope(parsed.scope, parsed.prNumber);
 }
 
+// ── Shared ref resolution for the PR-action executors ───────────────────────
+
+/**
+ * Resolve `{ url }` (raw PR URL / canonical id), an already-normalized ref, or a
+ * plan/handle carrying `.ref` into a normalized PR ref. Throws `PrActionError`
+ * (400) on missing/unrecognized input so callers reflect a 400, not a 500.
+ *
+ * Shared by the 6 PR-action executor modules (pr-clone-keep, pr-devbox,
+ * pr-remote-patch, pr-temp-clone, pr-track, pr-fix-target), which previously
+ * each defined a byte-identical copy of this function. `PrActionError` must be
+ * passed in by the caller — pr-resolve.js does not import engine/pr-action.js
+ * (that would introduce a new cross-module dependency in that direction).
+ */
+function resolvePrActionRef(input, PrActionError) {
+  if (input && typeof input === 'object') {
+    if (input.host && input.slug && input.number) return input; // already normalized
+    if (input.ref && input.ref.host) return input.ref;          // plan/handle carrying a ref
+  }
+  const rawUrl = input && typeof input === 'object'
+    ? (typeof input.url === 'string' ? input.url.trim() : '')
+    : (typeof input === 'string' ? input.trim() : '');
+  if (!rawUrl) throw new PrActionError('url required');
+  const ref = normalizePrRef(rawUrl);
+  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
+  return ref;
+}
+
+/**
+ * Derive the canonical `host:slug#number` PR id string from a normalized ref
+ * (or its already-computed `.id`). Returns null when `ref` is falsy.
+ */
+function prIdFromRef(ref) {
+  if (!ref) return null;
+  return ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
+}
+
 // ── Config (for the unknown-slug account fallback) ───────────────────────────
 
 function _readConfig(opts = {}) {
@@ -432,6 +468,8 @@ async function fetchPrPayload(refOrInput, opts = {}) {
 
 module.exports = {
   normalizePrRef,
+  resolvePrActionRef,
+  prIdFromRef,
   fetchPrPayload,
   fetchPrBranches,
   // Exported for testing.

package/engine/pr-temp-clone.js

@@ -57,24 +57,9 @@ const GIT_OP_TIMEOUT_MS = 60 * 1000;
  * `PrActionError` (400) on missing/unrecognized input — mirrors the read-only
  * and choice-surface paths so the dashboard reflects a 400, not a 500.
  */
-function _resolveRef(input) {
-  if (input && typeof input === 'object') {
-    if (input.host && input.slug && input.number) return input; // already normalized
-    if (input.ref && input.ref.host) return input.ref;          // plan/handle carrying a ref
-  }
-  const rawUrl = input && typeof input === 'object'
-    ? (typeof input.url === 'string' ? input.url.trim() : '')
-    : (typeof input === 'string' ? input.trim() : '');
-  if (!rawUrl) throw new PrActionError('url required');
-  const ref = prResolve.normalizePrRef(rawUrl);
-  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
-  return ref;
-}
+const _resolveRef = (input) => prResolve.resolvePrActionRef(input, PrActionError);
 
-function _prId(ref) {
-  if (!ref) return null;
-  return ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
-}
+const _prId = prResolve.prIdFromRef;
 
 /** Filesystem-safe slug for a PR id (used in the ephemeral dir name). */
 function _safeDirSlug(prId) {

package/engine/pr-track.js

@@ -56,24 +56,9 @@ const TRACK_RECOMMENDED_TARGET = 'clone-keep';
  * missing/unrecognized input so the dashboard reflects a 400 — mirrors the
  * read-only and choice-surface paths.
  */
-function _resolveRef(input) {
-  if (input && typeof input === 'object') {
-    if (input.host && input.slug && input.number) return input; // already normalized
-    if (input.ref && input.ref.host) return input.ref;          // plan/handle carrying a ref
-  }
-  const rawUrl = input && typeof input === 'object'
-    ? (typeof input.url === 'string' ? input.url.trim() : '')
-    : (typeof input === 'string' ? input.trim() : '');
-  if (!rawUrl) throw new PrActionError('url required');
-  const ref = prResolve.normalizePrRef(rawUrl);
-  if (!ref) throw new PrActionError(`unrecognized PR reference: ${JSON.stringify(rawUrl.slice(0, 120))}`);
-  return ref;
-}
+const _resolveRef = (input) => prResolve.resolvePrActionRef(input, PrActionError);
 
-function _prId(ref) {
-  if (!ref) return null;
-  return ref.id || (ref.host && ref.slug && ref.number ? `${ref.host}:${ref.slug}#${ref.number}` : null);
-}
+const _prId = prResolve.prIdFromRef;
 
 // ── Choice surface (Clone & keep implied) ─────────────────────────────────────
 

package/engine.js

@@ -7185,7 +7185,19 @@ async function discoverFromPrs(config, project) {
         coalesceCurrentHumanFeedback();
         continue;
       }
-      if (blockedByCooldown && !alreadyDispatched) {
+      // #634 — only clear the cooldown when it holds no real failure history
+      // (i.e. it was created purely by `setCooldownWithContext` to park
+      // coalesced feedback while `fixThrottled`, and `failures` is still 0).
+      // A cooldown with `failures > 0` came from `setCooldownFailure` after an
+      // actual dispatch error — including non-retryable structural failures,
+      // which now always record a failure (see dispatch.js#completeDispatch).
+      // Clearing it just because the 15-min `isAlreadyDispatched` window
+      // closed would erase the exponential backoff and re-dispatch the same
+      // doomed key every ~15 minutes, defeating the whole point of the
+      // backoff. Only genuinely orphaned (never-attempted) cooldowns are
+      // cleared as stale.
+      const isGenuineFailureCooldown = (dispatchCooldowns.get(key)?.failures || 0) > 0;
+      if (blockedByCooldown && !alreadyDispatched && !isGenuineFailureCooldown) {
         staleCoalesced = drainCoalescedContexts(key);
         clearCooldown(key);
         log('info', `Cleared stale cooldown for ${key} — no matching dispatch history`);

package/package.json

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