eve-hub 0.6.21 → 0.6.23

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # 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
+
+- Move shared hub code (dash, hitl, delta) out of registry/ into hosted-hub/src/domain.
+
 ## 0.6.21
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.6.21",
+  "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/schedules/dash-classify.mjs

@@ -1,5 +1,5 @@
 // The threads part of main's dash pass (schedules/dash-pass.mjs): gives
-// every open thread, busy or idle, a Dash entry (registry/dash.mjs: importance,
+// every open thread, busy or idle, a Dash entry (hosted-hub/src/domain/dash.mjs: importance,
 // lane, reason) and writes them back through POST /api/dash/entries.
 //
 //   targets   open threads (not DMs, schedule threads or archived) that aren't
@@ -41,8 +41,8 @@ const working = (t) => Object.values(t?.status ?? {}).includes("working");
 // What a classification was made from: the last message, the live status
 // class (waiting / working / idle) and the project and issue type tags. The entry
 // keeps it (entry.basis); a thread is classified again once it differs. Kept
-// in step with registry/dash.mjs classifyBasis (test/dash-entries.test.mjs).
-// The input version (registry/dash.mjs BASIS_VERSION): bumped when what the
+// in step with hosted-hub/src/domain/dash.mjs classifyBasis (test/dash-entries.test.mjs).
+// The input version (hosted-hub/src/domain/dash.mjs BASIS_VERSION): bumped when what the
 // model reads changes, so every entry made from the older input is
 // classified once more, then stays quiet.
 export const BASIS_VERSION = "v:lanes1";
@@ -131,7 +131,7 @@ export const DECISION_MODEL = "openai/gpt-6-luna-decisions";
 
 // What the thread is doing for the human, as one pick. Each state is one lane
 // (the entry's `lane`); `ready` isn't here, the hub derives it from the reviewer's
-// ship verdict on the PR's current head (entriesOf, registry/dash.mjs).
+// ship verdict on the PR's current head (entriesOf, hosted-hub/src/domain/dash.mjs).
 export const STATES = {
   "asks-you": "needs-you",
   stuck: "running", // a stall is a bot's to steer; it shows on the thread's own row, not as the human's task

package/schedules/dash-rules.mjs

@@ -14,7 +14,7 @@ import { said, lastSaid } from "./thread-brief.mjs";
 
 // ---------------------------------------------------------------------------
 // dash: what changed since the last scan that could put something on the
-// human's Dash (registry/dash.mjs), with no model call. Four parts, each kept
+// human's Dash (hosted-hub/src/domain/dash.mjs), with no model call. Four parts, each kept
 // exactly (by id, not time) in the saved state:
 //   p  the human's PRs: CI, review, draft, merge conflicts, open/merged/closed,
 //      and every PR a Dash item waits on, whoever wrote it. A PR that leaves

package/schedules/hub.d.mts

@@ -1,6 +1,6 @@
 // Types for hub.mjs: main's schedules' client of the hub's HTTP API. Bodies
 // the schedules only pass through are `unknown`.
-import type { DashEntries } from '../../../registry/dash.mjs';
+import type { DashEntries } from '../../../hosted-hub/src/domain/dash.mjs';
 
 type Notice = { schedule: string; text: string; clientId?: string };
 type Post = { text: string; clientId?: string };

package/schedules/hub.mjs

@@ -42,14 +42,14 @@ export function createHub({ base = registryBase(), agent = "main", fetchImpl = f
     // With `report` ({ trigger, reportTo: "<bot>/<schedule>" }) the hub posts
     // this compaction's report lines into that schedule's thread itself.
     compact: (threadId, bot, by, report = {}) => call(`/api/threads/${encodeURIComponent(threadId)}/compact`, { method: "POST", body: JSON.stringify({ agent: bot, by, ...report }) }),
-    // The Dash was scanned now (registry/dash.mjs checkedAt), changed or not.
+    // The Dash was scanned now (hosted-hub/src/domain/dash.mjs checkedAt), changed or not.
     // `prFacts` ({ "owner/repo#12": { head, ci } }): what the scan's GitHub query said of the PRs reviews are about.
     dashChecked: (prFacts = {}) => must("/api/dash/checked", { method: "POST", body: JSON.stringify({ by: agent, prFacts }) }),
     // A track's summary (set_summary's endpoint, as main).
     setSummary: (path, text) => must("/api/summaries", { method: "POST", body: JSON.stringify({ by: agent, scope: `path:${path}`, text }) }),
-    // A classifier pass finished (registry/dash.mjs classifiedAt).
+    // A classifier pass finished (hosted-hub/src/domain/dash.mjs classifiedAt).
     dashClassified: () => must("/api/dash/classified", { method: "POST", body: JSON.stringify({ by: agent }) }),
-    // Dash entries from the classifier (registry/dash.mjs), merged per field.
+    // Dash entries from the classifier (hosted-hub/src/domain/dash.mjs), merged per field.
     // File an unfiled thread into a track (the classifier's pick), as a bot:
     // the hub refuses a thread that's already filed and doesn't lock it.
     fileThread: (threadId, path) => must(`/api/threads/${encodeURIComponent(threadId)}/track`, { method: "POST", body: JSON.stringify({ by: agent, path }) }),

package/tools/dash_update.js

@@ -2,7 +2,7 @@ import { defineTool } from "eve/tools";
 import { z } from "zod";
 import { registryFetch } from "../registry-fetch.mjs";
 // main only (the registry refuses other bots). Writes Dash entries
-// (registry/dash.mjs): importance / lane / reason / deferred on existing,
+// (hosted-hub/src/domain/dash.mjs): importance / lane / reason / deferred on existing,
 // non-archived threads, merged field by field (POST /api/dash/entries). The
 // dash schedule classifies idle threads on its own; this is for corrections.
 const entry = z.object({

package/tools/restart_hub.js

@@ -3,7 +3,7 @@ import { z } from "zod";
 import { registryFetch } from "../registry-fetch.mjs";
 // main only (the registry refuses anyone else). The registry hands the restart
 // to a detached `hub restart`, which replaces the registry and keeps each bot
-// whose inputs are unchanged (registry/fingerprint.mjs); a turn the restart
+// whose inputs are unchanged (lib/fingerprint.mjs); a turn the restart
 // cuts off is re-delivered, so it can't strand the turn that asked for it
 // (packages/agent-kit/self-restart.mjs).
 export default defineTool({

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);
           }