eve-hub 0.6.32 → 0.6.33

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eve-hub
 
+## 0.6.33
+
+### Patch Changes
+
+- Hosted hub: a schedule's run history is what its handler reports (hub.track: a start, an end and the error), so a dispatch is one run however often it loads state; a commit names its run. The mention rule moves to the kit (mention-tokens.mjs).
+
 ## 0.6.32
 
 ### Patch Changes

package/mention-tokens.d.mts

@@ -0,0 +1 @@
+export function mentionTokens(text: unknown): string[];

package/mention-tokens.mjs

@@ -0,0 +1,15 @@
+import { codeRanges } from "./mention-gate.mjs";
+
+// The one definition of an actual mention: `@handle` at a word boundary (not
+// foo@bar, @@x, \@x or a URL's /@x) and outside code (codeRanges). Every reader of
+// handles (routing, aliases, @all, notifications) takes its tokens from here; anything else
+// is text. Returns the lowercased handles in order, duplicates kept.
+export function mentionTokens(text) {
+  const s = String(text ?? "");
+  const code = codeRanges(s);
+  const out = [];
+  for (const match of s.matchAll(/(?<![\w@./\\-])@([a-z0-9][a-z0-9-]*)/gi)) {
+    if (!code.some(([a, b]) => match.index >= a && match.index < b)) out.push(match[1].toLowerCase());
+  }
+  return out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.6.32",
+  "version": "0.6.33",
   "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/compact.js

@@ -12,6 +12,7 @@ import { runCompact } from "./run-compact.mjs";
 export default defineSchedule({
     cron: "*/10 * * * *",
     async run() {
-        await runCompact(createHub());
+        const hub = createHub();
+        await hub.track("compact", () => runCompact(hub));
     },
 });

package/schedules/dash.js

@@ -15,6 +15,7 @@ import { modelSummarize } from "./track-summaries.mjs";
 export default defineSchedule({
     cron: "*/8 * * * *",
     async run() {
-        await dashPass(createHub(), { classify: modelClassify({ evaluate }), summarize: modelSummarize({ generateText }) });
+        const hub = createHub();
+        await hub.track("dash", () => dashPass(hub, { classify: modelClassify({ evaluate }), summarize: modelSummarize({ generateText }) }));
     },
 });

package/schedules/hub.d.mts

@@ -9,10 +9,11 @@ export type Hub = {
   snapshot(): Promise<Record<string, unknown>>;
   roster(): Promise<unknown>;
   load(id: string): Promise<unknown>;
-  loadVersioned(id: string): Promise<{ state: unknown; savedAt: string | null }>;
+  loadVersioned(id: string): Promise<{ state: unknown; savedAt: string | null; paused: boolean }>;
   save(id: string, state: unknown): Promise<unknown>;
   commit(id: string, withState: { state?: unknown }, posts: Post[]): Promise<unknown>;
   post(id: string, text: string, key?: string): Promise<unknown>;
+  track<T>(id: string, fn: () => Promise<T>): Promise<T | undefined>;
   compact(threadId: string, bot: string, by: string, report?: { trigger?: string; reportTo?: string }): Promise<{ status: number; ok: boolean; body: unknown }>;
   dashChecked(prFacts?: Record<string, { head: string | null; ci: string }>): Promise<Ok & { checkedAt: string }>;
   setSummary(path: string, text: string): Promise<unknown>;

package/schedules/hub.mjs

@@ -23,6 +23,8 @@ export function createHub({ base = registryBase(), agent = "main", fetchImpl = f
     if (!r.ok) throw new Error(`${init?.method ?? "GET"} ${path}: ${r.status} ${typeof r.body === "string" ? r.body : JSON.stringify(r.body)}`.slice(0, 400));
     return r.body;
   };
+  // The run the hub is following for this process's handler (`track`), so a commit says which run it belongs to.
+  let run = null;
   const threadOf = (id) => `sch-${agent}-${id.replaceAll("/", ".")}`;
   const statePath = (id) => `/api/schedules/${encodeURIComponent(agent)}/${id.split("/").map(encodeURIComponent).join("/")}/state`;
   return {
@@ -32,11 +34,31 @@ export function createHub({ base = registryBase(), agent = "main", fetchImpl = f
     // The state and when it was saved (the version a run decided on).
     loadVersioned: async (id) => {
       const body = await must(statePath(id));
-      return { state: body?.state ?? null, savedAt: body?.savedAt ?? null };
+      return { state: body?.state ?? null, savedAt: body?.savedAt ?? null, paused: body?.paused === true };
     },
     save: (id, state) => must(statePath(id), { method: "PUT", body: JSON.stringify({ state }) }),
     // Save `state` (if given: { state }) and post `posts` in one step.
-    commit: (id, withState, posts) => must(statePath(id), { method: "PUT", body: JSON.stringify({ ...withState, posts }) }),
+    commit: (id, withState, posts) => must(statePath(id), { method: "PUT", body: JSON.stringify({ ...withState, posts, ...(run?.id === id ? { run: run.run } : {}) }) }),
+    // One dispatch of the schedule `id`: the hub is told it started (it answers with the run's id and whether the
+    // schedule is paused, which skips `fn`) and how it ended, so the hub's run history is what the handler did. A hub
+    // that doesn't keep run history (the local one) answers 404 to the start, and `fn` runs untracked.
+    track: async (id, fn) => {
+      const started = await call(`${statePath(id).slice(0, -"/state".length)}/runs`, { method: "POST", body: "{}" }).catch(() => null);
+      if (!started?.ok) return fn();
+      if (started.body.paused) return;
+      run = { id, run: started.body.run };
+      const end = (error) => call(`${statePath(id).slice(0, -"/state".length)}/runs/${encodeURIComponent(run.run)}/end`, { method: "POST", body: JSON.stringify(error ? { error: error.slice(0, 2000) } : {}) }).catch(() => null);
+      try {
+        const result = await fn();
+        await end();
+        return result;
+      } catch (error) {
+        await end(String(error?.message ?? error) || "the run failed");
+        throw error;
+      } finally {
+        run = null;
+      }
+    },
     // A one-off post outside a run (runOnce commits through `commit`).
     post: (id, text, key) => must(`/api/threads/${encodeURIComponent(threadOf(id))}/messages`, { method: "POST", body: JSON.stringify({ author: "system", text, ...(key ? { clientId: key } : {}) }) }),
     // With `report` ({ trigger, reportTo: "<bot>/<schedule>" }) the hub posts
@@ -117,10 +139,12 @@ export function toPosts(notices) {
 // the same keys and the hub skips the posts it already has. Nothing is
 // lost and nothing posted twice. `decide(snap, saved, now)` ->
 // { posts: [text], state, changed }; `snapshot: false` skips reading
-// /api/state (decide gets null).
+// /api/state (decide gets null). A paused schedule (the state's `paused`)
+// decides and commits nothing.
 export async function runOnce(hub, id, decide, { now = Date.now(), snapshot = true } = {}) {
   const [snap, loaded] = await Promise.all([snapshot ? hub.snapshot() : null, hub.loadVersioned(id)]);
   const saved = loaded.state;
+  if (loaded.paused) return { posts: [], state: saved };
   const { posts = [], state, changed } = await decide(snap, saved, now);
   const texts = toPosts(posts.filter((t) => typeof t === "string" && t.trim()));
   if (!changed && !texts.length) return { posts: [], state: saved };

package/world.mjs

@@ -545,6 +545,79 @@ function stepValues(sessionId2, step) {
   return [sessionId2, step.sequence, step.stepIndex, Date.parse(step.at), b.inputTokens, b.outputTokens, b.cacheReadTokens, b.cacheWriteTokens, b.costUsd];
 }
 
+// mention-gate.mjs
+function codeRanges(text) {
+  const s2 = String(text ?? "");
+  const ranges = [];
+  const lines = [];
+  for (let at = 0; at <= s2.length; ) {
+    const nl = s2.indexOf("\n", at);
+    const end = nl < 0 ? s2.length : nl;
+    lines.push({ start: at, end, text: s2.slice(at, end) });
+    if (nl < 0) break;
+    at = nl + 1;
+  }
+  const fenced = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lines.length; i++) {
+    const open3 = lines[i].text.match(/^ {0,3}(`{3,}|~{3,})(.*)$/);
+    if (!open3 || open3[1][0] === "`" && open3[2].includes("`")) continue;
+    const close = new RegExp(`^ {0,3}${open3[1][0] === "`" ? "`" : "~"}{${open3[1].length},}\\s*$`);
+    const j = lines.findIndex((l, k) => k > i && close.test(l.text));
+    if (j < 0) continue;
+    ranges.push([lines[i].start, lines[j].end]);
+    for (let k = i; k <= j; k++) fenced.add(k);
+    i = j;
+  }
+  let para = [];
+  const flush = () => {
+    if (!para.length) return;
+    const from = para[0].start;
+    const t = s2.slice(from, para.at(-1).end);
+    const runs = [...t.matchAll(/`+/g)].map((m) => ({ at: m.index, n: m[0].length }));
+    for (let i = 0; i < runs.length; i++) {
+      let { at, n } = runs[i];
+      let slash = 0;
+      for (let b = at - 1; b >= 0 && t[b] === "\\"; b--) slash++;
+      if (slash % 2 === 1) {
+        at++;
+        n--;
+        if (!n) continue;
+      }
+      const j = runs.findIndex((r, k) => k > i && r.n === n);
+      if (j < 0) continue;
+      ranges.push([from + at, from + runs[j].at + n]);
+      i = j;
+    }
+    para = [];
+  };
+  lines.forEach((l, i) => {
+    if (!fenced.has(i) && l.text.trim()) para.push(l);
+    flush();
+  });
+  return ranges;
+}
+
+// mention-tokens.mjs
+function mentionTokens(text) {
+  const s2 = String(text ?? "");
+  const code = codeRanges(s2);
+  const out = [];
+  for (const match of s2.matchAll(/(?<![\w@./\\-])@([a-z0-9][a-z0-9-]*)/gi)) {
+    if (!code.some(([a, b]) => match.index >= a && match.index < b)) out.push(match[1].toLowerCase());
+  }
+  return out;
+}
+
+// ../../hosted-hub/src/store/notifications.ts
+var NOTIFICATION_READS = s("SELECT person, notification_id FROM notification_reads");
+var NOTIFICATIONS = s("SELECT message_id, person FROM notifications");
+var names = (text, { person, names: names2 }) => {
+  const known = new Set([person, ...names2].map((n) => n.toLowerCase()));
+  return mentionTokens(text).some((t) => known.has(t));
+};
+var record = (id, person) => s("INSERT OR IGNORE INTO notifications (message_id, person) SELECT ?, ? WHERE EXISTS (SELECT 1 FROM messages WHERE id = ?)", id, person, id);
+var notificationFor = (messageId2, kind, text, notify) => notify && kind === "agent" && names(text, notify) ? [record(messageId2, notify.person)] : [];
+
 // ../../hosted-hub/src/store/subagents.ts
 var UP = `up(session_id, parent) AS (
   SELECT session_id, parent FROM subagent_links WHERE session_id = ?
@@ -828,7 +901,7 @@ __export(external_exports, {
   properties: () => _properties,
   property: () => _property,
   readonly: () => readonly,
-  record: () => record,
+  record: () => record2,
   refine: () => refine,
   regex: () => _regex,
   regexes: () => regexes_exports,
@@ -17271,14 +17344,14 @@ function rewriteKeyNames(ctx) {
       bySchema.set(entry.schema, entry);
   }
   const rewrites = /* @__PURE__ */ new Map();
-  for (const record3 of pendingRecords.get(ctx) ?? []) {
-    const seen = ctx.seen.get(record3);
-    const names = (seen?.def ?? seen?.schema)?.propertyNames;
-    if (!names || names === true || rewrites.has(names))
+  for (const record4 of pendingRecords.get(ctx) ?? []) {
+    const seen = ctx.seen.get(record4);
+    const names2 = (seen?.def ?? seen?.schema)?.propertyNames;
+    if (!names2 || names2 === true || rewrites.has(names2))
       continue;
-    const rewritten = stringifyKeyNames(bySchema, names, /* @__PURE__ */ new Set());
-    if (rewritten !== names)
-      rewrites.set(names, rewritten);
+    const rewritten = stringifyKeyNames(bySchema, names2, /* @__PURE__ */ new Set());
+    if (rewritten !== names2)
+      rewrites.set(names2, rewritten);
   }
   if (!rewrites.size)
     return;
@@ -17740,7 +17813,7 @@ __export(schemas_exports2, {
   preprocess: () => preprocess,
   promise: () => promise,
   readonly: () => readonly,
-  record: () => record,
+  record: () => record2,
   refine: () => refine,
   set: () => set,
   strictObject: () => strictObject,
@@ -18842,7 +18915,7 @@ var ZodRecord = /* @__PURE__ */ $constructor("ZodRecord", (inst, def) => {
   inst.keyType = def.keyType;
   inst.valueType = def.valueType;
 });
-function record(keyType, valueType, params) {
+function record2(keyType, valueType, params) {
   if (!valueType || !valueType._zod) {
     return new ZodRecord({
       type: "record",
@@ -19317,7 +19390,7 @@ var stringbool = (...args) => _stringbool({
 }, ...args);
 function json(params) {
   const jsonSchema = lazy(() => {
-    return union([string2(params), number2(), boolean2(), _null3(), array(jsonSchema), record(string2(), jsonSchema)]);
+    return union([string2(params), number2(), boolean2(), _null3(), array(jsonSchema), record2(string2(), jsonSchema)]);
   });
   return jsonSchema;
 }
@@ -25254,14 +25327,14 @@ function rewriteKeyNames2(ctx) {
       bySchema.set(entry.schema, entry);
   }
   const rewrites = /* @__PURE__ */ new Map();
-  for (const record3 of pendingRecords2.get(ctx) ?? []) {
-    const seen = ctx.seen.get(record3);
-    const names = (seen?.def ?? seen?.schema)?.propertyNames;
-    if (!names || names === true || rewrites.has(names))
+  for (const record4 of pendingRecords2.get(ctx) ?? []) {
+    const seen = ctx.seen.get(record4);
+    const names2 = (seen?.def ?? seen?.schema)?.propertyNames;
+    if (!names2 || names2 === true || rewrites.has(names2))
       continue;
-    const rewritten = stringifyKeyNames2(bySchema, names, /* @__PURE__ */ new Set());
-    if (rewritten !== names)
-      rewrites.set(names, rewritten);
+    const rewritten = stringifyKeyNames2(bySchema, names2, /* @__PURE__ */ new Set());
+    if (rewritten !== names2)
+      rewrites.set(names2, rewritten);
   }
   if (!rewrites.size)
     return;
@@ -26092,7 +26165,7 @@ var ZodRecord2 = /* @__PURE__ */ $constructor2("ZodRecord", (inst, def) => {
   inst.keyType = def.keyType;
   inst.valueType = def.valueType;
 });
-function record2(keyType, valueType, params) {
+function record3(keyType, valueType, params) {
   if (!valueType || !valueType._zod) {
     return new ZodRecord2({
       type: "record",
@@ -26362,7 +26435,7 @@ function superRefine2(fn, params) {
 
 // ../wire/src/common.ts
 var maybe = (schema) => schema.nullish();
-var map2 = (id, value) => record2(string5(), value).meta({ id });
+var map2 = (id, value) => record3(string5(), value).meta({ id });
 
 // ../wire/src/live.ts
 var TaskRow = object2({
@@ -27034,6 +27107,7 @@ var DELIVERY_STATUS = `CASE WHEN d.accepted_at IS NOT NULL OR ${LINKED} THEN COA
 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}
       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 = ?`;
@@ -27044,6 +27118,7 @@ function foldState(row) {
     roster: JSON.parse(String(row.roster)),
     participants: JSON.parse(String(row.participants)),
     held: row.held == null ? null : String(row.held),
+    notify: row.notify ? JSON.parse(String(row.notify)) : null,
     foldedIndex: Number(row.folded_index),
     open: row.open_turn ? JSON.parse(String(row.open_turn)) : null
   };
@@ -27174,6 +27249,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);
+            stmts.push(...notificationFor(messageId2, "agent", text, state.notify ?? void 0));
             const to = recipients(state.roster, text, { name: session.bot, kind: "agent" }, session.thread, state.participants);
             stmts.push(...routingStatements(messageId2, session.thread, to, at, { by: session.bot, joins: true }));
             deliver.push(messageId2);