@hueyexe/opencode-ensemble 0.6.2 → 0.6.3

package/dist/index.js

@@ -15371,7 +15371,9 @@ var MIGRATIONS = [
 function applyMigrations(db) {
   const { user_version: current } = db.query("PRAGMA user_version").get();
   for (let i = current;i < MIGRATIONS.length; i++) {
-    db.exec(MIGRATIONS[i]);
+    const migration = MIGRATIONS[i];
+    if (migration)
+      db.exec(migration);
     db.exec(`PRAGMA user_version = ${i + 1}`);
   }
 }
@@ -15611,6 +15613,9 @@ class MemberRegistry {
   isTeamSession(sessionId) {
     return this.bySession.has(sessionId);
   }
+  allSessionIds() {
+    return new Set(this.bySession.keys());
+  }
 }
 var DEFAULT_MAX_DEPTH = 10;
 
@@ -15680,10 +15685,7 @@ function checkToolIsolation(registry2, tracker, toolName, sessionId) {
     return;
   if (registry2.isTeamSession(sessionId))
     return;
-  const allTeamSessions = new Set;
-  for (const entry of registry2["bySession"].keys()) {
-    allTeamSessions.add(entry);
-  }
+  const allTeamSessions = registry2.allSessionIds();
   if (allTeamSessions.size > 0 && tracker.isDescendantOf(sessionId, allTeamSessions)) {
     throw new Error("Team tools are not available to sub-agents. Report findings to your parent teammate via your normal output.");
   }
@@ -15771,9 +15773,9 @@ function buildLeadSystemPrompt(db, teamId) {
   for (const row of taskCounts) {
     countMap[row.status] = row.count;
   }
-  const completed = countMap["completed"] ?? 0;
-  const inProgress = countMap["in_progress"] ?? 0;
-  const pending = countMap["pending"] ?? 0;
+  const completed = countMap.completed ?? 0;
+  const inProgress = countMap.in_progress ?? 0;
+  const pending = countMap.pending ?? 0;
   const memberList = members.map((m) => `${m.name} [${STATUS_DISPLAY[m.status] ?? m.status}]`).join(", ");
   const teammateLine = members.length > 0 ? `Teammates: ${memberList}` : "Teammates: none";
   return [
@@ -15804,9 +15806,9 @@ function buildTeamCompactionContext(db, teamId, role, memberName) {
   for (const row of taskCounts) {
     countMap[row.status] = row.count;
   }
-  const completed = countMap["completed"] ?? 0;
-  const inProgress = countMap["in_progress"] ?? 0;
-  const pending = countMap["pending"] ?? 0;
+  const completed = countMap.completed ?? 0;
+  const inProgress = countMap.in_progress ?? 0;
+  const pending = countMap.pending ?? 0;
   const roleLine = role === "lead" ? `[Team Context] You are the lead of team "${team.name}".` : `[Team Context] You are a teammate named "${memberName}" in team "${team.name}".`;
   const memberList = members.map((m) => `${m.name} (${STATUS_DISPLAY[m.status] ?? m.status})`).join(", ");
   const membersLine = members.length > 0 ? `Members: ${memberList}` : "Members: none";
@@ -15947,25 +15949,36 @@ async function executeTeamSpawn(deps, args, sessionId) {
   }
   const contextStr = context.join(`
 `);
-  try {
-    await deps.client.session.promptAsync({
-      sessionID: childSessionId,
-      parts: [{ type: "text", text: contextStr }],
-      agent: args.agent
-    });
-  } catch (err) {
-    deps.db.run("DELETE FROM team_member WHERE team_id = ? AND name = ?", [teamInfo.teamId, args.name]);
-    deps.registry.unregister(childSessionId);
+  deps.client.session.promptAsync({
+    sessionID: childSessionId,
+    parts: [{ type: "text", text: contextStr }],
+    agent: args.agent
+  }).catch(() => {
     try {
-      await deps.client.session.abort({ sessionID: childSessionId });
+      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 (worktreeDir) {
+        deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }).catch(() => {});
+      }
+      deps.client.tui.showToast({
+        title: "Team",
+        message: `Teammate "${args.name}" failed to start and was removed`,
+        variant: "error",
+        duration: 5000
+      }).catch(() => {});
+      sendMessage(deps.db, {
+        teamId: teamInfo.teamId,
+        from: "system",
+        to: "lead",
+        content: `Teammate "${args.name}" failed to start and was removed. You may retry the spawn.`
+      });
+      const team = deps.db.query("SELECT lead_session_id FROM team WHERE id = ?").get(teamInfo.teamId);
+      if (team) {
+        handleLeadIdleFlush(deps.db, deps.client, team.lead_session_id).catch(() => {});
+      }
     } catch {}
-    if (worktreeDir) {
-      try {
-        await deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } });
-      } catch {}
-    }
-    throw new Error(`Failed to send initial prompt to teammate "${args.name}": ${err instanceof Error ? err.message : String(err)}`);
-  }
+  });
   const branchInfo = worktreeBranch ? ` (branch: ${worktreeBranch})` : "";
   const planInfo = usePlanApproval ? " [plan mode \u2014 will send plan for approval]" : "";
   return `Teammate "${args.name}" spawned (agent: ${args.agent})${branchInfo}${planInfo}. They are working on: ${args.prompt.slice(0, 120)}${args.prompt.length > 120 ? "..." : ""}`;
