@hueyexe/opencode-ensemble 0.6.4 → 0.7.0

package/README.md

@@ -79,7 +79,11 @@ Lead: "All validation and tests are complete. 5 endpoints validated,
 
 ## Install
 
-Add the plugin to your OpenCode config. Project-level or global.
+Two steps: add the plugin, then allowlist worktree paths.
+
+### 1. Add the plugin
+
+Add to your OpenCode config. Project-level or global.
 
 **Project-level** (`opencode.json` in your project root):
 
@@ -99,6 +103,24 @@ Add the plugin to your OpenCode config. Project-level or global.
 
 OpenCode auto-installs npm plugins at startup (cached in `~/.cache/opencode/node_modules/`). No `npm install` needed.
 
+### 2. Allow worktree directory access
+
+Teammates work in git worktrees outside your project directory. Without this permission, OpenCode will prompt you to approve every file operation in a teammate's worktree.
+
+Add to your OpenCode config (`~/.config/opencode/opencode.json`):
+
+```json
+{
+  "permission": {
+    "external_directory": {
+      "~/.local/share/opencode/worktree/**": "allow"
+    }
+  }
+}
+```
+
+This is required. Without it, you'll see "Permission required — Access external directory" prompts constantly.
+
 ### Local development
 
 For working on the plugin itself, create `.opencode/plugins/ensemble.ts` in your project:
@@ -221,7 +243,7 @@ Same coordination model (shared tasks, peer messaging, lead coordination) with s
 ```bash
 bun install
 bun run typecheck
-bun test             # 286 tests
+bun test             # 370 tests
 bun run build
 ```
 

package/dist/index.js

