eve-hub 0.6.35 → 0.6.36

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eve-hub
 
+## 0.6.36
+
+### Patch Changes
+
+- The bots' /hub/manifest reports the workspace's `hopLimit`, so the hosted hub holds bot-to-bot chains at it.
+
 ## 0.6.35
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.6.35",
+  "version": "0.6.36",
   "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/prepare.mjs

@@ -63,8 +63,8 @@ import workspace from "../../../../hub.manifest.json" with { type: "json" };
 // syncs by; a deployment with none (\`vercel deploy\` uploads no git metadata)
 // has no manifest to give.
 const sha = process.env.VERCEL_GIT_COMMIT_SHA;
-const { agents, humans, subagentCap } = parseWorkspace(workspace);
-const manifest = { sha, kit: ${JSON.stringify(KIT_VERSION)}, agents, humans, subagentCap };
+const { agents, humans, subagentCap, hopLimit } = parseWorkspace(workspace);
+const manifest = { sha, kit: ${JSON.stringify(KIT_VERSION)}, agents, humans, subagentCap, ...(hopLimit === undefined ? {} : { hopLimit }) };
 
 export default defineChannel({
   routes: [

package/world.mjs

@@ -437,6 +437,7 @@ function derivedMessageId(...parts) {
 }
 var sessionId = () => `wrun_${ulid()}`;
 var deliveryId = (message, bot) => `dlv_${message}_${bot}`;
+var messageOfDelivery = (delivery, bot) => delivery.slice("dlv_".length, -`_${bot}`.length);
 var turnId = (session, chunkIndex) => `trn_${session}_${chunkIndex}`;
 
 // ../../hosted-hub/src/store/events.ts
@@ -495,6 +496,9 @@ function routingStatements(messageId2, threadId2, bots, now, { by, joins }, held
     ])
   ];
 }
