eve-hub 0.6.30 → 0.6.31

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eve-hub
 
+## 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/package.json

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