@hueyexe/opencode-ensemble 0.6.1 → 0.6.2

package/dist/index.js

@@ -15478,6 +15478,30 @@ function getUndeliveredMessages(db, teamId) {
 function markDelivered(db, messageId) {
   db.run("UPDATE team_message SET delivered = 1 WHERE id = ?", [messageId]);
 }
+async function flushPendingMessages(db, client3, teamId, leadSessionId) {
+  const pending = db.query("SELECT * FROM team_message WHERE team_id = ? AND delivered = 0 AND to_name = 'lead' ORDER BY time_created ASC").all(teamId);
+  if (pending.length === 0)
+    return 0;
+  const MAX_LEAD_MSG = 500;
+  const parts = pending.map((msg) => {
+    if (msg.content.length > MAX_LEAD_MSG) {
+      return `[Team message from ${msg.from_name}]: ${msg.content.slice(0, MAX_LEAD_MSG)}... (use team_results to read full message)`;
+    }
+    return `[Team message from ${msg.from_name}]: ${msg.content}`;
+  });
+  try {
+    await client3.session.promptAsync({
+      sessionID: leadSessionId,
+      parts: [{ type: "text", text: parts.join(`
+`) }]
+    });
+    for (const msg of pending)
+      markDelivered(db, msg.id);
+    return pending.length;
+  } catch {
+    return 0;
+  }
+}
 
 // src/recovery.ts
 async function recoverStaleMembers(db, client3) {
@@ -15664,6 +15688,12 @@ function checkToolIsolation(registry2, tracker, toolName, sessionId) {
     throw new Error("Team tools are not available to sub-agents. Report findings to your parent teammate via your normal output.");
   }
 }
+async function handleLeadIdleFlush(db, client3, sessionId) {
+  const team = db.query("SELECT id FROM team WHERE lead_session_id = ? AND status = 'active'").get(sessionId);
+  if (!team)
+    return 0;
+  return flushPendingMessages(db, client3, team.id, sessionId);
+}
 
 // src/notify.ts
 var TOAST_CONFIG = {
@@ -15753,8 +15783,6 @@ function buildLeadSystemPrompt(db, teamId) {
     "",
     "Teammates work asynchronously and message you when done.",
     "Do NOT poll team_status or team_tasks_list repeatedly \u2014 wait for messages.",
-    "Spawn teammates ONE at a time \u2014 do not send multiple team_spawn calls in a single response.",
-    "After each team_spawn, verify the output confirms the spawn succeeded before spawning the next.",
     "After spawning teammates, tell the user what you've set up and wait.",
     "When all teammates finish, summarize results and suggest next steps."
   ].join(`
@@ -15987,6 +16015,17 @@ async function executeTeamMessage(deps, args, sessionId) {
   } else {
     deliveryText = `[Team message from ${senderName}]: ${messageText}`;
   }
+  let recipientBusy = false;
+  try {
+    const statusResult = await deps.client.session.status();
+    const sessionStatus = statusResult.data?.[recipientSessionId];
+    if (sessionStatus?.type === "busy") {
+      recipientBusy = true;
+    }
+  } catch {}
+  if (recipientBusy) {
+    return `Message sent to ${args.to}. (queued \u2014 recipient is busy)`;
+  }
   await deps.client.session.promptAsync({
     sessionID: recipientSessionId,
     parts: [{ type: "text", text: deliveryText }]
@@ -16506,6 +16545,9 @@ var plugin = async (input) => {
           }
           await notifyWorkingProgress(client3, db, transition.teamId);
         }
+        if (statusType === "idle") {
+          handleLeadIdleFlush(db, client3, sessionID).catch(() => {});
+        }
       }
       if (event.type === "session.created") {
         const info = event.properties.info;

package/package.json

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

@@ -1,5 +1,7 @@
 import type { Database } from "bun:sqlite"
 import type { MemberRegistry, DescendantTracker } from "./state"
+import type { PluginClient } from "./types"
+import { flushPendingMessages } from "./messaging"
 
 const TEAM_TOOL_PREFIX = "team_"
 
@@ -101,3 +103,17 @@ export function checkToolIsolation(
     throw new Error("Team tools are not available to sub-agents. Report findings to your parent teammate via your normal output.")
   }
 }
+
+/**
+ * Check if a session going idle is a team lead with pending messages.
+ * If so, flush them via promptAsync. Called from the event hook on idle transitions.
+ */
+export async function handleLeadIdleFlush(
+  db: Database,
+  client: PluginClient,
+  sessionId: string,
+): Promise<number> {
+  const team = db.query("SELECT id FROM team WHERE lead_session_id = ? AND status = 'active'").get(sessionId) as { id: string } | null
+  if (!team) return 0
+  return flushPendingMessages(db, client, team.id, sessionId)
+}

package/src/index.ts

@@ -7,7 +7,7 @@ import { createDb, getDbPath } from "./db"
 import { wrapThrowingClient } from "./client"
 import { recoverStaleMembers, recoverUndeliveredMessages, recoverOrphanedWorktrees } from "./recovery"
 import { MemberRegistry, DescendantTracker } from "./state"
-import { handleSessionStatusEvent, handleSessionCreatedEvent, checkToolIsolation } from "./hooks"
+import { handleSessionStatusEvent, handleSessionCreatedEvent, checkToolIsolation, handleLeadIdleFlush } from "./hooks"
 import { notifyTeamEvent, notifyWorkingProgress } from "./notify"
 import { buildLeadSystemPrompt, buildTeammateSystemPrompt, buildTeamCompactionContext } from "./system-prompt"
 import { findTeamBySession } from "./types"
@@ -139,6 +139,11 @@ const plugin: Plugin = async (input) => {
           // Show working progress after every transition so the user sees who's still active
           await notifyWorkingProgress(client, db, transition.teamId)
         }
+
+        // Flush pending messages to the lead when their session goes idle
+        if (statusType === "idle") {
+          handleLeadIdleFlush(db, client, sessionID).catch(() => { /* best effort */ })
+        }
       }
 
       if (event.type === "session.created") {

package/src/messaging.ts

@@ -1,4 +1,5 @@
 import type { Database } from "bun:sqlite"
+import type { PluginClient } from "./types"
 import { generateId } from "./util"
 
 const MAX_CONTENT_BYTES = 10 * 1024 // 10KB
@@ -76,3 +77,40 @@ 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])
 }
+
+/**
+ * Flush undelivered messages addressed to the lead for a given team.
+ * Batches all pending messages into a single promptAsync call to avoid
+ * interrupting the lead with multiple deliveries. Returns count of delivered messages.
+ */
+export async function flushPendingMessages(
+  db: Database,
+  client: PluginClient,
+  teamId: string,
+  leadSessionId: string,
+): Promise<number> {
+  const pending = db.query(
+    "SELECT * FROM team_message WHERE team_id = ? AND delivered = 0 AND to_name = 'lead' ORDER BY time_created ASC"
+  ).all(teamId) as MessageRow[]
+
+  if (pending.length === 0) return 0
+
+  const MAX_LEAD_MSG = 500
+  const parts = pending.map((msg) => {
+    if (msg.content.length > MAX_LEAD_MSG) {
+      return `[Team message from ${msg.from_name}]: ${msg.content.slice(0, MAX_LEAD_MSG)}... (use team_results to read full message)`
+    }
+    return `[Team message from ${msg.from_name}]: ${msg.content}`
+  })
+
+  try {
+    await client.session.promptAsync({
+      sessionID: leadSessionId,
+      parts: [{ type: "text", text: parts.join("\n") }],
+    })
+    for (const msg of pending) markDelivered(db, msg.id)
+    return pending.length
+  } catch {
+    return 0
+  }
+}

package/src/system-prompt.ts

@@ -47,8 +47,6 @@ export function buildLeadSystemPrompt(db: Database, teamId: string): string {
     "",
     "Teammates work asynchronously and message you when done.",
     "Do NOT poll team_status or team_tasks_list repeatedly — wait for messages.",
-    "Spawn teammates ONE at a time — do not send multiple team_spawn calls in a single response.",
-    "After each team_spawn, verify the output confirms the spawn succeeded before spawning the next.",
     "After spawning teammates, tell the user what you've set up and wait.",
     "When all teammates finish, summarize results and suggest next steps.",
   ].join("\n")

package/src/tools/team-message.ts

@@ -67,6 +67,24 @@ export async function executeTeamMessage(
     deliveryText = `[Team message from ${senderName}]: ${messageText}`
   }
 
+  // Check if recipient is busy — if so, queue the message for later delivery.
+  // TOCTOU: status check and promptAsync are not atomic. A recipient can transition
+  // idle→busy between the check and delivery. This is accepted as benign — the idle-flush
+  // backstop catches anything that slips through, so no messages are lost.
+  let recipientBusy = false
+  try {
+    const statusResult = await deps.client.session.status()
+    const sessionStatus = statusResult.data?.[recipientSessionId]
+    if (sessionStatus?.type === "busy") {
+      recipientBusy = true
+    }
+  } catch { /* status check failed — deliver anyway as best effort */ }
+
+  if (recipientBusy) {
+    // Message is stored in DB with delivered=0, will be flushed when recipient goes idle
+    return `Message sent to ${args.to}. (queued — recipient is busy)`
+  }
+
   await deps.client.session.promptAsync({
     sessionID: recipientSessionId,
     parts: [{ type: "text", text: deliveryText }],