@hueyexe/opencode-ensemble 0.12.0 → 0.13.0

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-477%20passing-brightgreen.svg)]()
+[![tests](https://img.shields.io/badge/tests-482%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)
@@ -15,7 +15,7 @@ Plugin built on the public OpenCode SDK. No internal dependencies.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.12.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.0"]
 }
 ```
 
@@ -136,7 +136,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.12.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.0"]
 }
 ```
 
@@ -144,7 +144,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.12.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.0"]
 }
 ```
 
@@ -201,7 +201,7 @@ Build with `bun run build`, then restart OpenCode to pick up changes.
 | `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. Preserves their branch before aborting. Supports `force` flag. |
-| `team_merge` | Merge a shutdown teammate's branch into working directory (unstaged). |
+| `team_merge` | Merge a shutdown teammate's branch into working directory (unstaged). Blocks if you have local changes to overlapping files. |
 | `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. |
@@ -252,6 +252,7 @@ Teammate messages arrive in the lead's session as `[Team message from alice]: ..
 - **Stall detection**: detects teammates making no progress (low output tokens or no communication) and escalates to the lead
 - **Peer-to-peer communication**: teammates can message each other directly, with idle-flush delivery and chatty agent detection
 - **Auto-merge on cleanup**: worktree branches are squash-merged into your working directory as unstaged changes for review
+- **Overlap detection**: `team_merge` blocks when you have local changes to files the agent also modified, preventing silent overwrites
 - **Spawn circuit breaker**: stops retrying after 3 consecutive spawn failures
 - **Graceful shutdown**: busy teammates receive a shutdown message and finish their current work. Use `force: true` to abort immediately.
 - **Rate limiting**: token bucket (configurable via config file or `OPENCODE_ENSEMBLE_RATE_LIMIT`, default 10 tokens/sec)
@@ -405,7 +406,7 @@ Same coordination model (shared tasks, peer messaging, lead coordination) with s
 ```bash
 bun install
 bun run typecheck
-bun test             # 477 tests
+bun test             # 482 tests
 bun run build
 ```
 

package/dist/index.js

@@ -33,9 +33,8 @@ __export(exports_merge_helper, {
   preserveBranch: () => preserveBranch,
   mergeBranchRaw: () => mergeBranchRaw,
   mergeBranch: () => mergeBranch,
-  gitStashPop: () => gitStashPop,
-  gitStash: () => gitStash,
   gitReset: () => gitReset,
+  getOverlappingFiles: () => getOverlappingFiles,
   deleteBranch: () => deleteBranch
 });
 async function preserveBranch(sourceBranch, targetBranch, cwd) {
@@ -70,48 +69,33 @@ async function mergeBranchRaw(branch, cwd) {
   }
   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` };
-    }
+  if (!result.ok)
     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 };
 }
+async function getOverlappingFiles(branch, cwd) {
+  const run = async (args) => {
+    const proc = Bun.spawn(["git", ...args], { cwd, stdout: "pipe", stderr: "pipe" });
+    const out = await new Response(proc.stdout).text();
+    const exit = await proc.exited;
+    if (exit !== 0)
+      throw new Error(`git ${args.join(" ")} failed with exit code ${exit}`);
+    return out.split(`
+`).filter(Boolean);
+  };
+  const agentFiles = new Set(await run(["diff", "--name-only", "HEAD", branch]));
+  const localChanged = await run(["diff", "--name-only", "HEAD"]);
+  const localUntracked = await run(["ls-files", "--others", "--exclude-standard"]);
+  const localFiles = [...new Set([...localChanged, ...localUntracked])];
+  return localFiles.filter((f) => agentFiles.has(f));
+}
 function preservedBranchName(teamName, memberName) {
   return `ensemble/preserved/${teamName}/${memberName}`;
 }
@@ -15988,7 +15972,7 @@ function buildLeadSystemPrompt(db, teamId, config2) {
     }
     lines.push(`If user picks "I'll choose per agent", ask for each agent's model individually before each team_spawn call.`, "Pass the chosen model via the model parameter on each team_spawn call.");
   }
