@hueyexe/opencode-ensemble 0.9.0 → 0.10.0

package/dist/index.js

@@ -13,6 +13,109 @@ var __export = (target, all) => {
       set: __exportSetter.bind(all, name)
     });
 };
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+
+// src/log.ts
+function initLog(client3) {
+  _client = client3;
+}
+function log(msg) {
+  if (!_client)
+    return;
+  _client.app.log({ service: "ensemble", level: "info", message: msg }).catch(() => {});
+}
+var _client = null;
+
+// src/tools/merge-helper.ts
+var exports_merge_helper = {};
+__export(exports_merge_helper, {
+  preservedBranchName: () => preservedBranchName,
+  preserveBranch: () => preserveBranch,
+  mergeBranchRaw: () => mergeBranchRaw,
+  mergeBranch: () => mergeBranch,
+  gitStashPop: () => gitStashPop,
+  gitStash: () => gitStash,
+  gitReset: () => gitReset,
+  deleteBranch: () => deleteBranch
+});
+async function preserveBranch(sourceBranch, targetBranch, cwd) {
+  const proc = Bun.spawn(["git", "branch", targetBranch, sourceBranch], { cwd, stdout: "pipe", stderr: "pipe" });
+  const exit = await proc.exited;
+  if (exit !== 0) {
+    const stderr = await new Response(proc.stderr).text();
+    log(`merge-helper:preserve:failed src=${sourceBranch} target=${targetBranch} err=${stderr.trim()}`);
+    return false;
+  }
+  return true;
+}
+async function deleteBranch(branch, cwd) {
+  const proc = Bun.spawn(["git", "branch", "-D", branch], { cwd, stdout: "pipe", stderr: "pipe" });
+  const exit = await proc.exited;
+  if (exit !== 0) {
+    log(`merge-helper:delete:failed branch=${branch}`);
+    return false;
+  }
+  return true;
+}
+async function mergeBranchRaw(branch, cwd) {
+  const merge2 = Bun.spawn(["git", "merge", "--squash", branch], { cwd, stdout: "pipe", stderr: "pipe" });
+  const stderrPromise = new Response(merge2.stderr).text();
+  const mergeExit = await merge2.exited;
+  if (mergeExit !== 0) {
+    const stderr = await stderrPromise;
+    log(`merge-helper:merge:conflict branch=${branch} err=${stderr.trim()}`);
+    const abort = Bun.spawn(["git", "merge", "--abort"], { cwd, stdout: "pipe", stderr: "pipe" });
+    await abort.exited;
+    return { ok: false, error: stderr.trim() || `merge exited with code ${mergeExit}` };
+  }
+  return { ok: true };
+}
+async function gitStash(cwd) {
+  const stash = Bun.spawn(["git", "stash", "--include-untracked"], { cwd, stdout: "pipe", stderr: "pipe" });
+  const stashOut = await new Response(stash.stdout).text();
+  const stashExit = await stash.exited;
+  return stashExit === 0 && !stashOut.includes("No local changes");
+}
+async function gitReset(cwd) {
+  const reset = Bun.spawn(["git", "reset", "HEAD"], { cwd, stdout: "pipe", stderr: "pipe" });
+  await reset.exited;
+}
+async function gitStashPop(cwd) {
+  const pop = Bun.spawn(["git", "stash", "pop", "--index"], { cwd, stdout: "pipe", stderr: "pipe" });
+  const exit = await pop.exited;
+  if (exit !== 0) {
+    const fallback = Bun.spawn(["git", "stash", "pop"], { cwd, stdout: "pipe", stderr: "pipe" });
+    const fallbackExit = await fallback.exited;
+    if (fallbackExit !== 0) {
+      log("merge-helper:stash-pop:failed \u2014 stashed work remains in git stash list");
+      return false;
+    }
+  }
+  return true;
+}
+async function mergeBranch(branch, cwd) {
+  const didStash = await gitStash(cwd);
+  const result = await mergeBranchRaw(branch, cwd);
+  if (!result.ok) {
+    if (didStash) {
+      const restored = await gitStashPop(cwd);
+      if (!restored)
+        return { ok: false, error: `${result.error}. WARNING: stashed work could not be restored \u2014 check git stash list` };
+    }
+    return result;
+  }
+  await gitReset(cwd);
+  if (didStash) {
+    const restored = await gitStashPop(cwd);
+    if (!restored)
+      return { ok: true, error: "Merge succeeded but stashed work could not be restored \u2014 check git stash list" };
+  }
+  return { ok: true };
+}
+function preservedBranchName(teamName, memberName) {
+  return `ensemble/preserved/${teamName}/${memberName}`;
+}
+var init_merge_helper = () => {};
 
 // node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -15491,8 +15594,10 @@ function markDelivered(db, messageId) {
 }
 
 // src/recovery.ts
