@hueyexe/opencode-ensemble 0.12.1 → 0.13.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-482%20passing-brightgreen.svg)]()
+[![tests](https://img.shields.io/badge/tests-492%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.1"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.1"]
 }
 ```
 
@@ -136,7 +136,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.12.1"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.1"]
 }
 ```
 
@@ -144,7 +144,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.12.1"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.1"]
 }
 ```
 
@@ -406,7 +406,7 @@ Same coordination model (shared tasks, peer messaging, lead coordination) with s
 ```bash
 bun install
 bun run typecheck
-bun test             # 482 tests
+bun test             # 492 tests
 bun run build
 ```
 

package/dist/index.js

@@ -33,8 +33,6 @@ __export(exports_merge_helper, {
   preserveBranch: () => preserveBranch,
   mergeBranchRaw: () => mergeBranchRaw,
   mergeBranch: () => mergeBranch,
-  gitStashPop: () => gitStashPop,
-  gitStash: () => gitStash,
   gitReset: () => gitReset,
   getOverlappingFiles: () => getOverlappingFiles,
   deleteBranch: () => deleteBranch
@@ -71,46 +69,15 @@ 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) {
@@ -15487,7 +15454,8 @@ var MIGRATIONS = [
   `ALTER TABLE team_member ADD COLUMN plan_approval TEXT NOT NULL DEFAULT 'none'
      CHECK(plan_approval IN ('none', 'pending', 'approved', 'rejected'));`,
   `ALTER TABLE team ADD COLUMN lead_agent TEXT;`,
-  `ALTER TABLE team_member ADD COLUMN workspace_id TEXT;`
+  `ALTER TABLE team_member ADD COLUMN workspace_id TEXT;`,
+  `ALTER TABLE team_member ADD COLUMN reported_to_lead INTEGER NOT NULL DEFAULT 0;`
 ];
 function applyMigrations(db) {
   const { user_version: current } = db.query("PRAGMA user_version").get();
@@ -15609,6 +15577,10 @@ function getUndeliveredMessages(db, teamId) {
 function markDelivered(db, messageId) {
   db.run("UPDATE team_message SET delivered = 1 WHERE id = ?", [messageId]);
 }
+function hasReportedCompletion(db, teamId, memberName) {
+  const row = db.query("SELECT reported_to_lead FROM team_member WHERE team_id = ? AND name = ?").get(teamId, memberName);
+  return row?.reported_to_lead === 1;
+}
 
 // src/recovery.ts
 init_merge_helper();
@@ -15676,6 +15648,10 @@ async function recoverUndeliveredMessages(db, client3, registry2) {
       }
       if (!recipientSessionId)
         continue;
+      if (hasReportedCompletion(db, team.id, msg.to_name)) {
+        markDelivered(db, msg.id);
+        continue;
+      }
       try {
         await client3.session.promptAsync({
           sessionID: recipientSessionId,
@@ -15811,10 +15787,16 @@ function handleSessionStatusEvent(db, registry2, sessionId, status) {
     if (member.status === newStatus)
       return;
     db.run("UPDATE team_member SET status = ?, execution_status = 'idle', time_updated = ? WHERE team_id = ? AND name = ?", [newStatus, Date.now(), entry.teamId, entry.memberName]);
+    if (member.status === "busy" && newStatus === "ready") {
+      const leadMsgCount = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND from_name = ? AND to_name = 'lead'").get(entry.teamId, entry.memberName).c;
+      if (leadMsgCount > 0) {
+        db.run("UPDATE team_member SET reported_to_lead = 1 WHERE team_id = ? AND name = ?", [entry.teamId, entry.memberName]);
+      }
+    }
     return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: newStatus };
   } else if (status === "busy") {
     if (member.status === "ready" || member.status === "error") {
-      db.run("UPDATE team_member SET status = 'busy', execution_status = 'running', time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), entry.teamId, entry.memberName]);
+      db.run("UPDATE team_member SET status = 'busy', execution_status = 'running', reported_to_lead = 0, time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), entry.teamId, entry.memberName]);
       return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: "busy" };
     }
     if (member.status === "shutdown_requested") {
@@ -16005,7 +15987,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(`
 `);
 }
@@ -16877,6 +16859,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" });
@@ -17209,6 +17204,9 @@ async function executeTeamMessage(deps, args, sessionId) {
     });
     return `Message sent to ${args.to}.`;
   }
+  if (hasReportedCompletion(deps.db, teamInfo.teamId, args.to)) {
+    return `Message stored for ${args.to} (teammate has completed their task \u2014 message will not wake them).`;
+  }
   const deliveryText = `[Team message from ${senderName}]: ${messageText}`;
   deps.client.session.promptAsync({
     sessionID: recipientSessionId,
@@ -17243,7 +17241,12 @@ async function executeTeamBroadcast(deps, args, sessionId) {
     }
   }
   let delivered = 0;
+  let skipped = 0;
   for (const recipient of recipients) {
+    if (recipient.name !== "lead" && hasReportedCompletion(deps.db, teamInfo.teamId, recipient.name)) {
+      skipped++;
+      continue;
+    }
     deps.client.session.promptAsync({
       sessionID: recipient.sessionId,
       parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }]
@@ -17255,12 +17258,13 @@ async function executeTeamBroadcast(deps, args, sessionId) {
       log(`team_broadcast:deliver:failed to=${recipient.name} err=${err instanceof Error ? err.message : String(err)}`);
     });
   }
-  return `Broadcast sent to ${recipients.length} recipient${recipients.length !== 1 ? "s" : ""}.`;
+  const sent = recipients.length - skipped;
+  return `Broadcast sent to ${sent} recipient${sent !== 1 ? "s" : ""}.`;
 }
 
 // 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)
@@ -17270,9 +17274,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 {
@@ -17282,9 +17285,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);
@@ -17322,21 +17324,30 @@ 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
@@ -17438,7 +17449,7 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
     parts.push(`Warning: safety-net merge overwrote local changes to overlapping files:
 ${overlapWarnings.map((w) => `  - ${w}`).join(`
 `)}