-  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.");
+  lines.push("", "Spawn teammates ONE AT A TIME. Wait for each tool result before spawning the next.", "This avoids git worktree contention. Once all are spawned, wait for their messages.", "", "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 squash-merges and unstages for you.", "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(`
 `);
 }
@@ -16860,6 +16844,19 @@ async function executeTeamCreate(deps, args, sessionId) {
 }
 
 // src/tools/shared.ts
+async function countBranchCommits(branch, cwd) {
+  try {
+    const proc = Bun.spawn(["git", "rev-list", "--count", `HEAD..${branch}`], { cwd, stdout: "pipe", stderr: "pipe" });
+    const out = await new Response(proc.stdout).text();
+    const exit = await proc.exited;
+    if (exit !== 0)
+      return -1;
+    const n = Number.parseInt(out.trim(), 10);
+    return Number.isNaN(n) ? -1 : n;
+  } catch {
+    return -1;
+  }
+}
 async function checkWorktreeDirty(dir) {
   try {
     const proc = Bun.spawn(["git", "-C", dir, "status", "--porcelain"], { stdout: "pipe", stderr: "pipe" });
@@ -17243,7 +17240,7 @@ async function executeTeamBroadcast(deps, args, sessionId) {
 
 // src/tools/team-shutdown.ts
 init_merge_helper();
-async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktreeDirty, preserve = preserveBranch) {
+async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktreeDirty, preserve = preserveBranch, commitCount = countBranchCommits) {
   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)
@@ -17253,9 +17250,8 @@ async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktre
   const force = args.force ?? false;
   if (member.status === "shutdown_requested") {
     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}`;
+    const status = await getBranchStatus(deps, teamInfo.teamId, args.member, member.worktree_dir, isDirty, commitCount);
+    return `Force shut down "${args.member}".${status}`;
   }
   let isIdle = false;
   try {
@@ -17265,9 +17261,8 @@ async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktre
   } catch {}
   if (isIdle || force) {
     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}`;
+    const status = await getBranchStatus(deps, teamInfo.teamId, args.member, member.worktree_dir, isDirty, commitCount);
+    return `Teammate "${args.member}" has been shut down.${status}`;
   }
   if (member.worktree_branch) {
     const safeBranch = preservedBranchName(teamInfo.teamName, args.member);
@@ -17305,26 +17300,35 @@ async function preserveAndAbort(deps, teamId, teamName, memberName, sessionId, w
   } 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) {
+async function getBranchStatus(deps, teamId, memberName, worktreeDir, isDirty, commitCount) {
   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)
+  if (!row?.worktree_branch)
     return "";
-  try {
-    if (await isDirty(worktreeDir)) {
-      return `
-
-Warning: ${memberName} has uncommitted changes in their worktree. Commit or merge before calling team_cleanup.`;
-    }
-  } catch {}
-  return "";
+  const branch = row.worktree_branch;
+  const parts = [];
+  const commits = await commitCount(branch, deps.directory);
+  const dirty = worktreeDir ? await isDirty(worktreeDir).catch(() => false) : false;
+  if (commits > 0 && dirty) {
+    parts.push(`${memberName} committed ${commits} change${commits !== 1 ? "s" : ""} and has uncommitted work.`);
+  } else if (commits > 0) {
+    parts.push(`${memberName} committed ${commits} change${commits !== 1 ? "s" : ""}. Ready to merge.`);
+  } else if (dirty) {
+    parts.push(`${memberName} has uncommitted changes only \u2014 their work may be incomplete.`);
+  } else if (commits < 0) {
+    parts.push(`Could not determine ${memberName}'s commit status. Merge to check their work.`);
+  } else {
+    parts.push(`${memberName} made no changes.`);
+  }
+  parts.push(`Branch: ${branch}`);
+  parts.push("Use team_merge to merge their work.");
+  return `
+${parts.join(`
+`)}`;
 }
 
 // src/tools/team-cleanup.ts
 init_merge_helper();