@@ -15366,7 +15366,8 @@ var MIGRATIONS = [
    ALTER TABLE team_member ADD COLUMN worktree_branch TEXT;`,
   `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 ADD COLUMN lead_agent TEXT;`,
+  `ALTER TABLE team_member ADD COLUMN workspace_id TEXT;`
 ];
 function applyMigrations(db) {
   const { user_version: current } = db.query("PRAGMA user_version").get();
@@ -15426,6 +15427,11 @@ function wrapThrowingClient(raw) {
       remove: throwing(r.worktree.remove.bind(r.worktree)),
       list: throwing(r.worktree.list.bind(r.worktree)),
       reset: throwing(r.worktree.reset.bind(r.worktree))
+    },
+    workspace: {
+      create: throwing(r.experimental.workspace.create.bind(r.experimental.workspace)),
+      remove: throwing(r.experimental.workspace.remove.bind(r.experimental.workspace)),
+      list: throwing(r.experimental.workspace.list.bind(r.experimental.workspace))
     }
   };
 }
@@ -15770,7 +15776,7 @@ function buildLeadSystemPrompt(db, teamId) {
     }
     lines.push("--- End Messages ---");
   }
-  lines.push("", "CRITICAL: Spawn teammates ONE AT A TIME. Send only ONE team_spawn call per response.", "Wait for the tool result before spawning the next teammate.", "Multiple team_spawn calls in a single response will cause timeouts.", "", "Teammates work asynchronously and message you when done.", "Do NOT poll team_status or team_tasks_list repeatedly \u2014 wait for messages.", "After spawning all teammates, tell the user what you've set up and wait.", "When all teammates finish, summarize results and suggest next steps.");
+  lines.push("", "CRITICAL: Spawn teammates ONE AT A TIME. Send only ONE team_spawn call per response.", "Wait for the tool result before spawning the next teammate.", "Multiple team_spawn calls in a single response will cause timeouts.", "", "Teammates work asynchronously and message you when done.", "Do NOT poll team_status or team_tasks_list repeatedly \u2014 wait for messages.", "After spawning all teammates, tell the user what you've set up and wait.", "When all teammates finish, summarize results and suggest next steps.", "", "Before calling team_cleanup, verify teammates have committed their work.", "team_shutdown will warn you if a teammate has uncommitted changes.", "team_cleanup will block if any worktree has uncommitted changes \u2014 merge or commit first.");
   return lines.join(`
 `);
 }
@@ -15854,10 +15860,41 @@ async function executeTeamCreate(deps, args, sessionId) {
   return `Team "${args.name}" created. You are the lead. Use team_spawn to add teammates.`;
 }
 
+// src/tools/shared.ts
+async function checkWorktreeDirty(dir) {
+  try {
+    const proc = Bun.spawn(["git", "-C", dir, "status", "--porcelain"], { stdout: "pipe", stderr: "pipe" });
+    const output = await new Response(proc.stdout).text();
+    const exitCode = await proc.exited;
+    if (exitCode !== 0)
+      return false;
+    return output.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function requireLead(deps, sessionId) {
+  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
+  if (!teamInfo)
+    throw new Error("This session is not in a team. Use team_create first.");
+  if (teamInfo.role !== "lead")
+    throw new Error("Only the team lead can use this tool.");
+  return { teamId: teamInfo.teamId, teamName: teamInfo.teamName };
+}
+function requireTeamMember(deps, sessionId) {
+  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
+  if (!teamInfo)
+    throw new Error("This session is not in a team.");
+  return teamInfo;
+}
+
 // src/tools/team-spawn.ts
 function getSpawnTimeout() {
   return Number(process.env.SPAWN_TIMEOUT_MS) || 120000;
 }
+function isWorktreeDirectory(dir) {
+  return dir.includes("/opencode/worktree/");
+}
 function withTimeout(promise2, ms, label) {
   let timer;
   return Promise.race([
@@ -15871,15 +15908,11 @@ async function executeTeamSpawn(deps, args, sessionId) {
   const nameError = validateMemberName(args.name);
   if (nameError)
     throw new Error(nameError);
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team. Use team_create first.");
-  if (teamInfo.role !== "lead")
-    throw new Error("Only the team lead can spawn teammates.");
+  const teamInfo = requireLead(deps, sessionId);
   const existing = deps.db.query("SELECT name FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, args.name);
   if (existing)
     throw new Error(`Teammate "${args.name}" already exists in team "${teamInfo.teamName}"`);
-  const useWorktree = args.worktree !== false;
+  const useWorktree = args.worktree !== false && !isWorktreeDirectory(deps.directory);
   const usePlanApproval = args.plan_approval === true;
   log(`spawn:start name=${args.name} agent=${args.agent} worktree=${useWorktree}`);
   let worktreeDir = null;
@@ -15906,26 +15939,50 @@ async function executeTeamSpawn(deps, args, sessionId) {
       } catch {}
     }
   }
+  let workspaceId = null;
+  if (worktreeDir && worktreeBranch) {
+    try {
+      log(`spawn:workspace:start name=${args.name}`);
+      const wsResult = await withTimeout(deps.client.workspace.create({ branch: worktreeBranch }), getSpawnTimeout(), `workspace.create for "${args.name}"`);
+      if (wsResult.data) {
+        workspaceId = wsResult.data.id;
+      }
+      log(`spawn:workspace:done name=${args.name} id=${workspaceId}`);
+    } catch (err) {
+      log(`spawn:workspace:failed name=${args.name} err=${err instanceof Error ? err.message : String(err)}`);
+    }
+  }
   const isReadOnly = args.agent === "plan" || args.agent === "explore";
   const TEAM_TOOLS = ["team_message", "team_broadcast", "team_tasks_list", "team_tasks_add", "team_tasks_complete", "team_claim"];
-  const permission = isReadOnly ? [
-    { permission: "edit", pattern: "*", action: "deny" },
-    { permission: "bash", pattern: "*", action: "deny" },
-    ...TEAM_TOOLS.map((t) => ({ permission: t, pattern: "*", action: "allow" }))
-  ] : undefined;
+  const permission = [];
+  if (worktreeDir) {
+    permission.push({ permission: "edit", pattern: `${worktreeDir}/**`, action: "allow" });
+    if (!isReadOnly) {
+      permission.push({ permission: "bash", pattern: "*", action: "allow" });
+    }
+  }
+  if (isReadOnly) {
+    permission.push({ permission: "edit", pattern: "*", action: "deny" }, { permission: "bash", pattern: "*", action: "deny" });
+  }
+  permission.push(...TEAM_TOOLS.map((t) => ({ permission: t, pattern: "*", action: "allow" })));
   let childSessionId;
   try {
     log(`spawn:session:start name=${args.name}`);
     const createResult = await withTimeout(deps.client.session.create({
       parentID: sessionId,
       title: `${args.name} (@${args.agent} teammate)`,
-      ...permission ? { permission } : {},
-      ...worktreeDir ? { directory: worktreeDir } : {}
+      permission,
+      ...workspaceId ? { workspaceID: workspaceId } : {}
     }), getSpawnTimeout(), `session.create for "${args.name}"`);
     childSessionId = createResult.data?.id;
     log(`spawn:session:done name=${args.name} sessionId=${childSessionId}`);
   } catch (err) {
     log(`spawn:session:failed name=${args.name} err=${err instanceof Error ? err.message : String(err)}`);
+    if (workspaceId) {
+      try {
+        await deps.client.workspace.remove({ id: workspaceId });
+      } catch {}
+    }
     if (worktreeDir) {
       try {
         await deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } });
@@ -15934,6 +15991,11 @@ async function executeTeamSpawn(deps, args, sessionId) {
     throw new Error(`Failed to create session for teammate "${args.name}": ${err instanceof Error ? err.message : String(err)}`);
   }
   if (!childSessionId) {
+    if (workspaceId) {
+      try {
+        await deps.client.workspace.remove({ id: workspaceId });
+      } catch {}
+    }
     if (worktreeDir) {
       try {
         await deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } });
@@ -15943,20 +16005,46 @@ async function executeTeamSpawn(deps, args, sessionId) {
   }
   const planApproval = usePlanApproval ? "pending" : "none";
   const now = Date.now();
-  deps.db.run(`INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, model, prompt, worktree_dir, worktree_branch, plan_approval, time_created, time_updated)
-     VALUES (?, ?, ?, ?, 'busy', 'starting', ?, ?, ?, ?, ?, ?, ?)`, [teamInfo.teamId, args.name, childSessionId, args.agent, args.model ?? null, args.prompt, worktreeDir, worktreeBranch, planApproval, now, now]);
+  deps.db.run(`INSERT INTO team_member (team_id, name, session_id, agent, status, execution_status, model, prompt, worktree_dir, worktree_branch, workspace_id, plan_approval, time_created, time_updated)
+     VALUES (?, ?, ?, ?, 'busy', 'starting', ?, ?, ?, ?, ?, ?, ?, ?)`, [teamInfo.teamId, args.name, childSessionId, args.agent, args.model ?? null, args.prompt, worktreeDir, worktreeBranch, workspaceId, planApproval, now, now]);
   deps.registry.register(teamInfo.teamId, args.name, childSessionId);
   const context = [
     `You are "${args.name}", a teammate in team "${teamInfo.teamName}".`,
     `Your agent type is "${args.agent}".`
   ];
-  if (worktreeBranch) {
-    context.push(`You are working on branch "${worktreeBranch}" in your own worktree. Your changes are isolated from other teammates.`);
+  if (worktreeBranch && worktreeDir && !workspaceId) {
+    context.push(`You are working on branch "${worktreeBranch}" in your own worktree at: ${worktreeDir}`, `Your changes are isolated from other teammates.`, `IMPORTANT: All file operations and shell commands MUST target your worktree directory.`, `Before running shell commands, cd to: ${worktreeDir}`);
+  } else if (worktreeBranch && worktreeDir) {
+    context.push(`You are working on branch "${worktreeBranch}" in your own isolated worktree.`, `Your changes are isolated from other teammates.`);
+  } else if (worktreeBranch) {
+    context.push(`You are working on branch "${worktreeBranch}". Your changes are isolated from other teammates.`);
   }
   if (usePlanApproval) {
     context.push("", "IMPORTANT: You are in PLAN MODE.", "Read and explore the codebase, then send your implementation plan to the lead via team_message.", "Do NOT write or modify any files until the lead approves your plan.", "Wait for the lead's approval message before proceeding with implementation.");
   }
-  context.push("", "Tools available to you:", "- team_message: send a message to the lead or another teammate", "- team_broadcast: send a message to all team members", "- team_tasks_list: view the shared team task board", "- team_tasks_add: add tasks to the shared board", "- team_tasks_complete: mark a task complete on the shared board", "- team_claim: claim a pending task from the shared board", "", "When you finish your task:", "1. If you claimed a task, mark it complete using team_tasks_complete.", "2. Send ONE message to the lead with your findings using team_message.", "3. STOP. Do not send follow-up confirmations, status updates, or 'standing by' messages.", "", "If you are blocked, send ONE message to the lead describing the specific blocker.", "", "Your plain text output is NOT visible to the team. You MUST use team_message to communicate.");
+  if (isReadOnly) {
+    context.push("", "Tools available to you:", "- team_message: send a message to the lead or another teammate", "- team_broadcast: send a message to all team members", "- team_tasks_list: view the shared team task board");
+  } else {
+    context.push("", "Tools available to you:", "- team_message: send a message to the lead or another teammate", "- team_broadcast: send a message to all team members", "- team_tasks_list: view the shared team task board", "- team_tasks_add: add tasks to the shared board", "- team_tasks_complete: mark a task complete on the shared board", "- team_claim: claim a pending task from the shared board");
+  }
+  context.push("", "When you finish your task:");
+  if (!isReadOnly && worktreeBranch) {
+    context.push(`1. Commit your changes: git add -A && git commit -m "your summary"`);
+    context.push("2. If you claimed a task, mark it complete using team_tasks_complete.");
+    context.push("3. Send ONE message to the lead using team_message with this format:");
+  } else if (!isReadOnly) {
+    context.push("1. If you claimed a task, mark it complete using team_tasks_complete.");
+    context.push("2. Send ONE message to the lead using team_message with this format:");
+  } else {
+    context.push("1. Send ONE message to the lead using team_message with this format:");
+  }
+  context.push("<task-result>", "<status>completed or failed</status>", "<summary>One-line summary of what you did</summary>", "<details>Full findings or changes made</details>");
+  if (worktreeBranch) {
+    context.push(`<branch>${worktreeBranch}</branch>`);
+  }
+  context.push("</task-result>");
+  const lastStep = !isReadOnly && worktreeBranch ? "4" : !isReadOnly ? "3" : "2";
+  context.push(`${lastStep}. STOP. Do not send follow-up confirmations, status updates, or 'standing by' messages.`, "", "If you are blocked, send ONE message to the lead describing the specific blocker.", "", "Your plain text output is NOT visible to the team. You MUST use team_message to communicate.");
   context.push("", "Your task:", args.prompt);
   if (args.claim_task) {
     context.push("", `You have been assigned task ${args.claim_task}. Mark it complete when done.`);
@@ -15974,6 +16062,9 @@ async function executeTeamSpawn(deps, args, sessionId) {
       deps.db.run("DELETE FROM team_member WHERE team_id = ? AND session_id = ?", [teamInfo.teamId, childSessionId]);
       deps.registry.unregister(childSessionId);
       deps.client.session.abort({ sessionID: childSessionId }).catch(() => {});
+      if (workspaceId) {
+        deps.client.workspace.remove({ id: workspaceId }).catch(() => {});
+      }
       if (worktreeDir) {
         deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }).catch(() => {});
       }
@@ -15999,9 +16090,7 @@ async function executeTeamSpawn(deps, args, sessionId) {
 
 // src/tools/team-message.ts
 async function executeTeamMessage(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team. Use team_create first.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName ?? "unknown";
   const recipientSessionId = resolveRecipientSession(deps.db, deps.registry, teamInfo.teamId, args.to);
   if (!recipientSessionId)
@@ -16057,9 +16146,7 @@ async function executeTeamMessage(deps, args, sessionId) {
 
 // src/tools/team-broadcast.ts
 async function executeTeamBroadcast(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team. Use team_create first.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName ?? "unknown";
   const msgId = broadcastMessage(deps.db, {
     teamId: teamInfo.teamId,
@@ -16095,13 +16182,9 @@ async function executeTeamBroadcast(deps, args, sessionId) {
 }
 
 // src/tools/team-shutdown.ts
-async function executeTeamShutdown(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
-  if (teamInfo.role !== "lead")
-    throw new Error("Only the team lead can shut down teammates.");
-  const member = deps.db.query("SELECT session_id, status, worktree_branch FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, args.member);
+async function executeTeamShutdown(deps, args, sessionId, isDirty = checkWorktreeDirty) {
+  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)
     throw new Error(`Teammate "${args.member}" not found in team "${teamInfo.teamName}"`);
   if (member.status === "shutdown")
@@ -16110,7 +16193,8 @@ async function executeTeamShutdown(deps, args, sessionId) {
   if (member.status === "shutdown_requested") {
     await abortAndShutdown(deps, teamInfo.teamId, args.member, member.session_id);
     const branchInfo = member.worktree_branch ? ` Changes on branch: ${member.worktree_branch}` : "";
-    return `Force shut down "${args.member}".${branchInfo}`;
+    const dirtyWarning = await getDirtyWarning(member.worktree_dir, args.member, isDirty);
+    return `Force shut down "${args.member}".${branchInfo}${dirtyWarning}`;
   }
   let isIdle = false;
   try {
@@ -16121,7 +16205,8 @@ async function executeTeamShutdown(deps, args, sessionId) {
   if (isIdle || force) {
     await abortAndShutdown(deps, teamInfo.teamId, args.member, member.session_id);
     const branchInfo = member.worktree_branch ? ` Changes on branch: ${member.worktree_branch}` : "";
-    return `Teammate "${args.member}" has been shut down.${branchInfo}`;
+    const dirtyWarning = await getDirtyWarning(member.worktree_dir, args.member, isDirty);
+    return `Teammate "${args.member}" has been shut down.${branchInfo}${dirtyWarning}`;
   }
   try {
     await deps.client.session.promptAsync({
@@ -16141,20 +16226,50 @@ async function abortAndShutdown(deps, teamId, memberName, sessionId) {
   } catch {}
   deps.db.run("UPDATE team_member SET status = 'shutdown', execution_status = 'idle', time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), teamId, memberName]);
 }
+async function getDirtyWarning(worktreeDir, memberName, isDirty) {
+  if (!worktreeDir)
+    return "";
+  try {
+    if (await isDirty(worktreeDir)) {
+      return `
+
+Warning: ${memberName} has uncommitted changes in their worktree. Commit or merge before calling team_cleanup.`;
+    }
+  } catch {}
+  return "";
+}
 
 // src/tools/team-cleanup.ts
-async function executeTeamCleanup(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
-  if (teamInfo.role !== "lead")
-    throw new Error("Only the team lead can clean up the team.");
-  const members = deps.db.query("SELECT name, session_id, status, worktree_dir, worktree_branch FROM team_member WHERE team_id = ?").all(teamInfo.teamId);
+async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty) {
+  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");
   if (active.length > 0 && !args.force) {
     const names = active.map((m) => m.name).join(", ");
     throw new Error(`Cannot clean up team "${teamInfo.teamName}": ${active.length} member(s) still active: ${names}. Use team_shutdown on each member first, or call team_cleanup with force: true to abort them immediately.`);
   }
+  if (!args.acknowledge_uncommitted) {
+    const dirty = [];
+    for (const member of members) {
+      if (member.worktree_dir) {
+        try {
+          if (await isDirty(member.worktree_dir)) {
+            dirty.push({ name: member.name, branch: member.worktree_branch ?? "unknown" });
+          }
+        } catch {
+          log(`cleanup:dirty-check:failed name=${member.name}`);
+        }
+      }
+    }
+    if (dirty.length > 0) {
+      const warnings = dirty.map((d) => `  - ${d.name} (branch: ${d.branch})`).join(`
+`);
+      return `Warning: ${dirty.length} teammate(s) have uncommitted changes in their worktrees:
+${warnings}
+
+Commit or merge their work first, then call team_cleanup with acknowledge_uncommitted: true to proceed.`;
+    }
+  }
   if (args.force) {
     for (const member of active) {
       try {
@@ -16164,9 +16279,16 @@ async function executeTeamCleanup(deps, args, sessionId) {
   }
   const branches = [];
   for (const member of members) {
+    if (member.workspace_id) {
+      try {
+        await deps.client.workspace.remove({ id: member.workspace_id });
+        deps.db.run("UPDATE team_member SET workspace_id = NULL WHERE team_id = ? AND name = ?", [teamInfo.teamId, member.name]);
+      } catch {}
+    }
     if (member.worktree_dir) {
       try {
         await deps.client.worktree.remove({ worktreeRemoveInput: { directory: member.worktree_dir } });
+        deps.db.run("UPDATE team_member SET worktree_dir = NULL WHERE team_id = ? AND name = ?", [teamInfo.teamId, member.name]);
       } catch {}
     }
     if (member.worktree_branch) {
@@ -16188,9 +16310,7 @@ ${mergeCommands}`;
 
 // src/tools/team-tasks-list.ts
 async function executeTeamTasksList(deps, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const tasks = deps.db.query("SELECT * FROM team_task WHERE team_id = ? ORDER BY time_created ASC").all(teamInfo.teamId);
   if (tasks.length === 0)
     return "No tasks on the board.";
@@ -16200,9 +16320,7 @@ async function executeTeamTasksList(deps, sessionId) {
 
 // src/tools/team-tasks-add.ts
 async function executeTeamTasksAdd(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const ids = [];
   const now = Date.now();
   for (const task of args.tasks) {
@@ -16225,9 +16343,7 @@ async function executeTeamTasksAdd(deps, args, sessionId) {
 
 // src/tools/team-tasks-complete.ts
 async function executeTeamTasksComplete(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const task = deps.db.query("SELECT * FROM team_task WHERE id = ? AND team_id = ?").get(args.task_id, teamInfo.teamId);
   if (!task)
     throw new Error(`Task "${args.task_id}" not found`);
@@ -16258,9 +16374,7 @@ async function executeTeamTasksComplete(deps, args, sessionId) {
 
 // src/tools/team-claim.ts
 async function executeTeamClaim(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const claimerName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName ?? "unknown";
   const task = deps.db.query("SELECT * FROM team_task WHERE id = ? AND team_id = ?").get(args.task_id, teamInfo.teamId);
   if (!task)
@@ -16280,9 +16394,7 @@ async function executeTeamClaim(deps, args, sessionId) {
 
 // src/tools/team-results.ts
 async function executeTeamResults(deps, args, sessionId) {
-  const team = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!team)
-    throw new Error("not in a team");
+  const team = requireTeamMember(deps, sessionId);
   const rows = args.from ? deps.db.query("SELECT id, from_name, content, time_created FROM team_message WHERE team_id = ? AND read = 0 AND from_name = ? ORDER BY time_created ASC").all(team.teamId, args.from) : deps.db.query("SELECT id, from_name, content, time_created FROM team_message WHERE team_id = ? AND read = 0 ORDER BY time_created ASC").all(team.teamId);
   if (rows.length === 0)
     return "No unread messages.";
@@ -16299,16 +16411,14 @@ ${r.content}
 var lastCallTime = new Map;
 var RATE_LIMIT_MS = 30000;
 async function executeTeamStatus(deps, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const now = Date.now();
   const last = lastCallTime.get(teamInfo.teamId);
   if (last !== undefined && now - last < RATE_LIMIT_MS) {
     return "No changes since last check.";
   }
   lastCallTime.set(teamInfo.teamId, now);
-  const members = deps.db.query("SELECT name, session_id, agent, status, execution_status, worktree_branch, plan_approval FROM team_member WHERE team_id = ? ORDER BY time_created ASC").all(teamInfo.teamId);
+  const members = deps.db.query("SELECT name, session_id, agent, status, execution_status, worktree_branch, worktree_dir, plan_approval FROM team_member WHERE team_id = ? ORDER BY time_created ASC").all(teamInfo.teamId);
   const tasks = deps.db.query("SELECT status FROM team_task WHERE team_id = ?").all(teamInfo.teamId);
   const lines = [];
   lines.push(`Team: ${teamInfo.teamName} (you are the ${teamInfo.role})`);
@@ -16322,6 +16432,9 @@ async function executeTeamStatus(deps, sessionId) {
       const branch = m.worktree_branch ? `  branch: ${m.worktree_branch}` : "";
       const plan = m.plan_approval !== "none" ? `, plan: ${m.plan_approval}` : "";
       lines.push(`  ${m.name}  [${statusIcon}${plan}]  agent: ${m.agent}${branch}  session: ${m.session_id}`);
+      if (m.worktree_dir) {
+        lines.push(`    worktree: ${m.worktree_dir}`);
+      }
     }
   }
   if (tasks.length > 0) {
@@ -16358,9 +16471,7 @@ async function executeTeamStatus(deps, sessionId) {
 
 // src/tools/team-view.ts
 async function executeTeamView(deps, args, sessionId) {
-  const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId);
-  if (!teamInfo)
-    throw new Error("This session is not in a team.");
+  const teamInfo = requireTeamMember(deps, sessionId);
   const member = deps.db.query("SELECT session_id, status, agent FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, args.member);
   if (!member)
     throw new Error(`Teammate "${args.member}" not found in team "${teamInfo.teamName}"`);
@@ -16450,7 +16561,28 @@ class Watchdog {
     this.ttlMs = opts.ttlMs;
     this.checkIntervalMs = opts.checkIntervalMs ?? 60000;
   }
+  static STALE_THRESHOLD_MS = Number(process.env.STALE_WORKTREE_THRESHOLD_MS) || 300000;
+  async cleanupStaleWorktrees() {
+    const cutoff = Date.now() - Watchdog.STALE_THRESHOLD_MS;
+    const stale = this.db.query(`SELECT tm.team_id, tm.name, tm.worktree_dir, tm.workspace_id
+       FROM team_member tm
+       JOIN team t ON tm.team_id = t.id
+       WHERE t.status = 'active'
+         AND tm.status IN ('shutdown', 'error')
+         AND tm.worktree_dir IS NOT NULL
+         AND tm.time_updated < ?`).all(cutoff);
+    for (const m of stale) {
+      try {
+        if (m.workspace_id) {
+          await this.client.workspace.remove({ id: m.workspace_id });
+        }
+        await this.client.worktree.remove({ worktreeRemoveInput: { directory: m.worktree_dir } });
+        this.db.run("UPDATE team_member SET worktree_dir = NULL, worktree_branch = NULL, workspace_id = NULL WHERE team_id = ? AND name = ?", [m.team_id, m.name]);
+      } catch {}
+    }
+  }
   async check() {
+    await this.cleanupStaleWorktrees();
     if (this.ttlMs === 0)
       return;
     const cutoff = Date.now() - this.ttlMs;
@@ -16478,8 +16610,6 @@ class Watchdog {
   start() {
     if (this.timer)
       return;
-    if (this.ttlMs === 0)
-      return;
     this.timer = setInterval(() => this.check(), this.checkIntervalMs);
   }
   stop() {
@@ -16638,10 +16768,13 @@ var plugin = async (input) => {
       output.env.ENSEMBLE_ROLE = teamInfo.role;
       if (teamInfo.memberName) {
         output.env.ENSEMBLE_MEMBER = teamInfo.memberName;
-        const member = db.query("SELECT worktree_branch FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, teamInfo.memberName);
+        const member = db.query("SELECT worktree_branch, worktree_dir FROM team_member WHERE team_id = ? AND name = ?").get(teamInfo.teamId, teamInfo.memberName);
         if (member?.worktree_branch) {
           output.env.ENSEMBLE_BRANCH = member.worktree_branch;
         }
+        if (member?.worktree_dir) {
+          output.env.ENSEMBLE_WORKTREE_DIR = member.worktree_dir;
+        }
       }
     },
     tool: {
@@ -16765,18 +16898,21 @@ var plugin = async (input) => {
         },
         async execute(args, ctx) {
           const result = await executeTeamShutdown(deps, args, ctx.sessionID);
-          ctx.metadata({ title: `Shutdown \u2192 ${args.member}` });
+          const hasWarning = result.includes("uncommitted");
+          ctx.metadata({ title: hasWarning ? `${args.member} shut down \u2014 uncommitted changes` : `${args.member} shut down` });
           return result;
         }
       }),
       team_cleanup: tool({
         description: "Clean up the team. All teammates must be shut down first. Removes team data and frees resources.",
         args: {
-          force: tool.schema.boolean().default(false).describe("Force cleanup even if members are active (will abort them)")
+          force: tool.schema.boolean().default(false).describe("Force cleanup even if members are active (will abort them)"),
+          acknowledge_uncommitted: tool.schema.boolean().default(false)
         },
         async execute(args, ctx) {
           const result = await executeTeamCleanup(deps, args, ctx.sessionID);
-          ctx.metadata({ title: "Team cleaned up" });
+          const blocked = result.includes("uncommitted");
+          ctx.metadata({ title: blocked ? "Cleanup blocked \u2014 uncommitted changes" : "Team cleaned up" });
           return result;
         }
       }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hueyexe/opencode-ensemble",
-  "version": "0.6.4",
+  "version": "0.7.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/client.ts

@@ -25,6 +25,7 @@ interface RawClient {
   session: { create: SdkMethod; promptAsync: SdkMethod; abort: SdkMethod; status: SdkMethod }
   tui: { showToast: SdkMethod; selectSession: SdkMethod }
   worktree: { create: SdkMethod; remove: SdkMethod; list: SdkMethod; reset: SdkMethod }
+  experimental: { workspace: { create: SdkMethod; remove: SdkMethod; list: SdkMethod } }
 }
 
 /**
@@ -50,5 +51,10 @@ export function wrapThrowingClient(raw: unknown): PluginClient {
       list: throwing(r.worktree.list.bind(r.worktree)),
       reset: throwing(r.worktree.reset.bind(r.worktree)),
     },
+    workspace: {
+      create: throwing(r.experimental.workspace.create.bind(r.experimental.workspace)),
+      remove: throwing(r.experimental.workspace.remove.bind(r.experimental.workspace)),
+      list: throwing(r.experimental.workspace.list.bind(r.experimental.workspace)),
+    },
   } as PluginClient
 }

package/src/index.ts

@@ -217,11 +217,14 @@ const plugin: Plugin = async (input) => {
       output.env.ENSEMBLE_ROLE = teamInfo.role
       if (teamInfo.memberName) {
         output.env.ENSEMBLE_MEMBER = teamInfo.memberName
-        const member = db.query("SELECT worktree_branch FROM team_member WHERE team_id = ? AND name = ?")
-          .get(teamInfo.teamId, teamInfo.memberName) as { worktree_branch: string | null } | null
+        const member = db.query("SELECT worktree_branch, worktree_dir FROM team_member WHERE team_id = ? AND name = ?")
+          .get(teamInfo.teamId, teamInfo.memberName) as { worktree_branch: string | null; worktree_dir: string | null } | null
         if (member?.worktree_branch) {
           output.env.ENSEMBLE_BRANCH = member.worktree_branch
         }
+        if (member?.worktree_dir) {
+          output.env.ENSEMBLE_WORKTREE_DIR = member.worktree_dir
+        }
       }
     },
 
@@ -358,7 +361,8 @@ const plugin: Plugin = async (input) => {
         },
         async execute(args, ctx) {
           const result = await executeTeamShutdown(deps, args, ctx.sessionID)
-          ctx.metadata({ title: `Shutdown → ${args.member}` })
+          const hasWarning = result.includes("uncommitted")
+          ctx.metadata({ title: hasWarning ? `${args.member} shut down — uncommitted changes` : `${args.member} shut down` })
           return result
         },
       }),
@@ -367,10 +371,12 @@ const plugin: Plugin = async (input) => {
         description: "Clean up the team. All teammates must be shut down first. Removes team data and frees resources.",
         args: {
           force: tool.schema.boolean().default(false).describe("Force cleanup even if members are active (will abort them)"),
+          acknowledge_uncommitted: tool.schema.boolean().default(false),
         },
         async execute(args, ctx) {
           const result = await executeTeamCleanup(deps, args, ctx.sessionID)
-          ctx.metadata({ title: "Team cleaned up" })
+          const blocked = result.includes("uncommitted")
+          ctx.metadata({ title: blocked ? "Cleanup blocked — uncommitted changes" : "Team cleaned up" })
           return result
         },
       }),

package/src/schema.ts

@@ -78,6 +78,8 @@ export const MIGRATIONS: string[] = [
      CHECK(plan_approval IN ('none', 'pending', 'approved', 'rejected'));`,
   // Migration 5: Track lead's agent mode so message delivery preserves it
   `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;`,
 ]
 
 /**