@yemi33/minions 0.1.1770 → 0.1.1772

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.1.1772 (2026-05-07)
+
+### Features
+- fix copilot cc resume context (#2166)
+
+## 0.1.1771 (2026-05-07)
+
+### Features
+- clean merged pr local branches (#2165)
+
 ## 0.1.1770 (2026-05-07)
 
 ### Fixes

package/dashboard.js

@@ -10,6 +10,7 @@ const zlib = require('zlib');
 const fs = require('fs');
 const path = require('path');
 const llm = require('./engine/llm');
+const { resolveRuntime } = require('./engine/runtimes');
 
 // Dashboard version stamp — captured at module load so it reflects the code actually running
 const _dashboardVersion = {
@@ -1262,9 +1263,14 @@ function _readCcTabSessions({ prune = true } = {}) {
 const CC_CARRYOVER_MAX_TURNS = 20;
 const CC_CARRYOVER_PER_MSG_CHARS = 2000;
 
-function _buildTranscriptCarryover(transcript, { previousRuntime } = {}) {
+function _buildTranscriptCarryover(transcript, { previousRuntime, currentMessage } = {}) {
   if (!Array.isArray(transcript) || transcript.length === 0) return '';
-  const filtered = transcript.filter(m => m && (m.role === 'user' || m.role === 'assistant') && typeof m.text === 'string' && m.text.trim());
+  let filtered = transcript.filter(m => m && (m.role === 'user' || m.role === 'assistant') && typeof m.text === 'string' && m.text.trim());
+  const current = typeof currentMessage === 'string' ? currentMessage.trim() : '';
+  if (current && filtered.length > 0) {
+    const last = filtered[filtered.length - 1];
+    if (last.role === 'user' && last.text.trim() === current) filtered = filtered.slice(0, -1);
+  }
   if (filtered.length === 0) return '';
   const recent = filtered.slice(-CC_CARRYOVER_MAX_TURNS);
   const truncated = filtered.length > recent.length;
@@ -1281,6 +1287,19 @@ function _buildTranscriptCarryover(transcript, { previousRuntime } = {}) {
   return `${header}\n\n${truncationNote}${lines.join('\n\n')}\n\n--- Current message follows ---`;
 }
 
+function _ccRuntimeNeedsResumeCarryover(runtimeName) {
+  try {
+    const runtime = resolveRuntime(runtimeName);
+    return !!runtime?.capabilities?.resumePromptCarryover;
+  } catch {
+    return false;
+  }
+}
+
+function _joinCcPromptParts(...parts) {
+  return parts.filter(Boolean).join('\n\n---\n\n');
+}
+
 // Load persisted CC session on startup. CC chat sessions are non-expiring;
 // only restore-time validity checks here are sessionId presence (anything
 // else would auto-expire the user's chat without their consent).
@@ -2415,7 +2434,7 @@ async function _preflightModelCheck({ runtime: cliOverride, model: modelOverride
  * @param {number} opts.maxTurns - Max tool-use turns
  * @param {string} opts.allowedTools - Comma-separated tool list
  */
-async function ccCall(message, { store = 'cc', sessionKey, extraContext, label = 'command-center', timeout = CC_CALL_TIMEOUT_MS, maxTurns, allowedTools = 'Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch', skipStatePreamble = false, model, onAbortReady, systemPrompt = CC_STATIC_SYSTEM_PROMPT } = {}) {
+async function ccCall(message, { store = 'cc', sessionKey, extraContext, label = 'command-center', timeout = CC_CALL_TIMEOUT_MS, maxTurns, allowedTools = 'Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch', skipStatePreamble = false, model, onAbortReady, systemPrompt = CC_STATIC_SYSTEM_PROMPT, transcript } = {}) {
   if (!maxTurns) maxTurns = CONFIG.engine?.ccMaxTurns || shared.ENGINE_DEFAULTS.ccMaxTurns;
   if (!model) model = CONFIG.engine?.ccModel || shared.ENGINE_DEFAULTS.ccModel;
   const ccEffort = CONFIG.engine?.ccEffort || shared.ENGINE_DEFAULTS.ccEffort;
@@ -2428,10 +2447,15 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
 
   const existing = resolveSession(store, sessionKey);
   let sessionId = existing ? existing.sessionId : null;
+  const resumeNeedsCarryover = !!sessionId && _ccRuntimeNeedsResumeCarryover(shared.resolveCcCli(CONFIG.engine));
 
-  function buildPrompt({ includePreamble = true } = {}) {
+  function buildPrompt({ includePreamble = true, includeCarryover = false } = {}) {
     const parts = (!skipStatePreamble && includePreamble) ? [`## Current Minions State (${new Date().toISOString().slice(0, 16)})\n\n${buildCCStatePreamble()}`] : [];
     if (extraContext) parts.push(extraContext);
+    if (includeCarryover) {
+      const carryover = _buildTranscriptCarryover(transcript, { currentMessage: message });
+      if (carryover) parts.push(carryover);
+    }
     parts.push(message);
     return parts.join('\n\n---\n\n');
   }
@@ -2440,7 +2464,7 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
 
   // Attempt 1: resume existing session — skip preamble (session already has context)
   if (sessionId && maxTurns > 1) {
-    const p1 = llm.callLLM(buildPrompt({ includePreamble: false }), '', {
+    const p1 = llm.callLLM(buildPrompt({ includePreamble: false, includeCarryover: resumeNeedsCarryover }), '', {
       timeout, label, model, maxTurns, allowedTools, sessionId, effort: ccEffort, direct: true,
       engineConfig: CONFIG.engine,
     });
@@ -2477,7 +2501,7 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
   }
 
   // Attempt 2: fresh session (include preamble for full context)
-  const freshPrompt = buildPrompt();
+  const freshPrompt = buildPrompt({ includeCarryover: resumeNeedsCarryover });
   const p2 = llm.callLLM(freshPrompt, systemPrompt, {
     timeout, label, model, maxTurns, allowedTools, effort: ccEffort, direct: true,
     engineConfig: CONFIG.engine,
@@ -2511,7 +2535,7 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
   return result;
 }
 
-async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext, label = 'command-center', timeout = CC_CALL_TIMEOUT_MS, maxTurns, allowedTools = 'Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch', skipStatePreamble = false, model, onAbortReady, onChunk, onToolUse, onRetry, systemPrompt = CC_STATIC_SYSTEM_PROMPT } = {}) {
+async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext, label = 'command-center', timeout = CC_CALL_TIMEOUT_MS, maxTurns, allowedTools = 'Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch', skipStatePreamble = false, model, onAbortReady, onChunk, onToolUse, onRetry, systemPrompt = CC_STATIC_SYSTEM_PROMPT, transcript } = {}) {
   if (!maxTurns) maxTurns = CONFIG.engine?.ccMaxTurns || shared.ENGINE_DEFAULTS.ccMaxTurns;
   if (!model) model = CONFIG.engine?.ccModel || shared.ENGINE_DEFAULTS.ccModel;
   const ccEffort = CONFIG.engine?.ccEffort || shared.ENGINE_DEFAULTS.ccEffort;
@@ -2524,10 +2548,15 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
 
   const existing = resolveSession(store, sessionKey);
   let sessionId = existing ? existing.sessionId : null;
+  const resumeNeedsCarryover = !!sessionId && _ccRuntimeNeedsResumeCarryover(shared.resolveCcCli(CONFIG.engine));
 
-  function buildPrompt({ includePreamble = true } = {}) {
+  function buildPrompt({ includePreamble = true, includeCarryover = false } = {}) {
     const parts = (!skipStatePreamble && includePreamble) ? [`## Current Minions State (${new Date().toISOString().slice(0, 16)})\n\n${buildCCStatePreamble()}`] : [];
     if (extraContext) parts.push(extraContext);
+    if (includeCarryover) {
+      const carryover = _buildTranscriptCarryover(transcript, { currentMessage: message });
+      if (carryover) parts.push(carryover);
+    }
     parts.push(message);
     return parts.join('\n\n---\n\n');
   }
@@ -2535,7 +2564,7 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
   let result;
 
   if (sessionId && maxTurns > 1) {
-    const p1 = llm.callLLMStreaming(buildPrompt({ includePreamble: false }), '', {
+    const p1 = llm.callLLMStreaming(buildPrompt({ includePreamble: false, includeCarryover: resumeNeedsCarryover }), '', {
       timeout, label, model, maxTurns, allowedTools, sessionId, effort: ccEffort, direct: true,
       engineConfig: CONFIG.engine,
       onChunk,
@@ -2572,7 +2601,7 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
   }
 
   if (onRetry) onRetry(2);
-  const freshPrompt = buildPrompt();
+  const freshPrompt = buildPrompt({ includeCarryover: resumeNeedsCarryover });
   const p2 = llm.callLLMStreaming(freshPrompt, systemPrompt, {
     timeout, label, model, maxTurns, allowedTools, effort: ccEffort, direct: true,
     engineConfig: CONFIG.engine,
@@ -5754,7 +5783,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
         }
         const wasResume = !!(body.sessionId && body.sessionId === ccSession.sessionId && ccSessionValid());
 
-        const result = await ccCall(body.message, { store: 'cc' });
+        const result = await ccCall(body.message, { store: 'cc', transcript: body.transcript });
 
         // Non-zero exit with text = max_turns or partial success — still usable
         if (!result.text) {
@@ -5989,13 +6018,21 @@ What would you like to discuss or change? When you're happy, say "approve" and I
             sessionReset = true;
             sessionResetReason = 'runtimeChanged';
             previousRuntime = tabEntry.runtime;
+          } else if (tabEntry.sessionId && tabEntry.sessionId !== tabSessionId) {
+            tabSessionId = tabEntry.sessionId;
           }
         }
         const wasResume = !!tabSessionId;
         const sessionId = tabSessionId || null;
+        const resumeNeedsCarryover = wasResume && _ccRuntimeNeedsResumeCarryover(currentRuntime);
         const preamble = wasResume ? '' : buildCCStatePreamble();
-        const carryover = sessionReset ? _buildTranscriptCarryover(body.transcript, { previousRuntime }) : '';
-        const prompt = (preamble ? preamble + '\n\n---\n\n' : '') + (carryover ? carryover + '\n\n---\n\n' : '') + body.message;
+        const carryover = (sessionReset || resumeNeedsCarryover)
+          ? _buildTranscriptCarryover(body.transcript, {
+            previousRuntime: sessionReset ? previousRuntime : null,
+            currentMessage: body.message,
+          })
+          : '';
+        const prompt = _joinCcPromptParts(preamble, carryover, body.message);
 
         const { trackEngineUsage: trackUsage } = require('./engine/llm');
         const streamModel = CONFIG.engine?.ccModel || shared.ENGINE_DEFAULTS.ccModel;
@@ -6023,7 +6060,8 @@ What would you like to discuss or change? When you're happy, say "approve" and I
           // Resume failed (stale/expired session) — auto-retry as fresh session (skip if client already disconnected)
           console.log(`[CC-stream] Resume failed (code=${result.code}) — retrying fresh`);
           const freshPreamble = buildCCStatePreamble();
-          const freshPrompt = (freshPreamble ? freshPreamble + '\n\n---\n\n' : '') + body.message;
+          const freshCarryover = _buildTranscriptCarryover(body.transcript, { currentMessage: body.message });
+          const freshPrompt = _joinCcPromptParts(freshPreamble, freshCarryover, body.message);
           toolUses = []; // discard stale metadata from the failed resume attempt
           const retryPromise = _invokeCcStream({
             prompt: freshPrompt, sessionId: undefined, liveState, toolUses,
@@ -7695,6 +7733,9 @@ module.exports = {
   _createPipelineFromAction: createPipelineFromAction,
   executeCCActions,
   buildCCStatePreamble,
+  _buildTranscriptCarryover,
+  _ccRuntimeNeedsResumeCarryover,
+  _joinCcPromptParts,
   _captureApiRoutesMeta,
   _formatCcApiRoutesIndex,
   _formatCcCliCommandsIndex,

package/docs/copilot-cli-schema.md

@@ -17,6 +17,7 @@
 | `capabilities.modelDiscovery` | **`true`** | `GET https://api.githubcopilot.com/models` with a `gh auth token` Bearer returns HTTP 200 + a 24-model JSON catalog. |
 | `capabilities.streaming` | **`true`** | `--stream on` (default) emits `assistant.message_delta` events incrementally; `--stream off` suppresses deltas but the final `assistant.message` always arrives. |
 | `capabilities.sessionResume` | **`true`** | `--resume <session-id>` documented, and every `result` event emits `sessionId`. |
+| `capabilities.resumePromptCarryover` | **`true`** | Command Center resume turns should prepend the browser's recent Q&A transcript because Copilot's session store is opaque to Minions and can resume without enough conversational context. |
 | `capabilities.systemPromptFile` | **`false`** | No `--system-prompt-file` flag exists. Inject system prompt via a `<system>` block prepended to stdin. |
 | `capabilities.effortLevels` | **`true`** | `--effort` accepts `low|medium|high|xhigh` (no `max`). Adapter must map `'max' → 'xhigh'`. |
 | `capabilities.costTracking` | **`false`** | `result.usage` contains `premiumRequests` (count, not USD), no token counts, no cost. |

package/engine/cleanup.js

@@ -48,6 +48,105 @@ function worktreeMatchesBranch(dirLower, branch, actualBranch = '') {
   return worktreeBranchMatches(actualBranch, branch) || worktreeDirMatchesBranch(dirLower, branch);
 }
 
+function normalizeLocalBranchName(branch) {
+  return String(branch || '').trim().replace(/^refs\/heads\//i, '');
+}
+
+function isSafeLocalBranchName(branch) {
+  if (!branch || branch !== sanitizeBranch(branch)) return false;
+  if (branch.startsWith('-') || branch.includes('..') || branch.includes('@{')) return false;
+  if (branch.endsWith('/') || branch.endsWith('.lock')) return false;
+  return branch.split('/').every(part => part && part !== '.' && part !== '..' && !part.endsWith('.lock'));
+}
+
+function isProtectedLocalBranch(branch, project = {}) {
+  const protectedBranches = new Set(['main', 'master', 'trunk', 'develop', 'development', 'head']);
+  const configuredMain = normalizeLocalBranchName(project.mainBranch);
+  if (configuredMain) protectedBranches.add(configuredMain.toLowerCase());
+  return protectedBranches.has(branch.toLowerCase());
+}
+
+function localBranchWorktreeInUse(root, branch) {
+  try {
+    const out = String(shared.execSilent('git worktree list --porcelain', {
+      cwd: root, encoding: 'utf8', stdio: 'pipe', timeout: 10000, windowsHide: true,
+    }) || '');
+    return out.split(/\r?\n/).some(line => line.trim() === `branch refs/heads/${branch}`);
+  } catch {
+    return true;
+  }
+}
+
+function cleanupMergedPrLocalBranch(root, project, pr) {
+  const branch = normalizeLocalBranchName(pr?.branch);
+  const result = { deleted: false, forced: false, skipped: null };
+  if (pr?.status !== shared.PR_STATUS.MERGED) { result.skipped = 'not-merged'; return result; }
+  if (!root || !branch) { result.skipped = 'missing-branch'; return result; }
+  if (!isSafeLocalBranchName(branch)) { result.skipped = 'unsafe-branch-name'; return result; }
+  if (isProtectedLocalBranch(branch, project)) { result.skipped = 'protected-branch'; return result; }
+
+  try {
+    const current = String(shared.execSilent('git branch --show-current', {
+      cwd: root, encoding: 'utf8', stdio: 'pipe', timeout: 10000, windowsHide: true,
+    }) || '').trim();
+    if (current === branch) { result.skipped = 'current-branch'; return result; }
+  } catch {
+    result.skipped = 'current-branch-unknown';
+    return result;
+  }
+
+  if (localBranchWorktreeInUse(root, branch)) { result.skipped = 'branch-in-worktree'; return result; }
+
+  let localHead = '';
+  try {
+    localHead = String(shared.execSilent(`git rev-parse --verify "refs/heads/${branch}"`, {
+      cwd: root, encoding: 'utf8', stdio: 'pipe', timeout: 10000, windowsHide: true,
+    }) || '').trim();
+  } catch {
+    result.skipped = 'missing-local-branch';
+    return result;
+  }
+
+  try {
+    shared.execSilent(`git branch -d -- "${branch}"`, {
+      cwd: root, encoding: 'utf8', stdio: 'pipe', timeout: 15000, windowsHide: true,
+    });
+    log('info', `Post-merge cleanup: deleted local branch ${branch}`);
+    return { deleted: true, forced: false, skipped: null };
+  } catch (deleteErr) {
+    const localHeadLower = localHead.toLowerCase();
+    // Only use -D when the local tip still matches the merged PR head (or its remote-tracking ref);
+    // otherwise a reused local branch could lose unrelated work after the PR merged.
+    const proofHeads = [pr.headSha, pr._adoSourceCommit, pr.sourceCommit]
+      .map(v => String(v || '').trim().toLowerCase())
+      .filter(Boolean);
+    let safeToForce = proofHeads.includes(localHeadLower);
+    if (!safeToForce) {
+      try {
+        const remoteHead = String(shared.execSilent(`git rev-parse --verify "refs/remotes/origin/${branch}"`, {
+          cwd: root, encoding: 'utf8', stdio: 'pipe', timeout: 10000, windowsHide: true,
+        }) || '').trim().toLowerCase();
+        safeToForce = !!remoteHead && remoteHead === localHeadLower;
+      } catch { /* no matching remote-tracking branch */ }
+    }
+    if (!safeToForce) {
+      result.skipped = 'unproven-force-delete';
+      return result;
+    }
+    try {
+      shared.execSilent(`git branch -D -- "${branch}"`, {
+        cwd: root, encoding: 'utf8', stdio: 'pipe', timeout: 15000, windowsHide: true,
+      });
+      log('info', `Post-merge cleanup: force-deleted local branch ${branch} after merged PR confirmation`);
+      return { deleted: true, forced: true, skipped: null };
+    } catch (forceErr) {
+      log('warn', `Post-merge cleanup: failed to delete local branch ${branch}: ${forceErr.message || deleteErr.message}`);
+      result.skipped = 'delete-failed';
+      return result;
+    }
+  }
+}
+
 /**
  * Sweep leaked test-fixture meetings from a `meetings/` directory.
  *
@@ -342,9 +441,11 @@ async function runCleanup(config, verbose = false) {
         // Check if this worktree's branch is merged/abandoned
         // Prefer actual git branch metadata; compact Windows dirs intentionally omit branch names.
         const dirLower = dir.toLowerCase();
+        let matchedMergedBranch = '';
         for (const branch of mergedBranches) {
           if (worktreeMatchesBranch(dirLower, branch, actualBranch)) {
             shouldClean = true;
+            matchedMergedBranch = branch;
             break;
           }
         }
@@ -392,7 +493,7 @@ async function runCleanup(config, verbose = false) {
           } catch (e) { log('warn', 'check shared-branch protection: ' + e.message); }
         }
 
-        wtEntries.push({ dir, wtPath, mtime, shouldClean, isProtected, actualBranch });
+        wtEntries.push({ dir, wtPath, mtime, shouldClean, isProtected, actualBranch, matchedMergedBranch });
       }
 
       // Enforce max worktree cap — if over limit, mark oldest unprotected for cleanup
@@ -412,10 +513,14 @@ async function runCleanup(config, verbose = false) {
       // the initial status check and the actual deletion (Bug #15: TOCTOU race)
       const freshPrs = safeJson(projectPrPath(project)) || [];
       const freshMergedBranches = new Set();
+      const freshMergedPrByBranch = new Map();
       for (const pr of freshPrs) {
         if (pr.status === shared.PR_STATUS.MERGED || pr.status === shared.PR_STATUS.ABANDONED || pr.status === shared.PLAN_STATUS.COMPLETED) {
           if (pr.branch) freshMergedBranches.add(pr.branch);
         }
+        if (pr.status === shared.PR_STATUS.MERGED && pr.branch) {
+          freshMergedPrByBranch.set(sanitizeBranch(normalizeLocalBranchName(pr.branch)).toLowerCase(), pr);
+        }
       }
 
       for (const entry of wtEntries) {
@@ -446,6 +551,10 @@ async function runCleanup(config, verbose = false) {
           _killProcessInWorktree(entry.dir, activeProcesses, activeDispatchIds);
           if (shared.removeWorktree(entry.wtPath, root, worktreeRoot)) {
             cleaned.worktrees++;
+            const mergedPr = entry.matchedMergedBranch
+              ? freshMergedPrByBranch.get(sanitizeBranch(normalizeLocalBranchName(entry.matchedMergedBranch)).toLowerCase())
+              : null;
+            if (mergedPr) cleanupMergedPrLocalBranch(root, project, mergedPr);
             if (verbose) console.log(`  Removed worktree: ${entry.wtPath}`);
           } else {
             if (verbose) console.log(`  Failed to remove worktree ${entry.wtPath}`);
@@ -935,4 +1044,5 @@ module.exports = {
   worktreeDirMatchesBranch,  // exported for testing
   worktreeMatchesBranch,     // exported for testing
   getWorktreeBranch,         // exported for lifecycle cleanup
+  cleanupMergedPrLocalBranch, // exported for lifecycle cleanup and testing
 };

package/engine/copilot-models.json

@@ -1,5 +1,5 @@
 {
   "runtime": "copilot",
   "models": null,
-  "cachedAt": "2026-05-07T15:55:28.458Z"
+  "cachedAt": "2026-05-07T17:21:57.007Z"
 }

package/engine/lifecycle.js

@@ -7,14 +7,14 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const shared = require('./shared');
-const { safeRead, safeJson, safeJsonNoRestore, safeWrite, mutateJsonFileLocked, mutateWorkItems, execSilent, execAsync, projectPrPath, getPrLinks,
+const { safeRead, safeJson, safeJsonNoRestore, safeWrite, mutateJsonFileLocked, mutateWorkItems, execAsync, projectPrPath, getPrLinks,
   log, ts, dateStamp, WI_STATUS, DONE_STATUSES, PLAN_TERMINAL_STATUSES, WORK_TYPE, PLAN_STATUS, PRD_ITEM_STATUS, PR_STATUS, DISPATCH_RESULT,
   ENGINE_DEFAULTS, DEFAULT_AGENT_METRICS, FAILURE_CLASS } = shared;
 const { trackEngineUsage } = require('./llm');
 const { resolveRuntime } = require('./runtimes');
 const queries = require('./queries');
 const { isBranchActive } = require('./cooldown');
-const { worktreeMatchesBranch, getWorktreeBranch } = require('./cleanup');
+const { worktreeMatchesBranch, getWorktreeBranch, cleanupMergedPrLocalBranch } = require('./cleanup');
 const { getConfig, getInboxFiles, getNotes, getPrs, getDispatch,
   MINIONS_DIR, ENGINE_DIR, PLANS_DIR, PRD_DIR, INBOX_DIR, AGENTS_DIR } = queries;
 
@@ -1838,6 +1838,7 @@ async function handlePostMerge(pr, project, config, newStatus) {
   if (pr.branch && project) {
     const root = path.resolve(project.localPath);
     const wtRoot = path.resolve(root, config.engine?.worktreeRoot || '../worktrees');
+    let removedBranchWorktree = false;
     // Find worktrees matching this branch; compact Windows dirs require branch metadata.
     try {
       const dirs = require('fs').readdirSync(wtRoot);
@@ -1847,11 +1848,16 @@ async function handlePostMerge(pr, project, config, newStatus) {
         if (worktreeMatchesBranch(dirLower, pr.branch, getWorktreeBranch(wtPath)) || dir === pr.branch || dir === `bt-${prNum}`) {
           try {
             if (!require('fs').statSync(wtPath).isDirectory()) continue;
-            execSilent(`git worktree remove "${wtPath}" --force`, { cwd: root, stdio: 'pipe', timeout: 15000 });
-            log('info', `Post-merge cleanup: removed worktree ${dir}`);
+            if (shared.removeWorktree(wtPath, root, wtRoot)) {
+              removedBranchWorktree = true;
+              log('info', `Post-merge cleanup: removed worktree ${dir}`);
+            }
           } catch (err) { log('warn', `Failed to remove worktree ${dir}: ${err.message}`); }
         }
       }
+      if (removedBranchWorktree && newStatus === PR_STATUS.MERGED) {
+        cleanupMergedPrLocalBranch(root, project, pr);
+      }
     } catch (err) { log('warn', `Post-merge worktree cleanup: ${err.message}`); }
   }
 

package/engine/runtimes/claude.js

@@ -717,6 +717,8 @@ const capabilities = {
   fallbackModel: true,
   // Engine controls session persistence (writes session.json on completion)
   sessionPersistenceControl: true,
+  // Claude resume reliably restores prior turns; do not duplicate browser transcript.
+  resumePromptCarryover: false,
   // Adapter implements createStreamConsumer(ctx) — required by llm.js accumulator
   streamConsumer: true,
 };

package/engine/runtimes/copilot.js

@@ -874,6 +874,9 @@ const capabilities = {
   fallbackModel: false,
   // Copilot manages session state internally in ~/.copilot/session-state/
   sessionPersistenceControl: false,
+  // CC resumes should include recent visible Q&A in stdin because Minions cannot
+  // inspect or repair Copilot's opaque session-state store when it drops context.
+  resumePromptCarryover: true,
   // Adapter implements createStreamConsumer(ctx) — required by llm.js accumulator
   streamConsumer: true,
 };

package/package.json

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