@yemi33/minions 0.1.802 → 0.1.804

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.1.802 (2026-04-10)
+## 0.1.804 (2026-04-10)
 
 ### Features
 -  configurable ignored comment authors — auto-filtered, never trigger fixes
@@ -9,6 +9,8 @@
 -  cap review→fix cycles at evalMaxIterations (default 3)
 
 ### Fixes
+- allow PRD item retry when work item is missing (closes #781) (#807)
+-  handle force-pushed dep branches on retry (closes #738) (#806)
 -  project-scoped skill work items instruct wrong file path format (closes #790) (#804)
 -  move ignoredAuthors construction outside inner comment loop (ADO)
 -  approved is permanent — no path can ever downgrade it

package/dashboard/js/render-prd.js

@@ -171,9 +171,10 @@ function renderPrdProgress(prog) {
     const agentLabel = wiAgent ? '<span style="font-size:9px;color:var(--muted)" title="' + escHtml(wiAgent.name || wi.dispatched_to) + '">' +
       (wiAgent.emoji || '') + ' ' + escHtml(wiAgent.name || wi.dispatched_to) + '</span>' : '';
 
-    // Requeue button for failed items
-    const canRequeue = wi && (wi.status === 'failed' || i.status === 'failed');
-    const requeueState = wi ? getPrdRequeueState(wi.id) : null;
+    // Requeue button for failed items or PRD items with no work item (orphaned/deleted)
+    const canRequeue = (wi && (wi.status === 'failed' || i.status === 'failed')) ||
+      (!wi && i.status && i.status !== 'missing' && i.status !== 'done' && i.status !== 'planned');
+    const requeueState = getPrdRequeueState(wi ? wi.id : i.id);
     let requeueBtn = '';
     if (requeueState && requeueState.status === 'pending') {
       requeueBtn = '<span style="color:var(--yellow);cursor:wait;font-size:9px;padding:1px 5px;background:rgba(210,153,34,0.1);border:1px solid rgba(210,153,34,0.35);border-radius:3px" title="Retry request in progress">requeuing…</span>';
@@ -182,7 +183,7 @@ function renderPrdProgress(prog) {
     } else if (requeueState && requeueState.status === 'error') {
       requeueBtn = '<span style="color:var(--red);cursor:default;font-size:9px;padding:1px 5px;background:rgba(248,81,73,0.1);border:1px solid rgba(248,81,73,0.35);border-radius:3px" title="' + escHtml(requeueState.message || 'Retry failed') + '">retry failed</span>';
     } else if (canRequeue) {
-      requeueBtn = '<span onclick="event.stopPropagation();prdItemRequeue(\'' + escHtml(wi.id) + '\',\'' + escHtml(wi._source || '') + '\')" style="color:var(--green);cursor:pointer;font-size:9px;padding:1px 5px;background:rgba(63,185,80,0.1);border:1px solid rgba(63,185,80,0.3);border-radius:3px" title="Requeue this work item">retry</span>';
+      requeueBtn = '<span onclick="event.stopPropagation();prdItemRequeue(\'' + escHtml(wi ? wi.id : i.id) + '\',\'' + escHtml(wi ? (wi._source || '') : '') + '\',\'' + escHtml(i.source || '') + '\')" style="color:var(--green);cursor:pointer;font-size:9px;padding:1px 5px;background:rgba(63,185,80,0.1);border:1px solid rgba(63,185,80,0.3);border-radius:3px" title="Requeue this work item">retry</span>';
     }
 
     return '<div class="prd-item-row st-' + (i.status || 'missing') + '" style="flex-wrap:wrap;cursor:pointer" onclick="prdItemEdit(\'' + src + '\',\'' + iid + '\')">' +
@@ -381,8 +382,8 @@ function renderPrdProgress(prog) {
             (agentDisplay ? '<span style="font-size:8px;color:var(--muted)">' + agentDisplay + '</span>' : '') +
             (function() {
               const w = wi[i.id];
-              if (!w) return '';
-              const rq = getPrdRequeueState(w.id);
+              const rqId = w ? w.id : i.id;
+              const rq = getPrdRequeueState(rqId);
               if (rq && rq.status === 'pending') {
                 return '<span style="font-size:8px;color:var(--yellow);cursor:wait;padding:1px 4px;background:rgba(210,153,34,0.1);border:1px solid rgba(210,153,34,0.35);border-radius:3px">requeuing…</span>';
               }
@@ -392,8 +393,11 @@ function renderPrdProgress(prog) {
               if (rq && rq.status === 'error') {
                 return '<span style="font-size:8px;color:var(--red);cursor:default;padding:1px 4px;background:rgba(248,81,73,0.1);border:1px solid rgba(248,81,73,0.35);border-radius:3px" title="' + escHtml(rq.message || 'Retry failed') + '">failed</span>';
               }
-              if (i.status !== 'failed') return '';
-              return '<span onclick="event.stopPropagation();prdItemRequeue(\'' + escHtml(w.id) + '\',\'' + escHtml(w._source || '') + '\')" style="font-size:8px;color:var(--green);cursor:pointer;padding:1px 4px;background:rgba(63,185,80,0.1);border:1px solid rgba(63,185,80,0.3);border-radius:3px">retry</span>';
+              // Show retry for failed items, or PRD items with no work item (orphaned/deleted)
+              const canRetry = (w && i.status === 'failed') ||
+                (!w && i.status && i.status !== 'missing' && i.status !== 'done' && i.status !== 'planned');
+              if (!canRetry) return '';
+              return '<span onclick="event.stopPropagation();prdItemRequeue(\'' + escHtml(rqId) + '\',\'' + escHtml(w ? (w._source || '') : '') + '\',\'' + escHtml(i.source || '') + '\')" style="font-size:8px;color:var(--green);cursor:pointer;padding:1px 4px;background:rgba(63,185,80,0.1);border:1px solid rgba(63,185,80,0.3);border-radius:3px">retry</span>';
             })() +
             (deps ? '<span style="font-size:8px;color:var(--muted)" title="Depends on: ' + escHtml(deps) + '">deps: ' + escHtml(deps) + '</span>' : '') +
           '</div>' +
@@ -713,13 +717,15 @@ async function prdItemRemove(source, itemId) {
   } catch (e) { alert('Error: ' + e.message); refresh(); }
 }
 
-async function prdItemRequeue(workItemId, source) {
+async function prdItemRequeue(workItemId, source, prdFile) {
   setPrdRequeueState(workItemId, { status: 'pending', message: '' });
   rerenderPrdFromCache();
   try {
+    const payload = { id: workItemId, source };
+    if (prdFile) payload.prdFile = prdFile;
     const res = await fetch('/api/work-items/retry', {
       method: 'POST', headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ id: workItemId, source })
+      body: JSON.stringify(payload)
     });
     if (res.ok) {
       setPrdRequeueState(workItemId, { status: 'queued', until: Date.now() + 10000 });

package/dashboard.js

@@ -1040,7 +1040,74 @@ const server = http.createServer(async (req, res) => {
           }
         }
       }
-      if (!wiPath) return jsonReply(res, 404, { error: 'work item not found in any source' });
+      // If no work item found, attempt to re-materialize from PRD item definition
+      if (!wiPath) {
+        const prdFile = body.prdFile;
+        if (!prdFile) return jsonReply(res, 404, { error: 'work item not found in any source' });
+
+        // Look up PRD item to create a new work item on-demand
+        const prdPath = path.join(PRD_DIR, prdFile);
+        const plan = shared.safeJson(prdPath);
+        if (!plan?.missing_features) return jsonReply(res, 404, { error: 'PRD file not found or invalid' });
+        const prdItem = plan.missing_features.find(f => f.id === id);
+        if (!prdItem) return jsonReply(res, 404, { error: 'PRD item not found in ' + prdFile });
+
+        // Determine target work-items file (project from PRD item or plan, fallback to central)
+        const projName = prdItem.project || plan.project || prdFile.replace(/-\d{4}-\d{2}-\d{2}\.json$/, '');
+        const proj = PROJECTS.find(p => p.name?.toLowerCase() === projName.toLowerCase());
+        const targetWiPath = proj ? shared.projectWorkItemsPath(proj) : path.join(MINIONS_DIR, 'work-items.json');
+
+        // Create new work item from PRD item definition (same logic as materializePlansAsWorkItems)
+        const complexity = prdItem.estimated_complexity || 'medium';
+        const criteria = (prdItem.acceptance_criteria || []).map(c => `- ${c}`).join('\n');
+        const newItem = {
+          id,
+          title: `Implement: ${prdItem.name}`,
+          type: complexity === 'large' ? 'implement:large' : 'implement',
+          priority: prdItem.priority || 'medium',
+          description: `${prdItem.description || ''}\n\n**Plan:** ${prdFile}\n**Plan Item:** ${prdItem.id}\n**Complexity:** ${complexity}${criteria ? '\n\n**Acceptance Criteria:**\n' + criteria : ''}`,
+          status: WI_STATUS.PENDING,
+          created: new Date().toISOString(),
+          createdBy: 'dashboard:prd-retry',
+          sourcePlan: prdFile,
+          depends_on: prdItem.depends_on || [],
+          branchStrategy: plan.branch_strategy || 'parallel',
+          featureBranch: plan.feature_branch || null,
+          project: prdItem.project || plan.project || null,
+          _source: proj?.name || 'central',
+          _retryCount: 0,
+        };
+        mutateWorkItems(targetWiPath, items => { items.push(newItem); });
+
+        // Reset PRD item status to pending
+        try {
+          const lifecycle = require('./engine/lifecycle');
+          lifecycle.syncPrdItemStatus(id, WI_STATUS.PENDING, prdFile);
+        } catch (e) { console.error('PRD status sync:', e.message); }
+
+        // Clear dispatch history and cooldowns for this item
+        const dispatchPath = path.join(MINIONS_DIR, 'engine', 'dispatch.json');
+        const sourcePrefix = proj ? `work-${proj.name}-` : 'central-work-';
+        const dispatchKey = sourcePrefix + id;
+        try {
+          mutateJsonFileLocked(dispatchPath, (dispatch) => {
+            dispatch.completed = Array.isArray(dispatch.completed) ? dispatch.completed : [];
+            dispatch.completed = dispatch.completed.filter(d => d.meta?.dispatchKey !== dispatchKey);
+            dispatch.completed = dispatch.completed.filter(d => !d.meta?.parentKey || d.meta.parentKey !== dispatchKey);
+            return dispatch;
+          }, { defaultValue: { pending: [], active: [], completed: [] } });
+        } catch (e) { console.error('dispatch cleanup:', e.message); }
+        try {
+          const cooldownPath = path.join(MINIONS_DIR, 'engine', 'cooldowns.json');
+          const cooldowns = safeJsonObj(cooldownPath);
+          if (cooldowns[dispatchKey]) {
+            delete cooldowns[dispatchKey];
+            safeWrite(cooldownPath, cooldowns);
+          }
+        } catch (e) { console.error('cooldown cleanup:', e.message); }
+
+        return jsonReply(res, 200, { ok: true, id, rematerialized: true });
+      }
 
       let found = false;
       mutateJsonFileLocked(wiPath, (items) => {

package/engine.js

@@ -493,8 +493,25 @@ async function spawnAgent(dispatchItem, config) {
                 await execAsync(`git merge "origin/${depBranch}" --no-edit`, { ..._gitOpts, cwd: worktreePath });
                 log('info', `Merged dependency branch ${depBranch} (${prId}) into worktree ${branchName}`);
               } catch (mergeErr) {
-                log('warn', `Failed to merge dependency ${depBranch} into ${branchName}: ${mergeErr.message}`);
-                depMergeFailed = true;
+                // Merge failed — possibly due to diverged history from a force-pushed (rebased) dep branch.
+                // Abort partial merge, reset worktree to clean main base, and re-merge all deps from scratch.
+                log('warn', `Merge of ${depBranch} into ${branchName} failed: ${mergeErr.message} — attempting reset and re-merge of all deps`);
+                try { await execAsync(`git merge --abort`, { ..._gitOpts, cwd: worktreePath }); } catch (_) { /* no merge in progress */ }
+                const mainRef = sanitizeBranch(shared.resolveMainBranch(rootDir, project.mainBranch));
+                try {
+                  await execAsync(`git reset --hard "origin/${mainRef}"`, { ..._gitOpts, cwd: worktreePath });
+                  log('info', `Reset worktree ${branchName} to origin/${mainRef} for clean dep re-merge`);
+                  // Re-merge ALL fetched dep branches from scratch on clean base
+                  for (const { branch: reBranch, prId: rePrId } of fetched) {
+                    await execAsync(`git merge "origin/${reBranch}" --no-edit`, { ..._gitOpts, cwd: worktreePath });
+                    log('info', `Re-merged dependency branch ${reBranch} (${rePrId}) into worktree ${branchName}`);
+                  }
+                  log('info', `Successfully re-merged all ${fetched.length} dep branches after reset for ${branchName}`);
+                } catch (resetErr) {
+                  log('warn', `Failed to reset and re-merge deps for ${branchName}: ${resetErr.message}`);
+                  try { await execAsync(`git merge --abort`, { ..._gitOpts, cwd: worktreePath }); } catch (_) { /* no merge in progress */ }
+                  depMergeFailed = true;
+                }
                 break;
               }
             }
@@ -1185,6 +1202,10 @@ function autoCleanPrdWorkItems(prdFile, config) {
       }
       return dispatch;
     });
+    // Reset PRD item status to 'missing' so engine re-materializes on next tick
+    for (const id of deletedIds) {
+      try { syncPrdItemStatus(id, 'missing', prdFile); } catch (e) { log('warn', `PRD status reset for ${id}: ${e.message}`); }
+    }
     log('info', `Plan sync: cleared ${deletedIds.length} pending/failed work items for ${prdFile}`);
   }
 }

package/package.json

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