-Check git stash list or git diff to recover.`);
+Review with: git diff`);
   }
   return parts.join(`
 `);
@@ -17464,29 +17475,34 @@ async function executeTeamMerge(deps, args, sessionId, merge2 = mergeBranch, del
     if (overlap.length > 0) {
       const files = overlap.map((f) => `  - ${f}`).join(`
 `);
-      return `Cannot merge ${args.member}'s branch \u2014 you have local changes to files that ${args.member} also modified:
-${files}
-
-Commit or stash your changes to these files first, then retry team_merge.
-Branch preserved: ${branch}`;
+      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}`);
-  const msg = `Merged ${args.member}'s changes into working directory (unstaged). Review with: git diff`;
-  return result.error ? `${msg}
-
-Warning: ${result.error}` : msg;
+  return `Merged ${args.member}'s changes into your working directory (unstaged). Review with: git diff`;
 }
 
 // src/tools/team-tasks-list.ts
@@ -17549,6 +17565,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}`;
 }
@@ -17924,6 +17954,8 @@ var plugin = async (input) => {
   const tracker = new DescendantTracker;
   const nudgedMembers = new Set;
   const progressTracker = new ProgressTracker;
+  const wakeLeadTimestamps = new Map;
+  const WAKE_LEAD_COOLDOWN_MS = 5000;
   const pluginTransport = input.client._client;
   const rawClient = new OpencodeClient({ client: pluginTransport });
   initLog(rawClient);
@@ -18014,7 +18046,7 @@ var plugin = async (input) => {
               }
             }
             const nudgeKey = `${transition.teamId}:${transition.memberName}`;
-            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName)) {
+            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName) && !hasReportedCompletion(db, transition.teamId, transition.memberName)) {
               nudgedMembers.add(nudgeKey);
               log(`nudge:idle-without-report name=${transition.memberName}`);
               client3.session.promptAsync({
@@ -18057,7 +18089,10 @@ var plugin = async (input) => {
           const team = db.query("SELECT id FROM team WHERE lead_session_id = ? AND status = 'active'").get(sessionID);
           if (team) {
             const pending = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = 'lead' AND delivered = 0").get(team.id);
-            if (pending.c > 0) {
+            const allDone = db.query("SELECT COUNT(*) as c FROM team_member WHERE team_id = ? AND status NOT IN ('ready', 'shutdown', 'error')").get(team.id).c === 0;
+            const lastWake = wakeLeadTimestamps.get(team.id) ?? 0;
+            if (pending.c > 0 && !allDone && Date.now() - lastWake > WAKE_LEAD_COOLDOWN_MS) {
+              wakeLeadTimestamps.set(team.id, Date.now());
               log(`wake-lead: ${pending.c} pending messages, sending promptAsync`);
               client3.session.promptAsync({
                 sessionID,
@@ -18070,7 +18105,7 @@ var plugin = async (input) => {
           const member = db.query(`SELECT tm.team_id, tm.name FROM team_member tm
              JOIN team t ON tm.team_id = t.id
              WHERE tm.session_id = ? AND t.status = 'active'`).get(sessionID);
-          if (member) {
+          if (member && !hasReportedCompletion(db, member.team_id, member.name)) {
             const staleThreshold = Date.now() - 5000;
             const peerMsgs = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = ? AND delivered = 0 AND time_created < ?").get(member.team_id, member.name, staleThreshold);
             if (peerMsgs.c > 0) {

package/package.json

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

package/src/hooks.ts

@@ -41,11 +41,26 @@ export function handleSessionStatusEvent(
       "UPDATE team_member SET status = ?, execution_status = 'idle', time_updated = ? WHERE team_id = ? AND name = ?",
       [newStatus, Date.now(), entry.teamId, entry.memberName]
     )
+    // Mark teammate as having reported if they sent at least one message to lead (issue #3).
+    // Set on busy→ready transition so Q&A messages during work don't prematurely block delivery.
+    if (member.status === "busy" && newStatus === "ready") {
+      const leadMsgCount = (db.query(
+        "SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND from_name = ? AND to_name = 'lead'"
+      ).get(entry.teamId, entry.memberName) as { c: number }).c
+      if (leadMsgCount > 0) {
+        db.run(
+          "UPDATE team_member SET reported_to_lead = 1 WHERE team_id = ? AND name = ?",
+          [entry.teamId, entry.memberName]
+        )
+      }
+    }
     return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: newStatus }
   } else if (status === "busy") {
     if (member.status === "ready" || member.status === "error") {
+      // Reset reported_to_lead so re-activated teammates can receive messages again (issue #3).
+      // INVARIANT: every promptAsync delivery path must check hasReportedCompletion() to prevent loops.
       db.run(
-        "UPDATE team_member SET status = 'busy', execution_status = 'running', time_updated = ? WHERE team_id = ? AND name = ?",
+        "UPDATE team_member SET status = 'busy', execution_status = 'running', reported_to_lead = 0, time_updated = ? WHERE team_id = ? AND name = ?",
         [Date.now(), entry.teamId, entry.memberName]
       )
       return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: "busy" }

package/src/index.ts

@@ -10,7 +10,7 @@ import { MemberRegistry, DescendantTracker } from "./state"
 import { isWorktreeInstance } from "./util"
 import { handleSessionStatusEvent, handleSessionCreatedEvent, checkToolIsolation, shouldNudgeIdleMember } from "./hooks"
 import { notifyTeamEvent, notifyWorkingProgress } from "./notify"
-import { sendMessage } from "./messaging"
+import { sendMessage, hasReportedCompletion } from "./messaging"
 import { buildLeadSystemPrompt, buildTeammateSystemPrompt, buildTeamCompactionContext } from "./system-prompt"
 import { log, initLog } from "./log"
 import { findTeamBySession } from "./types"
@@ -58,6 +58,8 @@ const plugin: Plugin = async (input) => {
   const tracker = new DescendantTracker()
   const nudgedMembers = new Set<string>()
   const progressTracker = new ProgressTracker()
+  const wakeLeadTimestamps = new Map<string, number>()
+  const WAKE_LEAD_COOLDOWN_MS = 5000
 
   // Extract the working HeyAPI transport from the plugin-provided v1 client and pass it
   // to the v2 OpencodeClient. The plugin framework provides a v1 client which stores its
@@ -176,8 +178,9 @@ const plugin: Plugin = async (input) => {
             }
 
             // Nudge teammate if they went idle without reporting to the lead (once only)
+            // Skip if they already reported completion (issue #3 — prevents re-waking completed teammates)
             const nudgeKey = `${transition.teamId}:${transition.memberName}`
-            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName)) {
+            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName) && !hasReportedCompletion(db, transition.teamId, transition.memberName)) {
               nudgedMembers.add(nudgeKey)
               log(`nudge:idle-without-report name=${transition.memberName}`)
               client.session.promptAsync({
@@ -232,7 +235,13 @@ const plugin: Plugin = async (input) => {
           const team = db.query("SELECT id FROM team WHERE lead_session_id = ? AND status = 'active'").get(sessionID) as { id: string } | null
           if (team) {
             const pending = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = 'lead' AND delivered = 0").get(team.id) as { c: number }
-            if (pending.c > 0) {
+            // Skip wake if all teammates are done or if we woke recently (issue #3 — breaks completion loop)
+            const allDone = (db.query(
+              "SELECT COUNT(*) as c FROM team_member WHERE team_id = ? AND status NOT IN ('ready', 'shutdown', 'error')"
+            ).get(team.id) as { c: number }).c === 0
+            const lastWake = wakeLeadTimestamps.get(team.id) ?? 0
+            if (pending.c > 0 && !allDone && Date.now() - lastWake > WAKE_LEAD_COOLDOWN_MS) {
+              wakeLeadTimestamps.set(team.id, Date.now())
               log(`wake-lead: ${pending.c} pending messages, sending promptAsync`)
               client.session.promptAsync({
                 sessionID,
@@ -250,7 +259,7 @@ const plugin: Plugin = async (input) => {
              JOIN team t ON tm.team_id = t.id
              WHERE tm.session_id = ? AND t.status = 'active'`
           ).get(sessionID) as { team_id: string; name: string } | null