@@ -15976,7 +15989,7 @@ 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 senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName;
+  const senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName ?? "unknown";
   const recipientSessionId = resolveRecipientSession(deps.db, deps.registry, teamInfo.teamId, args.to);
   if (!recipientSessionId)
     throw new Error(`Recipient "${args.to}" not found in team "${teamInfo.teamName}"`);
@@ -16026,11 +16039,12 @@ async function executeTeamMessage(deps, args, sessionId) {
   if (recipientBusy) {
     return `Message sent to ${args.to}. (queued \u2014 recipient is busy)`;
   }
-  await deps.client.session.promptAsync({
+  deps.client.session.promptAsync({
     sessionID: recipientSessionId,
     parts: [{ type: "text", text: deliveryText }]
-  });
-  markDelivered(deps.db, msgId);
+  }).then(() => {
+    markDelivered(deps.db, msgId);
+  }).catch(() => {});
   return `Message sent to ${args.to}.`;
 }
 
@@ -16039,7 +16053,7 @@ 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 senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName;
+  const senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName ?? "unknown";
   const msgId = broadcastMessage(deps.db, {
     teamId: teamInfo.teamId,
     from: senderName,
@@ -16059,18 +16073,16 @@ async function executeTeamBroadcast(deps, args, sessionId) {
   }
   let delivered = 0;
   for (const recipient of recipients) {
-    try {
-      await deps.client.session.promptAsync({
-        sessionID: recipient.sessionId,
-        parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }]
-      });
+    deps.client.session.promptAsync({
+      sessionID: recipient.sessionId,
+      parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }]
+    }).then(() => {
       delivered++;
-    } catch {}
-  }
-  if (delivered > 0) {
-    markDelivered(deps.db, msgId);
+      if (delivered === 1)
+        markDelivered(deps.db, msgId);
+    }).catch(() => {});
   }
-  return `Broadcast sent to ${delivered} recipient${delivered !== 1 ? "s" : ""}.`;
+  return `Broadcast sent to ${recipients.length} recipient${recipients.length !== 1 ? "s" : ""}.`;
 }
 
 // src/tools/team-shutdown.ts
@@ -16240,7 +16252,7 @@ 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 claimerName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName;
+  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)
     throw new Error(`Task "${args.task_id}" not found`);
