eve-hub 0.6.30 → 0.6.32

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # eve-hub
 
+## 0.6.32
+
+### Patch Changes
+
+- The hosted bots' world carries the hub's image attachments: uploads are stored and handed to bots with a message.
+
+## 0.6.31
+
+### Patch Changes
+
+- A bot's sandbox reads its session's git worktree from the file in HUB_SESSION_WORKTREE_DIR when it is set (a bot run by the Mac runner).
+
 ## 0.6.30
 
 ### Patch Changes

package/host-sandbox.js

@@ -28,16 +28,16 @@ export function hostEnvironment(options) {
             return { root };
         },
         async start(ctx, _open, artifact) {
-            const worktree = await sessionWorktree(ctx.session.id);
             const rootSessionId = ctx.session.parent?.rootSessionId;
+            const worktree = await sessionWorktree(ctx.session.id, rootSessionId);
             const state = { ...(worktree ? { root: worktree.path, worktree } : { root: artifact.root }), version: 1, ...(rootSessionId ? { rootSessionId } : {}) };
             return { handle: hostHandle(state, ctx.session.id), state };
         },
         async resume(ctx, _artifact, state) {
             // Asked again: the registry restores a worktree whose directory went
             // missing. A session that started on the shared checkout stays there.
-            const worktree = state.worktree ? ((await sessionWorktree(ctx.session.id)) ?? state.worktree) : undefined;
             const rootSessionId = state.rootSessionId ?? ctx.session.parent?.rootSessionId;
+            const worktree = state.worktree ? ((await sessionWorktree(ctx.session.id, rootSessionId)) ?? state.worktree) : undefined;
             const next = { ...(worktree ? { ...state, root: worktree.path, worktree } : state), ...(rootSessionId ? { rootSessionId } : {}) };
             if (!worktree)
                 await mkdir(next.root, { recursive: true }); // never fake a missing worktree with an empty dir
@@ -59,7 +59,25 @@ export const HostSandbox = defineSandboxProvider({
 // checkout stays there. Any other failure: the shared checkout.
 class WorkspaceUnavailable extends Error {
 }
-async function sessionWorktree(sessionId) {
+// HUB_SESSION_WORKTREE_DIR (the Mac runner sets it): the runner writes
+// <dir>/<sessionId>.json before it delivers to the session, so there is nothing
+// to ask or wait for. An `agent` copy has no file of its own and uses its root session's.
+async function sessionWorktree(sessionId, rootSessionId) {
+    const dir = process.env.HUB_SESSION_WORKTREE_DIR;
+    if (dir) {
+        for (const id of [sessionId, rootSessionId]) {
+            if (!id)
+                continue;
+            try {
+                return JSON.parse(await readFile(join(dir, `${id}.json`), "utf8"));
+            }
+            catch (error) {
+                if (error.code !== "ENOENT")
+                    throw error;
+            }
+        }
+        return undefined;
+    }
     if (process.env.HUB_SESSION_WORKTREES !== "1")
         return undefined;
     const deadline = Date.now() + 15_000;

package/image-limits.d.mts

@@ -0,0 +1,5 @@
+export const MAX_BYTES: number;
+export const MODEL_MAX_EDGE: number;
+export function sniffImage(bytes: Uint8Array): string | null;
+export function imageSize(bytes: Uint8Array, mediaType: string): { width: number; height: number } | null;
+export function modelUnsafe(bytes: Uint8Array): string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-hub",
-  "version": "0.6.30",
+  "version": "0.6.32",
   "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/tools/view_image.d.ts

@@ -13,7 +13,7 @@ export declare function prepareImage(bytes: Uint8Array, name: string, { resize }
     resize?: Resize;
 }): Promise<{
     name: string;
-    mediaType: any;
+    mediaType: string;
     original: string | undefined;
     unsafe: string;
     data?: undefined;
@@ -23,7 +23,7 @@ export declare function prepareImage(bytes: Uint8Array, name: string, { resize }
     unsafe?: undefined;
     data: string;
     name: string;
-    mediaType: any;
+    mediaType: string;
     bytes: number;
     original: string | undefined;
     shown: string | undefined;
@@ -35,7 +35,7 @@ declare const _default: import("eve/tools").ToolDefinition<{
     screenshot?: boolean | undefined;
 }, {
     name: string;
-    mediaType: any;
+    mediaType: string;
     original: string | undefined;
     unsafe: string;
     data?: undefined;
@@ -45,7 +45,7 @@ declare const _default: import("eve/tools").ToolDefinition<{
     unsafe?: undefined;
     data: string;
     name: string;
-    mediaType: any;
+    mediaType: string;
     bytes: number;
     original: string | undefined;
     shown: string | undefined;
@@ -55,7 +55,7 @@ declare const _default: import("eve/tools").ToolDefinition<{
         screenshot?: boolean | undefined;
     }, ctx: import("eve/tools").ToolContext): Promise<{
         name: string;
-        mediaType: any;
+        mediaType: string;
         original: string | undefined;
         unsafe: string;
         data?: undefined;
@@ -65,7 +65,7 @@ declare const _default: import("eve/tools").ToolDefinition<{
         unsafe?: undefined;
         data: string;
         name: string;
-        mediaType: any;
+        mediaType: string;
         bytes: number;
         original: string | undefined;
         shown: string | undefined;

package/world.mjs

@@ -596,6 +596,14 @@ var PENDING_REQUESTS_READ = s(`SELECT r.id, r.session_id, r.thread_id, r.bot, r.
 // ../../hosted-hub/src/store/workspace-state.ts
 var LIVE_TURNS_READ = s(`SELECT thread_id,bot,started_at,reply_text,activity FROM turns WHERE status IN ${OPEN_TURN_STATUSES} ORDER BY started_at`);
 
+// ../../hosted-hub/src/store/attachments.ts
+var ATTACHMENTS_READ = s("SELECT message_id, upload_id, name FROM message_attachments ORDER BY message_id, position");
+var unseenBy = (bot, thread, mid) => {
+  const end = `COALESCE((SELECT rowid FROM messages WHERE id = ${mid}), 9223372036854775807)`;
+  return `a.message_id = e.id AND e.thread_id = ${thread} AND e.author <> ${bot} AND e.rowid < ${end}
+    AND e.rowid > COALESCE((SELECT MAX(p.rowid) FROM deliveries dd JOIN messages p ON p.id = dd.message_id WHERE p.thread_id = e.thread_id AND dd.bot = ${bot} AND p.rowid < ${end}), 0)`;
+};
+
 // ../../hosted-hub/src/store/threads.ts
 var SUMMARY_READ = s("SELECT scope,text,by,at FROM summaries");
 
@@ -26999,6 +27007,11 @@ var SESSION_WORK_DELIVERY = `busy.accepted_at IS NOT NULL AND busy.failed_at IS
     WHERE td.delivery_id = busy.id AND t.status NOT IN ('streaming','cancelling'))`;
 var SESSION_BUSY = `s.ended_at IS NULL AND EXISTS (SELECT 1 FROM deliveries busy
   WHERE busy.session_id = s.id AND ${SESSION_WORK_DELIVERY})`;
+var PENDING_FROM = `SELECT d.id, d.message_id, d.session_id, d.bot, m.thread_id, t.title, m.author, m.author_kind, m.text, m.status, m.status_from, m.metadata, d.steer,
+      EXISTS (SELECT 1 FROM deliveries a WHERE a.session_id = d.session_id AND a.accepted_at IS NOT NULL) AS session_started,
+      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 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))`;
@@ -27010,7 +27023,12 @@ var DELIVERY_STATUS = `CASE WHEN d.accepted_at IS NOT NULL OR ${LINKED} THEN COA
       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.held_at IS NOT NULL THEN CASE d.held_scope WHEN 'bot' THEN 'queued until free' ELSE 'queued' END ELSE 'pending' END`;
+  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)
+      OR EXISTS (SELECT 1 FROM message_attachments a, messages e WHERE ${unseenBy("d.bot", "(SELECT thread_id FROM messages WHERE id = d.message_id)", "d.message_id")}))
+    THEN 'waiting: the Mac app running this bot is too old to carry images; update it'
+  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,