@yemi33/minions 0.1.911 → 0.1.913

package/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## 0.1.911 (2026-04-13)
+## 0.1.913 (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,7 @@
 - add red dot notification on CC tab when response completes (#934) (#946)
 
 ### Fixes
+-  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)
 - remove KB watchdog — checkpoint never written, restore never worked

package/dashboard/js/command-center.js

@@ -368,6 +368,7 @@ async function ccSend() {
   input.value = '';
 
   var tab = _ccActiveTab();
+  var originTabId = _ccActiveTabId;
   if (!tab) return;
   if (!tab._queue) tab._queue = [];
 
@@ -377,16 +378,16 @@ async function ccSend() {
     _renderQueueIndicator();
     return;
   }
-  var wasAborted = await _ccDoSend(message);
+  var wasAborted = await _ccDoSend(message, false, originTabId);
 
-  // Flush queued messages one at a time, pausing after abort to let server release ccInFlight
+  // Flush queued messages to the ORIGINAL tab, even if user switched tabs
   while (tab._queue && tab._queue.length > 0) {
     if (wasAborted) {
       await new Promise(function(r) { setTimeout(r, 1500); });
     }
     var next = tab._queue.shift();
     _renderQueueIndicator();
-    wasAborted = await _ccDoSend(next);
+    wasAborted = await _ccDoSend(next, false, originTabId);
   }
 }
 
@@ -407,29 +408,30 @@ function _renderQueueIndicator() {
   if (msgs.scrollHeight - msgs.scrollTop - msgs.clientHeight < 150) msgs.scrollTop = msgs.scrollHeight;
 }
 
-async function _ccDoSend(message, skipUserMsg) {
+async function _ccDoSend(message, skipUserMsg, forceTabId) {
   // Client-side /pin and /unpin — no LLM round-trip needed
   var pinMatch = message.match(/^\/(pin|unpin)\s+(.+)/i);
   if (pinMatch) {
-    if (!skipUserMsg) ccAddMessage('user', escHtml(message));
+    if (!skipUserMsg) ccAddMessage('user', escHtml(message), false, forceTabId);
     var pinAction = pinMatch[1].toLowerCase();
     var pinQuery = pinMatch[2].toLowerCase().trim();
     var found = _ccFindPinTarget(pinQuery);
     if (found) {
       var wasPinned = isPinned(found.key);
-      if (pinAction === 'pin' && !wasPinned) { togglePin(found.key); ccAddMessage('assistant', 'Pinned <strong>' + escHtml(found.label) + '</strong> to top'); }
-      else if (pinAction === 'unpin' && wasPinned) { togglePin(found.key); ccAddMessage('assistant', 'Unpinned <strong>' + escHtml(found.label) + '</strong>'); }
-      else { ccAddMessage('assistant', '<strong>' + escHtml(found.label) + '</strong> is already ' + (wasPinned ? 'pinned' : 'unpinned')); }
+      if (pinAction === 'pin' && !wasPinned) { togglePin(found.key); ccAddMessage('assistant', 'Pinned <strong>' + escHtml(found.label) + '</strong> to top', false, forceTabId); }
+      else if (pinAction === 'unpin' && wasPinned) { togglePin(found.key); ccAddMessage('assistant', 'Unpinned <strong>' + escHtml(found.label) + '</strong>', false, forceTabId); }
+      else { ccAddMessage('assistant', '<strong>' + escHtml(found.label) + '</strong> is already ' + (wasPinned ? 'pinned' : 'unpinned'), false, forceTabId); }
       showToast('cmd-toast', pinAction === 'pin' ? 'Pinned to top' : 'Unpinned', true);
       renderInbox(inboxData); renderKnowledgeBase();
     } else {
-      ccAddMessage('assistant', 'No inbox or KB item matching "' + escHtml(pinQuery) + '"');
+      ccAddMessage('assistant', 'No inbox or KB item matching "' + escHtml(pinQuery) + '"', false, forceTabId);
     }
     return;
   }
 
-  var activeTab = _ccActiveTab();
-  var activeTabId = _ccActiveTabId;
+  // Use forced tab ID (from queue flush) or fall back to current active tab
+  var activeTabId = forceTabId || _ccActiveTabId;
+  var activeTab = _ccTabs.find(function(t) { return t.id === activeTabId; }) || _ccActiveTab();
   if (!activeTab) return;
   activeTab._sending = true;
   activeTab._sendStartedAt = Date.now();

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.911",
+  "version": "0.1.913",
   "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"