@yemi33/minions 0.1.912 → 0.1.914

package/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## 0.1.912 (2026-04-13)
+## 0.1.914 (2026-04-13)
 
 ### Features
+- fix dep re-merge failure on retry with existing commits (#977)
 - audit and harden log buffering implementation (#971)
 - replace magic string 'active' with PR_STATUS.ACTIVE in lifecycle.js (#969)
 - fix dashboard plan-pause nested lock violation (#968)
@@ -16,6 +17,8 @@
 - add red dot notification on CC tab when response completes (#934) (#946)
 
 ### Fixes
+- prevent Create Plan from meeting saving doc-chat context bleed (#980)
+- plan completion incorrectly overrides awaiting-approval status (#970) (#978)
 -  CC queued messages sent to wrong tab after tab switch
 - pass sysPromptPath instead of steerPromptPath as system prompt in steering resume (#962)
 -  PRD item display dispatched/in-progress status conflation (closes #950) (#955)

package/dashboard/js/render-meetings.js

@@ -438,12 +438,19 @@ async function _createPlanFromMeeting(id, btn) {
         message: 'Create an actionable implementation plan from this meeting. Extract concrete action items from the conclusion and debates. For each item include: what to do, which files/areas to change, priority (high/medium/low), and estimated complexity (small/medium/large). Structure it as a plan ready for execution. Do NOT include preamble — start with the plan title.' + humanContext,
         document: meetingDoc,
         title: 'Meeting: ' + m.title,
+        freshSession: true,
       })
     });
     const genData = await genRes.json();
     if (!genRes.ok || !genData.ok) { resetBtn(); showToast('cmd-toast', 'Failed to generate plan: ' + (genData.error || 'unknown'), false); return; }
 
     const planContent = genData.answer || '';
+    // Guard: reject doc-chat meta-responses that aren't plan content
+    if (!planContent.trim() || !/^(#|\*\*|[-*] )/.test(planContent.trim())) {
+      resetBtn();
+      showToast('cmd-toast', 'Generated content does not look like a plan — try again', false);
+      return;
+    }
     const title = 'Meeting follow-up: ' + (m.title || id);
     const planRes = await fetch('/api/plans/create', {
       method: 'POST', headers: { 'Content-Type': 'application/json' },

package/dashboard/js/render-plans.js

@@ -81,14 +81,14 @@ function derivePlanStatus(prdFile, mdFile, prdJsonStatus, workItems) {
   if (prdJsonStatus === 'rejected') return 'rejected';
   if (prdJsonStatus === 'paused' && !allDone) return 'paused';
   if (prdJsonStatus === 'revision-requested') return 'revision-requested';
+  // PRD awaiting approval overrides WI-derived completion — new items may need materialization (#970)
+  if (prdJsonStatus === 'awaiting-approval') return 'awaiting-approval';
 
   // Derive from work item progress
   if (allDone && !hasActiveWork) return 'completed';
   if (hasActiveWork) return 'dispatched';
   if (hasPendingPrd) return 'converting';
   if (hasFailed && !hasActiveWork) return 'has-failures';
-
-  if (prdJsonStatus === 'awaiting-approval' && implementWi.length === 0) return 'awaiting-approval';
   if (prdJsonStatus === 'approved' && implementWi.length === 0) return 'approved';
 
   // plan-to-prd conversion done but no implement items and PRD is gone — truly completed

package/dashboard.js

@@ -783,13 +783,21 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
 }
 
 // Doc-specific wrapper — adds document context, parses ---DOCUMENT---
-async function ccDocCall({ message, document, title, filePath, selection, canEdit, isJson, model }) {
+async function ccDocCall({ message, document, title, filePath, selection, canEdit, isJson, model, freshSession }) {
   const sessionKey = filePath || title;
   const docSlice = document.slice(0, 20000);
 
+  // freshSession: true → discard any prior session for this key so the call starts clean.
+  // Used by one-shot generation flows (e.g. Create Plan from meeting) that must not
+  // bleed context from earlier conversations.
+  if (freshSession && sessionKey) {
+    docSessions.delete(sessionKey);
+    // Skip persistDocSessions() here — the post-call cleanup below handles persistence.
+  }
+
   // Skip re-sending full document on session resume if content unchanged
   const docHash = require('crypto').createHash('md5').update(docSlice).digest('hex').slice(0, 8);
-  const existing = resolveSession('doc', sessionKey);
+  const existing = freshSession ? null : resolveSession('doc', sessionKey);
   const docUnchanged = existing?.sessionId && existing._docHash === docHash;
 
   let docContext;
@@ -808,8 +816,14 @@ async function ccDocCall({ message, document, title, filePath, selection, canEdi
     skipStatePreamble: true,
     ...(model ? { model } : {}),
   });
-  // Store doc hash for next call's unchanged check
-  if (result.code === 0 && result.sessionId) {
+
+  if (freshSession && sessionKey) {
+    // One-shot call — discard the session ccCall just stored so it cannot
+    // bleed into future interactions under the same key.
+    docSessions.delete(sessionKey);
+    persistDocSessions();
+  } else if (result.code === 0 && result.sessionId) {
+    // Store doc hash for next call's unchanged check
     const session = resolveSession('doc', sessionKey);
     if (session) session._docHash = docHash;
   }
@@ -2843,6 +2857,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
         message: body.message, document: currentContent, title: body.title,
         filePath: body.filePath, selection: body.selection, canEdit, isJson,
         model: body.model || undefined,
+        freshSession: !!body.freshSession,
       });
 
       if (!content) return jsonReply(res, 200, { ok: true, answer, edited: false, actions });
@@ -4105,6 +4120,13 @@ What would you like to discuss or change? When you're happy, say "approve" and I
       const { title, content, project: projectName, meetingId } = body;
       if (!title || !content) return jsonReply(res, 400, { error: 'title and content required' });
 
+      // Reject meta-responses that aren't actual plan content — e.g. doc-chat
+      // summaries of prior conversations that reference existing plan files.
+      const trimmed = content.trim();
+      if (!/^#/.test(trimmed) && !/^\*\*/.test(trimmed) && !/^[-*] /.test(trimmed)) {
+        return jsonReply(res, 400, { error: 'Plan content must start with a markdown heading (#), bold text (**), or a list item' });
+      }
+
       const plansDir = path.join(MINIONS_DIR, 'plans');
       if (!fs.existsSync(plansDir)) fs.mkdirSync(plansDir, { recursive: true });
       const slug = shared.slugify(title);

package/engine.js

@@ -524,7 +524,37 @@ async function spawnAgent(dispatchItem, config) {
           }
           // Merge successfully-fetched + recovered (local-only pushed) branches sequentially
           const fetched = fetchable.filter((_, i) => fetchResults[i].status === 'fulfilled' || recoveredBranches.has(fetchable[i].branch));
-          if (!depMergeFailed) {
+          // Skip dep re-merge if worktree HEAD already contains all dep commits (#973)
+          let skipDepMerge = false;
+          if (!depMergeFailed && fetched.length > 0) {
+            const ancestorChecks = await Promise.all(
+              fetched.map(async ({ branch: depBranch }) => {
+                try {
+                  await execAsync(`git merge-base --is-ancestor "origin/${depBranch}" HEAD`, { ..._gitOpts, cwd: worktreePath });
+                  return true;
+                } catch (_) { return false; }
+              })
+            );
+            if (ancestorChecks.every(Boolean)) {
+              log('info', `All ${fetched.length} dep branch(es) already merged into ${branchName} — skipping dep re-merge`);
+              skipDepMerge = true;
+            }
+          }
+          // Stash uncommitted changes before dep merge if worktree is dirty (#973)
+          let stashed = false;
+          if (!depMergeFailed && !skipDepMerge && fetched.length > 0) {
+            try {
+              const statusOut = (await execAsync('git status --porcelain', { ..._gitOpts, cwd: worktreePath })).stdout.toString().trim();
+              if (statusOut) {
+                await execAsync('git stash push --include-untracked -m "engine: stash before dep re-merge"', { ..._gitOpts, cwd: worktreePath });
+                stashed = true;
+                log('info', `Stashed uncommitted changes in ${branchName} before dep merge`);
+              }
+            } catch (stashErr) {
+              log('warn', `Failed to stash changes in ${branchName} before dep merge: ${stashErr.message}`);
+            }
+          }
+          if (!depMergeFailed && !skipDepMerge) {
             for (const { branch: depBranch, prId } of fetched) {
               try {
                 await execAsync(`git merge "origin/${depBranch}" --no-edit`, { ..._gitOpts, cwd: worktreePath });
@@ -573,6 +603,15 @@ async function spawnAgent(dispatchItem, config) {
               }
             }
           }
+          // Restore stashed changes after dep merge (#973)
+          if (stashed) {
+            try {
+              await execAsync('git stash pop', { ..._gitOpts, cwd: worktreePath });
+              log('info', `Restored stashed changes in ${branchName} after dep merge`);
+            } catch (popErr) {
+              log('warn', `git stash pop failed in ${branchName}: ${popErr.message} — stash preserved for agent`);
+            }
+          }
           if (depMergeFailed) {
             _cleanupPromptFiles();
             // Build actionable failReason identifying the conflicting branch and files

package/package.json

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