-async function recoverStaleMembers(db, client3) {
-  const stale = db.query(`SELECT tm.session_id FROM team_member tm
+init_merge_helper();
+async function recoverStaleMembers(db, client3, cwd) {
+  const stale = db.query(`SELECT tm.session_id, tm.worktree_branch, tm.name, tm.team_id, t.name as team_name
+     FROM team_member tm
      JOIN team t ON tm.team_id = t.id
      WHERE tm.status = 'busy' AND t.status = 'active'`).all();
   const result = db.run(`UPDATE team_member SET status = 'error', execution_status = 'idle', time_updated = ?
@@ -15500,6 +15605,14 @@ async function recoverStaleMembers(db, client3) {
        AND team_id IN (SELECT id FROM team WHERE status = 'active')`, [Date.now()]);
   if (client3) {
     for (const member of stale) {
+      if (cwd && member.worktree_branch && !member.worktree_branch.startsWith("ensemble/preserved/")) {
+        const safeBranch = preservedBranchName(member.team_name, member.name);
+        const ok = await preserveBranch(member.worktree_branch, safeBranch, cwd);
+        if (ok) {
+          db.run("UPDATE team_member SET worktree_branch = ? WHERE team_id = ? AND name = ?", [safeBranch, member.team_id, member.name]);
+          log(`recovery:branch:preserved src=${member.worktree_branch} target=${safeBranch}`);
+        }
+      }
       try {
         await client3.session.abort({ sessionID: member.session_id });
       } catch {}
@@ -15558,6 +15671,41 @@ async function recoverUndeliveredMessages(db, client3, registry2) {
   }
   return { redelivered };
 }
+async function recoverOrphanedBranches(db, cwd) {
+  let removed = 0;
+  const archivedTeams = db.query(`SELECT t.name FROM team t
+     WHERE t.status = 'archived'
+     AND NOT EXISTS (
+       SELECT 1 FROM team_member tm
+       WHERE tm.team_id = t.id AND tm.status NOT IN ('shutdown', 'error')
+     )`).all();
+  if (archivedTeams.length === 0)
+    return { removed: 0 };
+  const archivedNames = new Set(archivedTeams.map((t) => t.name));
+  const proc = Bun.spawn(["git", "branch", "--list", "ensemble/preserved/*"], { cwd, stdout: "pipe", stderr: "pipe" });
+  const stdoutPromise = new Response(proc.stdout).text();
+  await proc.exited;
+  const stdout = await stdoutPromise;
+  const branches = stdout.split(`
+`).map((b) => b.trim().replace(/^\* /, "")).filter(Boolean);
+  for (const branch of branches) {
+    const parts = branch.split("/");
+    if (parts.length < 4)
+      continue;
+    const teamName = parts[2];
+    if (!teamName || !archivedNames.has(teamName))
+      continue;
+    try {
+      const del = Bun.spawn(["git", "branch", "-D", branch], { cwd, stdout: "pipe", stderr: "pipe" });
+      const exitCode = await del.exited;
+      if (exitCode === 0) {
+        removed++;
+        log(`recovery:branch:deleted branch=${branch}`);
+      }
+    } catch {}
+  }
+  return { removed };
+}
 
 // src/state.ts
 class MemberRegistry {
@@ -15831,7 +15979,7 @@ function buildLeadSystemPrompt(db, teamId) {
     }
     lines.push("--- End Messages ---");
   }
-  lines.push("", "CRITICAL: Spawn teammates ONE AT A TIME. Send only ONE team_spawn call per response.", "Wait for the tool result before spawning the next teammate.", "Multiple team_spawn calls in a single response will cause timeouts.", "", "Teammates work asynchronously and message you when done.", "Do NOT poll team_status or team_tasks_list repeatedly \u2014 wait for messages.", "After spawning all teammates, tell the user what you've set up and wait.", "When all teammates finish, summarize results and suggest next steps.", "", "Before calling team_cleanup, verify teammates have committed their work.", "team_shutdown will warn you if a teammate has uncommitted changes.", "team_cleanup will block if any worktree has uncommitted changes \u2014 merge or commit first.");
+  lines.push("", "CRITICAL: Spawn teammates ONE AT A TIME. Send only ONE team_spawn call per response.", "Wait for the tool result before spawning the next teammate.", "Multiple team_spawn calls in a single response will cause timeouts.", "", "Teammates work asynchronously and message you when done.", "Do NOT poll team_status or team_tasks_list repeatedly \u2014 wait for messages.", "After spawning all teammates, tell the user what you've set up and wait.", "When all teammates finish, summarize results and suggest next steps.", "", "MERGE WORKFLOW:", "After a teammate finishes and you shut them down, use team_merge to merge their branch.", "Do NOT tell teammates to commit \u2014 they handle that themselves.", "Do NOT run git merge manually \u2014 use team_merge which handles stashing and unstaging.", "team_cleanup will safety-net merge any branches you forgot, but prefer explicit team_merge.", "", "Before calling team_cleanup, verify teammates have committed their work.", "team_shutdown will warn you if a teammate has uncommitted changes.", "team_cleanup will block if any worktree has uncommitted changes \u2014 merge or commit first.");
   return lines.join(`
 `);
 }
@@ -15890,18 +16038,6 @@ function buildTeamCompactionContext(db, teamId, role, memberName) {
   return lines.join(`
 `);
 }
-
-// src/log.ts
-var _client = null;
-function initLog(client3) {
-  _client = client3;
-}
-function log(msg) {
-  if (!_client)
-    return;
-  _client.app.log({ service: "ensemble", level: "info", message: msg }).catch(() => {});
-}
-
 // src/types.ts
 function findTeamBySession(db, registry2, sessionId) {
   const entry = registry2.getBySession(sessionId);
@@ -15933,7 +16069,8 @@ var DEFAULT_CONFIG = {
   stallMinSteps: 3,
   stallTokenThreshold: 500,
   timeoutMs: 30 * 60 * 1000,
-  rateLimitCapacity: 10
+  rateLimitCapacity: 10,
+  dashboardPort: 4747
 };
 function readConfigFile(filePath) {
   try {
@@ -15952,6 +16089,8 @@ function readConfigFile(filePath) {
       result.timeoutMs = raw.timeoutMs;
     if (typeof raw.rateLimitCapacity === "number")
       result.rateLimitCapacity = raw.rateLimitCapacity;
+    if (typeof raw.dashboardPort === "number")
+      result.dashboardPort = raw.dashboardPort;
     return result;
   } catch (err) {
     if (err && typeof err === "object" && "code" in err && err.code === "ENOENT")
@@ -16038,6 +16177,586 @@ class ProgressTracker {
   }
 }
 
+// src/dashboard-html.ts
+var DASHBOARD_HEAD = `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width,initial-scale=1.0">
+<title>Ensemble</title>
+<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'><circle cx='8' cy='8' r='6' fill='%2322c55e'/></svg>">
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=JetBrains+Mono:wght@400;600&display=swap" rel="stylesheet">
+<script src="https://cdn.tailwindcss.com"></script>
+<script>tailwind.config={theme:{extend:{colors:{base:{950:'#0c0e14',900:'#141822',850:'#1a1f2e',800:'#1e2433',700:'#2a3144',600:'#3a4358'},txt:{100:'#e2e8f0',200:'#c1c9d9',300:'#8892a8',400:'#5e6a82',500:'#4a5568'}},fontFamily:{sans:['Inter','system-ui','sans-serif'],mono:['JetBrains Mono','monospace']}}}}</script>
+<style>
+@media(prefers-reduced-motion:no-preference){
+@keyframes pulse{0%,100%{opacity:1}50%{opacity:.3}}
+@keyframes fadein{from{opacity:0;transform:translateY(3px)}to{opacity:1;transform:none}}
+@keyframes hl{from{background:rgba(59,130,246,.1)}to{background:transparent}}
+@keyframes shimmer{0%{background-position:-200% 0}100%{background-position:200% 0}}
+.pulse{animation:pulse 2s ease-in-out infinite}
+.fadein{animation:fadein .25s ease-out}
+.hl{animation:hl 1.5s ease-out}
+.shimmer{background:linear-gradient(90deg,#22c55e 0%,#4ade80 50%,#22c55e 100%)!important;background-size:200% 100%;animation:shimmer 1.5s ease-in-out}
+}
+.scroll::-webkit-scrollbar{width:5px}.scroll::-webkit-scrollbar-track{background:transparent}.scroll::-webkit-scrollbar-thumb{background:#2a3144;border-radius:3px}
+details summary::-webkit-details-marker{display:none}details summary{list-style:none}
+select{-webkit-appearance:none;appearance:none;background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10' viewBox='0 0 24 24' fill='none' stroke='%235e6a82' stroke-width='2.5'%3E%3Cpath d='M6 9l6 6 6-6'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right 8px center;padding-right:22px}
+.xp{max-height:0;overflow:hidden;transition:max-height .3s ease-out}.xp-open{max-height:3000px;transition:max-height .5s ease-in}
+.card-sel{outline:2px solid rgba(59,130,246,.4);outline-offset:1px}
+.md pre{background:#1a1f2e;border:1px solid #1e2433;border-radius:6px;padding:8px 12px;overflow-x:auto;margin:6px 0;font-size:12px;line-height:1.5}
+.md code{background:#1a1f2e;padding:1px 5px;border-radius:3px;font-size:12px}.md pre code{background:none;padding:0}
+.md strong{color:#e2e8f0;font-weight:600}.md em{color:#c1c9d9;font-style:italic}
+.md ul,.md ol{padding-left:18px;margin:4px 0}.md li{margin:2px 0}
+.md h1,.md h2,.md h3{color:#e2e8f0;font-weight:600;margin:8px 0 4px}.md h1{font-size:15px}.md h2{font-size:14px}.md h3{font-size:13px}
+.md a{color:#60a5fa;text-decoration:underline}.md p{margin:4px 0}
+#sco{display:none;position:fixed;inset:0;background:rgba(12,14,20,.85);backdrop-filter:blur(8px);z-index:100;align-items:center;justify-content:center}
+#sco.show{display:flex}
+#drawer{position:fixed;top:0;right:0;bottom:0;width:min(480px,85vw);background:#141822;border-left:1px solid #1e2433;z-index:90;transform:translateX(100%);transition:transform .25s ease-out;overflow-y:auto}
+#drawer.open{transform:translateX(0)}
+#drawer-bg{position:fixed;inset:0;background:rgba(12,14,20,.5);z-index:89;display:none}
+#drawer-bg.open{display:block}
+</style>
+</head>
+<body class="bg-base-950 text-txt-100 min-h-screen antialiased font-sans">
+<header class="fixed top-0 inset-x-0 h-11 bg-base-950/95 backdrop-blur border-b border-base-800 flex items-center justify-between px-4 z-50">
+<div class="flex items-center gap-3">
+<span class="font-mono font-semibold text-[13px] tracking-[.08em] text-txt-200">ensemble</span>
+<span class="text-base-700">|</span>
+<select id="sel" class="bg-base-900 border border-base-700 rounded-md px-2 py-[3px] text-[11px] text-txt-200 font-mono outline-none cursor-pointer hover:border-base-600 transition-colors"></select>
+</div>
+<div class="flex items-center gap-4">
+<div id="hring" class="w-6 h-6 rounded-full" title="Team health"></div>
+<div class="flex items-center gap-2">
+<span id="clk" class="text-[11px] text-txt-400 font-mono"></span>
+<span class="text-base-700">\xB7</span>
+<span id="cd" class="w-[7px] h-[7px] rounded-full bg-emerald-500 pulse"></span>
+<span id="ct" class="text-[11px] text-txt-400 font-mono">...</span>
+</div>
+</div>
+</header>
+<div id="sum" class="fixed top-11 inset-x-0 h-8 bg-base-900/80 backdrop-blur border-b border-base-800/50 flex items-center px-4 gap-4 text-[11px] text-txt-300 z-40"></div>
+<main class="pt-[76px] px-4 pb-16">
+<div id="empty" class="hidden flex-col items-center justify-center h-[70vh] gap-3">
+<div class="w-12 h-12 rounded-full border-2 border-base-700 flex items-center justify-center mb-2"><svg class="w-5 h-5 text-txt-500" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M12 4.5v15m7.5-7.5h-15"/></svg></div>
+<div class="text-txt-400 text-sm">Waiting for a team</div>
+<div class="text-txt-500 text-[11px]">Run <code class="px-1.5 py-0.5 bg-base-900 rounded text-txt-300 font-mono text-[11px]">team_create</code> in OpenCode to get started</div>
+</div>
+<div id="content" class="hidden">
+<div id="agents" class="grid gap-2 mb-4" style="grid-template-columns:repeat(auto-fill,minmax(300px,1fr))"></div>
+<div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+<div id="tasks" class="bg-base-900 rounded-lg p-3 border border-base-800/50"></div>
+<div id="activity" class="bg-base-900 rounded-lg p-3 border border-base-800/50"></div>
+</div>
+</div>
+</main>
+<div id="tl" class="fixed bottom-0 inset-x-0 h-10 bg-base-900/90 backdrop-blur border-t border-base-800 px-4 flex items-center z-40 overflow-x-auto scroll hidden"></div>
+<div id="sco" onclick="this.classList.remove('show')">
+<div class="bg-base-900 border border-base-800 rounded-lg p-6 max-w-sm" onclick="event.stopPropagation()">
+<div class="text-txt-200 font-semibold text-sm mb-4">Keyboard Shortcuts</div>
+<div class="grid grid-cols-2 gap-y-2 gap-x-6 text-[12px]">
+<div><kbd class="px-1.5 py-0.5 bg-base-800 rounded font-mono text-txt-300 text-[11px]">j</kbd> <span class="text-txt-400">Next agent</span></div>
+<div><kbd class="px-1.5 py-0.5 bg-base-800 rounded font-mono text-txt-300 text-[11px]">k</kbd> <span class="text-txt-400">Prev agent</span></div>
+<div><kbd class="px-1.5 py-0.5 bg-base-800 rounded font-mono text-txt-300 text-[11px]">Enter</kbd> <span class="text-txt-400">Expand agent</span></div>
+<div><kbd class="px-1.5 py-0.5 bg-base-800 rounded font-mono text-txt-300 text-[11px]">Esc</kbd> <span class="text-txt-400">Collapse all</span></div>
+<div><kbd class="px-1.5 py-0.5 bg-base-800 rounded font-mono text-txt-300 text-[11px]">1-9</kbd> <span class="text-txt-400">Switch team</span></div>
+<div><kbd class="px-1.5 py-0.5 bg-base-800 rounded font-mono text-txt-300 text-[11px]">?</kbd> <span class="text-txt-400">This help</span></div>
+</div>
+</div>
+</div>
+<div id="drawer-bg" onclick="closeDrawer()"></div>
+<div id="drawer" class="scroll p-4"></div>`;
+
+// src/dashboard-js-part1.ts
+var DASHBOARD_JS_PART1 = `
+let S=null,selId=null,fails=0,pollT=Date.now(),prevMC=0,selCard=-1;
+const expCards=new Set(),expMsgs=new Set();
+const E=s=>s?String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;'):'';
+const D=ms=>{const s=Math.floor(Math.abs(ms)/1000);return s<60?s+'s':s<3600?Math.floor(s/60)+'m':Math.floor(s/3600)+'h'};
+const T=e=>new Date(e).toLocaleTimeString('en-GB',{hour:'2-digit',minute:'2-digit',second:'2-digit'});
+function relT(ep){const ms=Date.now()-ep;if(ms<60000)return Math.floor(ms/1000)+'s ago';if(ms<3600000)return Math.floor(ms/60000)+'m ago';if(ms<86400000)return Math.floor(ms/3600000)+'h ago';return T(ep)}
+
+// Chip: small readable badge with background tint
+function chip(text,color){
+  var colors={
+    blue:'bg-blue-500/15 text-blue-400 border-blue-500/20',
+    green:'bg-emerald-500/15 text-emerald-400 border-emerald-500/20',
+    amber:'bg-amber-500/15 text-amber-400 border-amber-500/20',
+    red:'bg-red-500/15 text-red-400 border-red-500/20',
+    gray:'bg-base-700/40 text-txt-300 border-base-700/30',
+    muted:'bg-base-800/60 text-txt-400 border-base-700/20',
+  };
+  var c=colors[color]||colors.muted;
+  return '<span class="inline-flex items-center px-1.5 py-[1px] rounded text-[10px] font-medium border '+c+'">'+text+'</span>';
+}
+
+function md(s){
+  let h=E(s);
+  h=h.replace(/\`\`\`(\\w*)\\n([\\s\\S]*?)\`\`\`/g,function(_,l,c){return '<pre><code>'+c.trim()+'</code></pre>'});
+  h=h.replace(/\`([^\`]+)\`/g,'<code>$1</code>');
+  h=h.replace(/^### (.+)$/gm,'<h3>$1</h3>');
+  h=h.replace(/^## (.+)$/gm,'<h2>$1</h2>');
+  h=h.replace(/^# (.+)$/gm,'<h1>$1</h1>');
+  h=h.replace(/\\*\\*(.+?)\\*\\*/g,'<strong>$1</strong>');
+  h=h.replace(/\\*(.+?)\\*/g,'<em>$1</em>');
+  h=h.replace(/\\[([^\\]]+)\\]\\(([^)]+)\\)/g,'<a href="$2" target="_blank" rel="noopener">$1</a>');
+  h=h.replace(/^- (.+)$/gm,'<li>$1</li>');
+  h=h.replace(/(<li>.*<\\/li>\\n?)+/g,'<ul>$&</ul>');
+  h=h.replace(/^\\d+\\. (.+)$/gm,'<li>$1</li>');
+  h=h.replace(/\\n\\n/g,'</p><p>');
+  h=h.replace(/\\n/g,'<br>');
+  return '<p>'+h+'</p>';
+}
+
+function saveD(el){const s={};el.querySelectorAll('details').forEach((d,i)=>{s[i]=d.open});return s}
+function restD(el,s){if(!s)return;el.querySelectorAll('details').forEach((d,i)=>{if(i in s)d.open=s[i]})}
+function saveSc(el){const s=el.querySelector('.scroll');return s?s.scrollTop:0}
+function restSc(el,p){const s=el.querySelector('.scroll');if(s)s.scrollTop=p}
+function patch(el,h){if(el.innerHTML!==h)el.innerHTML=h}
+
+const ST={
+  busy:{c:'border-blue-500 bg-blue-500/[0.04]',d:'bg-blue-500',t:'text-blue-400',l:'working',dim:false},
+  ready:{c:'border-base-700 bg-base-950/50',d:'bg-txt-400',t:'text-txt-400',l:'idle',dim:true},
+  shutdown_requested:{c:'border-amber-500/50 bg-amber-500/[0.04]',d:'bg-amber-500',t:'text-amber-400',l:'stopping',dim:false},
+  shutdown:{c:'border-base-800 bg-base-950/30',d:'bg-base-700',t:'text-txt-500',l:'done',dim:true},
+  error:{c:'border-red-500/50 bg-red-500/[0.04]',d:'bg-red-500',t:'text-red-400',l:'error',dim:false},
+};
+const si=s=>ST[s]||ST.ready;
+const PR={high:'text-red-400 bg-red-500/10 border border-red-500/20',medium:'text-amber-400 bg-amber-500/10 border border-amber-500/20',low:'text-txt-400 bg-base-800 border border-base-700'};
+
+function parseR(c){const m=c.match(/<task-result>([\\s\\S]*?)<\\/task-result>/);if(!m)return null;const i=m[1],s=(i.match(/<status>([\\s\\S]*?)<\\/status>/)||[])[1]?.trim(),u=(i.match(/<summary>([\\s\\S]*?)<\\/summary>/)||[])[1]?.trim(),d=(i.match(/<details>([\\s\\S]*?)<\\/details>/)||[])[1]?.trim();return s&&u?{status:s,summary:u,details:d||''}:null}
+
+function allTeams(){
+  if(!S?.teams)return{active:[],archived:[]};
+  const active=[...S.teams.filter(t=>t.status==='active')].sort((a,b)=>b.timeUpdated-a.timeUpdated);
+  const archived=[...S.teams.filter(t=>t.status!=='active')].sort((a,b)=>b.timeUpdated-a.timeUpdated);
+  return{active,archived};
+}
+function cur(){const{active,archived}=allTeams(),all=[...active,...archived];if(!all.length)return null;if(selId){const t=all.find(t=>t.id===selId);if(t)return t}return active[0]||all[0]}
+
+function deriveHealth(t){
+  const mm=t.members||[];if(!mm.length)return{w:0,i:0,e:0,d:0,total:0};
+  return{w:mm.filter(m=>m.status==='busy').length,i:mm.filter(m=>m.status==='ready').length,e:mm.filter(m=>m.status==='error').length,d:mm.filter(m=>m.status==='shutdown'||m.status==='shutdown_requested').length,total:mm.length};
+}
+
+function deriveSparkline(name,msgs){
+  const mine=msgs.filter(m=>m.fromName===name).map(m=>m.timeCreated).sort();
+  if(mine.length<2)return '';
+  const min=mine[0],max=mine[mine.length-1],range=max-min||1;
+  const buckets=new Array(12).fill(0);
+  mine.forEach(t=>{const idx=Math.min(11,Math.floor((t-min)/range*12));buckets[idx]++});
+  const mx=Math.max(...buckets)||1;
+  const bars=buckets.map((v,i)=>{const h=Math.max(1,Math.round(v/mx*14));return '<rect x="'+(i*5)+'" y="'+(14-h)+'" width="3.5" height="'+h+'" rx="0.5" fill="currentColor" opacity="'+(0.3+v/mx*0.7)+'"/>'}).join('');
+  return '<svg class="inline-block text-blue-500/60" width="60" height="14" viewBox="0 0 60 14">'+bars+'</svg>';
+}
+
+function deriveTimeline(t){
+  const ev=[];
+  (t.members||[]).forEach(m=>{ev.push({t:m.timeCreated,type:'spawn',label:E(m.name)+' spawned',c:'bg-blue-400'});if(m.status==='shutdown')ev.push({t:m.timeUpdated,type:'off',label:E(m.name)+' shut down',c:'bg-txt-500'});if(m.status==='error')ev.push({t:m.timeUpdated,type:'err',label:E(m.name)+' error',c:'bg-red-500'})});
+  (t.messages||[]).forEach(m=>{const p=parseR(m.content);ev.push({t:m.timeCreated,type:'msg',label:E(m.fromName)+' \\u2192 '+(E(m.toName)||'all'),c:p?'bg-emerald-500':'bg-blue-400'})});
+  (t.tasks||[]).filter(x=>x.status==='completed').forEach(x=>{ev.push({t:x.timeUpdated,type:'done',label:'Task done',c:'bg-emerald-500'})});
+  return ev.sort((a,b)=>a.t-b.t).slice(-50);
+}
+
+function deriveThreads(msgs){
+  const threads={};
+  msgs.forEach(m=>{const k=m.fromName;if(!threads[k])threads[k]={from:m.fromName,msgs:[]};threads[k].msgs.push(m)});
+  return Object.values(threads).sort((a,b)=>b.msgs[0].timeCreated-a.msgs[0].timeCreated);
+}
+`;
+
+// src/dashboard-js-part2.ts
+var DASHBOARD_JS_PART2 = `
+function rSel(){
+  const el=document.getElementById('sel'),{active,archived}=allTeams(),c=cur();
+  if(!active.length&&!archived.length){el.innerHTML='<option>No teams</option>';return}
+  let h='';
+  if(active.length){h+='<optgroup label="Active">';h+=active.map(t=>'<option value="'+t.id+'">'+E(t.name)+' ('+relT(t.timeUpdated)+')</option>').join('');h+='</optgroup>'}
+  if(archived.length){h+='<optgroup label="Archived">';h+=archived.slice(0,5).map(t=>'<option value="'+t.id+'">'+E(t.name)+'</option>').join('');if(archived.length>5)h+='<option disabled>+ '+(archived.length-5)+' more</option>';h+='</optgroup>'}
+  if(el._lh!==h){el.innerHTML=h;el._lh=h}
+  if(c)el.value=c.id;
+}
+
+function rHealth(t){
+  const el=document.getElementById('hring'),h=deriveHealth(t);
+  if(!h.total){el.style.background='conic-gradient(#2a3144 0deg,#2a3144 360deg)';return}
+  const total=h.total,segs=[];let deg=0;
+  if(h.w){const d=h.w/total*360;segs.push('#3b82f6 '+deg+'deg '+(deg+d)+'deg');deg+=d}
+  if(h.i){const d=h.i/total*360;segs.push('#5e6a82 '+deg+'deg '+(deg+d)+'deg');deg+=d}
+  if(h.e){const d=h.e/total*360;segs.push('#ef4444 '+deg+'deg '+(deg+d)+'deg');deg+=d}
+  if(h.d){const d=h.d/total*360;segs.push('#2a3144 '+deg+'deg '+(deg+d)+'deg');deg+=d}
+  el.style.background='conic-gradient('+segs.join(',')+')';
+  el.style.mask='radial-gradient(circle at center,transparent 7px,black 8px)';
+  el.style.webkitMask=el.style.mask;
+}
+
+function rClock(t){
+  const el=document.getElementById('clk');
+  const now=new Date();
+  const hh=String(now.getHours()).padStart(2,'0'),mm=String(now.getMinutes()).padStart(2,'0'),ss=String(now.getSeconds()).padStart(2,'0');
+  const uptime=t?D(Date.now()-t.timeCreated):'';
+  el.textContent=hh+':'+mm+':'+ss+(uptime?' \\u00B7 '+uptime:'');
+}
+
+function rSum(t){
+  const el=document.getElementById('sum'),mm=t.members||[],tk=t.tasks||[],msgs=t.messages||[];
+  const h=deriveHealth(t),tc=tk.filter(x=>x.status==='completed').length;
+  patch(el,
+    '<span class="w-[6px] h-[6px] rounded-full '+(t.status==='active'?'bg-emerald-500':'bg-txt-500')+'"></span>'+
+    '<span class="font-mono font-semibold text-txt-200">'+E(t.name)+'</span>'+
+    (mm.length?chip(mm.length+' agent'+(mm.length!==1?'s':''),'gray'):'')+
+    (h.w?chip(h.w+' working','blue'):'')+
+    (h.i?chip(h.i+' idle','muted'):'')+
+    (h.d?chip(h.d+' done','muted'):'')+
+    (h.e?chip(h.e+' error','red'):'')+
+    (tk.length?chip(tc+'/'+tk.length+' tasks','green'):'')+
+    (msgs.length?chip(msgs.length+' msgs','muted'):'')
+  );
+}
+
+function rAgents(t){
+  const el=document.getElementById('agents'),mm=t.members||[];
+  if(!mm.length){patch(el,'<div class="col-span-full text-center py-12"><div class="text-txt-400 text-sm mb-1">No agents yet</div><div class="text-txt-500 text-[11px]">Spawn teammates with <code class="px-1 py-0.5 bg-base-900 rounded font-mono text-[10px]">team_spawn</code></div></div>');return}
+  const n=Date.now(),msgs=t.messages||[],sorted=[...mm].sort((a,b)=>{const o={busy:0,ready:1,shutdown_requested:2,error:3,shutdown:4};return(o[a.status]??5)-(o[b.status]??5)});
+  const html=sorted.map((m,idx)=>{
+    const s=si(m.status),task=(t.tasks||[]).find(x=>x.assignee===m.name&&x.status==='in_progress'),msg=msgs.find(x=>x.fromName===m.name);
+    const d=D(n-m.timeUpdated),mi=msg?relT(msg.timeCreated):'\\u2014';
+    const tt=task?.content,tr=tt&&tt.length>90?tt.slice(0,90)+'\\u2026':tt;
+    const spark=deriveSparkline(m.name,msgs);
+    const isSel=selCard===idx;
+    return '<div class="rounded-lg border '+s.c+' p-3 transition-all duration-300 cursor-pointer hover:border-base-600'+(s.dim?' opacity-50 hover:opacity-70':'')+(isSel?' card-sel':'')+'" data-card="'+E(m.name)+'" onclick="openDrawer(\\''+E(m.name)+'\\')">'+
+      '<div class="flex items-center gap-2">'+
+        '<span class="w-[8px] h-[8px] rounded-full '+s.d+(m.status==='busy'?' pulse':'')+' shrink-0"></span>'+
+        '<span class="font-mono font-semibold text-[14px] truncate">'+E(m.name)+'</span>'+
+        '<span class="text-[10px] px-1.5 py-[1px] rounded '+s.t+' bg-base-800/80 shrink-0">'+s.l+'</span>'+
+        spark+
+        '<span class="text-[10px] text-txt-500 ml-auto shrink-0">'+E(m.agent)+'</span>'+
+      '</div>'+
+      (tr?'<div class="mt-2 text-[13px] text-txt-200 leading-snug truncate">'+E(tr)+'</div>':'')+
+      '<div class="mt-2 flex items-center gap-1.5 flex-wrap">'+
+        chip(d,'muted')+chip('msg '+mi,'muted')+
+        (m.worktreeBranch?chip(E(m.worktreeBranch),'muted'):'')+
+      '</div></div>';
+  }).join('');
+  patch(el,html);
+}
+
+function openDrawer(name){
+  var t=cur();if(!t)return;
+  var m=(t.members||[]).find(x=>x.name===name);if(!m)return;
+  var s=si(m.status),msgs=(t.messages||[]).filter(x=>x.fromName===name);
+  var h='';
+  // Header
+  h+='<div class="flex items-center justify-between mb-4">';
+  h+='<div class="flex items-center gap-2"><span class="w-[10px] h-[10px] rounded-full '+s.d+(m.status==='busy'?' pulse':'')+'"></span><span class="font-mono font-semibold text-[16px]">'+E(m.name)+'</span><span class="text-[11px] px-2 py-[2px] rounded '+s.t+' bg-base-800/80">'+s.l+'</span></div>';
+  h+='<button onclick="closeDrawer()" class="text-txt-500 hover:text-txt-200 transition-colors p-1"><svg class="w-4 h-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6L6 18M6 6l12 12"/></svg></button>';
+  h+='</div>';
+  // Meta chips
+  var meta=[];
+  meta.push(chip(E(m.agent),'gray'));
+  if(m.model)meta.push(chip(E(m.model),'gray'));
+  meta.push(chip(E(m.executionStatus||m.status),m.status==='busy'?'blue':m.status==='error'?'red':'muted'));
+  if(m.planApproval&&m.planApproval!=='none')meta.push(chip(E(m.planApproval),m.planApproval==='approved'?'green':m.planApproval==='rejected'?'red':'amber'));
+  meta.push(chip('spawned '+relT(m.timeCreated),'muted'));
+  if(m.worktreeBranch)meta.push(chip(E(m.worktreeBranch),'muted'));
+  h+='<div class="flex flex-wrap gap-1.5 mb-4 pb-4 border-b border-base-800/50">'+meta.join('')+'</div>';
+  // Prompt
+  if(m.prompt){
+    h+='<div class="mb-4"><div class="text-txt-400 text-[10px] uppercase tracking-wider mb-2">Original Prompt</div>';
+    h+='<div class="text-[13px] text-txt-200 md bg-base-800/20 rounded-lg p-3 border border-base-800/30">'+md(m.prompt)+'</div></div>';
+  }
+  // Chat log
+  h+='<div class="text-txt-400 text-[10px] uppercase tracking-wider mb-3">Conversation</div>';
+  if(!msgs.length){h+='<div class="text-txt-500 text-[12px]">No messages yet</div>'}
+  else{
+    // Get all messages involving this agent (sent or received)
+    var allMsgs=(t.messages||[]).filter(function(x){return x.fromName===name||x.toName===name});
+    allMsgs.sort(function(a,b){return a.timeCreated-b.timeCreated});
+    allMsgs.forEach(function(am){
+      var isAgent=am.fromName===name;
+      var p=parseR(am.content);
+      var deliv=am.delivered?(am.read?'\\u2713\\u2713':'\\u2713'):'';
+      var align=isAgent?'mr-8':'ml-8';
+      var bubbleBg=isAgent?'bg-blue-500/[0.07] border-blue-500/20':'bg-base-800/40 border-base-700/30';
+      var sender=isAgent?E(am.fromName):'lead';
+      h+='<div class="mb-2 '+align+'">';
+      h+='<div class="rounded-xl border '+bubbleBg+' p-3">';
+      h+='<div class="flex items-center gap-2 mb-1.5">';
+      h+='<span class="text-[10px] font-medium '+(isAgent?'text-blue-400':'text-txt-300')+'">'+sender+'</span>';
+      h+=chip(relT(am.timeCreated),'muted');
+      if(am.toName)h+=chip('\\u2192 '+E(am.toName),'muted');
+      if(deliv)h+='<span class="text-txt-500 text-[10px] ml-auto">'+deliv+'</span>';
+      h+='</div>';
+      if(p){
+        h+='<div class="mb-1">'+chip(E(p.status),p.status==='completed'?'green':'red')+' <span class="text-[13px] text-txt-200 font-medium">'+E(p.summary)+'</span></div>';
+        if(p.details)h+='<div class="text-[12px] text-txt-300 md mt-2">'+md(p.details)+'</div>';
+      }else{
+        h+='<div class="text-[12px] text-txt-300 md">'+md(am.content)+'</div>';
+      }
+      h+='</div></div>';
+    });
+  }
+  document.getElementById('drawer').innerHTML=h;
+  document.getElementById('drawer').classList.add('open');
+  document.getElementById('drawer-bg').classList.add('open');
+}
+
+function closeDrawer(){
+  document.getElementById('drawer').classList.remove('open');
+  document.getElementById('drawer-bg').classList.remove('open');
+}
+
+function rTasks(t){
+  const el=document.getElementById('tasks'),tk=t.tasks||[];
+  if(!tk.length){patch(el,'<div class="text-txt-500 text-sm py-6 text-center">No tasks yet</div>');return}
+  const c=tk.filter(x=>x.status==='completed').length,pct=Math.max(Math.round(c/tk.length*100),tk.length>0?2:0);
+  const allDone=c===tk.length&&tk.length>0;
+  const g={in_progress:[],pending:[],completed:[],blocked:[],cancelled:[]};for(const x of tk)(g[x.status]||(g[x.status]=[])).push(x);
+  const ds=saveD(el);
+  const taskMap={};tk.forEach(x=>{taskMap[x.id]=x});
+  function grp(label,items,dc,defOpen){
+    if(!items.length)return'';
+    const rows=items.map(x=>{
+      const ic=x.status==='completed'?'\\u2713':x.status==='in_progress'?'\\u25CF':'\\u25CB';
+      const icl=x.status==='completed'?'text-emerald-500':x.status==='in_progress'?'text-blue-400':'text-txt-500';
+      const p=PR[x.priority]||PR.low,cn=x.content.length>55?x.content.slice(0,55)+'\\u2026':x.content;
+      let dep='';
+      if(x.dependsOn){const parent=taskMap[x.dependsOn];dep='<div class="text-[10px] text-txt-500 mt-0.5">\\u2514\\u2192 '+(parent?E(parent.content.slice(0,30)):E(x.dependsOn))+'</div>'}
+      return '<div class="flex items-start gap-2 py-1.5 px-1 rounded hover:bg-base-800/40 transition-colors">'+
+        '<span class="'+icl+' text-[11px] mt-[2px] shrink-0">'+ic+'</span>'+
+        '<div class="flex-1 min-w-0"><div class="text-[13px] text-txt-200 truncate">'+E(cn)+'</div>'+
+        '<div class="flex gap-2 mt-1 text-[10px]"><span class="rounded px-1.5 py-[0px] '+p+'">'+E(x.priority)+'</span>'+
+        '<span class="text-txt-500">'+(E(x.assignee)||'unassigned')+'</span></div>'+dep+'</div></div>';
+    }).join('');
+    return '<details '+(defOpen?'open':'')+'><summary class="flex items-center gap-2 text-[11px] text-txt-300 cursor-pointer py-1.5 hover:text-txt-200 transition-colors select-none">'+
+      '<svg class="w-3 h-3 transition-transform [details[open]>summary>&]:rotate-90" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M9 18l6-6-6-6"/></svg>'+
+      '<span class="w-[6px] h-[6px] rounded-full '+dc+'"></span>'+label+' <span class="text-txt-500">('+items.length+')</span></summary>'+
+      '<div class="ml-5 mt-1">'+rows+'</div></details>';
+  }
+  el.innerHTML='<div class="flex items-center gap-3 mb-3">'+
+    '<span class="text-[11px] text-txt-300 font-semibold uppercase tracking-wider">Tasks</span>'+
+    '<div class="flex-1 bg-base-800 rounded-full h-[5px]"><div class="'+(allDone?'shimmer':'bg-emerald-500')+' h-[5px] rounded-full transition-all duration-500" style="width:'+pct+'%"></div></div>'+
+    '<span class="text-[11px] text-txt-400 font-mono">'+c+'/'+tk.length+'</span>'+
+    (allDone?'<span class="text-emerald-400 text-[10px] font-medium">All complete</span>':'')+
+  '</div>'+
+  grp('In Progress',g.in_progress,'bg-blue-500',true)+grp('Pending',g.pending,'bg-txt-500',true)+grp('Blocked',g.blocked||[],'bg-amber-500',true)+grp('Completed',g.completed,'bg-emerald-500',false);
+  restD(el,ds);
+}
+
+function rActivity(t){
+  const el=document.getElementById('activity'),msgs=t.messages||[];
+  if(!msgs.length){patch(el,'<div class="text-txt-500 text-sm py-6 text-center">Waiting for agent messages...</div>');return}
+  const sp=saveSc(el);
+  const newCount=msgs.length,hasNew=newCount>prevMC&&prevMC>0;
+  let html='<div class="text-[11px] text-txt-300 font-semibold uppercase tracking-wider mb-3">Activity '+chip(msgs.length+' msgs','muted')+'</div>';
+  html+='<div class="max-h-[50vh] overflow-y-auto scroll space-y-2">';
+  msgs.slice(0,30).forEach(function(m,mi){
+    const isNew=hasNew&&mi<(newCount-prevMC);
+    const isExp=expMsgs.has(m.id);
+    const p=parseR(m.content);
+    const deliv=m.delivered?(m.read?'\\u2713\\u2713':'\\u2713'):'';
+    const isFromAgent=m.fromName!=='lead'&&m.fromName!=='system';
+    const align=isFromAgent?'mr-6':'ml-6';
+    const bubbleBg=isFromAgent?'bg-blue-500/[0.06] border-blue-500/15':'bg-base-800/40 border-base-700/30';
+    const initial=m.fromName.charAt(0).toUpperCase();
+    const avatarColor=m.fromName==='system'?'bg-amber-500/20 text-amber-400':isFromAgent?'bg-blue-500/20 text-blue-400':'bg-emerald-500/20 text-emerald-400';
+    html+='<div class="'+align+(isNew?' hl':'')+' cursor-pointer" data-msg="'+E(m.id)+'" onclick="toggleMsg(\\''+E(m.id)+'\\')">';
+    html+='<div class="flex items-start gap-2">';
+    html+='<span class="w-5 h-5 rounded-full '+avatarColor+' flex items-center justify-center text-[9px] font-semibold shrink-0 mt-0.5">'+E(initial)+'</span>';
+    html+='<div class="flex-1 min-w-0 rounded-xl border '+bubbleBg+' px-3 py-2">';
+    html+='<div class="flex items-center gap-1.5 mb-1">';
+    html+='<span class="text-[11px] font-medium '+(isFromAgent?'text-blue-400':'text-txt-300')+'">'+E(m.fromName)+'</span>';
+    if(m.toName)html+=chip('\\u2192 '+E(m.toName),'muted');
+    html+=chip(relT(m.timeCreated),'muted');
+    if(deliv)html+='<span class="text-txt-500 text-[10px] ml-auto">'+deliv+'</span>';
+    html+='</div>';
+    if(p){
+      html+='<div>'+chip(E(p.status),p.status==='completed'?'green':'red')+' <span class="text-[13px] text-txt-200">'+E(p.summary)+'</span></div>';
+      if(isExp&&p.details)html+='<div class="mt-2 text-[12px] text-txt-300 md">'+md(p.details)+'</div>';
+      if(!isExp&&p.details)html+='<div class="mt-1 text-[10px] text-txt-500">Click to expand details</div>';
+    }else{
+      if(isExp){html+='<div class="text-[12px] text-txt-300 md">'+md(m.content)+'</div>'}
+      else{const preview=m.content.length>120?m.content.slice(0,120)+'\\u2026':m.content;html+='<div class="text-[13px] text-txt-300 truncate">'+E(preview)+'</div>'}
+    }
+    html+='</div></div></div>';
+  });
+  if(msgs.length>30)html+='<div class="text-center text-[10px] text-txt-500 py-2">+'+(msgs.length-30)+' older messages</div>';
+  html+='</div>';
+  prevMC=newCount;
+  el.innerHTML=html;
+  restSc(el,sp);
+}
+
+function rTimeline(t){
+  const el=document.getElementById('tl'),evs=deriveTimeline(t);
+  if(!evs.length){el.classList.add('hidden');return}
+  el.classList.remove('hidden');
+  const html=evs.map(ev=>{
+    return '<div class="flex flex-col items-center mx-1 shrink-0 group" title="'+E(ev.label)+' \\u00B7 '+relT(ev.t)+'"><div class="w-[6px] h-[6px] rounded-full '+ev.c+' group-hover:scale-150 transition-transform"></div><div class="text-[8px] text-txt-500 mt-0.5 hidden group-hover:block whitespace-nowrap">'+E(ev.label)+'</div></div>';
+  }).join('<div class="w-3 h-px bg-base-700 shrink-0 self-center"></div>');
+  patch(el,'<span class="text-[9px] text-txt-500 uppercase tracking-wider mr-3 shrink-0">Timeline</span>'+html);
+}
+`;
+
+// src/dashboard-js-part3.ts
+var DASHBOARD_JS_PART3 = `
+function toggleMsg(id){if(expMsgs.has(id))expMsgs.delete(id);else expMsgs.add(id);render()}
+
+function render(){
+  rSel();const t=cur();
+  const empty=document.getElementById('empty'),content=document.getElementById('content');
+  if(!t){empty.classList.remove('hidden');empty.classList.add('flex');content.classList.add('hidden');document.getElementById('tl').classList.add('hidden');return}
+  empty.classList.add('hidden');empty.classList.remove('flex');content.classList.remove('hidden');
+  rHealth(t);rSum(t);rAgents(t);rTasks(t);rActivity(t);rTimeline(t);
+}
+
+function conn(ok){
+  document.getElementById('cd').className='w-[7px] h-[7px] rounded-full '+(ok?'bg-emerald-500 pulse':'bg-red-500');
+  document.getElementById('ct').textContent=ok?D(Date.now()-pollT)+' ago':'disconnected';
+}
+
+async function poll(){try{S=await(await fetch('/api/state')).json();fails=0;pollT=Date.now();conn(true);render()}catch{if(++fails>=3)conn(false)}}
+
+// Clock update every second
+setInterval(function(){var t=cur();if(t)rClock(t);if(fails<3)conn(true)},1000);
+
+// Poll every 2.5s
+setInterval(poll,2500);
+
+// Keyboard shortcuts
+document.addEventListener('keydown',function(e){
+  if(e.target.tagName==='INPUT'||e.target.tagName==='SELECT'||e.target.tagName==='TEXTAREA')return;
+  var t=cur();if(!t)return;
+  var mm=t.members||[];
+  if(e.key==='?'){e.preventDefault();document.getElementById('sco').classList.toggle('show');return}
+  if(e.key==='Escape'){closeDrawer();expMsgs.clear();selCard=-1;document.getElementById('sco').classList.remove('show');render();return}
+  if(e.key==='j'&&mm.length){e.preventDefault();selCard=Math.min(selCard+1,mm.length-1);render();return}
+  if(e.key==='k'&&mm.length){e.preventDefault();selCard=Math.max(selCard-1,0);render();return}
+  if(e.key==='Enter'&&selCard>=0&&selCard<mm.length){e.preventDefault();openDrawer(mm[selCard].name);return}
+  if(e.key>='1'&&e.key<='9'){
+    var teams=allTeams(),all=[...teams.active,...teams.archived];
+    var idx=parseInt(e.key)-1;
+    if(idx<all.length){selId=all[idx].id;render()}
+  }
+});
+
+// Select handler
+document.getElementById('sel').addEventListener('change',function(){selId=this.value;render()});
+
+// Initial poll
+poll();
+
+console.log('%c Ensemble Mission Control','font-size:14px;font-weight:bold;color:#22c55e');
+`;
+
+// src/dashboard.ts
+var DASHBOARD_HTML = DASHBOARD_HEAD + `
+<script>` + DASHBOARD_JS_PART1 + DASHBOARD_JS_PART2 + DASHBOARD_JS_PART3 + `</script>
+</body></html>`;
+function jsonResponse(data, status = 200) {
+  return new Response(JSON.stringify(data), {
+    status,
+    headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" }
+  });
+}
+function buildState(db) {
+  const teams = db.query("SELECT id, name, status, lead_agent, time_created, time_updated FROM team ORDER BY time_created DESC").all();
+  const memberStmt = db.query("SELECT name, agent, status, execution_status, worktree_branch, prompt, model, plan_approval, time_created, time_updated FROM team_member WHERE team_id = ?");
+  const taskStmt = db.query("SELECT id, content, status, priority, assignee, depends_on, time_created, time_updated FROM team_task WHERE team_id = ?");
+  const msgStmt = db.query("SELECT id, from_name, to_name, content, delivered, read, time_created FROM team_message WHERE team_id = ? ORDER BY time_created DESC LIMIT 50");
+  return {
+    teams: teams.map((t) => ({
+      id: t.id,
+      name: t.name,
+      status: t.status,
+      leadAgent: t.lead_agent,
+      timeCreated: t.time_created,
+      timeUpdated: t.time_updated,
+      members: memberStmt.all(t.id).map((m) => ({
+        name: m.name,
+        agent: m.agent,
+        status: m.status,
+        executionStatus: m.execution_status,
+        worktreeBranch: m.worktree_branch,
+        prompt: m.prompt,
+        model: m.model,
+        planApproval: m.plan_approval,
+        timeCreated: m.time_created,
+        timeUpdated: m.time_updated
+      })),
+      tasks: taskStmt.all(t.id).map((tk) => ({
+        id: tk.id,
+        content: tk.content,
+        status: tk.status,
+        priority: tk.priority,
+        assignee: tk.assignee,
+        dependsOn: tk.depends_on,
+        timeCreated: tk.time_created,
+        timeUpdated: tk.time_updated
+      })),
+      messages: msgStmt.all(t.id).map((msg) => ({
+        id: msg.id,
+        fromName: msg.from_name,
+        toName: msg.to_name,
+        content: msg.content,
+        delivered: msg.delivered === 1,
+        read: msg.read === 1,
+        timeCreated: msg.time_created
+      }))
+    }))
+  };
+}
+async function startDashboard(db, port) {
+  try {
+    const server2 = Bun.serve({
+      port,
+      fetch(req) {
+        const url2 = new URL(req.url);
+        if (url2.pathname === "/api/health") {
+          return jsonResponse({ ensemble: true, pid: process.pid });
+        }
+        if (url2.pathname === "/api/state") {
+          return jsonResponse(buildState(db));
+        }
+        if (url2.pathname === "/") {
+          return new Response(DASHBOARD_HTML, {
+            headers: { "Content-Type": "text/html" }
+          });
+        }
+        return new Response("Not Found", { status: 404 });
+      }
+    });
+    log(`dashboard:started port=${port} url=http://localhost:${port}`);
+    return server2;
+  } catch (err) {
+    if (err && typeof err === "object" && "code" in err && err.code === "EADDRINUSE") {
+      try {
+        const res = await fetch(`http://localhost:${port}/api/health`);
+        const data = await res.json();
+        if (data.ensemble && data.pid) {
+          let alive = false;
+          try {
+            process.kill(data.pid, 0);
+            alive = true;
+          } catch {}
+          if (alive && data.pid !== process.pid) {
+            log(`dashboard:already-running port=${port} pid=${data.pid}`);
+            return null;
+          }
+          log(`dashboard:stale-server port=${port} stale-pid=${data.pid} \u2014 run: kill -9 ${data.pid} || lsof -ti:${port} | xargs kill -9`);
+          return null;
+        }
+      } catch {}
+      log(`dashboard:port-in-use port=${port} (not an ensemble instance)`);
+      return null;
+    }
+    log(`dashboard:failed err=${err instanceof Error ? err.message : String(err)}`);
+    return null;
+  }
+}
+
 // src/tools/team-create.ts
 async function executeTeamCreate(deps, args, sessionId) {
   const nameError = validateTeamName(args.name);
@@ -16390,7 +17109,8 @@ async function executeTeamBroadcast(deps, args, sessionId) {
 }
 
 // src/tools/team-shutdown.ts
-async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktreeDirty) {
+init_merge_helper();
+async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktreeDirty, preserve = preserveBranch) {
   const teamInfo = requireLead(deps, sessionId);
   const member = deps.db.query("SELECT session_id, status, worktree_branch, worktree_dir FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, args.member);
   if (!member)
@@ -16399,8 +17119,8 @@ async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktre
     throw new Error(`Teammate "${args.member}" is already shut down`);
   const force = args.force ?? false;
   if (member.status === "shutdown_requested") {
-    await abortAndShutdown(deps, teamInfo.teamId, args.member, member.session_id);
-    const branchInfo = member.worktree_branch ? ` Changes on branch: ${member.worktree_branch}` : "";
+    await preserveAndAbort(deps, teamInfo.teamId, teamInfo.teamName, args.member, member.session_id, member.worktree_branch, preserve);
+    const branchInfo = getBranchInfo(deps, teamInfo.teamId, args.member);
     const dirtyWarning = await getDirtyWarning(member.worktree_dir, args.member, isDirty);
     return `Force shut down "${args.member}".${branchInfo}${dirtyWarning}`;
   }
@@ -16411,29 +17131,51 @@ async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktre
     isIdle = !sessionStatus || sessionStatus.type === "idle";
   } catch {}
   if (isIdle || force) {
-    await abortAndShutdown(deps, teamInfo.teamId, args.member, member.session_id);
-    const branchInfo = member.worktree_branch ? ` Changes on branch: ${member.worktree_branch}` : "";
+    await preserveAndAbort(deps, teamInfo.teamId, teamInfo.teamName, args.member, member.session_id, member.worktree_branch, preserve);
+    const branchInfo = getBranchInfo(deps, teamInfo.teamId, args.member);
     const dirtyWarning = await getDirtyWarning(member.worktree_dir, args.member, isDirty);
     return `Teammate "${args.member}" has been shut down.${branchInfo}${dirtyWarning}`;
   }
+  if (member.worktree_branch) {
+    const safeBranch = preservedBranchName(teamInfo.teamName, args.member);
+    const ok = await preserve(member.worktree_branch, safeBranch, deps.directory);
+    if (ok) {
+      deps.db.run("UPDATE team_member SET worktree_branch = ? WHERE team_id = ? AND name = ?", [safeBranch, teamInfo.teamId, args.member]);
+      log(`shutdown:branch:preserved-graceful src=${member.worktree_branch} target=${safeBranch}`);
+    }
+  }
   try {
-    await deps.client.session.promptAsync({
+    deps.client.session.promptAsync({
       sessionID: member.session_id,
       parts: [{
         type: "text",
         text: `[Shutdown requested]: The lead has requested you shut down. Finish your current task, send your final findings to the lead via team_message, then stop.`
       }]
-    });
+    }).catch(() => {});
   } catch {}
   deps.db.run("UPDATE team_member SET status = 'shutdown_requested', time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), teamInfo.teamId, args.member]);
   return `Shutdown requested for ${args.member}. They will finish current work and shut down. Call team_shutdown with force: true to abort immediately.`;
 }
-async function abortAndShutdown(deps, teamId, memberName, sessionId) {
+async function preserveAndAbort(deps, teamId, teamName, memberName, sessionId, worktreeBranch, preserve) {
+  if (worktreeBranch && !worktreeBranch.startsWith("ensemble/preserved/")) {
+    const safeBranch = preservedBranchName(teamName, memberName);
+    const ok = await preserve(worktreeBranch, safeBranch, deps.directory);
+    if (ok) {
+      deps.db.run("UPDATE team_member SET worktree_branch = ? WHERE team_id = ? AND name = ?", [safeBranch, teamId, memberName]);
+      log(`shutdown:branch:preserved src=${worktreeBranch} target=${safeBranch}`);
+    } else {
+      log(`shutdown:branch:preserve-failed src=${worktreeBranch} target=${safeBranch}`);
+    }
+  }
   try {
     await deps.client.session.abort({ sessionID: sessionId });
   } catch {}
   deps.db.run("UPDATE team_member SET status = 'shutdown', execution_status = 'idle', time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), teamId, memberName]);
 }
+function getBranchInfo(deps, teamId, memberName) {
+  const row = deps.db.query("SELECT worktree_branch FROM team_member WHERE team_id = ? AND name = ?").get(teamId, memberName);
+  return row?.worktree_branch ? ` Changes preserved on branch: ${row.worktree_branch}. Use team_merge to merge.` : "";
+}
 async function getDirtyWarning(worktreeDir, memberName, isDirty) {
   if (!worktreeDir)
     return "";
@@ -16448,40 +17190,8 @@ Warning: ${memberName} has uncommitted changes in their worktree. Commit or merg
 }
 
 // src/tools/team-cleanup.ts
-async function mergeAllBranches(branches, cwd) {
-  const merged = [];
-  const conflicted = [];
-  const stash = Bun.spawn(["git", "stash", "--include-untracked"], { cwd, stdout: "pipe", stderr: "pipe" });
-  const stashOut = await new Response(stash.stdout).text();
-  const stashExit = await stash.exited;
-  const didStash = stashExit === 0 && !stashOut.includes("No local changes");
-  for (const branch of branches) {
-    const merge2 = Bun.spawn(["git", "merge", "--squash", branch], { cwd, stdout: "pipe", stderr: "pipe" });
-    const stderrPromise = new Response(merge2.stderr).text();
-    const exit = await merge2.exited;
-    if (exit !== 0) {
-      const stderr = await stderrPromise;
-      log(`cleanup:merge:conflict branch=${branch} err=${stderr.trim()}`);
-      const abort = Bun.spawn(["git", "merge", "--abort"], { cwd, stdout: "pipe", stderr: "pipe" });
-      await abort.exited;
-      conflicted.push(branch);
-    } else {
-      const del = Bun.spawn(["git", "branch", "-D", branch], { cwd, stdout: "pipe", stderr: "pipe" });
-      await del.exited;
-      merged.push(branch);
-    }
-  }
-  if (merged.length > 0) {
-    const reset = Bun.spawn(["git", "reset", "HEAD"], { cwd, stdout: "pipe", stderr: "pipe" });
-    await reset.exited;
-  }
-  if (didStash) {
-    const pop = Bun.spawn(["git", "stash", "pop", "--index"], { cwd, stdout: "pipe", stderr: "pipe" });
-    await pop.exited;
-  }
-  return { merged, conflicted };
-}
-async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty, mergeAll = mergeAllBranches, mergeOnCleanup = true) {
+init_merge_helper();
+async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty, merge2 = mergeBranch, delBranch = deleteBranch, mergeOnCleanup = true) {
   const teamInfo = requireLead(deps, sessionId);
   const members = deps.db.query("SELECT name, session_id, status, worktree_dir, worktree_branch, workspace_id FROM team_member WHERE team_id = ?").all(teamInfo.teamId);
   const active = members.filter((m) => m.status !== "shutdown" && m.status !== "shutdown_requested" && m.status !== "error");
@@ -16513,24 +17223,35 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
   }
   if (args.force) {
     for (const member of active) {
+      if (member.worktree_branch && !member.worktree_branch.startsWith("ensemble/preserved/")) {
+        const safeBranch = preservedBranchName(teamInfo.teamName, member.name);
+        const ok = await preserveBranch(member.worktree_branch, safeBranch, deps.directory);
+        if (ok) {
+          deps.db.run("UPDATE team_member SET worktree_branch = ? WHERE team_id = ? AND name = ?", [safeBranch, teamInfo.teamId, member.name]);
+          member.worktree_branch = safeBranch;
+        }
+      }
       try {
         await deps.client.session.abort({ sessionID: member.session_id });
       } catch {}
     }
   }
-  const branches = members.map((m) => m.worktree_branch).filter((b) => b !== null);
-  let mergeResult = "";
-  if (branches.length > 0 && mergeOnCleanup) {
-    const { merged, conflicted } = await mergeAll(branches, deps.directory);
-    const parts = [];
-    if (merged.length > 0) {
-      parts.push(`Merged ${merged.length} branch(es) into working directory (unstaged). Review changes with: git diff`);
-    }
-    if (conflicted.length > 0) {
-      parts.push(`Could not auto-merge: ${conflicted.join(", ")}. Merge manually with: git merge <branch>`);
+  const unmerged = members.filter((m) => m.worktree_branch !== null);
+  const merged = [];
+  const conflicted = [];
+  if (unmerged.length > 0 && mergeOnCleanup) {
+    for (const member of unmerged) {
+      const branch = member.worktree_branch;
+      const result = await merge2(branch, deps.directory);
+      if (result.ok) {
+        await delBranch(branch, deps.directory);
+        deps.db.run("UPDATE team_member SET worktree_branch = NULL WHERE team_id = ? AND name = ?", [teamInfo.teamId, member.name]);
+        merged.push(`${member.name} (${branch})`);
+      } else {
+        log(`cleanup:merge:conflict member=${member.name} branch=${branch} err=${result.error}`);
+        conflicted.push(`${member.name} (${branch})`);
+      }
     }
-    mergeResult = parts.join(`
-`);
   }
   for (const member of members) {
     if (member.workspace_id) {
@@ -16549,19 +17270,43 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
   deps.db.run("UPDATE team SET status = 'archived', time_updated = ? WHERE id = ?", [Date.now(), teamInfo.teamId]);
   deps.registry.unregisterTeam(teamInfo.teamId);
   spawnFailures.delete(teamInfo.teamId);
-  if (mergeResult) {
-    return `Team "${teamInfo.teamName}" cleaned up.
-${mergeResult}`;
+  const parts = [`Team "${teamInfo.teamName}" cleaned up.`];
+  if (merged.length > 0) {
+    parts.push(`Safety-net merged ${merged.length} unmerged branch(es): ${merged.join(", ")}. Review with: git diff`);
   }
-  if (branches.length > 0) {
-    const mergeCommands = branches.map((b) => `  git merge ${b}`).join(`
+  if (conflicted.length > 0) {
+    parts.push(`Could not auto-merge: ${conflicted.join(", ")}. Merge manually.`);
+  }
+  return parts.join(`
 `);
-    return `Team "${teamInfo.teamName}" cleaned up. Worktrees removed.
+}
+
+// src/tools/team-merge.ts
+init_merge_helper();
+async function executeTeamMerge(deps, args, sessionId, merge2 = mergeBranch, delBranch = deleteBranch) {
+  const teamInfo = requireLead(deps, sessionId);
+  const member = deps.db.query("SELECT status, worktree_branch FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, args.member);
+  if (!member)
+    throw new Error(`Teammate "${args.member}" not found in team "${teamInfo.teamName}"`);
+  if (member.status !== "shutdown" && member.status !== "error") {
+    throw new Error(`Teammate "${args.member}" is still active (status: ${member.status}). Shut them down first with team_shutdown.`);
+  }
+  if (!member.worktree_branch) {
+    throw new Error(`No branch to merge for "${args.member}". They may not have a worktree, or their work was already merged.`);
+  }
+  const branch = member.worktree_branch;
+  log(`merge:start member=${args.member} branch=${branch}`);
+  const result = await merge2(branch, deps.directory);
+  if (!result.ok) {
+    return `Merge conflict with ${args.member}'s branch (${branch}). Resolve manually:
+  git merge --squash ${branch}
 
-Merge teammate branches:
-${mergeCommands}`;
+Error: ${result.error}`;
   }
-  return `Team "${teamInfo.teamName}" cleaned up.`;
+  await delBranch(branch, deps.directory);
+  deps.db.run("UPDATE team_member SET worktree_branch = NULL WHERE team_id = ? AND name = ?", [teamInfo.teamId, args.member]);
+  log(`merge:done member=${args.member} branch=${branch}`);
+  return `Merged ${args.member}'s changes into working directory (unstaged). Review with: git diff`;
 }
 
 // src/tools/team-tasks-list.ts
@@ -16823,6 +17568,7 @@ class TokenBucket {
 }
 
 // src/watchdog.ts
+init_merge_helper();
 class Watchdog {
   db;
   client;
@@ -16833,6 +17579,7 @@ class Watchdog {
   stallThresholdMs;
   stallMinSteps;
   stallTokenThreshold;
+  cwd;
   timer;
   constructor(opts) {
     this.db = opts.db;
@@ -16844,6 +17591,7 @@ class Watchdog {
     this.stallThresholdMs = opts.stallThresholdMs ?? 0;
     this.stallMinSteps = opts.stallMinSteps ?? 3;
     this.stallTokenThreshold = opts.stallTokenThreshold ?? 500;
+    this.cwd = opts.cwd;
   }
   static STALE_THRESHOLD_MS = Number(process.env.STALE_WORKTREE_THRESHOLD_MS) || 300000;
   async cleanupStaleWorktrees() {
@@ -16907,13 +17655,21 @@ class Watchdog {
     if (this.ttlMs === 0)
       return;
     const cutoff = Date.now() - this.ttlMs;
-    const stale = this.db.query(`SELECT tm.team_id, tm.name, tm.session_id
+    const stale = this.db.query(`SELECT tm.team_id, tm.name, tm.session_id, tm.worktree_branch, t.name as team_name
        FROM team_member tm
        JOIN team t ON tm.team_id = t.id
        WHERE t.status = 'active'
          AND tm.status = 'busy'
          AND tm.time_updated < ?`).all(cutoff);
     for (const member of stale) {
+      if (this.cwd && member.worktree_branch && !member.worktree_branch.startsWith("ensemble/preserved/")) {
+        const safeBranch = preservedBranchName(member.team_name, member.name);
+        const ok = await preserveBranch(member.worktree_branch, safeBranch, this.cwd);
+        if (ok) {
+          this.db.run("UPDATE team_member SET worktree_branch = ? WHERE team_id = ? AND name = ?", [safeBranch, member.team_id, member.name]);
+          log(`watchdog:branch:preserved src=${member.worktree_branch} target=${safeBranch}`);
+        }
+      }
       this.db.run("UPDATE team_member SET status = 'error', execution_status = 'timed_out', time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), member.team_id, member.name]);
       try {
         await this.client.session.abort({ sessionID: member.session_id });
@@ -16964,7 +17720,7 @@ var plugin = async (input) => {
   const deps = { db, registry: registry2, tracker, client: client3, directory: input.directory };
   if (!isWorktreeInstance(input.directory)) {
     log("init:recovery:start (main instance)");
-    const recovery = await recoverStaleMembers(db, client3);
+    const recovery = await recoverStaleMembers(db, client3, input.directory);
     if (recovery.interrupted > 0) {
       log(`init:recovery:interrupted=${recovery.interrupted}`);
       const members = db.query("SELECT tm.team_id, tm.name, tm.session_id FROM team_member tm JOIN team t ON tm.team_id = t.id WHERE t.status = 'active'").all();
@@ -16978,7 +17734,15 @@ var plugin = async (input) => {
     recoverOrphanedWorktrees(db, client3).catch((err) => {
       log(`init:recover-worktrees:failed err=${err instanceof Error ? err.message : String(err)}`);
     });
+    recoverOrphanedBranches(db, input.directory).catch((err) => {
+      log(`init:recover-branches:failed err=${err instanceof Error ? err.message : String(err)}`);
+    });
     log("init:recovery:done");
+    if (config2.dashboardPort !== 0) {
+      startDashboard(db, config2.dashboardPort).catch((err) => {
+        log(`init:dashboard:failed err=${err instanceof Error ? err.message : String(err)}`);
+      });
+    }
   } else {
     log(`init:skip-recovery (worktree instance: ${input.directory})`);
   }
@@ -16996,7 +17760,8 @@ var plugin = async (input) => {
     progressTracker,
     stallThresholdMs: config2.stallThresholdMs,
     stallMinSteps: config2.stallMinSteps,
-    stallTokenThreshold: config2.stallTokenThreshold
+    stallTokenThreshold: config2.stallTokenThreshold,
+    cwd: input.directory
   });
   watchdog.start();
   return {
@@ -17031,12 +17796,22 @@ var plugin = async (input) => {
               });
             } catch {}
           } else if (transition.to === "busy_while_shutdown") {
-            const entry = registry2.getBySession(sessionID);
-            if (entry) {
-              try {
-                await client3.session.abort({ sessionID });
-              } catch {}
+            const member = deps.db.query("SELECT worktree_branch, name, team_id FROM team_member WHERE session_id = ?").get(sessionID);
+            if (member?.worktree_branch && !member.worktree_branch.startsWith("ensemble/preserved/")) {
+              const teamRow = deps.db.query("SELECT name FROM team WHERE id = ?").get(member.team_id);
+              if (teamRow) {
+                const { preserveBranch: preserve, preservedBranchName: branchName } = await Promise.resolve().then(() => (init_merge_helper(), exports_merge_helper));
+                const safeBranch = branchName(teamRow.name, member.name);
+                const ok = await preserve(member.worktree_branch, safeBranch, deps.directory);
+                if (ok) {
+                  deps.db.run("UPDATE team_member SET worktree_branch = ? WHERE team_id = ? AND name = ?", [safeBranch, member.team_id, member.name]);
+                  log(`busy_while_shutdown:branch:preserved src=${member.worktree_branch} target=${safeBranch}`);
+                }
+              }
             }
+            try {
+              await client3.session.abort({ sessionID });
+            } catch {}
           }
           await notifyWorkingProgress(client3, db, transition.teamId);
         }
@@ -17129,7 +17904,7 @@ var plugin = async (input) => {
         }
       }),
       team_spawn: tool({
-        description: "Spawn a new teammate that works in parallel. The teammate starts immediately with the given prompt. " + "Each teammate gets their own git worktree for file isolation. " + "Teammates work asynchronously and will message you when done. Do not poll for their status.",
+        description: "Spawn a new teammate that works in parallel. The teammate starts immediately with the given prompt. Each teammate gets their own git worktree for file isolation. Teammates work asynchronously and will message you when done. Do not poll for their status.",
         args: {
           name: tool.schema.string().describe("Teammate name (lowercase alphanumeric with hyphens)"),
           agent: tool.schema.string().default("build").describe("Agent type (e.g. 'build', 'plan', 'explore')"),
@@ -17233,7 +18008,7 @@ var plugin = async (input) => {
         }
       }),
       team_shutdown: tool({
-        description: "Request a teammate to shut down. The teammate finishes current work then stops. " + "Pass force: true to abort immediately without waiting.",
+        description: "Request a teammate to shut down. The teammate finishes current work then stops. Pass force: true to abort immediately without waiting.",
         args: {
           member: tool.schema.string().describe("Teammate name to shut down"),
           force: tool.schema.boolean().default(false).describe("Force immediate abort without waiting for current work to finish")
@@ -17255,14 +18030,26 @@ var plugin = async (input) => {
           acknowledge_uncommitted: tool.schema.boolean().default(false)
         },
         async execute(args, ctx) {
-          const result = await executeTeamCleanup(deps, args, ctx.sessionID, undefined, undefined, config2.mergeOnCleanup);
+          const result = await executeTeamCleanup(deps, args, ctx.sessionID, undefined, undefined, undefined, config2.mergeOnCleanup);
           const blocked = result.includes("uncommitted");
           ctx.metadata({ title: blocked ? "Cleanup blocked \u2014 uncommitted changes" : "Team cleaned up" });
           return result;
         }
       }),
+      team_merge: tool({
+        description: "Merge a shutdown teammate's branch into the working directory as unstaged changes. Use this after team_shutdown to review and integrate a teammate's work. The teammate must be shut down first.",
+        args: {
+          member: tool.schema.string().describe("Teammate name whose branch to merge")
+        },
+        async execute(args, ctx) {
+          const result = await executeTeamMerge(deps, args, ctx.sessionID);
+          const conflict = result.includes("conflict");
+          ctx.metadata({ title: conflict ? `Merge conflict: ${args.member}` : `Merged ${args.member}` });
+          return result;
+        }
+      }),
       team_status: tool({
-        description: "View team members with their current status, agent type, and session IDs. " + "Use this to check who is working, idle, or shut down. Includes a task summary.",
+        description: "View team members with their current status, agent type, and session IDs. Use this to check who is working, idle, or shut down. Includes a task summary.",
         args: {},
         async execute(_args, ctx) {
           const result = await executeTeamStatus(deps, ctx.sessionID);
@@ -17274,7 +18061,7 @@ var plugin = async (input) => {
         }
       }),
       team_view: tool({
-        description: "Navigate the TUI to a teammate's session so you can see what they are doing. " + "Use the session picker (ctrl+p) to return to the lead session.",
+        description: "Navigate the TUI to a teammate's session so you can see what they are doing. Use the session picker (ctrl+p) to return to the lead session.",
         args: {
           member: tool.schema.string().describe("Teammate name to view")
         },