@@ -16484,7 +16496,8 @@ var plugin = async (input) => {
   const db = createDb(dbPath);
   const registry2 = new MemberRegistry;
   const tracker = new DescendantTracker;
-  const rawClient = new OpencodeClient({ client: input.client._client });
+  const pluginTransport = input.client._client;
+  const rawClient = new OpencodeClient({ client: pluginTransport });
   const client3 = wrapThrowingClient(rawClient);
   const deps = { db, registry: registry2, tracker, client: client3, directory: input.directory };
   const recovery = await recoverStaleMembers(db, client3);
@@ -16570,7 +16583,7 @@ var plugin = async (input) => {
       const teamInfo = findTeamBySession(db, registry2, input2.sessionID);
       if (!teamInfo)
         return;
-      const prompt = teamInfo.role === "lead" ? buildLeadSystemPrompt(db, teamInfo.teamId) : buildTeammateSystemPrompt(db, teamInfo.teamId, teamInfo.memberName);
+      const prompt = teamInfo.role === "lead" ? buildLeadSystemPrompt(db, teamInfo.teamId) : buildTeammateSystemPrompt(db, teamInfo.teamId, teamInfo.memberName ?? "unknown");
       output.system.push(prompt);
     },
     "experimental.session.compacting": async (input2, output) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hueyexe/opencode-ensemble",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "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",
@@ -26,12 +26,14 @@
     "README.md"
   ],
   "scripts": {
+    "lint": "bunx biome lint src/",
     "typecheck": "tsc --noEmit",
     "test": "bun test",
     "build": "bun build src/index.ts --outdir dist --target bun",
     "prepublishOnly": "bun run typecheck && bun test && bun run build"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.4.9",
     "@types/bun": "latest"
   },
   "peerDependencies": {

package/src/client.ts

@@ -6,11 +6,11 @@ function extractError(err: unknown): string {
   return String(err)
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AnyFn = (...args: any[]) => Promise<any>
+/** Generic async SDK method type. Actual type safety enforced by PluginClient interface. */
+type SdkMethod = (...args: unknown[]) => Promise<unknown>
 
 /** Wrap a single async SDK method to throw on { error } responses. */
-function throwing(fn: AnyFn): AnyFn {
+function throwing(fn: SdkMethod): SdkMethod {
   return async (...args: unknown[]) => {
     const result = await fn(...args)
     if (result && typeof result === "object" && "error" in result && result.error !== undefined) {
@@ -22,9 +22,9 @@ function throwing(fn: AnyFn): AnyFn {
 
 /** Shape of the raw v2 SDK client — just the methods we wrap. */
 interface RawClient {
-  session: { create: AnyFn; promptAsync: AnyFn; abort: AnyFn; status: AnyFn }
-  tui: { showToast: AnyFn; selectSession: AnyFn }
-  worktree: { create: AnyFn; remove: AnyFn; list: AnyFn; reset: AnyFn }
+  session: { create: SdkMethod; promptAsync: SdkMethod; abort: SdkMethod; status: SdkMethod }
+  tui: { showToast: SdkMethod; selectSession: SdkMethod }
+  worktree: { create: SdkMethod; remove: SdkMethod; list: SdkMethod; reset: SdkMethod }
 }
 
 /**

package/src/db.ts

@@ -1,5 +1,5 @@
 import { Database } from "bun:sqlite"
-import path from "path"
+import path from "node:path"
 import { applyMigrations } from "./schema"
 
 let instance: Database | undefined

package/src/hooks.ts

@@ -94,10 +94,7 @@ export function checkToolIsolation(
   if (registry.isTeamSession(sessionId)) return
 
   // Check if this session is a descendant of any team member
-  const allTeamSessions = new Set<string>()
-  for (const entry of registry["bySession"].keys()) {
-    allTeamSessions.add(entry)
-  }
+  const allTeamSessions = registry.allSessionIds()
 
   if (allTeamSessions.size > 0 && tracker.isDescendantOf(sessionId, allTeamSessions)) {
     throw new Error("Team tools are not available to sub-agents. Report findings to your parent teammate via your normal output.")

package/src/index.ts

@@ -1,7 +1,7 @@
 import type { Plugin } from "@opencode-ai/plugin"
 import { tool } from "@opencode-ai/plugin"
-import { OpencodeClient as OpencodeClientV2 } from "@opencode-ai/sdk/v2"
-import path from "path"
+import { OpencodeClient } from "@opencode-ai/sdk/v2"
+import path from "node:path"
 import { mkdirSync } from "node:fs"
 import { createDb, getDbPath } from "./db"
 import { wrapThrowingClient } from "./client"
@@ -24,7 +24,7 @@ import { executeTeamClaim } from "./tools/team-claim"
 import { executeTeamResults } from "./tools/team-results"
 import { executeTeamStatus } from "./tools/team-status"
 import { executeTeamView } from "./tools/team-view"
-import type { ToolDeps, PluginClient } from "./types"
+import type { ToolDeps, } from "./types"
 import { TokenBucket } from "./rate-limit"
 import { Watchdog } from "./watchdog"
 
@@ -49,11 +49,12 @@ const plugin: Plugin = async (input) => {
   const registry = new MemberRegistry()
   const tracker = new DescendantTracker()
 
-  // Reuse the v1 client's working HTTP transport with v2's method signatures.
-  // The v1 client (input.client) has the correct connection (Unix socket/auth),
-  // while v2 gives us flat params + permission on create + agent/tools on promptAsync.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const rawClient = new OpencodeClientV2({ client: (input.client as any)._client })
+  // 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
+  // HeyAPI transport as `_client` (underscore). The v2 constructor accepts it as `client`.
+  type V2Transport = ConstructorParameters<typeof OpencodeClient>[0] extends { client?: infer C } ? C : never
+  const pluginTransport = (input.client as unknown as { _client: V2Transport })._client
+  const rawClient = new OpencodeClient({ client: pluginTransport })
   const client = wrapThrowingClient(rawClient)
   const deps: ToolDeps = { db, registry, tracker, client, directory: input.directory }
 
@@ -172,7 +173,7 @@ const plugin: Plugin = async (input) => {
       if (!teamInfo) return
       const prompt = teamInfo.role === "lead"
         ? buildLeadSystemPrompt(db, teamInfo.teamId)
-        : buildTeammateSystemPrompt(db, teamInfo.teamId, teamInfo.memberName!)
+        : buildTeammateSystemPrompt(db, teamInfo.teamId, teamInfo.memberName ?? "unknown")
       output.system.push(prompt)
     },
 

package/src/notify.ts

@@ -3,17 +3,6 @@ import type { PluginClient } from "./types"
 
 type TeamEventType = "spawn" | "message" | "completed" | "error" | "shutdown"
 
-interface SpawnEvent { memberName: string; agent: string }
-interface MessageEvent { from: string; to: string }
-interface MemberEvent { memberName: string }
-
-type TeamEventData =
-  | { type: "spawn"; data: SpawnEvent }
-  | { type: "message"; data: MessageEvent }
-  | { type: "completed"; data: MemberEvent }
-  | { type: "error"; data: MemberEvent }
-  | { type: "shutdown"; data: MemberEvent }
-
 const TOAST_CONFIG: Record<TeamEventType, { variant: "info" | "success" | "warning" | "error"; duration: number }> = {
   spawn: { variant: "success", duration: 3000 },
   message: { variant: "info", duration: 3000 },

package/src/schema.ts

@@ -88,7 +88,8 @@ export function applyMigrations(db: Database): void {
   const { user_version: current } = db.query("PRAGMA user_version").get() as { user_version: number }
 
   for (let i = current; i < MIGRATIONS.length; i++) {
-    db.exec(MIGRATIONS[i]!)
+    const migration = MIGRATIONS[i]
+    if (migration) db.exec(migration)
     db.exec(`PRAGMA user_version = ${i + 1}`)
   }
 }

package/src/state.ts

@@ -59,6 +59,11 @@ export class MemberRegistry {
   isTeamSession(sessionId: string): boolean {
     return this.bySession.has(sessionId)
   }
+
+  /** Get all registered session IDs. */
+  allSessionIds(): Set<string> {
+    return new Set(this.bySession.keys())
+  }
 }
 
 const DEFAULT_MAX_DEPTH = 10

package/src/system-prompt.ts

@@ -28,9 +28,9 @@ export function buildLeadSystemPrompt(db: Database, teamId: string): string {
     countMap[row.status] = row.count
   }
 
-  const completed = countMap["completed"] ?? 0
-  const inProgress = countMap["in_progress"] ?? 0
-  const pending = countMap["pending"] ?? 0
+  const completed = countMap.completed ?? 0
+  const inProgress = countMap.in_progress ?? 0
+  const pending = countMap.pending ?? 0
 
   const memberList = members
     .map((m) => `${m.name} [${STATUS_DISPLAY[m.status] ?? m.status}]`)
@@ -87,9 +87,9 @@ export function buildTeamCompactionContext(
     countMap[row.status] = row.count
   }
 
-  const completed = countMap["completed"] ?? 0
-  const inProgress = countMap["in_progress"] ?? 0
-  const pending = countMap["pending"] ?? 0
+  const completed = countMap.completed ?? 0
+  const inProgress = countMap.in_progress ?? 0
+  const pending = countMap.pending ?? 0
 
   const roleLine = role === "lead"
     ? `[Team Context] You are the lead of team "${team.name}".`

package/src/tools/team-broadcast.ts

@@ -13,7 +13,7 @@ export async function executeTeamBroadcast(
   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 senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName!
+  const senderName = teamInfo.role === "lead" ? "lead" : (teamInfo.memberName ?? "unknown")
 
   const msgId = broadcastMessage(deps.db, {
     teamId: teamInfo.teamId,
@@ -39,24 +39,17 @@ export async function executeTeamBroadcast(
     }
   }
 
-  // Deliver to all recipients — partial failures logged but don't fail the broadcast
+  // Fire-and-forget: deliver to all recipients. Message is already persisted in DB.
   let delivered = 0
   for (const recipient of recipients) {
-    try {
-      await deps.client.session.promptAsync({
-        sessionID: recipient.sessionId,
-        parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }],
-      })
+    deps.client.session.promptAsync({
+      sessionID: recipient.sessionId,
+      parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }],
+    }).then(() => {
       delivered++
-    } catch {
-      // Log but don't fail
-    }
-  }
-
-  // Only mark delivered if at least one recipient received it
-  if (delivered > 0) {
-    markDelivered(deps.db, msgId)
+      if (delivered === 1) markDelivered(deps.db, msgId)
+    }).catch(() => { /* partial failure is expected */ })
   }
 
-  return `Broadcast sent to ${delivered} recipient${delivered !== 1 ? "s" : ""}.`
+  return `Broadcast sent to ${recipients.length} recipient${recipients.length !== 1 ? "s" : ""}.`
 }

package/src/tools/team-claim.ts

@@ -13,7 +13,7 @@ export async function executeTeamClaim(
   const teamInfo = findTeamBySession(deps.db, deps.registry, sessionId)
   if (!teamInfo) throw new Error("This session is not in a team.")
 
-  const claimerName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName!
+  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) as Record<string, unknown> | null

package/src/tools/team-message.ts

@@ -14,7 +14,7 @@ export async function executeTeamMessage(
   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 senderName = teamInfo.role === "lead" ? "lead" : teamInfo.memberName!
+  const senderName = teamInfo.role === "lead" ? "lead" : (teamInfo.memberName ?? "unknown")
 
   const recipientSessionId = resolveRecipientSession(deps.db, deps.registry, teamInfo.teamId, args.to)
   if (!recipientSessionId) throw new Error(`Recipient "${args.to}" not found in team "${teamInfo.teamName}"`)
@@ -85,12 +85,14 @@ export async function executeTeamMessage(
     return `Message sent to ${args.to}. (queued — recipient is busy)`
   }
 
-  await deps.client.session.promptAsync({
+  // Fire-and-forget: message is already persisted in DB. If delivery fails,
+  // the idle-flush backstop will redeliver it.
+  deps.client.session.promptAsync({
     sessionID: recipientSessionId,
     parts: [{ type: "text", text: deliveryText }],
-  })
-
-  markDelivered(deps.db, msgId)
+  }).then(() => {
+    markDelivered(deps.db, msgId)
+  }).catch(() => { /* message stays delivered=0, idle-flush will retry */ })
 
   return `Message sent to ${args.to}.`
 }

package/src/tools/team-spawn.ts

@@ -1,6 +1,8 @@
 import type { ToolDeps, PermissionRule } from "../types"
-import { generateId, validateMemberName } from "../util"
+import { validateMemberName } from "../util"
 import { findTeamBySession } from "../types"
+import { sendMessage } from "../messaging"
+import { handleLeadIdleFlush } from "../hooks"
 
 /**
  * Execute the team_spawn tool. Creates a child session and starts a teammate.
@@ -156,23 +158,45 @@ export async function executeTeamSpawn(
 
   const contextStr = context.join("\n")
 
-  // Fire-and-forget: send prompt to teammate session
-  try {
-    await deps.client.session.promptAsync({
-      sessionID: childSessionId,
-      parts: [{ type: "text", text: contextStr }],
-      agent: args.agent,
-    })
-  } catch (err) {
-    // Rollback: clean up DB, registry, session, and worktree
-    deps.db.run("DELETE FROM team_member WHERE team_id = ? AND name = ?", [teamInfo.teamId, args.name])
-    deps.registry.unregister(childSessionId)
-    try { await deps.client.session.abort({ sessionID: childSessionId }) } catch { /* best effort */ }
-    if (worktreeDir) {
-      try { await deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }) } catch { /* best effort */ }
-    }
-    throw new Error(`Failed to send initial prompt to teammate "${args.name}": ${err instanceof Error ? err.message : String(err)}`)
-  }
+  // Fire-and-forget: send prompt to teammate session.
+  // Do NOT await — promptAsync is HTTP 204 (returns immediately on the server)
+  // but awaiting it can block if the transport is slow or broken (e.g. proxy).
+  // The child session is already created and registered. If delivery fails,
+  // the async .catch() rolls back the member and the watchdog handles stale members.
+  deps.client.session.promptAsync({
+    sessionID: childSessionId,
+    parts: [{ type: "text", text: contextStr }],
+    agent: args.agent,
+  }).catch(() => {
+    try {
+      // Async rollback: clean up DB (by session_id to avoid deleting a re-spawned member with the same name), registry, session, and worktree
+      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 (worktreeDir) {
+        deps.client.worktree.remove({ worktreeRemoveInput: { directory: worktreeDir } }).catch(() => { /* best effort */ })
+      }
+      // Notify user that spawn failed so the lead doesn't think the teammate is active
+      deps.client.tui.showToast({
+        title: "Team",
+        message: `Teammate "${args.name}" failed to start and was removed`,
+        variant: "error",
+        duration: 5000,
+      }).catch(() => { /* TUI may not be available */ })
+      // Notify the lead model so it can react (retry, adjust plan, etc.)
+      sendMessage(deps.db, {
+        teamId: teamInfo.teamId,
+        from: "system",
+        to: "lead",
+        content: `Teammate "${args.name}" failed to start and was removed. You may retry the spawn.`,
+      })
+      const team = deps.db.query("SELECT lead_session_id FROM team WHERE id = ?")
+        .get(teamInfo.teamId) as { lead_session_id: string } | null
+      if (team) {
+        handleLeadIdleFlush(deps.db, deps.client, team.lead_session_id).catch(() => {})
+      }
+    } catch { /* rollback failed — watchdog will clean up stale member */ }
+  })
 
   const branchInfo = worktreeBranch ? ` (branch: ${worktreeBranch})` : ""
   const planInfo = usePlanApproval ? " [plan mode — will send plan for approval]" : ""