-          if (member) {
+          if (member && !hasReportedCompletion(db, member.team_id, member.name)) {
             const staleThreshold = Date.now() - 5000
             const peerMsgs = db.query(
               "SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = ? AND delivered = 0 AND time_created < ?"

package/src/messaging.ts

@@ -76,3 +76,14 @@ export function getUndeliveredMessages(db: Database, teamId: string): MessageRow
 export function markDelivered(db: Database, messageId: string): void {
   db.run("UPDATE team_message SET delivered = 1 WHERE id = ?", [messageId])
 }
+
+/**
+ * Check if a teammate has reported completion to the lead.
+ * Returns true if the reported_to_lead flag is set on the member.
+ */
+export function hasReportedCompletion(db: Database, teamId: string, memberName: string): boolean {
+  const row = db.query(
+    "SELECT reported_to_lead FROM team_member WHERE team_id = ? AND name = ?"
+  ).get(teamId, memberName) as { reported_to_lead: number } | null
+  return row?.reported_to_lead === 1
+}

package/src/recovery.ts

@@ -1,7 +1,7 @@
 import type { Database } from "bun:sqlite"
 import type { PluginClient } from "./types"
 import type { MemberRegistry } from "./state"
-import { getUndeliveredMessages, markDelivered } from "./messaging"
+import { getUndeliveredMessages, markDelivered, hasReportedCompletion } from "./messaging"
 import { preserveBranch, preservedBranchName } from "./tools/merge-helper"
 import { log } from "./log"
 
@@ -123,6 +123,12 @@ export async function recoverUndeliveredMessages(
 
       if (!recipientSessionId) continue
 
+      // Skip delivery to teammates who have already reported completion (issue #3)
+      if (hasReportedCompletion(db, team.id, msg.to_name!)) {
+        markDelivered(db, msg.id)
+        continue
+      }
+
       try {
         await client.session.promptAsync({
           sessionID: recipientSessionId,

package/src/schema.ts

@@ -80,6 +80,8 @@ export const MIGRATIONS: string[] = [
   `ALTER TABLE team ADD COLUMN lead_agent TEXT;`,
   // Migration 6: Track workspace ID for worktree-session binding
   `ALTER TABLE team_member ADD COLUMN workspace_id TEXT;`,
+  // Migration 7: Track whether teammate has reported to lead (completion loop prevention, issue #3)
+  `ALTER TABLE team_member ADD COLUMN reported_to_lead INTEGER NOT NULL DEFAULT 0;`,
 ]
 
 /**

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

@@ -67,57 +67,21 @@ 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 }
 }
 

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-broadcast.ts

@@ -1,6 +1,6 @@
 import type { ToolDeps } from "../types"
 import { requireTeamMember } from "./shared"
-import { broadcastMessage, markDelivered } from "../messaging"
+import { broadcastMessage, markDelivered, hasReportedCompletion } from "../messaging"
 import { log } from "../log"
 
 /**
@@ -40,8 +40,14 @@ export async function executeTeamBroadcast(
   }
 
   // Fire-and-forget: deliver to all recipients. Message is already persisted in DB.
+  // Skip completed teammates to prevent re-waking them (issue #3).
   let delivered = 0
+  let skipped = 0
   for (const recipient of recipients) {
+    if (recipient.name !== "lead" && hasReportedCompletion(deps.db, teamInfo.teamId, recipient.name)) {
+      skipped++
+      continue
+    }
     deps.client.session.promptAsync({
       sessionID: recipient.sessionId,
       parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }],
@@ -53,5 +59,6 @@ export async function executeTeamBroadcast(
     })
   }
 
-  return `Broadcast sent to ${recipients.length} recipient${recipients.length !== 1 ? "s" : ""}.`
+  const sent = recipients.length - skipped
+  return `Broadcast sent to ${sent} recipient${sent !== 1 ? "s" : ""}.`
 }

package/src/tools/team-cleanup.ts

@@ -132,7 +132,7 @@ export async function executeTeamCleanup(
     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")}\nCheck git stash list or git diff to recover.`)
+    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

@@ -38,7 +38,13 @@ export async function executeTeamMerge(
     const overlap = await overlapCheck(branch, deps.directory)
     if (overlap.length > 0) {
       const files = overlap.map(f => `  - ${f}`).join("\n")
-      return `Cannot merge ${args.member}'s branch — you have local changes to files that ${args.member} also modified:\n${files}\n\nCommit or stash your changes to these files first, then retry team_merge.\nBranch preserved: ${branch}`
+      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}`)
@@ -46,7 +52,14 @@ export async function executeTeamMerge(
 
   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
@@ -57,6 +70,5 @@ export async function executeTeamMerge(
   )
 
   log(`merge:done member=${args.member} branch=${branch}`)
-  const msg = `Merged ${args.member}'s changes into working directory (unstaged). Review with: git diff`
-  return result.error ? `${msg}\n\nWarning: ${result.error}` : msg
+  return `Merged ${args.member}'s changes into your working directory (unstaged). Review with: git diff`
 }

package/src/tools/team-message.ts

@@ -1,7 +1,7 @@
 import type { ToolDeps } from "../types"
 import { resolveRecipientSession } from "../types"
 import { requireTeamMember } from "./shared"
-import { sendMessage, markDelivered } from "../messaging"
+import { sendMessage, markDelivered, hasReportedCompletion } from "../messaging"
 import { log } from "../log"
 
 /**
@@ -90,6 +90,11 @@ export async function executeTeamMessage(
     return `Message sent to ${args.to}.`
   }
 
+  // Guard: skip promptAsync delivery to teammates who have already reported completion (issue #3)
+  if (hasReportedCompletion(deps.db, teamInfo.teamId, args.to)) {
+    return `Message stored for ${args.to} (teammate has completed their task — message will not wake them).`
+  }
+
   // For member-to-member messages, fire-and-forget delivery is safe.
   const deliveryText = `[Team message from ${senderName}]: ${messageText}`
   deps.client.session.promptAsync({

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}`
 }