@hueyexe/opencode-ensemble 0.6.4 → 0.6.5

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))
     }
   };
 }
@@ -15906,6 +15912,19 @@ 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 ? [
@@ -15920,12 +15939,17 @@ async function executeTeamSpawn(deps, args, sessionId) {
       parentID: sessionId,
       title: `${args.name} (@${args.agent} teammate)`,
       ...permission ? { permission } : {},
-      ...worktreeDir ? { directory: worktreeDir } : {}
+      ...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 +15958,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,15 +15972,19 @@ 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.");
@@ -15974,6 +16007,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(() => {});
       }
@@ -16149,7 +16185,7 @@ async function executeTeamCleanup(deps, args, sessionId) {
     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);
+  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(", ");
@@ -16164,9 +16200,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) {
@@ -16638,10 +16681,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: {

package/package.json

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

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;`,
 ]
 
 /**

package/src/tools/team-cleanup.ts

@@ -15,8 +15,8 @@ export async function executeTeamCleanup(
   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) as Array<{ name: string; session_id: string; status: string; worktree_dir: string | null; worktree_branch: string | null }>
+  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) as Array<{ name: string; session_id: string; status: string; worktree_dir: string | null; worktree_branch: string | null; workspace_id: string | null }>
 
   const active = members.filter(m => m.status !== "shutdown" && m.status !== "shutdown_requested" && m.status !== "error")
 
@@ -34,12 +34,19 @@ export async function executeTeamCleanup(
     }
   }
 
-  // Remove worktrees and collect branches for merging
+  // Remove workspaces, worktrees, and collect branches for merging
   const branches: string[] = []
   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 { /* best effort — workspace may already be gone */ }
+    }
     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 { /* best effort — worktree may already be gone */ }
     }
     if (member.worktree_branch) {

package/src/tools/team-spawn.ts

@@ -78,6 +78,26 @@ export async function executeTeamSpawn(
     }
   }
 
+  // Create workspace from worktree branch — links session to worktree directory.
+  // OQ-workspace: assumes workspace.create({ branch }) auto-links to the worktree at that branch.
+  let workspaceId: string | null = 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)}`)
+      // Non-fatal — prompt-based CWD instruction is the fallback
+    }
+  }
+
   // Permission rules on session.create are the hard gate (server-enforced).
   // For read-only agents, deny write tools and explicitly allow team tools
   // so the agent's built-in restrictive permissions don't block them.
@@ -91,7 +111,8 @@ export async function executeTeamSpawn(
       ]
     : undefined
 
-  // Create child session — use worktree directory if available
+  // Create child session — bind to workspace if available (server-enforced CWD isolation).
+  // Falls back to no workspace binding if workspace.create failed.
   let childSessionId: string | undefined
   try {
     log(`spawn:session:start name=${args.name}`)
@@ -100,7 +121,7 @@ export async function executeTeamSpawn(
         parentID: sessionId,
         title: `${args.name} (@${args.agent} teammate)`,
         ...(permission ? { permission } : {}),
-        ...(worktreeDir ? { directory: worktreeDir } : {}),
+        ...(workspaceId ? { workspaceID: workspaceId } : {}),
       }),
       getSpawnTimeout(), `session.create for "${args.name}"`
     )
@@ -108,7 +129,10 @@ export async function executeTeamSpawn(
     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)}`)
-    // Rollback worktree if session creation failed
+    // Rollback workspace and worktree if session creation failed
+    if (workspaceId) {
+      try { await deps.client.workspace.remove({ id: workspaceId }) } catch { /* best effort */ }
+    }
     if (worktreeDir) {
       try { await deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }) } catch { /* best effort */ }
     }
@@ -116,6 +140,9 @@ export async function executeTeamSpawn(
   }
 
   if (!childSessionId) {
+    if (workspaceId) {
+      try { await deps.client.workspace.remove({ id: workspaceId }) } catch { /* best effort */ }
+    }
     if (worktreeDir) {
       try { await deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }) } catch { /* best effort */ }
     }
@@ -126,9 +153,9 @@ export async function executeTeamSpawn(
   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]
+    `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]
   )
 
   // Register in memory
@@ -140,8 +167,22 @@ export async function executeTeamSpawn(
     `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) {
+    // Workspace binding failed — fallback to prompt-based CWD instruction
+    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) {
+    // Workspace binding active — server handles CWD
+    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.`)
   }
 
   // Plan approval mode — teammate must send plan before writing
@@ -200,6 +241,9 @@ export async function executeTeamSpawn(
       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(() => { /* best effort */ })
+      if (workspaceId) {
+        deps.client.workspace.remove({ id: workspaceId }).catch(() => { /* best effort */ })
+      }
       if (worktreeDir) {
         deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }).catch(() => { /* best effort */ })
       }

package/src/types.ts

@@ -62,6 +62,11 @@ export interface PluginClient {
     list(): Promise<{ data?: Array<{ name: string; branch: string; directory: string }> }>
     reset(options: { worktreeResetInput?: { directory: string } }): Promise<unknown>
   }
+  workspace: {
+    create(options: { id?: string; type?: string; branch?: string | null; extra?: unknown | null }): Promise<{ data?: { id: string; type: string; branch: string | null; directory: string | null; projectID: string } }>
+    remove(options: { id: string }): Promise<unknown>
+    list(): Promise<{ data?: Array<{ id: string; type: string; branch: string | null; directory: string | null; projectID: string }> }>
+  }
 }
 
 /**