-async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty, merge2 = mergeBranch, delBranch = deleteBranch, mergeOnCleanup = true) {
+async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty, merge2 = mergeBranch, delBranch = deleteBranch, mergeOnCleanup = true, overlapCheck = getOverlappingFiles) {
   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");
@@ -17372,9 +17376,16 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
   const unmerged = members.filter((m) => m.worktree_branch !== null);
   const merged = [];
   const conflicted = [];
+  const overlapWarnings = [];
   if (unmerged.length > 0 && mergeOnCleanup) {
     for (const member of unmerged) {
       const branch = member.worktree_branch;
+      try {
+        const overlap = await overlapCheck(branch, deps.directory);
+        if (overlap.length > 0) {
+          overlapWarnings.push(`${member.name}: ${overlap.join(", ")}`);
+        }
+      } catch {}
       const result = await merge2(branch, deps.directory);
       if (result.ok) {
         await delBranch(branch, deps.directory);
@@ -17410,13 +17421,19 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
   if (conflicted.length > 0) {
     parts.push(`Could not auto-merge: ${conflicted.join(", ")}. Merge manually.`);
   }
+  if (overlapWarnings.length > 0) {
+    parts.push(`Warning: safety-net merge overwrote local changes to overlapping files:
+${overlapWarnings.map((w) => `  - ${w}`).join(`
+`)}
+Review with: git diff`);
+  }
   return parts.join(`
 `);
 }
 
 // src/tools/team-merge.ts
 init_merge_helper();
-async function executeTeamMerge(deps, args, sessionId, merge2 = mergeBranch, delBranch = deleteBranch) {
+async function executeTeamMerge(deps, args, sessionId, merge2 = mergeBranch, delBranch = deleteBranch, overlapCheck = getOverlappingFiles) {
   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)
@@ -17429,17 +17446,39 @@ async function executeTeamMerge(deps, args, sessionId, merge2 = mergeBranch, del
   }
   const branch = member.worktree_branch;
   log(`merge:start member=${args.member} branch=${branch}`);
+  try {
+    const overlap = await overlapCheck(branch, deps.directory);
+    if (overlap.length > 0) {
+      const files = overlap.map((f) => `  - ${f}`).join(`
+`);
+      return [
+        `Cannot merge ${args.member} \u2014 you have local changes to the same files:`,
+        files,
+        ``,
+        `Commit or stash your changes first, then retry team_merge.`,
+        `Branch preserved: ${branch}`
+      ].join(`
+`);
+    }
+  } catch {
+    log(`merge:overlap-check:failed 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}
-
-Error: ${result.error}`;
+    return [
+      `Merge conflict merging ${args.member}'s branch (${branch}).`,
+      `Resolve manually:`,
+      `  git merge --squash ${branch}`,
+      `  git reset HEAD`,
+      ``,
+      `Error: ${result.error}`
+    ].join(`
+`);
   }
   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`;
+  return `Merged ${args.member}'s changes into your working directory (unstaged). Review with: git diff`;
 }
 
 // src/tools/team-tasks-list.ts
@@ -17502,6 +17541,20 @@ async function executeTeamTasksComplete(deps, args, sessionId) {
       unblocked++;
     }
   }
+  const counts = deps.db.query("SELECT status, COUNT(*) as c FROM team_task WHERE team_id = ? GROUP BY status").all(teamInfo.teamId);
+  const completed = counts.find((r) => r.status === "completed")?.c ?? 0;
+  const total = counts.reduce((sum, r) => sum + r.c, 0);
+  const who = teamInfo.memberName ?? "teammate";
+  try {
+    deps.client.tui.showToast({
+      title: "Team",
+      message: `${who}: ${completed}/${total} tasks complete`,
+      variant: "info",
+      duration: 3000
+    }).catch(() => {});
+  } catch {
+    log(`tasks-complete:toast:failed`);
+  }
   const unblockedMsg = unblocked > 0 ? ` Unblocked ${unblocked} dependent task${unblocked !== 1 ? "s" : ""}.` : "";
   return `Completed task: ${task.content}${unblockedMsg}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hueyexe/opencode-ensemble",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "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",

package/src/system-prompt.ts

@@ -133,9 +133,8 @@ export function buildLeadSystemPrompt(db: Database, teamId: string, config?: Req
 
   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.",
+    "Spawn teammates ONE AT A TIME. Wait for each tool result before spawning the next.",
+    "This avoids git worktree contention. Once all are spawned, wait for their messages.",
     "",
     "Teammates work asynchronously and message you when done.",
     "Do NOT poll team_status or team_tasks_list repeatedly — wait for messages.",
@@ -145,7 +144,7 @@ export function buildLeadSystemPrompt(db: Database, teamId: string, config?: Req
     "MERGE WORKFLOW:",
     "After a teammate finishes and you shut them down, use team_merge to merge their branch.",
     "Do NOT tell teammates to commit — they handle that themselves.",
-    "Do NOT run git merge manually — use team_merge which handles stashing and unstaging.",
+    "Do NOT run git merge manually — use team_merge which squash-merges and unstages for you.",
     "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.",

package/src/tools/merge-helper.ts

@@ -9,6 +9,9 @@ export interface MergeResult {
 /** Injectable function for testing. */
 export type MergeBranchFn = (branch: string, cwd: string) => Promise<MergeResult>
 
+/** Injectable function for overlap detection before merge. */
+export type OverlapCheckFn = (branch: string, cwd: string) => Promise<string[]>
+
 /** Injectable function for preserving a branch before worktree deletion. */
 export type PreserveBranchFn = (sourceBranch: string, targetBranch: string, cwd: string) => Promise<boolean>
 
@@ -64,60 +67,43 @@ export async function mergeBranchRaw(branch: string, cwd: string): Promise<Merge
   return { ok: true }
 }
 
-/** Stash existing work. Returns true if something was stashed. */
-export async function gitStash(cwd: string): Promise<boolean> {
-  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")
-}
-
-/** Unstage all changes. */
+/** Unstage all changes so merge results appear as unstaged. */
 export async function gitReset(cwd: string): Promise<void> {
   const reset = Bun.spawn(["git", "reset", "HEAD"], { cwd, stdout: "pipe", stderr: "pipe" })
   await reset.exited
 }
 
-/** Restore stashed work, preserving staged/unstaged state. Returns true if successful. */
-export async function gitStashPop(cwd: string): Promise<boolean> {
-  const pop = Bun.spawn(["git", "stash", "pop", "--index"], { cwd, stdout: "pipe", stderr: "pipe" })
-  const exit = await pop.exited
-  if (exit !== 0) {
-    // --index is strict about staged/unstaged distinction — fall back to plain pop
-    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 — stashed work remains in git stash list")
-      return false
-    }
-  }
-  return true
-}
-
 /**
- * Stash-safe squash merge of a single branch into the working directory.
- * Stashes existing work, merges, unstages, restores stash.
+ * Squash merge a branch into the working directory as unstaged changes.
+ * No stashing — existing unstaged changes from previous merges are preserved.
+ * If the merge conflicts, the lead resolves it with git.
  */
 export async function mergeBranch(branch: string, cwd: string): Promise<MergeResult> {
-  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 — check git stash list` }
-    }
-    return result
-  }
-
+  if (!result.ok) 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 — check git stash list" }
-  }
   return { ok: true }
 }
 
