@hueyexe/opencode-ensemble 0.12.0 → 0.12.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-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.12.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.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.12.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.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.12.1"]
 }
 ```
 
@@ -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

@@ -36,6 +36,7 @@ __export(exports_merge_helper, {
   gitStashPop: () => gitStashPop,
   gitStash: () => gitStash,
   gitReset: () => gitReset,
+  getOverlappingFiles: () => getOverlappingFiles,
   deleteBranch: () => deleteBranch
 });
 async function preserveBranch(sourceBranch, targetBranch, cwd) {
@@ -112,6 +113,22 @@ async function mergeBranch(branch, cwd) {
   }
   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}`;
 }
@@ -17324,7 +17341,7 @@ Warning: ${memberName} has uncommitted changes in their worktree. Commit or merg
 
 // 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 +17389,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 +17434,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(`
+`)}
+Check git stash list or git diff to recover.`);
+  }
   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,6 +17459,20 @@ 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}'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}`;
+    }
+  } 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:
@@ -17439,7 +17483,10 @@ Error: ${result.error}`;
   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`;
+  const msg = `Merged ${args.member}'s changes into working directory (unstaged). Review with: git diff`;
+  return result.error ? `${msg}
+
+Warning: ${result.error}` : msg;
 }
 
 // src/tools/team-tasks-list.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hueyexe/opencode-ensemble",
-  "version": "0.12.0",
+  "version": "0.12.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/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>
 
@@ -118,6 +121,25 @@ export async function mergeBranch(branch: string, cwd: string): Promise<MergeRes
   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/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")}\nCheck git stash list or git diff to recover.`)
+  }
   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,6 +33,17 @@ 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}'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}`
+    }
+  } 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}`
@@ -45,5 +57,6 @@ 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`
+  const msg = `Merged ${args.member}'s changes into working directory (unstaged). Review with: git diff`
+  return result.error ? `${msg}\n\nWarning: ${result.error}` : msg
 }