@hueyexe/opencode-ensemble 0.13.0 → 0.13.1

package/README.md

@@ -2,7 +2,7 @@
 
 [![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-482%20passing-brightgreen.svg)]()
+[![tests](https://img.shields.io/badge/tests-492%20passing-brightgreen.svg)]()
 [![TypeScript](https://img.shields.io/badge/TypeScript-strict-blue.svg)]()
 [![OpenCode SDK](https://img.shields.io/badge/deps-OpenCode%20SDK%20only-blue.svg)]()
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
@@ -15,7 +15,7 @@ Plugin built on the public OpenCode SDK. No internal dependencies.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.13.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.1"]
 }
 ```
 
@@ -136,7 +136,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.13.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.1"]
 }
 ```
 
@@ -144,7 +144,7 @@ Add to your OpenCode config with a pinned version. Project-level or global.
 
 ```json
 {
-  "plugin": ["@hueyexe/opencode-ensemble@0.13.0"]
+  "plugin": ["@hueyexe/opencode-ensemble@0.13.1"]
 }
 ```
 
@@ -406,7 +406,7 @@ Same coordination model (shared tasks, peer messaging, lead coordination) with s
 ```bash
 bun install
 bun run typecheck
-bun test             # 482 tests
+bun test             # 492 tests
 bun run build
 ```
 

package/dist/index.js

@@ -15454,7 +15454,8 @@ var MIGRATIONS = [
   `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_member ADD COLUMN workspace_id TEXT;`
+  `ALTER TABLE team_member ADD COLUMN workspace_id TEXT;`,
+  `ALTER TABLE team_member ADD COLUMN reported_to_lead INTEGER NOT NULL DEFAULT 0;`
 ];
 function applyMigrations(db) {
   const { user_version: current } = db.query("PRAGMA user_version").get();
@@ -15576,6 +15577,10 @@ function getUndeliveredMessages(db, teamId) {
 function markDelivered(db, messageId) {
   db.run("UPDATE team_message SET delivered = 1 WHERE id = ?", [messageId]);
 }
+function hasReportedCompletion(db, teamId, memberName) {
+  const row = db.query("SELECT reported_to_lead FROM team_member WHERE team_id = ? AND name = ?").get(teamId, memberName);
+  return row?.reported_to_lead === 1;
+}
 
 // src/recovery.ts
 init_merge_helper();
@@ -15643,6 +15648,10 @@ async function recoverUndeliveredMessages(db, client3, registry2) {
       }
       if (!recipientSessionId)
         continue;
+      if (hasReportedCompletion(db, team.id, msg.to_name)) {
+        markDelivered(db, msg.id);
+        continue;
+      }
       try {
         await client3.session.promptAsync({
           sessionID: recipientSessionId,
@@ -15778,10 +15787,16 @@ function handleSessionStatusEvent(db, registry2, sessionId, status) {
     if (member.status === newStatus)
       return;
     db.run("UPDATE team_member SET status = ?, execution_status = 'idle', time_updated = ? WHERE team_id = ? AND name = ?", [newStatus, Date.now(), entry.teamId, entry.memberName]);
+    if (member.status === "busy" && newStatus === "ready") {
+      const leadMsgCount = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND from_name = ? AND to_name = 'lead'").get(entry.teamId, entry.memberName).c;
+      if (leadMsgCount > 0) {
+        db.run("UPDATE team_member SET reported_to_lead = 1 WHERE team_id = ? AND name = ?", [entry.teamId, entry.memberName]);
+      }
+    }
     return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: newStatus };
   } else if (status === "busy") {
     if (member.status === "ready" || member.status === "error") {
-      db.run("UPDATE team_member SET status = 'busy', execution_status = 'running', time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), entry.teamId, entry.memberName]);
+      db.run("UPDATE team_member SET status = 'busy', execution_status = 'running', reported_to_lead = 0, time_updated = ? WHERE team_id = ? AND name = ?", [Date.now(), entry.teamId, entry.memberName]);
       return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: "busy" };
     }
     if (member.status === "shutdown_requested") {
@@ -17189,6 +17204,9 @@ async function executeTeamMessage(deps, args, sessionId) {
     });
     return `Message sent to ${args.to}.`;
   }
+  if (hasReportedCompletion(deps.db, teamInfo.teamId, args.to)) {
+    return `Message stored for ${args.to} (teammate has completed their task \u2014 message will not wake them).`;
+  }
   const deliveryText = `[Team message from ${senderName}]: ${messageText}`;
   deps.client.session.promptAsync({
     sessionID: recipientSessionId,
@@ -17223,7 +17241,12 @@ async function executeTeamBroadcast(deps, args, sessionId) {
     }
   }
   let delivered = 0;
+  let skipped = 0;
   for (const recipient of recipients) {
+    if (recipient.name !== "lead" && hasReportedCompletion(deps.db, teamInfo.teamId, recipient.name)) {
+      skipped++;
+      continue;
+    }
     deps.client.session.promptAsync({
       sessionID: recipient.sessionId,
       parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }]
@@ -17235,7 +17258,8 @@ async function executeTeamBroadcast(deps, args, sessionId) {
       log(`team_broadcast:deliver:failed to=${recipient.name} err=${err instanceof Error ? err.message : String(err)}`);
     });
   }
-  return `Broadcast sent to ${recipients.length} recipient${recipients.length !== 1 ? "s" : ""}.`;
+  const sent = recipients.length - skipped;
+  return `Broadcast sent to ${sent} recipient${sent !== 1 ? "s" : ""}.`;
 }
 
 // src/tools/team-shutdown.ts
@@ -17930,6 +17954,8 @@ var plugin = async (input) => {
   const tracker = new DescendantTracker;
   const nudgedMembers = new Set;
   const progressTracker = new ProgressTracker;
+  const wakeLeadTimestamps = new Map;
+  const WAKE_LEAD_COOLDOWN_MS = 5000;
   const pluginTransport = input.client._client;
   const rawClient = new OpencodeClient({ client: pluginTransport });
   initLog(rawClient);
@@ -18020,7 +18046,7 @@ var plugin = async (input) => {
               }
             }
             const nudgeKey = `${transition.teamId}:${transition.memberName}`;
-            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName)) {
+            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName) && !hasReportedCompletion(db, transition.teamId, transition.memberName)) {
               nudgedMembers.add(nudgeKey);
               log(`nudge:idle-without-report name=${transition.memberName}`);
               client3.session.promptAsync({
@@ -18063,7 +18089,10 @@ var plugin = async (input) => {
           const team = db.query("SELECT id FROM team WHERE lead_session_id = ? AND status = 'active'").get(sessionID);
           if (team) {
             const pending = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = 'lead' AND delivered = 0").get(team.id);
-            if (pending.c > 0) {
+            const allDone = db.query("SELECT COUNT(*) as c FROM team_member WHERE team_id = ? AND status NOT IN ('ready', 'shutdown', 'error')").get(team.id).c === 0;
+            const lastWake = wakeLeadTimestamps.get(team.id) ?? 0;
+            if (pending.c > 0 && !allDone && Date.now() - lastWake > WAKE_LEAD_COOLDOWN_MS) {
+              wakeLeadTimestamps.set(team.id, Date.now());
               log(`wake-lead: ${pending.c} pending messages, sending promptAsync`);
               client3.session.promptAsync({
                 sessionID,
@@ -18076,7 +18105,7 @@ var plugin = async (input) => {
           const member = db.query(`SELECT tm.team_id, tm.name FROM team_member tm
              JOIN team t ON tm.team_id = t.id
              WHERE tm.session_id = ? AND t.status = 'active'`).get(sessionID);
-          if (member) {
+          if (member && !hasReportedCompletion(db, member.team_id, member.name)) {
             const staleThreshold = Date.now() - 5000;
             const peerMsgs = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = ? AND delivered = 0 AND time_created < ?").get(member.team_id, member.name, staleThreshold);
             if (peerMsgs.c > 0) {

package/package.json

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

@@ -41,11 +41,26 @@ export function handleSessionStatusEvent(
       "UPDATE team_member SET status = ?, execution_status = 'idle', time_updated = ? WHERE team_id = ? AND name = ?",
       [newStatus, Date.now(), entry.teamId, entry.memberName]
     )
+    // Mark teammate as having reported if they sent at least one message to lead (issue #3).
+    // Set on busy→ready transition so Q&A messages during work don't prematurely block delivery.
+    if (member.status === "busy" && newStatus === "ready") {
+      const leadMsgCount = (db.query(
+        "SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND from_name = ? AND to_name = 'lead'"
+      ).get(entry.teamId, entry.memberName) as { c: number }).c
+      if (leadMsgCount > 0) {
+        db.run(
+          "UPDATE team_member SET reported_to_lead = 1 WHERE team_id = ? AND name = ?",
+          [entry.teamId, entry.memberName]
+        )
+      }
+    }
     return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: newStatus }
   } else if (status === "busy") {
     if (member.status === "ready" || member.status === "error") {
+      // Reset reported_to_lead so re-activated teammates can receive messages again (issue #3).
+      // INVARIANT: every promptAsync delivery path must check hasReportedCompletion() to prevent loops.
       db.run(
-        "UPDATE team_member SET status = 'busy', execution_status = 'running', time_updated = ? WHERE team_id = ? AND name = ?",
+        "UPDATE team_member SET status = 'busy', execution_status = 'running', reported_to_lead = 0, time_updated = ? WHERE team_id = ? AND name = ?",
         [Date.now(), entry.teamId, entry.memberName]
       )
       return { memberName: entry.memberName, teamId: entry.teamId, from: member.status, to: "busy" }

package/src/index.ts

@@ -10,7 +10,7 @@ import { MemberRegistry, DescendantTracker } from "./state"
 import { isWorktreeInstance } from "./util"
 import { handleSessionStatusEvent, handleSessionCreatedEvent, checkToolIsolation, shouldNudgeIdleMember } from "./hooks"
 import { notifyTeamEvent, notifyWorkingProgress } from "./notify"
-import { sendMessage } from "./messaging"
+import { sendMessage, hasReportedCompletion } from "./messaging"
 import { buildLeadSystemPrompt, buildTeammateSystemPrompt, buildTeamCompactionContext } from "./system-prompt"
 import { log, initLog } from "./log"
 import { findTeamBySession } from "./types"
@@ -58,6 +58,8 @@ const plugin: Plugin = async (input) => {
   const tracker = new DescendantTracker()
   const nudgedMembers = new Set<string>()
   const progressTracker = new ProgressTracker()
+  const wakeLeadTimestamps = new Map<string, number>()
+  const WAKE_LEAD_COOLDOWN_MS = 5000
 
   // 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
@@ -176,8 +178,9 @@ const plugin: Plugin = async (input) => {
             }
 
             // Nudge teammate if they went idle without reporting to the lead (once only)
+            // Skip if they already reported completion (issue #3 — prevents re-waking completed teammates)
             const nudgeKey = `${transition.teamId}:${transition.memberName}`
-            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName)) {
+            if (!nudgedMembers.has(nudgeKey) && shouldNudgeIdleMember(db, transition.teamId, transition.memberName) && !hasReportedCompletion(db, transition.teamId, transition.memberName)) {
               nudgedMembers.add(nudgeKey)
               log(`nudge:idle-without-report name=${transition.memberName}`)
               client.session.promptAsync({
@@ -232,7 +235,13 @@ const plugin: Plugin = async (input) => {
           const team = db.query("SELECT id FROM team WHERE lead_session_id = ? AND status = 'active'").get(sessionID) as { id: string } | null
           if (team) {
             const pending = db.query("SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = 'lead' AND delivered = 0").get(team.id) as { c: number }
-            if (pending.c > 0) {
+            // Skip wake if all teammates are done or if we woke recently (issue #3 — breaks completion loop)
+            const allDone = (db.query(
+              "SELECT COUNT(*) as c FROM team_member WHERE team_id = ? AND status NOT IN ('ready', 'shutdown', 'error')"
+            ).get(team.id) as { c: number }).c === 0
+            const lastWake = wakeLeadTimestamps.get(team.id) ?? 0
+            if (pending.c > 0 && !allDone && Date.now() - lastWake > WAKE_LEAD_COOLDOWN_MS) {
+              wakeLeadTimestamps.set(team.id, Date.now())
               log(`wake-lead: ${pending.c} pending messages, sending promptAsync`)
               client.session.promptAsync({
                 sessionID,
@@ -250,7 +259,7 @@ const plugin: Plugin = async (input) => {
              JOIN team t ON tm.team_id = t.id
              WHERE tm.session_id = ? AND t.status = 'active'`
           ).get(sessionID) as { team_id: string; name: string } | null
-          if (member) {
+          if (member && !hasReportedCompletion(db, member.team_id, member.name)) {
             const staleThreshold = Date.now() - 5000
             const peerMsgs = db.query(
               "SELECT COUNT(*) as c FROM team_message WHERE team_id = ? AND to_name = ? AND delivered = 0 AND time_created < ?"

package/src/messaging.ts

@@ -76,3 +76,14 @@ export function getUndeliveredMessages(db: Database, teamId: string): MessageRow
 export function markDelivered(db: Database, messageId: string): void {
   db.run("UPDATE team_message SET delivered = 1 WHERE id = ?", [messageId])
 }
+
+/**
+ * Check if a teammate has reported completion to the lead.
+ * Returns true if the reported_to_lead flag is set on the member.
+ */
+export function hasReportedCompletion(db: Database, teamId: string, memberName: string): boolean {
+  const row = db.query(
+    "SELECT reported_to_lead FROM team_member WHERE team_id = ? AND name = ?"
+  ).get(teamId, memberName) as { reported_to_lead: number } | null
+  return row?.reported_to_lead === 1
+}

package/src/recovery.ts

@@ -1,7 +1,7 @@
 import type { Database } from "bun:sqlite"
 import type { PluginClient } from "./types"
 import type { MemberRegistry } from "./state"
-import { getUndeliveredMessages, markDelivered } from "./messaging"
+import { getUndeliveredMessages, markDelivered, hasReportedCompletion } from "./messaging"
 import { preserveBranch, preservedBranchName } from "./tools/merge-helper"
 import { log } from "./log"
 
@@ -123,6 +123,12 @@ export async function recoverUndeliveredMessages(
 
       if (!recipientSessionId) continue
 
+      // Skip delivery to teammates who have already reported completion (issue #3)
+      if (hasReportedCompletion(db, team.id, msg.to_name!)) {
+        markDelivered(db, msg.id)
+        continue
+      }
+
       try {
         await client.session.promptAsync({
           sessionID: recipientSessionId,

package/src/schema.ts

@@ -80,6 +80,8 @@ export const MIGRATIONS: string[] = [
   `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;`,
+  // Migration 7: Track whether teammate has reported to lead (completion loop prevention, issue #3)
+  `ALTER TABLE team_member ADD COLUMN reported_to_lead INTEGER NOT NULL DEFAULT 0;`,
 ]
 
 /**

package/src/tools/team-broadcast.ts

@@ -1,6 +1,6 @@
 import type { ToolDeps } from "../types"
 import { requireTeamMember } from "./shared"
-import { broadcastMessage, markDelivered } from "../messaging"
+import { broadcastMessage, markDelivered, hasReportedCompletion } from "../messaging"
 import { log } from "../log"
 
 /**
@@ -40,8 +40,14 @@ export async function executeTeamBroadcast(
   }
 
   // Fire-and-forget: deliver to all recipients. Message is already persisted in DB.
+  // Skip completed teammates to prevent re-waking them (issue #3).
   let delivered = 0
+  let skipped = 0
   for (const recipient of recipients) {
+    if (recipient.name !== "lead" && hasReportedCompletion(deps.db, teamInfo.teamId, recipient.name)) {
+      skipped++
+      continue
+    }
     deps.client.session.promptAsync({
       sessionID: recipient.sessionId,
       parts: [{ type: "text", text: `[Team broadcast from ${senderName}]: ${args.text}` }],
@@ -53,5 +59,6 @@ export async function executeTeamBroadcast(
     })
   }
 
-  return `Broadcast sent to ${recipients.length} recipient${recipients.length !== 1 ? "s" : ""}.`
+  const sent = recipients.length - skipped
+  return `Broadcast sent to ${sent} recipient${sent !== 1 ? "s" : ""}.`
 }

package/src/tools/team-message.ts

@@ -1,7 +1,7 @@
 import type { ToolDeps } from "../types"
 import { resolveRecipientSession } from "../types"
 import { requireTeamMember } from "./shared"
-import { sendMessage, markDelivered } from "../messaging"
+import { sendMessage, markDelivered, hasReportedCompletion } from "../messaging"
 import { log } from "../log"
 
 /**
@@ -90,6 +90,11 @@ export async function executeTeamMessage(
     return `Message sent to ${args.to}.`
   }
 
+  // Guard: skip promptAsync delivery to teammates who have already reported completion (issue #3)
+  if (hasReportedCompletion(deps.db, teamInfo.teamId, args.to)) {
+    return `Message stored for ${args.to} (teammate has completed their task — message will not wake them).`
+  }
+
   // For member-to-member messages, fire-and-forget delivery is safe.
   const deliveryText = `[Team message from ${senderName}]: ${messageText}`
   deps.client.session.promptAsync({