@hueyexe/opencode-ensemble 0.7.1 → 0.8.0

package/README.md

@@ -1,5 +1,12 @@
 # OpenCode Ensemble
 
+[![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-423%20passing-brightgreen.svg)]()
+[![TypeScript](https://img.shields.io/badge/TypeScript-strict-blue.svg)]()
+[![zero deps](https://img.shields.io/badge/dependencies-0-brightgreen.svg)]()
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
+
 Run parallel AI agents in OpenCode. Each agent gets its own session, context window, and task. They coordinate through messaging and a shared task board.
 
 Plugin built on the public OpenCode SDK. No internal dependencies.
@@ -50,9 +57,10 @@ You: "How's the team doing?"
 Lead calls team_status:
   Team: validation (you are the lead)
   Members:
-    alice   [idle]     agent: build  session: ses_abc
-    bob     [idle]     agent: build  session: ses_def
-    carol   [working]  agent: build  session: ses_ghi
+    alice   [idle 2m, last msg: 1m ago]     agent: build  branch: ensemble-validation-alice
+    bob     [idle 1m, last msg: 30s ago]     agent: build  branch: ensemble-validation-bob
+    carol   [working 5m, last msg: 3m ago]   agent: build  branch: ensemble-validation-carol
+      task: Write integration tests for validated endpoints
   Tasks: 5 total (3 completed, 1 in_progress, 1 pending)
 ```
 
@@ -66,7 +74,7 @@ Lead calls team_view({ member: "carol" })
 -> Use the session picker (ctrl+p) to go back to the lead
 ```
 
-When everything is done, the lead shuts down teammates and cleans up:
+When everything is done, the lead shuts down teammates and cleans up. Worktree branches are automatically merged into your working directory as unstaged changes for review:
 
 ```
 [toast] alice shut down
@@ -74,9 +82,13 @@ When everything is done, the lead shuts down teammates and cleans up:
 [toast] carol shut down
 
 Lead: "All validation and tests are complete. 5 endpoints validated,
-       12 test cases added. Team cleaned up."
+       12 test cases added. Team cleaned up.
+       Merged 3 branch(es) into working directory (unstaged).
+       Review changes with: git diff"
 ```
 
+All teammate changes are now in your working directory, unstaged, ready for you to review file-by-file with `git diff`.
+
 ## Install
 
 Two steps: add the plugin, then allowlist worktree paths.
@@ -193,23 +205,66 @@ Teammate messages arrive in the lead's session as `[Team message from alice]: ..
 - **Crash recovery**: stale busy members marked as errored on restart, orphaned sessions aborted, orphaned worktrees cleaned up, undelivered messages redelivered
 - **Spawn rollback**: if the initial prompt fails, the member, session, and worktree are all cleaned up
 - **Timeout watchdog**: teammates stuck busy beyond the TTL are automatically timed out and aborted
+- **Stall detection**: detects teammates making no progress (low output tokens or no communication) and escalates to the lead
+- **Auto-merge on cleanup**: worktree branches are squash-merged into your working directory as unstaged changes for review
+- **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 `OPENCODE_ENSEMBLE_RATE_LIMIT`, default 10 tokens/sec)
+- **Rate limiting**: token bucket (configurable via config file or `OPENCODE_ENSEMBLE_RATE_LIMIT`, default 10 tokens/sec)
 
 ## Configuration
 
+Configure via JSON files, environment variables, or both. Project config overrides global config. Env vars override everything.
+
+### Config file
+
+**Global** (`~/.config/opencode/ensemble.json`):
+
+```json
+{
+  "mergeOnCleanup": true,
+  "stallThresholdMs": 180000,
+  "stallMinSteps": 3,
+  "stallTokenThreshold": 500,
+  "timeoutMs": 1800000,
+  "rateLimitCapacity": 10
+}
+```
+
+**Project** (`.opencode/ensemble.json` in your project root) — same shape, overrides global per-key.
+
+All fields are optional. Missing fields use defaults.
+
+| Key | Default | Description |
+|-----|---------|-------------|
+| `mergeOnCleanup` | `true` | Auto-merge worktree branches on cleanup (squash + unstage) |
+| `stallThresholdMs` | `180000` (3 min) | Time without communication before stall escalation. `0` disables. |
+| `stallMinSteps` | `3` | Min model steps before token-based stall check kicks in |
+| `stallTokenThreshold` | `500` | Output tokens per step below which the agent is considered stalled |
+| `timeoutMs` | `1800000` (30 min) | Hard timeout for busy teammates. `0` disables. |
+| `rateLimitCapacity` | `10` | Token bucket capacity for team tool calls. `0` disables. |
+
+### Environment variables
+
+Env vars override config file values. Useful for CI or one-off overrides.
+
 ```bash
+# Adjust teammate timeout (default: 1800000ms = 30 minutes)
+OPENCODE_ENSEMBLE_TIMEOUT=3600000
+
+# Disable timeout watchdog
+OPENCODE_ENSEMBLE_TIMEOUT=0
+
 # Adjust rate limit (default: 10 tokens, refills 2/sec)
 OPENCODE_ENSEMBLE_RATE_LIMIT=20
 
 # Disable rate limiting
 OPENCODE_ENSEMBLE_RATE_LIMIT=0
 
-# Adjust teammate timeout (default: 1800000ms = 30 minutes)
-OPENCODE_ENSEMBLE_TIMEOUT=3600000
+# Adjust stall detection threshold (default: 180000ms = 3 minutes)
+STALL_THRESHOLD_MS=300000
 
-# Disable timeout watchdog
-OPENCODE_ENSEMBLE_TIMEOUT=0
+# Disable stall detection
+STALL_THRESHOLD_MS=0
 ```
 
 ## Best practices
@@ -243,7 +298,7 @@ Same coordination model (shared tasks, peer messaging, lead coordination) with s
 ```bash
 bun install
 bun run typecheck
-bun test             # 377 tests
+bun test             # 423 tests
 bun run build
 ```
 

package/dist/index.js

@@ -15287,7 +15287,7 @@ class OpencodeClient extends HeyApiClient {
   }
 }
 // src/index.ts
-import path2 from "path";
+import path3 from "path";
 import { mkdirSync } from "fs";
 
 // src/db.ts
@@ -15742,6 +15742,9 @@ async function notifyWorkingProgress(client3, db, teamId) {
 }
 
 // src/system-prompt.ts
+function truncate(s, maxLen) {
+  return s.length > maxLen ? `${s.slice(0, maxLen)}...` : s;
+}
 var STATUS_DISPLAY = {
   busy: "working",
   ready: "idle",
@@ -15770,6 +15773,20 @@ function buildLeadSystemPrompt(db, teamId) {
     teammateLine,
     `Tasks: ${completed} completed, ${inProgress} in progress, ${pending} pending`
   ];
+  const activeTasks = db.query("SELECT content, assignee FROM team_task WHERE team_id = ? AND status = 'in_progress' ORDER BY time_updated DESC LIMIT 5").all(teamId);
+  const recentCompleted = db.query("SELECT content, assignee FROM team_task WHERE team_id = ? AND status = 'completed' ORDER BY time_updated DESC LIMIT 3").all(teamId);
+  if (activeTasks.length > 0) {
+    lines.push("Active tasks:");
+    for (const t of activeTasks) {
+      lines.push(`  [in_progress] ${truncate(t.content, 120)}${t.assignee ? ` \u2192 ${t.assignee}` : ""}`);
+    }
+  }
+  if (recentCompleted.length > 0) {
+    lines.push("Recently completed:");
+    for (const t of recentCompleted) {
+      lines.push(`  [completed] ${truncate(t.content, 120)}${t.assignee ? ` \u2192 ${t.assignee}` : ""}`);
+    }
+  }
   if (pendingMessages.length > 0) {
     lines.push("", "--- Team Messages ---");
     const MAX_MSG = 500;
@@ -15814,9 +15831,31 @@ function buildTeamCompactionContext(db, teamId, role, memberName) {
     membersLine,
     `Tasks: ${completed} completed, ${inProgress} in progress, ${pending} pending`
   ];
-  if (role === "member") {
+  if (role === "member" && memberName) {
+    lines.push("IMPORTANT: You MUST send your results to the lead via team_message before stopping.");
+    const member = db.query("SELECT prompt FROM team_member WHERE team_id = ? AND name = ?").get(teamId, memberName);
+    if (member?.prompt) {
+      lines.push(`Your original task: ${truncate(member.prompt, 300)}`);
+    }
+    const recentMsgs = db.query("SELECT from_name, content FROM team_message WHERE team_id = ? AND (from_name = ? OR to_name = ?) ORDER BY time_created DESC LIMIT 3").all(teamId, memberName, memberName);
+    if (recentMsgs.length > 0) {
+      lines.push("Recent context:");
+      for (const msg of recentMsgs) {
+        lines.push(`  [${msg.from_name}]: ${truncate(msg.content, 200)}`);
+      }
+    }
+  } else if (role === "member") {
     lines.push("IMPORTANT: You MUST send your results to the lead via team_message before stopping.");
   }
+  if (role === "lead") {
+    const completedTasks = db.query("SELECT content, assignee FROM team_task WHERE team_id = ? AND status = 'completed' ORDER BY time_updated DESC LIMIT 5").all(teamId);
+    if (completedTasks.length > 0) {
+      lines.push("Recently completed:");
+      for (const t of completedTasks) {
+        lines.push(`  [completed] ${truncate(t.content, 120)}${t.assignee ? ` (by ${t.assignee})` : ""}`);
+      }
+    }
+  }
   return lines.join(`
 `);
 }
@@ -15854,6 +15893,120 @@ function resolveRecipientSession(db, registry2, teamId, recipientName) {
   return entry?.sessionId;
 }
 
+// src/config.ts
+import { readFileSync } from "fs";
+import path2 from "path";
+var DEFAULT_CONFIG = {
+  mergeOnCleanup: true,
+  stallThresholdMs: 180000,
+  stallMinSteps: 3,
+  stallTokenThreshold: 500,
+  timeoutMs: 30 * 60 * 1000,
+  rateLimitCapacity: 10
+};
+function readConfigFile(filePath) {
+  try {
+    const text = readFileSync(filePath, "utf-8");
+    const raw = JSON.parse(text);
+    const result = {};
+    if (typeof raw.mergeOnCleanup === "boolean")
+      result.mergeOnCleanup = raw.mergeOnCleanup;
+    if (typeof raw.stallThresholdMs === "number")
+      result.stallThresholdMs = raw.stallThresholdMs;
+    if (typeof raw.stallMinSteps === "number")
+      result.stallMinSteps = raw.stallMinSteps;
+    if (typeof raw.stallTokenThreshold === "number")
+      result.stallTokenThreshold = raw.stallTokenThreshold;
+    if (typeof raw.timeoutMs === "number")
+      result.timeoutMs = raw.timeoutMs;
+    if (typeof raw.rateLimitCapacity === "number")
+      result.rateLimitCapacity = raw.rateLimitCapacity;
+    return result;
+  } catch (err) {
+    if (err && typeof err === "object" && "code" in err && err.code === "ENOENT")
+      return {};
+    console.warn(`[ensemble] Invalid config at ${filePath}, using defaults`);
+    return {};
+  }
+}
+function loadConfig(projectDir) {
+  const homeDir = process.env.HOME ?? process.env.USERPROFILE ?? "";
+  const globalPath = path2.join(homeDir, ".config", "opencode", "ensemble.json");
+  const projectPath = path2.join(projectDir, ".opencode", "ensemble.json");
+  const global = readConfigFile(globalPath);
+  const project = readConfigFile(projectPath);
+  const merged = { ...DEFAULT_CONFIG, ...global, ...project };
+  const timeout = process.env.OPENCODE_ENSEMBLE_TIMEOUT;
+  if (timeout !== undefined)
+    merged.timeoutMs = timeout === "0" ? 0 : parseInt(timeout, 10) || merged.timeoutMs;
+  const rateLimit = process.env.OPENCODE_ENSEMBLE_RATE_LIMIT;
+  if (rateLimit !== undefined)
+    merged.rateLimitCapacity = rateLimit === "0" ? 0 : parseInt(rateLimit, 10) || merged.rateLimitCapacity;
+  const stall = process.env.STALL_THRESHOLD_MS;
+  if (stall !== undefined)
+    merged.stallThresholdMs = stall === "0" ? 0 : parseInt(stall, 10) || merged.stallThresholdMs;
+  return merged;
+}
+
+// src/progress.ts
+class ProgressTracker {
+  steps = new Map;
+  lastMessageAt = new Map;
+  lastTaskAt = new Map;
+  reported = new Set;
+  maxSteps;
+  constructor(maxSteps = 10) {
+    this.maxSteps = maxSteps;
+  }
+  recordStep(sessionId, outputTokens) {
+    const records = this.steps.get(sessionId) ?? [];
+    records.push({ outputTokens, timestamp: Date.now() });
+    if (records.length > this.maxSteps)
+      records.shift();
+    this.steps.set(sessionId, records);
+  }
+  recordMessage(sessionId) {
+    this.lastMessageAt.set(sessionId, Date.now());
+    this.clearReport(sessionId);
+  }
+  recordTaskComplete(sessionId) {
+    this.lastTaskAt.set(sessionId, Date.now());
+    this.clearReport(sessionId);
+  }
+  isTokenStalled(sessionId, minSteps, threshold) {
+    const records = this.steps.get(sessionId);
+    if (!records || records.length < minSteps)
+      return false;
+    const recent = records.slice(-minSteps);
+    return recent.every((r) => r.outputTokens < threshold);
+  }
+  isTimeStalled(sessionId, thresholdMs) {
+    const records = this.steps.get(sessionId);
+    if (!records || records.length === 0)
+      return false;
+    const msgAt = this.lastMessageAt.get(sessionId) ?? 0;
+    const taskAt = this.lastTaskAt.get(sessionId) ?? 0;
+    const lastStep = records[records.length - 1]?.timestamp ?? 0;
+    const baseline = Math.max(msgAt, taskAt, lastStep);
+    return Date.now() - baseline >= thresholdMs;
+  }
+  markReported(sessionId) {
+    this.reported.add(sessionId);
+  }
+  isReported(sessionId) {
+    return this.reported.has(sessionId);
+  }
+  clearReport(sessionId) {
+    this.reported.delete(sessionId);
+  }
+  remove(sessionId) {
+    this.steps.delete(sessionId);
+    this.lastMessageAt.delete(sessionId);
+    this.lastTaskAt.delete(sessionId);
+    this.reported.delete(sessionId);
+  }
+}
+
 // src/tools/team-create.ts
 async function executeTeamCreate(deps, args, sessionId) {
   const nameError = validateTeamName(args.name);
@@ -15900,6 +16053,7 @@ function requireTeamMember(deps, sessionId) {
 }
 
 // src/tools/team-spawn.ts
+var spawnFailures = new Map;
 function getSpawnTimeout() {
   return Number(process.env.SPAWN_TIMEOUT_MS) || 120000;
 }
@@ -15920,6 +16074,10 @@ async function executeTeamSpawn(deps, args, sessionId) {
   if (nameError)
     throw new Error(nameError);
   const teamInfo = requireLead(deps, sessionId);
+  const failures = spawnFailures.get(teamInfo.teamId);
+  if (failures && failures.count >= 3) {
+    throw new Error(`Spawn circuit breaker tripped for team "${teamInfo.teamName}": 3 consecutive failures. Last error: ${failures.lastError}. Investigate before retrying \u2014 the circuit breaker resets on the next successful spawn.`);
+  }
   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}"`);
@@ -15989,6 +16147,9 @@ async function executeTeamSpawn(deps, args, sessionId) {
     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)}`);
+    const errMsg = err instanceof Error ? err.message : String(err);
+    const prev = spawnFailures.get(teamInfo.teamId);
+    spawnFailures.set(teamInfo.teamId, { count: (prev?.count ?? 0) + 1, lastError: errMsg });
     if (workspaceId) {
       try {
         await deps.client.workspace.remove({ id: workspaceId });
@@ -16095,6 +16256,7 @@ async function executeTeamSpawn(deps, args, sessionId) {
   });
   const branchInfo = worktreeBranch ? ` (branch: ${worktreeBranch})` : "";
   const planInfo = usePlanApproval ? " [plan mode \u2014 will send plan for approval]" : "";
+  spawnFailures.delete(teamInfo.teamId);
   log(`spawn:done name=${args.name} sessionId=${childSessionId}`);
   return `Teammate "${args.name}" spawned (agent: ${args.agent})${branchInfo}${planInfo}. They are working on: ${args.prompt.slice(0, 120)}${args.prompt.length > 120 ? "..." : ""}`;
 }
@@ -16251,7 +16413,40 @@ Warning: ${memberName} has uncommitted changes in their worktree. Commit or merg
 }
 
 // src/tools/team-cleanup.ts
-async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty) {
+async function mergeAllBranches(branches, cwd) {
+  const merged = [];
+  const conflicted = [];
+  const stash = Bun.spawn(["git", "stash", "--include-untracked"], { cwd, stdout: "pipe", stderr: "pipe" });
+  const stashOut = await new Response(stash.stdout).text();
+  const stashExit = await stash.exited;
+  const didStash = stashExit === 0 && !stashOut.includes("No local changes");
+  for (const branch of branches) {
+    const merge2 = Bun.spawn(["git", "merge", "--squash", branch], { cwd, stdout: "pipe", stderr: "pipe" });
+    const stderrPromise = new Response(merge2.stderr).text();
+    const exit = await merge2.exited;
+    if (exit !== 0) {
+      const stderr = await stderrPromise;
+      log(`cleanup:merge:conflict branch=${branch} err=${stderr.trim()}`);
+      const abort = Bun.spawn(["git", "merge", "--abort"], { cwd, stdout: "pipe", stderr: "pipe" });
+      await abort.exited;
+      conflicted.push(branch);
+    } else {
+      const del = Bun.spawn(["git", "branch", "-D", branch], { cwd, stdout: "pipe", stderr: "pipe" });
+      await del.exited;
+      merged.push(branch);
+    }
+  }
+  if (merged.length > 0) {
+    const reset = Bun.spawn(["git", "reset", "HEAD"], { cwd, stdout: "pipe", stderr: "pipe" });
+    await reset.exited;
+  }
+  if (didStash) {
+    const pop = Bun.spawn(["git", "stash", "pop", "--index"], { cwd, stdout: "pipe", stderr: "pipe" });
+    await pop.exited;
+  }
+  return { merged, conflicted };
+}
+async function executeTeamCleanup(deps, args, sessionId, isDirty = checkWorktreeDirty, mergeAll = mergeAllBranches, mergeOnCleanup = true) {
   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");
@@ -16288,7 +16483,20 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
       } catch {}
     }
   }
-  const branches = [];
+  const branches = members.map((m) => m.worktree_branch).filter((b) => b !== null);
+  let mergeResult = "";
+  if (branches.length > 0 && mergeOnCleanup) {
+    const { merged, conflicted } = await mergeAll(branches, deps.directory);
+    const parts = [];
+    if (merged.length > 0) {
+      parts.push(`Merged ${merged.length} branch(es) into working directory (unstaged). Review changes with: git diff`);
+    }
+    if (conflicted.length > 0) {
+      parts.push(`Could not auto-merge: ${conflicted.join(", ")}. Merge manually with: git merge <branch>`);
+    }
+    mergeResult = parts.join(`
+`);
+  }
   for (const member of members) {
     if (member.workspace_id) {
       try {
@@ -16302,12 +16510,14 @@ Commit or merge their work first, then call team_cleanup with acknowledge_uncomm
         deps.db.run("UPDATE team_member SET worktree_dir = NULL WHERE team_id = ? AND name = ?", [teamInfo.teamId, member.name]);
       } catch {}
     }
-    if (member.worktree_branch) {
-      branches.push(member.worktree_branch);
-    }
   }
   deps.db.run("UPDATE team SET status = 'archived', time_updated = ? WHERE id = ?", [Date.now(), teamInfo.teamId]);
   deps.registry.unregisterTeam(teamInfo.teamId);
+  spawnFailures.delete(teamInfo.teamId);
+  if (mergeResult) {
+    return `Team "${teamInfo.teamName}" cleaned up.
+${mergeResult}`;
+  }
   if (branches.length > 0) {
     const mergeCommands = branches.map((b) => `  git merge ${b}`).join(`
 `);
@@ -16421,6 +16631,13 @@ ${r.content}
 // src/tools/team-status.ts
 var lastCallTime = new Map;
 var RATE_LIMIT_MS = 30000;
+function formatDuration(ms) {
+  if (ms < 60000)
+    return `${Math.floor(ms / 1000)}s`;
+  if (ms < 3600000)
+    return `${Math.floor(ms / 60000)}m`;
+  return `${Math.floor(ms / 3600000)}h`;
+}
 async function executeTeamStatus(deps, sessionId) {
   const teamInfo = requireTeamMember(deps, sessionId);
   const now = Date.now();
@@ -16429,7 +16646,7 @@ async function executeTeamStatus(deps, sessionId) {
     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, worktree_dir, 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, time_updated 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})`);
@@ -16440,9 +16657,17 @@ async function executeTeamStatus(deps, sessionId) {
     lines.push("Members:");
     for (const m of members) {
       const statusIcon = m.status === "busy" ? "working" : m.status === "ready" ? "idle" : m.status;
+      const duration3 = formatDuration(now - m.time_updated);
       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}`);
+      const lastMsg = deps.db.query("SELECT MAX(time_created) as last_msg FROM team_message WHERE team_id = ? AND from_name = ?").get(teamInfo.teamId, m.name);
+      const msgInfo = lastMsg?.last_msg ? `last msg: ${formatDuration(now - lastMsg.last_msg)} ago` : "no messages yet";
+      lines.push(`  ${m.name}  [${statusIcon} ${duration3}, ${msgInfo}${plan}]  agent: ${m.agent}${branch}`);
+      const task = deps.db.query("SELECT content FROM team_task WHERE team_id = ? AND assignee = ? AND status = 'in_progress' LIMIT 1").get(teamInfo.teamId, m.name);
+      if (task) {
+        const truncated = task.content.length > 80 ? `${task.content.slice(0, 80)}...` : task.content;
+        lines.push(`    task: ${truncated}`);
+      }
       if (m.worktree_dir) {
         lines.push(`    worktree: ${m.worktree_dir}`);
       }
@@ -16564,6 +16789,10 @@ class Watchdog {
   registry;
   ttlMs;
   checkIntervalMs;
+  progressTracker;
+  stallThresholdMs;
+  stallMinSteps;
+  stallTokenThreshold;
   timer;
   constructor(opts) {
     this.db = opts.db;
@@ -16571,6 +16800,10 @@ class Watchdog {
     this.registry = opts.registry;
     this.ttlMs = opts.ttlMs;
     this.checkIntervalMs = opts.checkIntervalMs ?? 60000;
+    this.progressTracker = opts.progressTracker;
+    this.stallThresholdMs = opts.stallThresholdMs ?? 0;
+    this.stallMinSteps = opts.stallMinSteps ?? 3;
+    this.stallTokenThreshold = opts.stallTokenThreshold ?? 500;
   }
   static STALE_THRESHOLD_MS = Number(process.env.STALE_WORKTREE_THRESHOLD_MS) || 300000;
   async cleanupStaleWorktrees() {
@@ -16592,8 +16825,45 @@ class Watchdog {
       } catch {}
     }
   }
+  async checkStalled() {
+    if (!this.progressTracker || this.stallThresholdMs === 0)
+      return;
+    const busy = this.db.query(`SELECT tm.team_id, tm.name, tm.session_id
+       FROM team_member tm
+       JOIN team t ON tm.team_id = t.id
+       WHERE t.status = 'active' AND tm.status = 'busy'`).all();
+    for (const member of busy) {
+      if (this.progressTracker.isReported(member.session_id))
+        continue;
+      const tokenStalled = this.progressTracker.isTokenStalled(member.session_id, this.stallMinSteps, this.stallTokenThreshold);
+      const timeStalled = this.progressTracker.isTimeStalled(member.session_id, this.stallThresholdMs);
+      if (!tokenStalled && !timeStalled)
+        continue;
+      this.progressTracker.markReported(member.session_id);
+      const reason = tokenStalled ? "low output tokens" : "no communication";
+      this.client.session.promptAsync({
+        sessionID: member.session_id,
+        parts: [{ type: "text", text: "[System]: You appear stalled \u2014 no progress detected. Report your current status to the lead via team_message, or wrap up your work." }]
+      }).catch(() => {});
+      sendMessage(this.db, {
+        teamId: member.team_id,
+        from: "system",
+        to: "lead",
+        content: `Teammate "${member.name}" appears stalled (${reason}). Consider checking on them via team_message or shutting them down.`
+      });
+      try {
+        await this.client.tui.showToast({
+          title: "Team",
+          message: `${member.name} appears stalled`,
+          variant: "warning",
+          duration: 5000
+        });
+      } catch {}
+    }
+  }
   async check() {
     await this.cleanupStaleWorktrees();
+    await this.checkStalled();
     if (this.ttlMs === 0)
       return;
     const cutoff = Date.now() - this.ttlMs;
@@ -16635,18 +16905,18 @@ class Watchdog {
 }
 
 // src/index.ts
-var DEFAULT_RATE_LIMIT_CAPACITY = 10;
 var DEFAULT_RATE_LIMIT_REFILL = 2;
 var DEFAULT_RATE_LIMIT_INTERVAL_MS = 1000;
-var DEFAULT_WATCHDOG_TTL_MS = 30 * 60 * 1000;
 var DEFAULT_WATCHDOG_CHECK_MS = 60 * 1000;
 var plugin = async (input) => {
   const dbPath = getDbPath();
-  mkdirSync(path2.dirname(dbPath), { recursive: true });
+  mkdirSync(path3.dirname(dbPath), { recursive: true });
   const db = createDb(dbPath);
+  const config2 = loadConfig(input.directory);
   const registry2 = new MemberRegistry;
   const tracker = new DescendantTracker;
   const nudgedMembers = new Set;
+  const progressTracker = new ProgressTracker;
   const pluginTransport = input.client._client;
   const rawClient = new OpencodeClient({ client: pluginTransport });
   initLog(rawClient);
@@ -16672,21 +16942,21 @@ var plugin = async (input) => {
   } else {
     log(`init:skip-recovery (worktree instance: ${input.directory})`);
   }
-  const rateLimitEnv = process.env.OPENCODE_ENSEMBLE_RATE_LIMIT;
-  const rateLimitCapacity = rateLimitEnv === "0" ? 0 : parseInt(rateLimitEnv ?? "", 10) || DEFAULT_RATE_LIMIT_CAPACITY;
   const rateLimiter = new TokenBucket({
-    capacity: rateLimitCapacity,
+    capacity: config2.rateLimitCapacity,
     refillRate: DEFAULT_RATE_LIMIT_REFILL,
     refillIntervalMs: DEFAULT_RATE_LIMIT_INTERVAL_MS
   });
-  const timeoutEnv = process.env.OPENCODE_ENSEMBLE_TIMEOUT;
-  const watchdogTtl = timeoutEnv === "0" ? 0 : parseInt(timeoutEnv ?? "", 10) || DEFAULT_WATCHDOG_TTL_MS;
   const watchdog = new Watchdog({
     db,
     client: client3,
     registry: registry2,
-    ttlMs: watchdogTtl,
-    checkIntervalMs: DEFAULT_WATCHDOG_CHECK_MS
+    ttlMs: config2.timeoutMs,
+    checkIntervalMs: DEFAULT_WATCHDOG_CHECK_MS,
+    progressTracker,
+    stallThresholdMs: config2.stallThresholdMs,
+    stallMinSteps: config2.stallMinSteps,
+    stallTokenThreshold: config2.stallTokenThreshold
   });
   watchdog.start();
   return {
@@ -16752,6 +17022,14 @@ var plugin = async (input) => {
           handleSessionCreatedEvent(tracker, info.id, info.parentID);
         }
       }
+      if (event.type === "message.part.updated") {
+        const part = event.properties.part;
+        if (part?.type === "step-finish" && part.sessionID && part.tokens?.output !== undefined) {
+          if (registry2.getBySession(part.sessionID)) {
+            progressTracker.recordStep(part.sessionID, part.tokens.output);
+          }
+        }
+      }
     },
     "tool.execute.before": async (input2, _output) => {
       checkToolIsolation(registry2, tracker, input2.tool, input2.sessionID);
@@ -16837,6 +17115,7 @@ var plugin = async (input) => {
         },
         async execute(args, ctx) {
           const result = await executeTeamMessage(deps, args, ctx.sessionID);
+          progressTracker.recordMessage(ctx.sessionID);
           ctx.metadata({ title: `Message \u2192 ${args.to}` });
           return result;
         }
@@ -16848,6 +17127,7 @@ var plugin = async (input) => {
         },
         async execute(args, ctx) {
           const result = await executeTeamBroadcast(deps, args, ctx.sessionID);
+          progressTracker.recordMessage(ctx.sessionID);
           ctx.metadata({ title: "Broadcast to team" });
           return result;
         }
@@ -16885,6 +17165,7 @@ var plugin = async (input) => {
         },
         async execute(args, ctx) {
           const result = await executeTeamTasksComplete(deps, args, ctx.sessionID);
+          progressTracker.recordTaskComplete(ctx.sessionID);
           ctx.metadata({ title: `Completed task` });
           return result;
         }
@@ -16919,6 +17200,9 @@ var plugin = async (input) => {
         },
         async execute(args, ctx) {
           const result = await executeTeamShutdown(deps, args, ctx.sessionID);
+          const member = deps.db.query("SELECT session_id FROM team_member WHERE name = ? AND status IN ('shutdown', 'shutdown_requested')").get(args.member);
+          if (member)
+            progressTracker.remove(member.session_id);
           const hasWarning = result.includes("uncommitted");
           ctx.metadata({ title: hasWarning ? `${args.member} shut down \u2014 uncommitted changes` : `${args.member} shut down` });
           return result;
@@ -16931,7 +17215,7 @@ var plugin = async (input) => {
           acknowledge_uncommitted: tool.schema.boolean().default(false)
         },
         async execute(args, ctx) {
-          const result = await executeTeamCleanup(deps, args, ctx.sessionID);
+          const result = await executeTeamCleanup(deps, args, ctx.sessionID, undefined, undefined, config2.mergeOnCleanup);
           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.7.1",
+  "version": "0.8.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",