@hueyexe/opencode-ensemble 0.9.0 → 0.9.1

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@hueyexe/opencode-ensemble.svg)](https://www.npmjs.com/package/@hueyexe/opencode-ensemble)
 [![npm downloads](https://img.shields.io/npm/dm/@hueyexe/opencode-ensemble.svg)](https://www.npmjs.com/package/@hueyexe/opencode-ensemble)
-[![tests](https://img.shields.io/badge/tests-432%20passing-brightgreen.svg)]()
+[![tests](https://img.shields.io/badge/tests-452%20passing-brightgreen.svg)]()
 [![TypeScript](https://img.shields.io/badge/TypeScript-strict-blue.svg)]()
 [![OpenCode SDK](https://img.shields.io/badge/deps-OpenCode%20SDK%20only-blue.svg)]()
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
@@ -101,7 +101,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.9.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.9.1"]
 }
 ```
 
@@ -109,7 +109,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.9.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.9.1"]
 }
 ```
 
@@ -159,7 +159,7 @@ export { default } from "/path/to/opencode-ensemble/src/index.ts"
 
 ## Tools
 
-13 tools. The lead has all of them. Teammates get 6 (messaging + tasks).
+14 tools. The lead has all of them. Teammates get 6 (messaging + tasks).
 
 **Team lifecycle** (lead only)
 
@@ -167,8 +167,9 @@ export { default } from "/path/to/opencode-ensemble/src/index.ts"
 |------|-------------|
 | `team_create` | Create a team. Caller becomes the lead. |
 | `team_spawn` | Start a new teammate with a task. Supports `plan_approval` mode. |
-| `team_shutdown` | Ask a teammate to stop. Supports `force` flag for immediate abort. |
-| `team_cleanup` | Remove the team when done. |
+| `team_shutdown` | Ask a teammate to stop. Preserves their branch before aborting. Supports `force` flag. |
+| `team_merge` | Merge a shutdown teammate's branch into working directory (unstaged). |
+| `team_cleanup` | Remove the team when done. Safety-net merges any forgotten branches. |
 | `team_status` | See all members, their status, and a task summary. |
 | `team_view` | Switch the TUI to a teammate's session. |
 
@@ -308,7 +309,7 @@ Same coordination model (shared tasks, peer messaging, lead coordination) with s
 ```bash
 bun install
 bun run typecheck
-bun test             # 432 tests
+bun test             # 452 tests
 bun run build
 ```
 

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);
@@ -16390,7 +16526,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 +16536,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 +16548,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 +16607,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 +16640,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 +16687,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 +16985,7 @@ class TokenBucket {
 }
 
 // src/watchdog.ts
+init_merge_helper();
 class Watchdog {
   db;
   client;
@@ -16833,6 +16996,7 @@ class Watchdog {
   stallThresholdMs;
   stallMinSteps;
   stallTokenThreshold;
+  cwd;
   timer;
   constructor(opts) {
     this.db = opts.db;
@@ -16844,6 +17008,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 +17072,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 +17137,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,6 +17151,9 @@ 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");
   } else {
     log(`init:skip-recovery (worktree instance: ${input.directory})`);
@@ -16996,7 +17172,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 +17208,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 +17316,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 +17420,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 +17442,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 +17473,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")
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hueyexe/opencode-ensemble",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Agent teams for OpenCode — parallel agents with peer-to-peer communication, shared tasks, and coordinated execution",
   "module": "src/index.ts",
   "main": "dist/index.js",