+/**
+ * Detect files that both the lead (local changes) and the agent (branch) modified.
+ * Returns the list of overlapping file paths, or empty if safe to merge.
+ */
+export async function getOverlappingFiles(branch: string, cwd: string): Promise<string[]> {
+  const run = async (args: string[]) => {
+    const proc = Bun.spawn(["git", ...args], { cwd, stdout: "pipe", stderr: "pipe" })
+    const out = await new Response(proc.stdout).text()
+    const exit = await proc.exited
+    if (exit !== 0) throw new Error(`git ${args.join(" ")} failed with exit code ${exit}`)
+    return out.split("\n").filter(Boolean)
+  }
+  const agentFiles = new Set(await run(["diff", "--name-only", "HEAD", branch]))
+  const localChanged = await run(["diff", "--name-only", "HEAD"])
+  const localUntracked = await run(["ls-files", "--others", "--exclude-standard"])
+  const localFiles = [...new Set([...localChanged, ...localUntracked])]
+  return localFiles.filter(f => agentFiles.has(f))
+}
+
 /**
  * Build the preserved branch name for a team member.
  */

package/src/tools/shared.ts

@@ -4,6 +4,21 @@ import { findTeamBySession } from "../types"
 /** Function type for dirty worktree check — injectable for testing. */
 export type IsDirtyFn = (dir: string) => Promise<boolean>
 
