@yemi33/minions 0.1.757 → 0.1.759

package/CHANGELOG.md

@@ -1,11 +1,13 @@
 # Changelog
 
-## 0.1.757 (2026-04-09)
+## 0.1.759 (2026-04-09)
 
 ### Features
 -  show branch strategy badge on PRD group header
 
 ### Fixes
+-  eliminate global ccSession corruption, clean up streaming state
+-  restore full streaming state (tools + partial text) on tab switch
 -  restored thinking UX matches original exactly (same bubble, layout)
 -  skip merged dependency branches instead of failing worktree setup
 -  restore same thinking UX when switching back to processing tab

package/dashboard/js/command-center.js

@@ -135,28 +135,38 @@ function ccSwitchTab(id) {
   for (var i = 0; i < tab.messages.length; i++) {
     ccAddMessage(tab.messages[i].role, tab.messages[i].html, true);
   }
-  // If this tab is still processing, restore the same thinking UX via addMessage (identical to original)
+  // If this tab is still processing, restore the full streaming UX (tools, partial text, thinking)
   if (tab._sending) {
     var dotPulse = '<span style="display:inline-flex;gap:3px;margin-left:6px;vertical-align:middle"><span style="width:4px;height:4px;background:var(--blue);border-radius:50%;animation:dotPulse 1.2s infinite"></span><span style="width:4px;height:4px;background:var(--blue);border-radius:50%;animation:dotPulse 1.2s infinite;animation-delay:0.2s"></span><span style="width:4px;height:4px;background:var(--blue);border-radius:50%;animation:dotPulse 1.2s infinite;animation-delay:0.4s"></span></span>';
     var restoreStart = tab._sendStartedAt || Date.now();
     var phases = [[0,'Thinking...'],[3000,'Reading minions context...'],[8000,'Analyzing...'],[15000,'Using tools to dig deeper...'],[30000,'Still working (multi-turn)...'],[60000,'Deep research in progress...']];
-    function _restoreThinkingHtml() {
+    function _restoreStreamHtml() {
+      var html = '';
+      var tools = tab._toolsUsed || [];
+      if (tools.length > 0) {
+        html += '<div style="margin-bottom:6px">';
+        tools.forEach(function(t) { html += '<div style="color:var(--blue);font-size:11px">\uD83D\uDD27 ' + escHtml(t) + '</div>'; });
+        html += '</div>';
+      }
+      var text = tab._streamedText || '';
+      if (text) html += renderMd(text);
       var ms = Date.now() - restoreStart;
       var label = 'Thinking...';
       for (var pi = phases.length - 1; pi >= 0; pi--) { if (ms >= phases[pi][0]) { label = phases[pi][1]; break; } }
       var secs = Math.floor(ms / 1000);
-      return '<div style="display:flex;align-items:center;gap:6px"><span style="color:var(--muted);font-size:11px">' + label + '</span>' + dotPulse + '<span style="margin-left:auto;font-size:10px;color:var(--muted)">' + secs + 's</span>' +
+      html += '<div style="margin-top:' + (text ? '6px' : '0') + ';display:flex;align-items:center;gap:6px"><span style="color:var(--muted);font-size:11px">' + label + '</span>' + dotPulse + '<span style="margin-left:auto;font-size:10px;color:var(--muted)">' + secs + 's</span>' +
         '<button onclick="ccAbort()" style="font-size:9px;padding:2px 8px;background:var(--surface2);border:1px solid var(--border);border-radius:4px;color:var(--red);cursor:pointer;margin-left:4px">Stop</button></div>';
+      return html;
     }
-    // Create as assistant message bubble (same as original)
-    ccAddMessage('assistant', _restoreThinkingHtml(), true);
+    ccAddMessage('assistant', _restoreStreamHtml(), true);
     var restoreDiv = el.lastElementChild;
     restoreDiv.id = 'cc-restore-thinking';
     el.scrollTop = el.scrollHeight;
     var restoreInterval = setInterval(function() {
       var re = document.getElementById('cc-restore-thinking');
       if (!re || !tab._sending) { clearInterval(restoreInterval); if (re) re.remove(); return; }
-      re.innerHTML = (typeof llmCopyBtn === 'function' ? '' : '') + _restoreThinkingHtml();
+      re.innerHTML = _restoreStreamHtml();
+      if (el.scrollHeight - el.scrollTop - el.clientHeight < 150) el.scrollTop = el.scrollHeight;
     }, 1000);
   }
   ccRenderTabBar();
@@ -448,8 +458,10 @@ async function _ccDoSend(message, skipUserMsg) {
   ];
 
   // Streaming state — declared before try so updateStreamDiv works during fetch
+  // Also saved on tab for restore when switching back
   var streamedText = '';
   var toolsUsed = [];
+  if (activeTab) { activeTab._streamedText = ''; activeTab._toolsUsed = []; }
 
   // Get active tab's sessionId to send with request
   var activeTab = _ccActiveTab();
@@ -526,9 +538,11 @@ async function _ccDoSend(message, skipUserMsg) {
           var evt = JSON.parse(line.slice(6));
           if (evt.type === 'chunk') {
             streamedText = evt.text;
+            if (activeTab) activeTab._streamedText = streamedText;
             updateStreamDiv();
           } else if (evt.type === 'tool') {
             toolsUsed.push(evt.name);
+            if (activeTab) activeTab._toolsUsed = toolsUsed.slice();
             updateStreamDiv();
             if (msgs.scrollHeight - msgs.scrollTop - msgs.clientHeight < 150) msgs.scrollTop = msgs.scrollHeight;
           } else if (evt.type === 'done') {
@@ -611,7 +625,7 @@ async function _ccDoSend(message, skipUserMsg) {
         ' <button onclick="ccNewTab()" style="margin-top:6px;padding:4px 12px;background:var(--surface2);border:1px solid var(--border);border-radius:4px;color:var(--muted);cursor:pointer;font-size:11px">New Session</button>');
     }
   } finally {
-    if (activeTab) { activeTab._sending = false; activeTab._abortController = null; }
+    if (activeTab) { activeTab._sending = false; activeTab._abortController = null; delete activeTab._streamedText; delete activeTab._toolsUsed; delete activeTab._sendStartedAt; }
     _ccSending = (_ccTabs.some(function(t) { return t._sending; }));
     try { clearInterval(phaseTimer); } catch { /* may not be defined if error before reader */ }
     try { localStorage.removeItem('cc-sending'); } catch {}

package/dashboard.js

@@ -3329,16 +3329,10 @@ What would you like to discuss or change? When you're happy, say "approve" and I
       req.on('close', () => { ccInFlightTabs.delete(tabId); if (_ccStreamAbort) _ccStreamAbort(); });
 
       try {
-        // Session management — per-tab: use sessionId from request if provided
+        // Session management — per-tab: use sessionId from request, don't mutate global ccSession
         const tabSessionId = body.sessionId || null;
-        if (tabSessionId) {
-          // Resume the tab's specific session
-          ccSession = { sessionId: tabSessionId, createdAt: ccSession.createdAt, lastActiveAt: Date.now(), turnCount: ccSession.turnCount || 0, _promptHash: _ccPromptHash };
-        } else if (!ccSessionValid()) {
-          ccSession = { sessionId: null, createdAt: null, lastActiveAt: null, turnCount: 0 };
-        }
-        const wasResume = !!tabSessionId || !!(ccSessionValid() && ccSession.sessionId);
-        const sessionId = tabSessionId || (wasResume ? ccSession.sessionId : null);
+        const wasResume = !!tabSessionId;
+        const sessionId = tabSessionId || null;
         const preamble = wasResume ? '' : buildCCStatePreamble();
         const prompt = (preamble ? preamble + '\n\n---\n\n' : '') + body.message;
 
@@ -3367,42 +3361,33 @@ What would you like to discuss or change? When you're happy, say "approve" and I
           const stderrTail = (result.stderr || '').trim().split('\n').filter(Boolean).slice(-3).join(' | ');
           console.error(`[CC-stream] Failed: code=${result.code}, stderr=${(result.stderr || '').slice(0, 500)}, stdout_tail=${(result.raw || '').slice(-500)}`);
           // If resuming a session failed, auto-reset so next attempt starts fresh
-          let retryHint;
-          if (wasResume && result.code !== 0) {
-            ccSession = { sessionId: null, createdAt: null, lastActiveAt: null, turnCount: 0 };
-            safeWrite(path.join(ENGINE_DIR, 'cc-session.json'), ccSession);
-            retryHint = 'Session was reset — send your message again to start fresh.';
-          } else {
-            retryHint = ccSession.sessionId
-              ? 'Your session is still active — just send your message again to retry.'
-              : 'Try clicking **New Session** and sending your message again.';
-          }
-          res.write('data: ' + JSON.stringify({ type: 'done', text: `I had trouble processing that ${debugInfo}. ${stderrTail ? 'Detail: ' + stderrTail : ''}\n\n${retryHint}`, actions: [], sessionId: ccSession.sessionId }) + '\n\n');
+          const retryHint = wasResume && result.code !== 0
+            ? 'Session was reset — send your message again to start fresh.'
+            : 'Send your message again to retry.';
+          // Return null sessionId on resume failure so client clears the stale session
+          const errorSessionId = (wasResume && result.code !== 0) ? null : tabSessionId;
+          res.write('data: ' + JSON.stringify({ type: 'done', text: `I had trouble processing that ${debugInfo}. ${stderrTail ? 'Detail: ' + stderrTail : ''}\n\n${retryHint}`, actions: [], sessionId: errorSessionId }) + '\n\n');
           res.end();
           return;
         }
 
         // Update session
+        // Persist tab→session mapping (no global ccSession mutation)
         const now = Date.now();
-        if (result.sessionId) {
-          ccSession = { sessionId: result.sessionId, createdAt: ccSession.createdAt || now, lastActiveAt: now, turnCount: (ccSession.turnCount || 0) + 1, _promptHash: _ccPromptHash };
-          safeWrite(path.join(ENGINE_DIR, 'cc-session.json'), ccSession);
-        }
-
-        // Persist tab→session mapping if tabId provided
+        const responseSessionId = result.sessionId || tabSessionId;
         const tabId = body.tabId;
-        if (tabId && ccSession.sessionId) {
+        if (tabId && responseSessionId) {
           try {
             const sessions = shared.safeJsonArr(CC_SESSIONS_PATH);
             const existing = sessions.find(s => s.id === tabId);
             const preview = (body.message || '').slice(0, 80);
             if (existing) {
-              existing.sessionId = ccSession.sessionId;
+              existing.sessionId = responseSessionId;
               existing.lastActiveAt = new Date(now).toISOString();
-              existing.turnCount = ccSession.turnCount;
+              existing.turnCount = (existing.turnCount || 0) + 1;
               existing.preview = preview;
             } else {
-              sessions.push({ id: tabId, title: (body.message || 'New chat').slice(0, 40), sessionId: ccSession.sessionId, createdAt: new Date(now).toISOString(), lastActiveAt: new Date(now).toISOString(), turnCount: ccSession.turnCount, preview });
+              sessions.push({ id: tabId, title: (body.message || 'New chat').slice(0, 40), sessionId: responseSessionId, createdAt: new Date(now).toISOString(), lastActiveAt: new Date(now).toISOString(), turnCount: 1, preview });
             }
             safeWrite(CC_SESSIONS_PATH, sessions);
           } catch { /* non-critical */ }
@@ -3410,7 +3395,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
 
         // Send final result with actions
         const { text: displayText, actions } = parseCCActions(result.text);
-        res.write('data: ' + JSON.stringify({ type: 'done', text: displayText, actions, sessionId: ccSession.sessionId, newSession: !wasResume }) + '\n\n');
+        res.write('data: ' + JSON.stringify({ type: 'done', text: displayText, actions, sessionId: responseSessionId, newSession: !wasResume }) + '\n\n');
         res.end();
       } finally {
         ccInFlightTabs.delete(tabId);

package/package.json

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