eve-hub 0.6.46 → 0.6.47

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eve-hub
 
+## 0.6.47
+
+### Patch Changes
+
+- The hub can ask a Mac bot's runner to compact a session, so Mac bots compact like hosted ones.
+
 ## 0.6.46
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.6.46",
+  "version": "0.6.47",
   "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

@@ -20450,6 +20450,94 @@ var MOVES = Object.freeze({
 });
 var VERDICTS = Object.freeze(["ship", "fix-first", "rethink"]);
 
+// ../../hosted-hub/src/domain/cron.mjs
+var MINUTE = 6e4;
+var CATCH_UP_MS = 7 * 24 * 60 * MINUTE;
+
+// ../../hosted-hub/src/store/schedules.ts
+var scheduleThreadId = (agent, id) => `sch-${agent}-${id.replaceAll("/", ".")}`;
+var Info = external_exports.object({ schedules: external_exports.array(external_exports.object({ name: external_exports.string().min(1), cron: external_exports.string().min(1), hasRun: external_exports.boolean() })) });
+
+// ../../hosted-hub/src/domain/compact-report.mjs
+var quiet = (text) => String(text).replace(/@/g, "\uFF20");
+var count = (n) => typeof n === "number" ? n.toLocaleString("en-US") : "?";
+var link = (thread, id) => `[${quiet(String(thread?.title ?? id).replace(/[[\]]/g, ""))}](${id})`;
+var nextTry = (agent) => `next try: after ${quiet(agent)}'s next turn there, once idle 10+ min (or at 40 turns) with its prompt cache gone cold`;
+var compactedLine = (r, thread) => `compacted: ${quiet(r.agent)} on ${link(thread, r.threadId)} \xB7 ${quiet(r.trigger)} \xB7 ${count(r.before)} input tokens before`;
+var afterLine = (r, thread, after) => `after compaction: ${quiet(r.agent)} on ${link(thread, r.threadId)} \xB7 ${count(r.before)} \u2192 ${count(after)} input tokens`;
+var failureLine = (r, thread, reason) => `compact failed: ${quiet(r.agent)} on ${link(thread, r.threadId)} \xB7 ${quiet(r.trigger)} \xB7 ${quiet(reason)}; ${nextTry(r.agent)}`;
+
+// ../../hosted-hub/src/store/compactions.ts
+var ASKED = `(c.attempt_at IS NOT NULL AND c.attempt_at > COALESCE(c.settled_at, 0))`;
+var k = (tokens) => `CAST((${tokens} + 500) / 1000 AS INTEGER) || 'k'`;
+var compactedText = (after) => `'Context compacted' || CASE WHEN c.before_tokens IS NULL THEN ''
+  WHEN ${after} IS NULL THEN ' at ' || ${k("c.before_tokens")} || ' input tokens'
+  ELSE ': ' || ${k("c.before_tokens")} || ' \u2192 ' || ${k(after)} || ' input tokens' END`;
+function compactionStatements(type, session, event, at, messageId2, report = null) {
+  const before = `COALESCE(?, (SELECT input_tokens FROM usage_steps WHERE session_id = ? ORDER BY at DESC, sequence DESC, step_index DESC LIMIT 1))`;
+  if (type === "compaction.requested")
+    return [s(
+      `INSERT INTO compactions (session_id, before_tokens) VALUES (?, ${before}) ON CONFLICT (session_id) DO UPDATE SET before_tokens = excluded.before_tokens,
+        report_phase = CASE WHEN report_phase = 'asked' THEN 'requested' ELSE report_phase END`,
+      session.id,
+      typeof event.usageInputTokens === "number" ? event.usageInputTokens : null,
+      session.id
+    )];
+  if (type === "session.waiting")
+    return [
+      // eve took the request and went idle with no checkpoint: it kept the history (the reason is in the bot's log). A
+      // session.waiting from before eve took the request (the previous turn's, folded late) is not that: only 'requested' counts.
+      ...reportLine(report, session, at, `${messageId2}:waiting`, (r) => failureLine(...r, `eve ended it without a checkpoint and kept the history (the reason is in ${session.bot}'s log)`), `report_phase = 'requested'`, null),
+      s("UPDATE compactions SET settled_at = ? WHERE session_id = ? AND attempt_at IS NOT NULL AND attempt_at > COALESCE(settled_at, 0)", at, session.id)
+    ];
+  return [
+    ...eventStatements(
+      session.thread,
+      {
+        sql: `(SELECT json_object('kind', 'compaction', 'agent', ?, 'by', CASE WHEN ${ASKED} THEN c.attempt_by ELSE 'eve' END) FROM (SELECT 1) LEFT JOIN compactions c ON c.session_id = ?)`,
+        args: [session.bot, session.id]
+      },
+      { sql: `(SELECT ${compactedText("NULL")} FROM (SELECT 1) LEFT JOIN compactions c ON c.session_id = ?)`, args: [session.id] },
+      at,
+      messageId2
+    ),
+    s(
+      `INSERT INTO compactions (session_id, completed_at, turns_at_completion, event_id) VALUES (?, ?, (SELECT turns FROM thread_totals WHERE thread_id = ? AND bot = ?), ?)
+      ON CONFLICT (session_id) DO UPDATE SET completed_at = excluded.completed_at, turns_at_completion = excluded.turns_at_completion, after_tokens = NULL, event_id = excluded.event_id`,
+      session.id,
+      at,
+      session.thread,
+      session.bot,
+      messageId2
+    ),
+    ...reportLine(report, session, at, `${messageId2}:completed`, (r) => compactedLine(...r), `report_phase IN ('asked', 'requested', 'unanswered')`, "compacted")
+  ];
+}
+var reportThread = (to) => {
+  const [bot, ...id] = to.split("/");
+  return scheduleThreadId(bot, id.join("/"));
+};
+var lineOf = (report, session) => [{ agent: session.bot, threadId: session.thread, trigger: report.trigger, before: report.before }, { title: report.title }];
+function reportLine(report, session, at, id, text, when, next) {
+  if (!report) return [];
+  const thread = reportThread(report.to), rowId = derivedMessageId(id, "report"), has = `EXISTS (SELECT 1 FROM compactions WHERE session_id = ? AND ${when})`;
+  return [
+    s(`INSERT INTO log (thread_id,type,data,at) SELECT ?, 'thread.created', ?, ? WHERE ${has} AND NOT EXISTS (SELECT 1 FROM threads WHERE id = ?)`, thread, JSON.stringify({ threadId: thread }), at, session.id, thread),
+    s(`INSERT OR IGNORE INTO threads (id,title,created_at) SELECT ?, ?, ? WHERE ${has}`, thread, report.to, at, session.id),
+    ...eventStatements(thread, { kind: "compaction-report", agent: session.bot }, text(lineOf(report, session)), at, rowId, { sql: has, args: [session.id] }),
+    s(`UPDATE compactions SET report_phase = ? WHERE session_id = ? AND ${when}`, next, session.id)
+  ];
+}
+function compactedSizeStatements(sessionId2, inputTokens) {
+  const waiting = (c) => `${c}completed_at IS NOT NULL AND ${c}after_tokens IS NULL`;
+  return [
+    s(`UPDATE messages SET text = (SELECT ${compactedText("a")} FROM compactions c, (SELECT ? AS a) WHERE c.session_id = ? AND ${waiting("c.")})
+      WHERE id = (SELECT event_id FROM compactions WHERE session_id = ? AND ${waiting("")})`, inputTokens, sessionId2, sessionId2),
+    s(`UPDATE compactions SET after_tokens = ? WHERE session_id = ? AND ${waiting("")}`, inputTokens, sessionId2)
+  ];
+}
+var reportAfterStatements = (report, session, inputTokens, at, id) => reportLine(report, session, at, `${id}:after`, ([r, thread]) => afterLine(r, thread, inputTokens), `report_phase = 'compacted' AND completed_at IS NOT NULL AND after_tokens IS NULL`, null);
+
 // ../../node_modules/.pnpm/zod@4.5.4/node_modules/zod/v4/core/util.js
 var util_exports2 = {};
 __export(util_exports2, {
@@ -27156,94 +27244,6 @@ var RESTARTED_TURNS_READ = s(`SELECT t.thread_id, t.bot, r.claimed_at FROM turns
   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/domain/cron.mjs
-var MINUTE = 6e4;
-var CATCH_UP_MS = 7 * 24 * 60 * MINUTE;
-
-// ../../hosted-hub/src/store/schedules.ts
-var scheduleThreadId = (agent, id) => `sch-${agent}-${id.replaceAll("/", ".")}`;
-var Info = external_exports.object({ schedules: external_exports.array(external_exports.object({ name: external_exports.string().min(1), cron: external_exports.string().min(1), hasRun: external_exports.boolean() })) });
-
-// ../../hosted-hub/src/domain/compact-report.mjs
-var quiet = (text) => String(text).replace(/@/g, "\uFF20");
-var count = (n) => typeof n === "number" ? n.toLocaleString("en-US") : "?";
-var link = (thread, id) => `[${quiet(String(thread?.title ?? id).replace(/[[\]]/g, ""))}](${id})`;
-var nextTry = (agent) => `next try: after ${quiet(agent)}'s next turn there, once idle 10+ min (or at 40 turns) with its prompt cache gone cold`;
-var compactedLine = (r, thread) => `compacted: ${quiet(r.agent)} on ${link(thread, r.threadId)} \xB7 ${quiet(r.trigger)} \xB7 ${count(r.before)} input tokens before`;
-var afterLine = (r, thread, after) => `after compaction: ${quiet(r.agent)} on ${link(thread, r.threadId)} \xB7 ${count(r.before)} \u2192 ${count(after)} input tokens`;
-var failureLine = (r, thread, reason) => `compact failed: ${quiet(r.agent)} on ${link(thread, r.threadId)} \xB7 ${quiet(r.trigger)} \xB7 ${quiet(reason)}; ${nextTry(r.agent)}`;
-
-// ../../hosted-hub/src/store/compactions.ts
-var ASKED = `(c.attempt_at IS NOT NULL AND c.attempt_at > COALESCE(c.settled_at, 0))`;
-var k = (tokens) => `CAST((${tokens} + 500) / 1000 AS INTEGER) || 'k'`;
-var compactedText = (after) => `'Context compacted' || CASE WHEN c.before_tokens IS NULL THEN ''
-  WHEN ${after} IS NULL THEN ' at ' || ${k("c.before_tokens")} || ' input tokens'
-  ELSE ': ' || ${k("c.before_tokens")} || ' \u2192 ' || ${k(after)} || ' input tokens' END`;
-function compactionStatements(type, session, event, at, messageId2, report = null) {
-  const before = `COALESCE(?, (SELECT input_tokens FROM usage_steps WHERE session_id = ? ORDER BY at DESC, sequence DESC, step_index DESC LIMIT 1))`;
-  if (type === "compaction.requested")
-    return [s(
-      `INSERT INTO compactions (session_id, before_tokens) VALUES (?, ${before}) ON CONFLICT (session_id) DO UPDATE SET before_tokens = excluded.before_tokens,
-        report_phase = CASE WHEN report_phase = 'asked' THEN 'requested' ELSE report_phase END`,
-      session.id,
-      typeof event.usageInputTokens === "number" ? event.usageInputTokens : null,
-      session.id
-    )];
-  if (type === "session.waiting")
-    return [
-      // eve took the request and went idle with no checkpoint: it kept the history (the reason is in the bot's log). A
-      // session.waiting from before eve took the request (the previous turn's, folded late) is not that: only 'requested' counts.
-      ...reportLine(report, session, at, `${messageId2}:waiting`, (r) => failureLine(...r, `eve ended it without a checkpoint and kept the history (the reason is in ${session.bot}'s log)`), `report_phase = 'requested'`, null),
-      s("UPDATE compactions SET settled_at = ? WHERE session_id = ? AND attempt_at IS NOT NULL AND attempt_at > COALESCE(settled_at, 0)", at, session.id)
-    ];
-  return [
-    ...eventStatements(
-      session.thread,
-      {
-        sql: `(SELECT json_object('kind', 'compaction', 'agent', ?, 'by', CASE WHEN ${ASKED} THEN c.attempt_by ELSE 'eve' END) FROM (SELECT 1) LEFT JOIN compactions c ON c.session_id = ?)`,
-        args: [session.bot, session.id]
-      },
-      { sql: `(SELECT ${compactedText("NULL")} FROM (SELECT 1) LEFT JOIN compactions c ON c.session_id = ?)`, args: [session.id] },
-      at,
-      messageId2
-    ),
-    s(
-      `INSERT INTO compactions (session_id, completed_at, turns_at_completion, event_id) VALUES (?, ?, (SELECT turns FROM thread_totals WHERE thread_id = ? AND bot = ?), ?)
-      ON CONFLICT (session_id) DO UPDATE SET completed_at = excluded.completed_at, turns_at_completion = excluded.turns_at_completion, after_tokens = NULL, event_id = excluded.event_id`,
-      session.id,
-      at,
-      session.thread,
-      session.bot,
-      messageId2
-    ),
-    ...reportLine(report, session, at, `${messageId2}:completed`, (r) => compactedLine(...r), `report_phase IN ('asked', 'requested', 'unanswered')`, "compacted")
-  ];
-}
-var reportThread = (to) => {
-  const [bot, ...id] = to.split("/");
-  return scheduleThreadId(bot, id.join("/"));
-};
-var lineOf = (report, session) => [{ agent: session.bot, threadId: session.thread, trigger: report.trigger, before: report.before }, { title: report.title }];
-function reportLine(report, session, at, id, text, when, next) {
-  if (!report) return [];
-  const thread = reportThread(report.to), rowId = derivedMessageId(id, "report"), has = `EXISTS (SELECT 1 FROM compactions WHERE session_id = ? AND ${when})`;
-  return [
-    s(`INSERT INTO log (thread_id,type,data,at) SELECT ?, 'thread.created', ?, ? WHERE ${has} AND NOT EXISTS (SELECT 1 FROM threads WHERE id = ?)`, thread, JSON.stringify({ threadId: thread }), at, session.id, thread),
-    s(`INSERT OR IGNORE INTO threads (id,title,created_at) SELECT ?, ?, ? WHERE ${has}`, thread, report.to, at, session.id),
-    ...eventStatements(thread, { kind: "compaction-report", agent: session.bot }, text(lineOf(report, session)), at, rowId, { sql: has, args: [session.id] }),
-    s(`UPDATE compactions SET report_phase = ? WHERE session_id = ? AND ${when}`, next, session.id)
-  ];
-}
-function compactedSizeStatements(sessionId2, inputTokens) {
-  const waiting = (c) => `${c}completed_at IS NOT NULL AND ${c}after_tokens IS NULL`;
-  return [
-    s(`UPDATE messages SET text = (SELECT ${compactedText("a")} FROM compactions c, (SELECT ? AS a) WHERE c.session_id = ? AND ${waiting("c.")})
-      WHERE id = (SELECT event_id FROM compactions WHERE session_id = ? AND ${waiting("")})`, inputTokens, sessionId2, sessionId2),
-    s(`UPDATE compactions SET after_tokens = ? WHERE session_id = ? AND ${waiting("")}`, inputTokens, sessionId2)
-  ];
-}
-var reportAfterStatements = (report, session, inputTokens, at, id) => reportLine(report, session, at, `${id}:after`, ([r, thread]) => afterLine(r, thread, inputTokens), `report_phase = 'compacted' AND completed_at IS NOT NULL AND after_tokens IS NULL`, null);
-
 // ../../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 WHERE ${inRoster} ORDER BY position)) AS roster,
     (SELECT json_group_array(bot) FROM (${PARTICIPANTS("s.thread_id")})) AS participants,