eve-hub 0.6.22 → 0.6.23

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eve-hub
 
+## 0.6.23
+
+### Patch Changes
+
+- A bot's world folds queued messages: a turn that ends releases the messages held for it.
+
 ## 0.6.22
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.6.22",
+  "version": "0.6.23",
   "license": "Apache-2.0",
   "description": "Bot-side code shared by every hub agent: registry tools, the roster hook, the eve channel, the host sandbox and browser, and model helpers.",
   "type": "module",

package/world.mjs

@@ -430,12 +430,13 @@ var OPEN_TURN_STATUSES = "('streaming','cancelling')";
 // ../../hosted-hub/src/domain/wake.ts
 var escape = (s2) => s2.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 var mentioned = (roster, text) => roster.filter((bot) => new RegExp(`(^|[^\\w@])@${escape(bot)}(?![\\w-])`, "i").test(text));
-function recipients(roster, text, from, threadId2 = "") {
+var hasAll = (text) => /(^|[^\w@])@all(?![\w-])/i.test(text);
+function recipients(roster, text, from, threadId2 = "", participants = []) {
   if (threadId2.startsWith("dm-")) {
     const bot = threadId2.slice(3);
     return bot !== from.name && roster.includes(bot) ? [bot] : [];
   }
-  const named = mentioned(roster, text).filter((bot) => bot !== from.name);
+  const named = [.../* @__PURE__ */ new Set([...mentioned(roster, text), ...hasAll(text) ? participants.filter((b) => roster.includes(b)) : []])].filter((bot) => bot !== from.name);
   if (from.kind === "agent") return named;
   return named.length ? named : roster.slice(0, 1);
 }
@@ -462,7 +463,8 @@ var deliveryId = (message, bot) => `dlv_${message}_${bot}`;
 var turnId = (session, chunkIndex) => `trn_${session}_${chunkIndex}`;
 
 // ../../hosted-hub/src/store/routing.ts
-function routingStatements(messageId2, threadId2, bots, now) {
+var PARTICIPANTS = (thread) => `SELECT bot FROM sessions WHERE thread_id = ${thread} UNION SELECT author FROM messages WHERE thread_id = ${thread} AND author_kind = 'agent'`;
+function routingStatements(messageId2, threadId2, bots, now, held = {}, steer = false) {
   const fresh = "EXISTS (SELECT 1 FROM messages WHERE id = ?)";
   return [
     ...bots.flatMap((bot) => [
@@ -477,7 +479,9 @@ function routingStatements(messageId2, threadId2, bots, now) {
         threadId2,
         bot,
         messageId2
-      )
+      ),
+      ...steer ? [s("UPDATE deliveries SET steer = 1 WHERE id = ? AND accepted_at IS NULL", deliveryId(messageId2, bot))] : [],
+      ...held[bot] ? [s("UPDATE deliveries SET held_at = ?, held_scope = ? WHERE id = ? AND accepted_at IS NULL", now, held[bot], deliveryId(messageId2, bot))] : []
     ])
   ];
 }
@@ -26962,10 +26966,13 @@ var DELIVERY_STATUS = `CASE WHEN d.accepted_at IS NOT NULL OR ${LINKED} THEN COA
     WHERE r.session_id = d.session_id AND r.status = 'pending' AND rs.ended_at IS NULL
       AND r.created_at <= COALESCE((SELECT t.started_at FROM turn_deliveries td JOIN turns t ON t.id = td.turn_id WHERE td.delivery_id = d.id), d.accepted_at) LIMIT 1),
     CASE WHEN ${LINKED} THEN 'seen' ELSE 'delivered' END)
-  WHEN d.failed_at IS NOT NULL THEN 'failed' WHEN d.revoked_at IS NOT NULL THEN 'skipped' ELSE 'pending' END`;
+  WHEN d.failed_at IS NOT NULL THEN 'failed' WHEN d.revoked_at IS NOT NULL THEN 'skipped'
+  WHEN d.held_at IS NOT NULL THEN CASE d.held_scope WHEN 'bot' THEN 'queued until free' ELSE 'queued' END ELSE 'pending' END`;
 
 // ../../hosted-hub/src/store/fold.ts
 var FOLD_STATE_SQL = `SELECT s.id, s.thread_id, s.bot, COALESCE(f.folded_index, -1) AS folded_index, (SELECT json_group_array(name) FROM (SELECT name FROM bots ORDER BY position)) AS roster,
+    (SELECT json_group_array(bot) FROM (${PARTICIPANTS("s.thread_id")})) AS participants,
+    (SELECT d.message_id FROM deliveries d WHERE d.bot = s.bot AND d.held_at IS NOT NULL AND d.held_paused IS NOT 1 AND d.accepted_at IS NULL AND d.failed_at IS NULL AND d.revoked_at IS NULL ORDER BY d.rowid LIMIT 1) AS held,
     (SELECT json_object('status', t.status, 'id', t.id, 'text', t.reply_text, 'lastStep', json(t.last_step), 'activity', json(t.activity)) FROM turns t WHERE t.session_id = s.id AND t.status IN ${OPEN_TURN_STATUSES}
       ORDER BY t.started_at DESC LIMIT 1) AS open_turn
   FROM sessions s LEFT JOIN session_folds f ON f.session_id = s.id WHERE s.id = ?`;
@@ -26974,6 +26981,8 @@ function foldState(row) {
   return {
     session: { id: String(row.id), thread: String(row.thread_id), bot: String(row.bot) },
     roster: JSON.parse(String(row.roster)),
+    participants: JSON.parse(String(row.participants)),
+    held: row.held == null ? null : String(row.held),
     foldedIndex: Number(row.folded_index),
     open: row.open_turn ? JSON.parse(String(row.open_turn)) : null
   };
@@ -27007,6 +27016,7 @@ function fold(state, chunks, now = Date.now()) {
     const reset = (t) => log("turn.delta", { turnId: t.id, index, reset: true, delta: t.text });
     const end = (status, error63 = null) => {
       if (!open3) return;
+      if (state.held) deliver.push(state.held);
       reduceActivity(open3.activity, { type: "turn.cancelled" }, at, cutOff(open3, "turn.cancelled"));
       Object.assign(open3, { status: open3.status === "cancelling" ? "cancelled" : status, endedAt: at, error: error63 });
       touched.set(open3.id, open3);
@@ -27103,7 +27113,7 @@ function fold(state, chunks, now = Date.now()) {
               SELECT ?, ?, ?, 'agent', ?, ?, ? WHERE ? <> ''
               AND EXISTS (SELECT 1 FROM turns WHERE id = ? AND status NOT IN ('cancelling','cancelled') AND NOT (${REVOKED_TURN}))`, messageId2, session.thread, session.bot, text, open3.id, at, text, open3.id));
             log("message.created", { messageId: messageId2, author: session.bot, authorKind: "agent" }, IF_INSERTED);
-            const to = recipients(state.roster, text, { name: session.bot, kind: "agent" }, session.thread);
+            const to = recipients(state.roster, text, { name: session.bot, kind: "agent" }, session.thread, state.participants);
             stmts.push(...routingStatements(messageId2, session.thread, to, at));
             deliver.push(messageId2);
           }