@hueyexe/opencode-ensemble 0.7.1 → 0.9.0

package/src/tools/team-status.ts

@@ -6,6 +6,13 @@ export const lastCallTime = new Map<string, number>()
 
 const RATE_LIMIT_MS = 30_000
 
+/** Format a duration in ms to a human-readable string. */
+export function formatDuration(ms: number): string {
+  if (ms < 60_000) return `${Math.floor(ms / 1000)}s`
+  if (ms < 3_600_000) return `${Math.floor(ms / 60_000)}m`
+  return `${Math.floor(ms / 3_600_000)}h`
+}
+
 /**
  * Execute the team_status tool. Shows team overview with member statuses and task summary.
  */
@@ -23,9 +30,9 @@ export async function executeTeamStatus(
   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"
+    "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) as Array<{
-    name: string; session_id: string; agent: string; status: string; execution_status: string; worktree_branch: string | null; worktree_dir: string | null; plan_approval: string
+    name: string; session_id: string; agent: string; status: string; execution_status: string; worktree_branch: string | null; worktree_dir: string | null; plan_approval: string; time_updated: number
   }>
 
   const tasks = deps.db.query(
@@ -42,9 +49,24 @@ export async function executeTeamStatus(
     lines.push("Members:")
     for (const m of members) {
       const statusIcon = m.status === "busy" ? "working" : m.status === "ready" ? "idle" : m.status
+      const duration = 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}`)
+
+      // Last message time
+      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) as { last_msg: number | null } | null
+      const msgInfo = lastMsg?.last_msg ? `last msg: ${formatDuration(now - lastMsg.last_msg)} ago` : "no messages yet"
+
+      lines.push(`  ${m.name}  [${statusIcon} ${duration}, ${msgInfo}${plan}]  agent: ${m.agent}${branch}`)
+
+      // Current task
+      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) as { content: string } | null
+      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}`)
       }

package/src/watchdog.ts

@@ -1,6 +1,8 @@
 import type { Database } from "bun:sqlite"
 import type { PluginClient } from "./types"
 import type { MemberRegistry } from "./state"
+import type { ProgressTracker } from "./progress"
+import { sendMessage } from "./messaging"
 
 interface WatchdogOpts {
   db: Database
@@ -10,6 +12,14 @@ interface WatchdogOpts {
   ttlMs: number
   /** How often to run the check. Defaults to 60s. */
   checkIntervalMs?: number
+  /** Progress tracker for stall detection. */
+  progressTracker?: ProgressTracker
+  /** Stall detection threshold in ms. 0 disables. */
+  stallThresholdMs?: number
+  /** Min steps before token-based stall check. */
+  stallMinSteps?: number
+  /** Output token threshold for stall detection. */
+  stallTokenThreshold?: number
 }
 
 /**
@@ -22,6 +32,10 @@ export class Watchdog {
   private readonly registry: MemberRegistry
   private readonly ttlMs: number
   private readonly checkIntervalMs: number
+  private readonly progressTracker?: ProgressTracker
+  private readonly stallThresholdMs: number
+  private readonly stallMinSteps: number
+  private readonly stallTokenThreshold: number
   private timer: ReturnType<typeof setInterval> | undefined
 
   constructor(opts: WatchdogOpts) {
@@ -30,6 +44,10 @@ export class Watchdog {
     this.registry = opts.registry
     this.ttlMs = opts.ttlMs
     this.checkIntervalMs = opts.checkIntervalMs ?? 60_000
+    this.progressTracker = opts.progressTracker
+    this.stallThresholdMs = opts.stallThresholdMs ?? 0
+    this.stallMinSteps = opts.stallMinSteps ?? 3
+    this.stallTokenThreshold = opts.stallTokenThreshold ?? 500
   }
 
   private static STALE_THRESHOLD_MS = Number(process.env.STALE_WORKTREE_THRESHOLD_MS) || 300_000
@@ -61,9 +79,58 @@ export class Watchdog {
     }
   }
 
+  /** Check for stalled busy members and escalate to lead + nudge teammate. */
+  async checkStalled(): Promise<void> {
+    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() as Array<{ team_id: string; name: string; session_id: string }>
+
+    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"
+
+      // Nudge the teammate directly
+      this.client.session.promptAsync({
+        sessionID: member.session_id,
+        parts: [{ type: "text", text: "[System]: You appear stalled — no progress detected. Report your current status to the lead via team_message, or wrap up your work." }],
+      }).catch(() => { /* best effort */ })
+
+      // Notify the lead
+      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.`,
+      })
+
+      // Toast for the user
+      try {
+        await this.client.tui.showToast({
+          title: "Team",
+          message: `${member.name} appears stalled`,
+          variant: "warning",
+          duration: 5000,
+        })
+      } catch { /* TUI may not be available */ }
+    }
+  }
+
   /** Run a single check for stale busy members. */
   async check(): Promise<void> {
     await this.cleanupStaleWorktrees()
+    await this.checkStalled()
     if (this.ttlMs === 0) return
 
     const cutoff = Date.now() - this.ttlMs