+/** Function type for counting commits on a branch — injectable for testing. */
+export type CommitCountFn = (branch: string, cwd: string) => Promise<number>
+
+/** Count commits a branch has ahead of HEAD. Approximate — may include base divergence. Returns -1 if check fails. */
+export async function countBranchCommits(branch: string, cwd: string): Promise<number> {
+  try {
+    const proc = Bun.spawn(["git", "rev-list", "--count", `HEAD..${branch}`], { cwd, stdout: "pipe", stderr: "pipe" })
+    const out = await new Response(proc.stdout).text()
+    const exit = await proc.exited
+    if (exit !== 0) return -1
+    const n = Number.parseInt(out.trim(), 10)
+    return Number.isNaN(n) ? -1 : n
+  } catch { return -1 }
+}
+
 /** Check if a worktree directory has uncommitted changes via git status. */
 export async function checkWorktreeDirty(dir: string): Promise<boolean> {
   try {

package/src/tools/team-cleanup.ts

@@ -2,8 +2,8 @@ import type { ToolDeps } from "../types"
 import { requireLead, checkWorktreeDirty } from "./shared"
 import type { IsDirtyFn } from "./shared"
 import { spawnFailures } from "./team-spawn"
-import { mergeBranch, deleteBranch, preserveBranch, preservedBranchName } from "./merge-helper"
-import type { MergeBranchFn, DeleteBranchFn, PreserveBranchFn } from "./merge-helper"
+import { mergeBranch, deleteBranch, preserveBranch, preservedBranchName, getOverlappingFiles } from "./merge-helper"
+import type { MergeBranchFn, DeleteBranchFn, PreserveBranchFn, OverlapCheckFn } from "./merge-helper"
 import { log } from "../log"
 
 /**
@@ -19,6 +19,7 @@ export async function executeTeamCleanup(
   merge: MergeBranchFn = mergeBranch,
   delBranch: DeleteBranchFn = deleteBranch,
   mergeOnCleanup = true,
+  overlapCheck: OverlapCheckFn = getOverlappingFiles,
 ): Promise<string> {
   const teamInfo = requireLead(deps, sessionId)
 
@@ -75,10 +76,18 @@ export async function executeTeamCleanup(
   const unmerged = members.filter(m => m.worktree_branch !== null)
   const merged: string[] = []
   const conflicted: string[] = []
+  const overlapWarnings: string[] = []
 
   if (unmerged.length > 0 && mergeOnCleanup) {
     for (const member of unmerged) {
       const branch = member.worktree_branch!
+      // Warn (but don't block) if lead has local changes to overlapping files
+      try {
+        const overlap = await overlapCheck(branch, deps.directory)
+        if (overlap.length > 0) {
+          overlapWarnings.push(`${member.name}: ${overlap.join(", ")}`)
+        }
+      } catch { /* best effort */ }
       const result = await merge(branch, deps.directory)
       if (result.ok) {
         await delBranch(branch, deps.directory)
@@ -122,5 +131,8 @@ export async function executeTeamCleanup(
   if (conflicted.length > 0) {
     parts.push(`Could not auto-merge: ${conflicted.join(", ")}. Merge manually.`)
   }
+  if (overlapWarnings.length > 0) {
+    parts.push(`Warning: safety-net merge overwrote local changes to overlapping files:\n${overlapWarnings.map(w => `  - ${w}`).join("\n")}\nReview with: git diff`)
+  }
   return parts.join("\n")
 }

package/src/tools/team-merge.ts

@@ -1,7 +1,7 @@
 import type { ToolDeps } from "../types"
 import { requireLead } from "./shared"
-import { mergeBranch, deleteBranch } from "./merge-helper"
-import type { MergeBranchFn, DeleteBranchFn } from "./merge-helper"
+import { mergeBranch, deleteBranch, getOverlappingFiles } from "./merge-helper"
+import type { MergeBranchFn, DeleteBranchFn, OverlapCheckFn } from "./merge-helper"
 import { log } from "../log"
 
 /**
@@ -14,6 +14,7 @@ export async function executeTeamMerge(
   sessionId: string,
   merge: MergeBranchFn = mergeBranch,
   delBranch: DeleteBranchFn = deleteBranch,
+  overlapCheck: OverlapCheckFn = getOverlappingFiles,
 ): Promise<string> {
   const teamInfo = requireLead(deps, sessionId)
 
@@ -32,9 +33,33 @@ export async function executeTeamMerge(
   const branch = member.worktree_branch
   log(`merge:start member=${args.member} branch=${branch}`)
 
+  // Block merge if lead has local changes to files the agent also modified
+  try {
+    const overlap = await overlapCheck(branch, deps.directory)
+    if (overlap.length > 0) {
+      const files = overlap.map(f => `  - ${f}`).join("\n")
+      return [
+        `Cannot merge ${args.member} — you have local changes to the same files:`,
+        files,
+        ``,
+        `Commit or stash your changes first, then retry team_merge.`,
+        `Branch preserved: ${branch}`,
+      ].join("\n")
+    }
+  } catch {
+    log(`merge:overlap-check:failed member=${args.member} branch=${branch}`)
+  }
+
   const result = await merge(branch, deps.directory)
   if (!result.ok) {
-    return `Merge conflict with ${args.member}'s branch (${branch}). Resolve manually:\n  git merge --squash ${branch}\n\nError: ${result.error}`
+    return [
+      `Merge conflict merging ${args.member}'s branch (${branch}).`,
+      `Resolve manually:`,
+      `  git merge --squash ${branch}`,
+      `  git reset HEAD`,
+      ``,
+      `Error: ${result.error}`,
+    ].join("\n")
   }
 
   // Merge succeeded — delete the preserved branch and clear DB
@@ -45,5 +70,5 @@ export async function executeTeamMerge(
   )
 
   log(`merge:done member=${args.member} branch=${branch}`)
-  return `Merged ${args.member}'s changes into working directory (unstaged). Review with: git diff`
+  return `Merged ${args.member}'s changes into your working directory (unstaged). Review with: git diff`
 }

package/src/tools/team-shutdown.ts

@@ -1,6 +1,6 @@
 import type { ToolDeps } from "../types"
-import { requireLead, checkWorktreeDirty } from "./shared"
-import type { IsDirtyFn } from "./shared"
+import { requireLead, checkWorktreeDirty, countBranchCommits } from "./shared"
+import type { IsDirtyFn, CommitCountFn } from "./shared"
 import { preserveBranch, preservedBranchName } from "./merge-helper"
 import type { PreserveBranchFn } from "./merge-helper"
 import { log } from "../log"
@@ -17,6 +17,7 @@ export async function executeTeamShutdown(
   sessionId: string,
   isDirty: IsDirtyFn = checkWorktreeDirty,
   preserve: PreserveBranchFn = preserveBranch,
+  commitCount: CommitCountFn = countBranchCommits,
 ): Promise<string> {
   const teamInfo = requireLead(deps, sessionId)
 
@@ -30,9 +31,8 @@ export async function executeTeamShutdown(
   // Second call on an already-requested member → force abort
   if (member.status === "shutdown_requested") {
     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}`
+    const status = await getBranchStatus(deps, teamInfo.teamId, args.member, member.worktree_dir, isDirty, commitCount)
+    return `Force shut down "${args.member}".${status}`
   }
 
   // Determine if member is idle or busy
@@ -47,9 +47,8 @@ export async function executeTeamShutdown(
 
   if (isIdle || force) {
     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}`
+    const status = await getBranchStatus(deps, teamInfo.teamId, args.member, member.worktree_dir, isDirty, commitCount)
+    return `Teammate "${args.member}" has been shut down.${status}`
   }
 
   // Busy + not force → graceful: preserve branch first, then send shutdown message
@@ -129,20 +128,39 @@ async function preserveAndAbort(
   )
 }
 
-/** Read the current branch from DB (may have been updated to preserved name). */
-function getBranchInfo(deps: ToolDeps, teamId: string, memberName: string): string {
+/** Build a status line describing the teammate's work: commit count, dirty state, next step. */
+async function getBranchStatus(
+  deps: ToolDeps,
+  teamId: string,
+  memberName: string,
+  worktreeDir: string | null,
+  isDirty: IsDirtyFn,
+  commitCount: CommitCountFn,
+): Promise<string> {
   const row = deps.db.query("SELECT worktree_branch FROM team_member WHERE team_id = ? AND name = ?")
     .get(teamId, memberName) as { worktree_branch: string | null } | null
-  return row?.worktree_branch ? ` Changes preserved on branch: ${row.worktree_branch}. Use team_merge to merge.` : ""
-}
+  if (!row?.worktree_branch) return ""
 
-/** Build a warning suffix if the member's worktree has uncommitted changes. */
-async function getDirtyWarning(worktreeDir: string | null, memberName: string, isDirty: IsDirtyFn): Promise<string> {
-  if (!worktreeDir) return ""
-  try {
-    if (await isDirty(worktreeDir)) {
-      return `\n\nWarning: ${memberName} has uncommitted changes in their worktree. Commit or merge before calling team_cleanup.`
-    }
-  } catch { /* best effort */ }
-  return ""
+  const branch = row.worktree_branch
+  const parts: string[] = []
+
+  const commits = await commitCount(branch, deps.directory)
+  // Best-effort dirty check — worktree may already be deleted by session.abort() race
+  const dirty = worktreeDir ? await isDirty(worktreeDir).catch(() => false) : false
+
+  if (commits > 0 && dirty) {
+    parts.push(`${memberName} committed ${commits} change${commits !== 1 ? "s" : ""} and has uncommitted work.`)
+  } else if (commits > 0) {
+    parts.push(`${memberName} committed ${commits} change${commits !== 1 ? "s" : ""}. Ready to merge.`)
+  } else if (dirty) {
+    parts.push(`${memberName} has uncommitted changes only — their work may be incomplete.`)
+  } else if (commits < 0) {
+    parts.push(`Could not determine ${memberName}'s commit status. Merge to check their work.`)
+  } else {
+    parts.push(`${memberName} made no changes.`)
+  }
+
+  parts.push(`Branch: ${branch}`)
+  parts.push("Use team_merge to merge their work.")
+  return `\n${parts.join("\n")}`
 }

package/src/tools/team-tasks-complete.ts

@@ -1,5 +1,6 @@
 import type { ToolDeps } from "../types"
 import { requireTeamMember } from "./shared"
+import { log } from "../log"
 
 /**
  * Execute the team_tasks_complete tool. Marks a task as completed
@@ -29,9 +30,8 @@ export async function executeTeamTasksComplete(
     const depIds: string[] = JSON.parse(t.depends_on)
     if (!depIds.includes(args.task_id)) continue
 
-    // Check if all dependencies are now resolved
     const allResolved = depIds.every(depId => {
-      if (depId === args.task_id) return true // just completed
+      if (depId === args.task_id) return true
       const dep = allTasks.find(d => d.id === depId)
       return dep && (dep.status === "completed" || dep.status === "cancelled")
     })
@@ -42,6 +42,22 @@ export async function executeTeamTasksComplete(
     }
   }
 
+  // Fire progress toast so the lead has visibility
+  const counts = deps.db.query(
+    "SELECT status, COUNT(*) as c FROM team_task WHERE team_id = ? GROUP BY status"
+  ).all(teamInfo.teamId) as Array<{ status: string; c: number }>
+  const completed = counts.find(r => r.status === "completed")?.c ?? 0
+  const total = counts.reduce((sum, r) => sum + r.c, 0)
+  const who = teamInfo.memberName ?? "teammate"
+  try {
+    deps.client.tui.showToast({
+      title: "Team",
+      message: `${who}: ${completed}/${total} tasks complete`,
+      variant: "info",
+      duration: 3000,
+    }).catch(() => { /* TUI may not be available */ })
+  } catch { log(`tasks-complete:toast:failed`) }
+
   const unblockedMsg = unblocked > 0 ? ` Unblocked ${unblocked} dependent task${unblocked !== 1 ? "s" : ""}.` : ""
   return `Completed task: ${task.content}${unblockedMsg}`
 }