+var hopAfter = (session) => s(`(SELECT 1 + COALESCE(MAX(m.hop), 0) FROM deliveries d JOIN messages m ON m.id = d.message_id WHERE d.session_id = ? AND (
+    EXISTS (SELECT 1 FROM turn_deliveries td WHERE td.delivery_id = d.id AND td.turn_id = (SELECT id FROM turns WHERE session_id = ? ORDER BY started_at DESC, rowid DESC LIMIT 1))
+    OR (d.accepted_at IS NOT NULL AND NOT EXISTS (SELECT 1 FROM turn_deliveries td WHERE td.delivery_id = d.id))))`, session, session);
 
 // subagent-cap.mjs
 var DEFAULT_SUBAGENT_CAP = Object.freeze({
@@ -505,6 +509,8 @@ var DEFAULT_SUBAGENT_CAP = Object.freeze({
 
 // ../../hosted-hub/src/store/roster.ts
 var onLocal = (bot) => `EXISTS (SELECT 1 FROM bots WHERE name = ${bot} AND runs_on = 'local')`;
+var HOP_LIMIT = "(SELECT json_extract(metadata, '$.workspace.hopLimit') FROM workspace_repo WHERE id = 1)";
+var heldByHopLimit = (m) => `(${m}.author_kind = 'agent' AND ${HOP_LIMIT} IS NOT NULL AND ${m}.hop >= ${HOP_LIMIT})`;
 
 // ../../hosted-hub/src/store/schema.ts
 var OPEN_TURN_STATUSES = "('streaming','cancelling')";
@@ -635,6 +641,29 @@ function linkStatements(sessionId2, parent, callId) {
   ];
 }
 
+// ../../hosted-hub/src/store/failures.ts
+var STATE = "json_extract(event, '$.state')";
+var failureId = (trigger, bot) => `evt_fail_${trigger}_${bot}`;
+var cardLog = (idSql, now, ...args) => s(`INSERT INTO log (thread_id, type, data, at) SELECT thread_id, 'message.updated', json_object('threadId', thread_id, 'messageId', id), ? FROM messages WHERE id = (${idSql}) AND changes() > 0`, now, ...args);
+function failureStatements(t, now) {
+  if (!t.trigger) return [];
+  const id = failureId(t.trigger, t.bot), detail = t.error ?? "unknown error";
+  const turn = (status) => s("EXISTS (SELECT 1 FROM turns WHERE id = ? AND status = ?)", t.id, status);
+  const failed = turn("failed"), settled = (status, next) => {
+    const when = turn(status);
+    return [s(`UPDATE messages SET event = json_set(event, '$.state', ?) WHERE id = ? AND ${STATE} = 'retrying' AND ${when.sql}`, next, id, ...when.args), cardLog("?", now, id)];
+  };
+  return [
+    ...eventStatements(t.threadId, { kind: "turn_failed", agent: t.bot, triggerId: t.trigger, state: "failed", retries: 0, turnId: t.id, detail }, `${t.bot}'s turn failed: ${detail}`, now, id, failed),
+    s(`UPDATE messages SET text = ?, event = json_set(event, '$.state', 'failed', '$.detail', ?, '$.turnId', ?, '$.retries', json_extract(event, '$.retries') + 1)
+      WHERE id = ? AND ${STATE} = 'retrying' AND json_extract(event, '$.turnId') <> ? AND ${failed.sql}`, `${t.bot}'s turn failed: ${detail}`, detail, t.id, id, t.id, ...failed.args),
+    cardLog("?", now, id),
+    ...settled("done", "resolved"),
+    ...settled("cancelled", "failed")
+  ];
+}
+var triggerOf = (t) => `(SELECT d.message_id FROM turn_deliveries td JOIN deliveries d ON d.id = td.delivery_id WHERE td.turn_id = ${t}.id ORDER BY d.rowid LIMIT 1)`;
+
 // ../../lib/tags.mjs
 var TAG_FIELDS = ["project", "issueType"];
 var LABEL_FIELDS = [...TAG_FIELDS, "path"];
@@ -5748,7 +5777,7 @@ var $ZodCyclicError = class extends Error {
     this.name = "ZodCyclicError";
   }
 };
-var STATE = "~memo";
+var STATE2 = "~memo";
 var NO_ISSUES = [];
 function isRef(value) {
   return value !== null && typeof value === "object";
@@ -5962,10 +5991,10 @@ var memo = {
         const input2 = payload.value;
         if (!isRef(input2))
           return base(payload, ctx);
-        let state = ctx[STATE];
+        let state = ctx[STATE2];
         if (!state) {
           state = { buckets: /* @__PURE__ */ new WeakMap(), backEdges: void 0 };
-          ctx[STATE] = state;
+          ctx[STATE2] = state;
         }
         let bucket;
         if (lastCtx === ctx) {
@@ -6014,7 +6043,7 @@ function memoizer() {
   return memo;
 }
 function isBackEdge(ctx, value) {
-  const backEdges = ctx[STATE]?.backEdges;
+  const backEdges = ctx[STATE2]?.backEdges;
   return backEdges !== void 0 && isRef(value) && backEdges.has(value);
 }
 
@@ -23602,7 +23631,7 @@ var $ZodCyclicError2 = class extends Error {
     this.name = "ZodCyclicError";
   }
 };
-var STATE2 = "~memo";
+var STATE3 = "~memo";
 var NO_ISSUES2 = [];
 function cloneIssues2(issues) {
   return issues.map((iss) => iss.path ? { ...iss, path: iss.path.slice() } : { ...iss });
@@ -23777,10 +23806,10 @@ var memo2 = {
         const input2 = payload.value;
         if (input2 === null || typeof input2 !== "object")
           return base(payload, ctx);
-        let state = ctx[STATE2];
+        let state = ctx[STATE3];
         if (!state) {
           state = { buckets: /* @__PURE__ */ new Map(), backEdges: void 0 };
-          ctx[STATE2] = state;
+          ctx[STATE3] = state;
         }
         let bucket;
         if (lastCtx === ctx) {
@@ -23829,7 +23858,7 @@ function memoizer2() {
   return memo2;
 }
 function isBackEdge2(ctx, value) {
-  const backEdges = ctx[STATE2]?.backEdges;
+  const backEdges = ctx[STATE3]?.backEdges;
   return backEdges !== void 0 && value !== null && typeof value === "object" && backEdges.has(value);
 }
 
@@ -27054,7 +27083,8 @@ var Cap = Requested.extend({ models: external_exports.array(external_exports.str
 var DeployedWorkspace = external_exports.object({
   agents: external_exports.array(external_exports.looseObject({ name: external_exports.string(), role: external_exports.string(), color: external_exports.string(), model: external_exports.string(), runsOn: external_exports.enum(["hosted", "local"]).optional(), subagents: external_exports.record(external_exports.string(), Requested).optional(), subagentCap: Cap.optional() })),
   humans: external_exports.array(external_exports.looseObject({ name: external_exports.string(), color: external_exports.string().optional() })).optional(),
-  subagentCap: Cap.optional()
+  subagentCap: Cap.optional(),
+  hopLimit: external_exports.int().min(1).nullable().optional()
 });
 var Upgrade = external_exports.object({
   to: external_exports.string(),
@@ -27087,6 +27117,7 @@ var PENDING_FROM = `SELECT d.id, d.message_id, d.session_id, d.bot, m.thread_id,
       s.ended_at IS NOT NULL AS session_ended, ${onLocal("d.bot")} AS on_local,
       (SELECT json_group_array(json_object('id', a.upload_id, 'name', a.name, 'size', a.size)) FROM (SELECT * FROM message_attachments WHERE message_id = m.id ORDER BY position) a) AS attachments
     FROM deliveries d JOIN messages m ON m.id = d.message_id JOIN threads t ON t.id = m.thread_id JOIN sessions s ON s.id = d.session_id`;
+var UNSETTLED = `d.accepted_at IS NULL AND d.failed_at IS NULL AND d.revoked_at IS NULL AND d.held_at IS NULL AND NOT ${heldByHopLimit("m")}`;
 var TASK_CARD = `(SELECT CASE WHEN json_array_length(json_extract(t.activity, '$.taskCard.tasks')) > 0 THEN json_extract(t.activity, '$.taskCard') END
   FROM turns t WHERE t.id = m.turn_id AND m.author_kind = 'agent' AND t.status NOT IN ${OPEN_TURN_STATUSES}
     AND m.rowid = (SELECT MAX(x.rowid) FROM messages x WHERE x.turn_id = m.turn_id))`;
@@ -27097,7 +27128,7 @@ 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'
+  WHEN d.failed_at IS NOT NULL THEN 'failed' WHEN d.revoked_at IS NOT NULL THEN 'skipped' WHEN EXISTS (SELECT 1 FROM messages hm WHERE hm.id = d.message_id AND ${heldByHopLimit("hm")}) THEN 'blocked: hop limit'
   WHEN d.held_at IS NOT NULL THEN CASE d.held_scope WHEN 'bot' THEN 'queued until free' ELSE 'queued' END
   WHEN ${onLocal("d.bot")} AND EXISTS (SELECT 1 FROM local_runner WHERE id = 1 AND device IS NOT NULL AND attachments = 0)
     AND (EXISTS (SELECT 1 FROM message_attachments o WHERE o.message_id = d.message_id)
@@ -27105,12 +27136,18 @@ var DELIVERY_STATUS = `CASE WHEN d.accepted_at IS NOT NULL OR ${LINKED} THEN COA
     THEN 'waiting: the Mac app running this bot is too old to carry images; update it'
   ELSE 'pending' END`;
 
+// ../../hosted-hub/src/store/local-runner.ts
+var RESTARTED_TURNS_READ = s(`SELECT t.thread_id, t.bot, r.claimed_at FROM turns t, local_runner r
+  WHERE r.id = 1 AND t.status IN ${OPEN_TURN_STATUSES} AND ${onLocal("t.bot")} AND t.started_at < r.claimed_at
+    AND NOT EXISTS (SELECT 1 FROM session_folds f WHERE f.session_id = t.session_id AND f.folded_at >= r.claimed_at)`);
+
 // ../../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('person', person, 'names', json(names)) FROM human_notify) AS notify,
-    (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}
+    (SELECT json_object('status', t.status, 'id', t.id, 'text', t.reply_text, 'lastStep', json(t.last_step), 'activity', json(t.activity),
+      'trigger', ${triggerOf("t")}) 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 = ?`;
 function foldState(row) {
@@ -27134,7 +27171,7 @@ function fold(state, chunks, now = Date.now()) {
   const { session } = state;
   const stmts = [], touched = /* @__PURE__ */ new Map();
   const log = (type, data, when = "") => stmts.push(s(`INSERT INTO log (thread_id, type, data, at) SELECT ?, ?, ?, ? ${when}`, session.thread, type, JSON.stringify({ threadId: session.thread, agent: session.bot, ...data }), at));
-  let open3 = state.open && { ...state.open, lastStep: state.open.lastStep ?? null, status: state.open.status, endedAt: null, error: null };
+  let open3 = state.open && { ...state.open, trigger: state.open.trigger ?? null, lastStep: state.open.lastStep ?? null, status: state.open.status, endedAt: null, error: null };
   const deliver = [];
   let last = state.foldedIndex;
   let at = now;
@@ -27183,15 +27220,17 @@ function fold(state, chunks, now = Date.now()) {
         if (!data.turnId) throw new Error("turn.started must name eve turnId");
         flush();
         end("cancelled", "superseded by a new turn");
-        open3 = { activity: initActivity(), id: turnId(session.id, index), text: "", lastStep: null, status: "streaming", endedAt: null, error: null };
+        open3 = { activity: initActivity(), id: turnId(session.id, index), trigger: null, text: "", lastStep: null, status: "streaming", endedAt: null, error: null };
         touched.set(open3.id, open3);
         stmts.push(s(`INSERT OR IGNORE INTO turns (id, thread_id, session_id, eve_turn_id, bot, status, started_at)
-          VALUES (?, ?, ?, ?, ?, 'streaming', ?)`, open3.id, session.thread, session.id, data.turnId, session.bot, at));
+          SELECT ?, ?, ?, ?, ?, 'streaming', ? WHERE EXISTS (SELECT 1 FROM sessions WHERE id = ? AND ended_at IS NULL)`, open3.id, session.thread, session.id, data.turnId, session.bot, at, session.id));
         log("turn.status", { turnId: open3.id, status: "streaming" });
       }
       if (!open3) continue;
-      for (const deliveryId2 of event.meta?.deliveryIds ?? [])
+      for (const deliveryId2 of event.meta?.deliveryIds ?? []) {
+        open3.trigger ??= messageOfDelivery(deliveryId2, session.bot);
         stmts.push(s("INSERT OR IGNORE INTO turn_deliveries (delivery_id, turn_id) SELECT id, ? FROM deliveries WHERE id = ? AND session_id = ?", open3.id, deliveryId2, session.id));
+      }
       if (event.meta?.deliveryIds?.length) touched.set(open3.id, open3);
       const activityEvent = event.type === "message.completed" ? { ...event, data: { ...data, message: data.message ?? open3.text } } : event;
       if (reduceActivity(open3.activity, activityEvent, at, cutOff(open3, event.type, data.turnId))) {
@@ -27252,9 +27291,10 @@ function fold(state, chunks, now = Date.now()) {
           const text = lastActWasOwnPost(open3.lastStep) ? "" : open3.text.trim();
           if (open3.status !== "cancelling") {
             const messageId2 = derivedMessageId(open3.id);
-            stmts.push(s(`INSERT OR IGNORE INTO messages (id, thread_id, author, author_kind, text, turn_id, created_at)
-              SELECT ?, ?, ?, 'agent', ?, ?, ? WHERE (? <> '' OR EXISTS (SELECT 1 FROM turn_attachments WHERE turn_id = ?))
-              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, open3.id));
+            const hop = hopAfter(session.id);
+            stmts.push(s(`INSERT OR IGNORE INTO messages (id, thread_id, author, author_kind, text, turn_id, created_at, hop)
+              SELECT ?, ?, ?, 'agent', ?, ?, ?, ${hop.sql} WHERE (? <> '' OR EXISTS (SELECT 1 FROM turn_attachments WHERE turn_id = ?))
+              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, ...hop.args, text, open3.id, open3.id));
             log("message.created", { messageId: messageId2, author: session.bot, authorKind: "agent" }, IF_INSERTED);
             stmts.push(...notificationFor(messageId2, "agent", text, state.notify ?? void 0));
             stmts.push(s(`INSERT OR IGNORE INTO message_attachments (message_id, position, upload_id, name, size)
@@ -27306,10 +27346,15 @@ function fold(state, chunks, now = Date.now()) {
       JSON.stringify(t.activity),
       t.id
     ));
+    if (t.endedAt !== null) stmts.push(...failureStatements({ id: t.id, threadId: session.thread, bot: session.bot, trigger: t.trigger, status: t.status, error: t.error }, t.endedAt));
+  }
+  if (last > state.foldedIndex) {
+    stmts.push(s(`INSERT INTO log (thread_id, type, data, at) SELECT t.thread_id, 'turn.status', json_object('turnId', t.id, 'status', t.status), ?
+      FROM turns t, local_runner r WHERE t.session_id = ? AND r.id = 1 AND t.status IN ${OPEN_TURN_STATUSES} AND t.started_at < r.claimed_at AND ${onLocal("t.bot")}
+        AND NOT EXISTS (SELECT 1 FROM session_folds f WHERE f.session_id = t.session_id AND f.folded_at >= r.claimed_at)`, now, session.id));
+    stmts.push(s(`INSERT INTO session_folds (session_id, folded_index, folded_at) VALUES (?, ?, ?)
+      ON CONFLICT (session_id) DO UPDATE SET folded_index = excluded.folded_index, folded_at = excluded.folded_at`, session.id, last, now));
   }
-  if (last > state.foldedIndex)
-    stmts.push(s(`INSERT INTO session_folds (session_id, folded_index) VALUES (?, ?)
-      ON CONFLICT (session_id) DO UPDATE SET folded_index = excluded.folded_index`, session.id, last));
   return { statements: stmts, deliver };
 }
 async function foldInTx(tx, sessionId2, chunks) {