usebeeline 0.1.181 → 0.1.184-rc.2

package/dist/usebeeline.mjs

@@ -176,7 +176,12 @@ var init_lifecycle_test_guard = __esm({
 // apps/body/dist/self-update-manifest.js
 function resolveManifestUrl(env = process.env) {
   const override = env.BEELINE_UPDATE_MANIFEST_URL?.trim();
-  return override && override.length > 0 ? override : DEFAULT_UPDATE_MANIFEST_URL;
+  if (override)
+    return override;
+  const channel = env.BEELINE_RELEASE_CHANNEL?.trim() || "latest";
+  if (!["latest", "next"].includes(channel))
+    throw new Error(`invalid helper release channel: ${channel}`);
+  return channel === "next" ? "https://usebeeline.app/dl/next/manifest.json" : DEFAULT_UPDATE_MANIFEST_URL;
 }
 function parseUpdateManifest(raw, platform) {
   let parsed;
@@ -1231,7 +1236,6 @@ var init_managed_update = __esm({
       #interruptAt;
       #deadlineAt;
       #handingOff;
-      #notice;
       #completed = false;
       #draining = false;
       constructor(options) {
@@ -1243,10 +1247,7 @@ var init_managed_update = __esm({
       get pending() {
         return this.#preparing ?? this.#handingOff;
       }
-      notify(releaseKey, minimum) {
-        if (releaseKey && releaseKey === this.#notice)
-          return;
-        this.#notice = releaseKey;
+      notify(_releaseKey, minimum) {
         if (minimum && (!this.#minimum || !versionAtLeast(this.#minimum, minimum))) {
           this.#minimum = minimum;
           this.#handoffAt = this.now();
@@ -3445,9 +3446,9 @@ var require_dispatcher_base = __commonJS({
       }
       close(callback) {
         if (callback === void 0) {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve13, reject) => {
             this.close((err, data) => {
-              return err ? reject(err) : resolve12(data);
+              return err ? reject(err) : resolve13(data);
             });
           });
         }
@@ -3485,12 +3486,12 @@ var require_dispatcher_base = __commonJS({
           err = null;
         }
         if (callback === void 0) {
-          return new Promise((resolve12, reject) => {
+          return new Promise((resolve13, reject) => {
             this.destroy(err, (err2, data) => {
               return err2 ? (
                 /* istanbul ignore next: should never error */
                 reject(err2)
-              ) : resolve12(data);
+              ) : resolve13(data);
             });
           });
         }
@@ -5757,8 +5758,8 @@ var require_util2 = __commonJS({
     function createDeferredPromise() {
       let res;
       let rej;
-      const promise = new Promise((resolve12, reject) => {
-        res = resolve12;
+      const promise = new Promise((resolve13, reject) => {
+        res = resolve13;
         rej = reject;
       });
       return { promise, resolve: res, reject: rej };
@@ -8004,12 +8005,12 @@ upgrade: ${upgrade}\r
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve12, reject) => {
+      const waitForDrain = () => new Promise((resolve13, reject) => {
         assert(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve12;
+          callback = resolve13;
         }
       });
       socket.on("close", onDrain).on("drain", onDrain);
@@ -8646,12 +8647,12 @@ var require_client_h2 = __commonJS({
           cb();
         }
       }
-      const waitForDrain = () => new Promise((resolve12, reject) => {
+      const waitForDrain = () => new Promise((resolve13, reject) => {
         assert(callback === null);
         if (socket[kError]) {
           reject(socket[kError]);
         } else {
-          callback = resolve12;
+          callback = resolve13;
         }
       });
       h2stream.on("close", onDrain).on("drain", onDrain);
@@ -9129,16 +9130,16 @@ var require_client = __commonJS({
         return this[kNeedDrain] < 2;
       }
       async [kClose]() {
-        return new Promise((resolve12) => {
+        return new Promise((resolve13) => {
           if (this[kSize]) {
-            this[kClosedResolve] = resolve12;
+            this[kClosedResolve] = resolve13;
           } else {
-            resolve12(null);
+            resolve13(null);
           }
         });
       }
       async [kDestroy](err) {
-        return new Promise((resolve12) => {
+        return new Promise((resolve13) => {
           const requests = this[kQueue].splice(this[kPendingIdx]);
           for (let i = 0; i < requests.length; i++) {
             const request2 = requests[i];
@@ -9149,7 +9150,7 @@ var require_client = __commonJS({
               this[kClosedResolve]();
               this[kClosedResolve] = null;
             }
-            resolve12(null);
+            resolve13(null);
           };
           if (this[kHTTPContext]) {
             this[kHTTPContext].destroy(err, callback);
@@ -9200,7 +9201,7 @@ var require_client = __commonJS({
         });
       }
       try {
-        const socket = await new Promise((resolve12, reject) => {
+        const socket = await new Promise((resolve13, reject) => {
           client[kConnector]({
             host,
             hostname,
@@ -9212,7 +9213,7 @@ var require_client = __commonJS({
             if (err) {
               reject(err);
             } else {
-              resolve12(socket2);
+              resolve13(socket2);
             }
           });
         });
@@ -9548,8 +9549,8 @@ var require_pool_base = __commonJS({
         if (this[kQueue].isEmpty()) {
           await Promise.all(this[kClients].map((c) => c.close()));
         } else {
-          await new Promise((resolve12) => {
-            this[kClosedResolve] = resolve12;
+          await new Promise((resolve13) => {
+            this[kClosedResolve] = resolve13;
           });
         }
       }
@@ -10792,7 +10793,7 @@ var require_readable = __commonJS({
         if (this._readableState.closeEmitted) {
           return null;
         }
-        return await new Promise((resolve12, reject) => {
+        return await new Promise((resolve13, reject) => {
           if (this[kContentLength] > limit) {
             this.destroy(new AbortError());
           }
@@ -10805,7 +10806,7 @@ var require_readable = __commonJS({
             if (signal?.aborted) {
               reject(signal.reason ?? new AbortError());
             } else {
-              resolve12(null);
+              resolve13(null);
             }
           }).on("error", noop).on("data", function(chunk) {
             limit -= chunk.length;
@@ -10824,7 +10825,7 @@ var require_readable = __commonJS({
     }
     async function consume(stream, type) {
       assert(!stream[kConsume]);
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve13, reject) => {
         if (isUnusable(stream)) {
           const rState = stream._readableState;
           if (rState.destroyed && rState.closeEmitted === false) {
@@ -10841,7 +10842,7 @@ var require_readable = __commonJS({
             stream[kConsume] = {
               type,
               stream,
-              resolve: resolve12,
+              resolve: resolve13,
               reject,
               length: 0,
               body: []
@@ -10911,18 +10912,18 @@ var require_readable = __commonJS({
       return buffer;
     }
     function consumeEnd(consume2) {
-      const { type, body, resolve: resolve12, stream, length } = consume2;
+      const { type, body, resolve: resolve13, stream, length } = consume2;
       try {
         if (type === "text") {
-          resolve12(chunksDecode(body, length));
+          resolve13(chunksDecode(body, length));
         } else if (type === "json") {
-          resolve12(JSON.parse(chunksDecode(body, length)));
+          resolve13(JSON.parse(chunksDecode(body, length)));
         } else if (type === "arrayBuffer") {
-          resolve12(chunksConcat(body, length).buffer);
+          resolve13(chunksConcat(body, length).buffer);
         } else if (type === "blob") {
-          resolve12(new Blob(body, { type: stream[kContentType] }));
+          resolve13(new Blob(body, { type: stream[kContentType] }));
         } else if (type === "bytes") {
-          resolve12(chunksConcat(body, length));
+          resolve13(chunksConcat(body, length));
         }
         consumeFinish(consume2);
       } catch (err) {
@@ -11179,9 +11180,9 @@ var require_api_request = __commonJS({
     };
     function request2(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           request2.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -11404,9 +11405,9 @@ var require_api_stream = __commonJS({
     };
     function stream(opts, factory, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           stream.call(this, opts, factory, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -11691,9 +11692,9 @@ var require_api_upgrade = __commonJS({
     };
     function upgrade(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           upgrade.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -11785,9 +11786,9 @@ var require_api_connect = __commonJS({
     };
     function connect(opts, callback) {
       if (callback === void 0) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           connect.call(this, opts, (err, data) => {
-            return err ? reject(err) : resolve12(data);
+            return err ? reject(err) : resolve13(data);
           });
         });
       }
@@ -15649,7 +15650,7 @@ var require_fetch = __commonJS({
       function dispatch({ body }) {
         const url = requestCurrentURL(request2);
         const agent = fetchParams.controller.dispatcher;
-        return new Promise((resolve12, reject) => agent.dispatch(
+        return new Promise((resolve13, reject) => agent.dispatch(
           {
             path: url.pathname + url.search,
             origin: url.origin,
@@ -15725,7 +15726,7 @@ var require_fetch = __commonJS({
                 }
               }
               const onError = this.onError.bind(this);
-              resolve12({
+              resolve13({
                 status,
                 statusText,
                 headersList,
@@ -15771,7 +15772,7 @@ var require_fetch = __commonJS({
               for (let i = 0; i < rawHeaders.length; i += 2) {
                 headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i]), rawHeaders[i + 1].toString("latin1"), true);
               }
-              resolve12({
+              resolve13({
                 status,
                 statusText: STATUS_CODES[status],
                 headersList,
@@ -19501,8 +19502,8 @@ var require_util8 = __commonJS({
       return true;
     }
     function delay(ms) {
-      return new Promise((resolve12) => {
-        setTimeout(resolve12, ms).unref();
+      return new Promise((resolve13) => {
+        setTimeout(resolve13, ms).unref();
       });
     }
     module.exports = {
@@ -20187,7 +20188,7 @@ import { watch as watch2 } from "node:fs";
 import { stat as stat2 } from "node:fs/promises";
 import { dirname as dirname6 } from "node:path";
 function waitForPathRemoval(path) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     let reading = false, dirty = false, ended = false;
     const finish = (error) => {
       if (ended)
@@ -20197,7 +20198,7 @@ function waitForPathRemoval(path) {
       if (error)
         reject(error);
       else
-        resolve12();
+        resolve13();
     };
     const inspect = async () => {
       dirty = true;
@@ -20674,6 +20675,35 @@ var init_beeline_api = __esm({
   }
 });
 
+// apps/body/dist/process-exit.js
+import { spawn as spawn5 } from "node:child_process";
+function waitForProcessExit(pid, signal) {
+  return new Promise((resolve13, reject) => {
+    const child = spawn5("/usr/bin/python3", ["-c", WAIT, String(pid)], { stdio: "ignore", signal });
+    child.once("error", reject);
+    child.once("close", (code) => code === 0 ? resolve13() : reject(new Error(`process exit observer failed (${code})`)));
+  });
+}
+var WAIT;
+var init_process_exit = __esm({
+  "apps/body/dist/process-exit.js"() {
+    "use strict";
+    WAIT = `import os,sys,select
+pid=int(sys.argv[1])
+try:
+ if hasattr(os,'pidfd_open'):
+  fd=os.pidfd_open(pid)
+  try: select.select([fd],[],[])
+  finally: os.close(fd)
+ else:
+  queue=select.kqueue()
+  try: queue.control([select.kevent(pid,filter=select.KQ_FILTER_PROC,flags=select.KQ_EV_ADD|select.KQ_EV_ONESHOT,fflags=select.KQ_NOTE_EXIT)],1)
+  finally: queue.close()
+except ProcessLookupError: pass
+`;
+  }
+});
+
 // packages/api-contract/dist/phone-types-room-live-delta.js
 var init_phone_types_room_live_delta = __esm({
   "packages/api-contract/dist/phone-types-room-live-delta.js"() {
@@ -21584,22 +21614,6 @@ var init_system_message_catalog_daemon_service = __esm({
         parts: [", "],
         variables: []
       },
-      "grant-policy-upgrade.system": {
-        parts: ["@system"],
-        variables: []
-      },
-      "grant-policy-upgrade.revoked-a-legacy-grant-for": {
-        parts: ["revoked a legacy grant for"],
-        variables: []
-      },
-      "grant-policy-upgrade.grant-target": {
-        parts: ["", " ", ""],
-        variables: ["grant_kind", "grant_target"]
-      },
-      "grant-policy-upgrade.permission-policy-upgraded": {
-        parts: ["permission policy upgraded"],
-        variables: []
-      },
       "membership-join.joined": {
         parts: ["joined"],
         variables: []
@@ -23706,8 +23720,8 @@ var init_external_agent_rules = __esm({
       },
       {
         id: "commander",
-        mcp: "When you finish, are blocked, fail, or need a decision on a chat request, tag the agent or person who asked you (your commander) with the result. A report returns to whoever ordered the work, one step up. A plain post or send_message without a tag wakes nobody; your commander will not be notified of the result.",
-        session: "When you finish, are blocked, fail, or need a decision on a chat request, tag the agent or person who asked you (your commander) with the result. A report returns to whoever ordered the work, one step up. A post without a tag wakes nobody."
+        mcp: "When you finish, are blocked, fail, or need a decision on a chat request, tag the agent or person who asked you with the result. Corner reports go one step up to the opener at the opening surface; later chat requests do not change the commander. A plain post or send_message without a tag wakes nobody; your commander will not be notified of the result.",
+        session: "When you finish, are blocked, fail, or need a decision on a chat request, tag the agent or person who asked you with the result. Corner reports go one step up to the opener at the opening surface; later chat requests do not change the commander. A post without a tag wakes nobody."
       },
       {
         id: "tagging",
@@ -23915,12 +23929,12 @@ function scanCodex(proc = "/proc") {
   return found;
 }
 function codexQueue(threadId, text, bin = "codex", timeoutMs = 3e4) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     execFile3(bin, ["queue", "--thread", threadId, "--message", text], { timeout: timeoutMs }, (error, _stdout, stderr) => {
       if (error)
         reject(new Error(String(stderr).trim() || error.message));
       else
-        resolve12();
+        resolve13();
     });
   });
 }
@@ -23967,7 +23981,7 @@ function chosenName(session2) {
   return ["user", "peer", "hook"].includes(session2.nameSource ?? "") ? session2.name : void 0;
 }
 function postToClaude(socket, text, _timeoutMs = 5e3) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     const connection = createConnection3(socket.path);
     connection.once("error", (error) => {
       reject(error);
@@ -23976,7 +23990,7 @@ function postToClaude(socket, text, _timeoutMs = 5e3) {
       if (socket.token)
         connection.write(JSON.stringify({ type: "auth", token: socket.token }) + "\n");
       connection.end(JSON.stringify({ type: "user", message: { role: "user", content: text } }) + "\n", () => {
-        resolve12();
+        resolve13();
       });
     });
   });
@@ -24066,17 +24080,19 @@ function hasClaudeMcp(dir, claudePid) {
 }
 async function flushClaudeMcp(dir, session2, token, post = postToClaude) {
   if (!session2.messagingSocketPath)
-    return;
+    return false;
   const joined2 = readState(dir).sessions.find((s) => s.agent === "claude-code" && (s.pid === session2.pid || s.sessionId === session2.sessionId));
   if (!joined2)
-    return;
+    return false;
   const text = takeInbox(dir, joined2.key);
   if (!text)
-    return;
+    return false;
   try {
     await post({ path: session2.messagingSocketPath, token }, text);
+    return true;
   } catch {
     queueInbox(dir, joined2.key, text);
+    return false;
   }
 }
 function joinedClaude(dir, env, chain) {
@@ -24086,32 +24102,38 @@ function joinedClaude(dir, env, chain) {
     return void 0;
   return readState(dir).sessions.find((s) => s.agent === "claude-code" && (s.pid === session2.pid || s.sessionId === session2.sessionId));
 }
-async function runClaudeMcp(dir, env, rulesFor) {
+async function runClaudeMcp(dir, env, rulesFor, post = postToClaude) {
   const chain = ancestors(process.pid);
   let registration;
-  let flushing = false;
+  let flushing = false, dirty = false;
   const flush2 = async () => {
+    dirty = true;
     if (flushing || !env.CLAUDE_CODE_MESSAGING_TOKEN)
       return;
     flushing = true;
     try {
-      const live = scanClaude(env);
-      const session2 = chain.map((pid) => live.find((s) => s.pid === pid)).find(Boolean);
-      if (!session2)
-        return;
-      if (!registration) {
-        const folder = join6(dir, "claude-mcp");
-        mkdirSync2(folder, { recursive: true, mode: 448 });
-        registration = join6(folder, `${process.pid}.json`);
-        writeFileSync2(registration, JSON.stringify({ pid: process.pid, claudePid: session2.pid }), { mode: 384 });
+      while (dirty) {
+        dirty = false;
+        const live = scanClaude(env);
+        const session2 = chain.map((pid) => live.find((s) => s.pid === pid)).find(Boolean);
+        if (!session2)
+          return;
+        if (!registration) {
+          const folder = join6(dir, "claude-mcp");
+          mkdirSync2(folder, { recursive: true, mode: 448 });
+          registration = join6(folder, `${process.pid}.json`);
+          writeFileSync2(registration, JSON.stringify({ pid: process.pid, claudePid: session2.pid }), { mode: 384 });
+        }
+        if (!await flushClaudeMcp(dir, session2, env.CLAUDE_CODE_MESSAGING_TOKEN, post))
+          break;
       }
-      await flushClaudeMcp(dir, session2, env.CLAUDE_CODE_MESSAGING_TOKEN);
     } finally {
       flushing = false;
     }
   };
   const watcher = watch3(dir, { recursive: true }, (_event, name) => {
-    if (String(name ?? "").startsWith("inbox/"))
+    const path = String(name ?? "");
+    if (path === "state.json" || path.startsWith("inbox/"))
       void flush2().catch(() => void 0);
   });
   try {
@@ -24200,10 +24222,10 @@ var init_sessions = __esm({
 });
 
 // apps/body/dist/session-join/bridge.js
-import { spawn as spawn5 } from "node:child_process";
+import { execFileSync, spawn as spawn6 } from "node:child_process";
 import { chmodSync as chmodSync2, closeSync as closeSync3, existsSync as existsSync2, mkdirSync as mkdirSync3, openSync as openSync3, readFileSync as readFileSync6, readdirSync as readdirSync5, renameSync as renameSync2, rmSync as rmSync3, writeFileSync as writeFileSync3, watch as watch4 } from "node:fs";
 import { createConnection as createConnection4, createServer as createServer3 } from "node:net";
-import { join as join7 } from "node:path";
+import { basename as basename4, join as join7, resolve as resolve10 } from "node:path";
 import { createHash as createHash6 } from "node:crypto";
 function command(runner2, joined2, args) {
   const q = (v) => /^[A-Za-z0-9_./:@=-]+$/.test(v) ? v : `"${v.replace(/(["\\$`])/g, "\\$1")}"`;
@@ -24402,14 +24424,14 @@ async function toolViaOutbox(cwd, name, args) {
   const request2 = join7(dirPath, `${id}.request.json`), result = join7(dirPath, `${id}.result.json`);
   writeFileSync3(`${request2}.tmp`, JSON.stringify({ name, args }));
   renameSync2(`${request2}.tmp`, request2);
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let settled = false;
     const finish = (answer) => {
       if (settled)
         return;
       settled = true;
       watcher.close();
-      resolve12(answer);
+      resolve13(answer);
     };
     const inspect = () => {
       try {
@@ -24427,7 +24449,7 @@ async function toolViaOutbox(cwd, name, args) {
   });
 }
 function toolViaBridge(dir, key, name, args) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const connection = createConnection4(join7(dir, "bridge.sock"));
     let text = "", sent = false, settled = false;
     const unknown = { ok: false, error: "Beeline tool result is awaiting confirmation" };
@@ -24435,7 +24457,7 @@ function toolViaBridge(dir, key, name, args) {
       if (settled)
         return;
       settled = true;
-      resolve12(answer);
+      resolve13(answer);
       connection.destroy();
     };
     connection.setEncoding("utf8");
@@ -24477,6 +24499,7 @@ async function runBridge(dir, runner2) {
     wake?.();
   };
   serveTools(dir);
+  writeFileSync3(join7(dir, "bridge-owner.json"), JSON.stringify({ pid: process.pid, digest: bundleDigest(runner2) }), { mode: 384 });
   const localWatch = watch4(dir, { recursive: true }, (_event, name) => {
     const path = String(name ?? "");
     if (path === "state.json" || path.startsWith("hooks/") || path.startsWith("inbox/") || path.startsWith("deliveries/"))
@@ -24573,8 +24596,8 @@ async function runBridge(dir, runner2) {
       await serveOutboxes(dir).catch((error) => log(dir, `outbox: ${String(error)}`));
       await flush(dir, sources).catch((error) => log(dir, `flush: ${String(error)}`));
       if (!localDirty)
-        await new Promise((resolve12) => {
-          wake = resolve12;
+        await new Promise((resolve13) => {
+          wake = resolve13;
         });
       wake = void 0;
     }
@@ -24599,19 +24622,90 @@ function bridgeRunning(dir) {
     return false;
   }
 }
-function ensureBridge(dir, runner2, env = process.env) {
-  if (bridgeRunning(dir))
-    return;
-  const out = openSync3(join7(dir, "bridge.log"), "a", 384);
-  const child = spawn5(runner2.node, [runner2.bundle, "session", "bridge"], { detached: true, stdio: ["ignore", out, out], env });
-  child.unref();
-  closeSync3(out);
+function bundleDigest(runner2) {
+  return createHash6("sha256").update(readFileSync6(runner2.bundle)).digest("hex");
+}
+function bridgeOwner(dir) {
+  try {
+    return JSON.parse(readFileSync6(join7(dir, "bridge-owner.json"), "utf8"));
+  } catch {
+    return void 0;
+  }
+}
+function isBridgeProcess(pid) {
+  try {
+    if (process.platform === "linux") {
+      const args2 = readFileSync6(`/proc/${pid}/cmdline`, "utf8").split("\0").filter(Boolean);
+      return args2.length === 4 && /^node(?:\.exe)?$/.test(basename4(args2[0])) && /^(?:beeline|usebeeline\.mjs|recovery-cli\.mjs)$/.test(basename4(args2[1])) && args2[2] === "session" && args2[3] === "bridge";
+    }
+    const args = execFileSync("ps", ["-ww", "-p", String(pid), "-o", "args="], { encoding: "utf8" }).trim();
+    return /(?:^|\/)node\s+.*\/(?:beeline|usebeeline\.mjs|recovery-cli\.mjs) session bridge$/.test(args);
+  } catch {
+    return false;
+  }
+}
+async function ensureBridge(dir, runner2, env = process.env) {
+  await withKernelLock(`beeline-session-bridge:${resolve10(dir)}`, async () => {
+    const digest = bundleDigest(runner2);
+    const pidFile = join7(dir, "bridge.pid");
+    if (bridgeRunning(dir)) {
+      const pid = Number(readFileSync6(pidFile, "utf8"));
+      if (!isBridgeProcess(pid))
+        throw new Error("Beeline bridge PID belongs to an unrecognized process; refusing takeover");
+      const owner = bridgeOwner(dir);
+      if (owner?.pid === pid && owner.digest === digest)
+        return;
+      log(dir, `replacing stale bridge ${pid}`);
+      await withLock(dir, async () => {
+        try {
+          process.kill(pid, "SIGTERM");
+        } catch (error) {
+          if (error.code !== "ESRCH")
+            throw error;
+        }
+        await waitForProcessExit(pid);
+      });
+      if (existsSync2(pidFile) && Number(readFileSync6(pidFile, "utf8")) === pid)
+        rmSync3(pidFile);
+    }
+    const out = openSync3(join7(dir, "bridge.log"), "a", 384);
+    const child = spawn6(runner2.node, [runner2.bundle, "session", "bridge"], { detached: true, stdio: ["ignore", out, out], env });
+    closeSync3(out);
+    child.unref();
+    await new Promise((done, fail) => {
+      const finish = (error) => {
+        watcher.close();
+        child.removeListener("error", failed);
+        child.removeListener("exit", exited);
+        if (error)
+          fail(error);
+        else
+          done();
+      };
+      const inspect = () => {
+        const owner = bridgeOwner(dir);
+        if (owner && owner.pid === child.pid && owner.digest === digest)
+          finish();
+      };
+      const failed = (error) => finish(error);
+      const exited = () => finish(new Error("Beeline bridge exited before readiness; see bridge.log"));
+      const watcher = watch4(dir, (_event, name) => {
+        if (String(name) === "bridge-owner.json")
+          inspect();
+      });
+      child.once("error", failed);
+      child.once("exit", exited);
+      inspect();
+    });
+  });
 }
 var realDeps;
 var init_bridge = __esm({
   "apps/body/dist/session-join/bridge.js"() {
     "use strict";
     init_agent_command();
+    init_kernel_lock();
+    init_process_exit();
     init_phone();
     init_beeline_api();
     init_stream_frame();
@@ -25232,7 +25326,7 @@ var init_claude_inbound = __esm({
 });
 
 // apps/body/dist/session-join/codex-trust.js
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 import { join as join10 } from "node:path";
 function beelineTrustEdits(hooks, context) {
   const path = join10(codexHome(context.env), "hooks.json");
@@ -25244,7 +25338,7 @@ function beelineTrustEdits(hooks, context) {
   return [{ keyPath: `hooks.state.${JSON.stringify(hook.key)}.trusted_hash`, value: hook.currentHash, mergeStrategy: "replace" }];
 }
 async function trustCodexHook(context, bin, cwd) {
-  const child = spawn6(bin, ["app-server", "--stdio"], { env: context.env, cwd, stdio: ["pipe", "pipe", "ignore"] });
+  const child = spawn7(bin, ["app-server", "--stdio"], { env: context.env, cwd, stdio: ["pipe", "pipe", "ignore"] });
   let id = 0, buffer = "";
   const pending = /* @__PURE__ */ new Map();
   const fail = () => {
@@ -25282,9 +25376,9 @@ async function trustCodexHook(context, bin, cwd) {
       }
     }
   });
-  const request2 = (method, params) => new Promise((resolve12, reject) => {
+  const request2 = (method, params) => new Promise((resolve13, reject) => {
     const key = ++id;
-    pending.set(key, { resolve: resolve12, reject: () => reject(new Error("Codex hook trust unavailable")) });
+    pending.set(key, { resolve: resolve13, reject: () => reject(new Error("Codex hook trust unavailable")) });
     child.stdin.write(JSON.stringify({ id: key, method, params }) + "\n");
   });
   try {
@@ -25465,7 +25559,7 @@ var init_pull_apps = __esm({
     "use strict";
     init_store();
     init_beeline_api();
-    agentapi = (sessionId, text) => new Promise((resolve12, reject) => execFile4("agentapi", ["send-message", sessionId, text], { timeout: 3e4 }, (error) => error ? reject(error) : resolve12()));
+    agentapi = (sessionId, text) => new Promise((resolve13, reject) => execFile4("agentapi", ["send-message", sessionId, text], { timeout: 3e4 }, (error) => error ? reject(error) : resolve13()));
   }
 });
 
@@ -25475,9 +25569,9 @@ __export(command_exports, {
   findOwnSession: () => findOwnSession,
   runSessionCommand: () => runSessionCommand
 });
-import { spawn as spawn7, spawnSync as spawnSync2 } from "node:child_process";
+import { spawn as spawn8, spawnSync as spawnSync2 } from "node:child_process";
 import { closeSync as closeSync4, copyFileSync as copyFileSync2, existsSync as existsSync5, fsyncSync, mkdirSync as mkdirSync5, openSync as openSync4, readFileSync as readFileSync9, readdirSync as readdirSync6, renameSync as renameSync4, rmSync as rmSync6, writeFileSync as writeFileSync5 } from "node:fs";
-import { delimiter, dirname as dirname8, join as join11, resolve as resolve10 } from "node:path";
+import { delimiter, dirname as dirname8, join as join11, resolve as resolve11 } from "node:path";
 import { createHash as createHash7, randomUUID as randomUUID2 } from "node:crypto";
 function writePending(file, pending) {
   const temporary = file + "." + randomUUID2() + ".tmp";
@@ -25547,7 +25641,7 @@ function runner(dir, env) {
   if (env.BEELINE_SESSION_BUNDLE)
     return { node: process.execPath, bundle: env.BEELINE_SESSION_BUNDLE };
   const bundle = join11(dir, "usebeeline.mjs");
-  const running = resolve10(process.argv[1] ?? "");
+  const running = resolve11(process.argv[1] ?? "");
   if (running !== bundle && running.endsWith(".mjs")) {
     mkdirSync5(dir, { recursive: true, mode: 448 });
     copyFileSync2(running, bundle);
@@ -25600,6 +25694,7 @@ async function joinCommand(args, env) {
   const server = serverUrl(args, env);
   const existing = readState(dir).sessions.find((s) => s.key === key && s.server === server);
   if (existing) {
+    let connected = false;
     try {
       await accessToken(dir, key);
       await updateState(dir, (state) => {
@@ -25609,10 +25704,13 @@ async function joinCommand(args, env) {
           s.pid = own2.pid ?? s.pid;
         }
       });
-      ensureBridge(dir, run2, env);
+      connected = true;
+    } catch {
+    }
+    if (connected) {
+      await ensureBridge(dir, run2, env);
       console.log(`This ${agentLabel(own2.agent)} session is on Beeline as @${existing.handle ?? existing.name}. Tags in its Rooms arrive here.`);
       return;
-    } catch {
     }
   }
   const taken = new Set(readState(dir).sessions.filter((s) => s.key !== key).map((s) => s.name));
@@ -25644,7 +25742,7 @@ async function joinCommand(args, env) {
   if (!resume && previous && previous.file !== file)
     rmSync6(previous.file, { force: true });
   const out = join11(dir, "bridge.log");
-  const child = spawn7(run2.node, [run2.bundle, "session", "finish-join", file], { detached: true, stdio: "ignore", env: { ...env, BEELINE_SESSION_BUNDLE: run2.bundle } });
+  const child = spawn8(run2.node, [run2.bundle, "session", "finish-join", file], { detached: true, stdio: "ignore", env: { ...env, BEELINE_SESSION_BUNDLE: run2.bundle } });
   child.unref();
   console.log([
     `Show your person this link. They open it on any device (a phone works) and sign in with GitHub or Google:`,
@@ -25721,7 +25819,7 @@ async function finishJoinOwned(file, env) {
         changes.splice(prompt, 1);
       changes.push("Trusted only Beeline\u2019s SessionStart hook, pinned to its current Codex hash.");
     }
-    ensureBridge(dir, run2, env);
+    await ensureBridge(dir, run2, env);
     const rooms = me.rooms.map((r) => r.name).slice(0, 5).join(", ");
     await announce(joined2, `Beeline: you joined as @${joined2.handle ?? joined2.name}${rooms ? ` in ${rooms}` : ""}. When someone tags you there, the message arrives here with the command that answers it.${changes.length ? `
 (${changes.join("; ")})` : ""}
@@ -25815,7 +25913,7 @@ async function session(args, env) {
       if (out)
         process.stdout.write(out + "\n");
       if (event === "session-start" && readState(dir).sessions.length)
-        ensureBridge(dir, runner(dir, env), env);
+        await ensureBridge(dir, runner(dir, env), env);
     } catch {
     }
     return;
@@ -25878,14 +25976,14 @@ async function session(args, env) {
   throw new Error("Usage: usebeeline join | usebeeline session reply|read|tool|status|leave");
 }
 function readStdin(_limitMs) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let text = "";
     process.stdin.setEncoding("utf8");
     process.stdin.on("data", (chunk) => {
       text += chunk;
     });
     process.stdin.on("end", () => {
-      resolve12(text);
+      resolve13(text);
     });
   });
 }
@@ -25923,15 +26021,15 @@ var init_command = __esm({
     init_setup();
     init_store();
     init_kernel_lock();
-    finisherKey = (file) => "beeline-session-sign-in:" + resolve10(file);
+    finisherKey = (file) => "beeline-session-sign-in:" + resolve11(file);
     VALUED = ["--as", "--room", "--reply-to", "--server", "--name", "--session", "--state", "--limit"];
   }
 });
 
 // apps/body/dist/recovery-cli.js
-import { spawn as spawn8 } from "node:child_process";
+import { spawn as spawn9 } from "node:child_process";
 import { readFile as readFile5, readdir as readdir5, stat as stat3, unlink } from "node:fs/promises";
-import { resolve as resolve11 } from "node:path";
+import { resolve as resolve12 } from "node:path";
 
 // apps/body/dist/recovery.js
 import { readFile as readFile4, readdir as readdir4, stat } from "node:fs/promises";
@@ -26448,18 +26546,18 @@ async function main() {
       if (args[i] === "--manifest-url" && !args[++i])
         throw new Error("--manifest-url requires a URL");
     }
-    const stateRoot2 = process.env.XDG_STATE_HOME || resolve11(process.env.HOME || "", ".local/state");
+    const stateRoot2 = process.env.XDG_STATE_HOME || resolve12(process.env.HOME || "", ".local/state");
     if (args.includes("--status")) {
       const [native, helper] = await Promise.all([
         nativeHelperStatus(),
         requestMachine(stateRoot2, { operation: "status" }, () => true, 2e3).catch(() => void 0)
       ]);
-      const root = resolve11(stateRoot2, "beeline/agents");
+      const root = resolve12(stateRoot2, "beeline/agents");
       const agents = await Promise.all((await readdir5(root).catch(() => [])).filter((id) => /^[0-9a-f]{64}$/.test(id)).map(async (id) => ({
         agentId: id,
-        enabled: !await stat3(resolve11(root, id, "stopped")).then(() => true, () => false),
+        enabled: !await stat3(resolve12(root, id, "stopped")).then(() => true, () => false),
         ...helper?.agents[id] ?? { state: "not hosted" },
-        validRecord: await readFile5(resolve11(root, id, "runtime.json"), "utf8").then((raw) => Boolean(JSON.parse(raw).agent)).catch(() => false)
+        validRecord: await readFile5(resolve12(root, id, "runtime.json"), "utf8").then((raw) => Boolean(JSON.parse(raw).agent)).catch(() => false)
       })));
       console.log(JSON.stringify({
         native,
@@ -26508,7 +26606,7 @@ async function main() {
     console.log(`[beeline] executing release ${status.loadedRelease}; helper ${status.pid}; every enabled agent serving`);
     return;
   }
-  const stateRoot = process.env.XDG_STATE_HOME || resolve11(process.env.HOME || "", ".local/state");
+  const stateRoot = process.env.XDG_STATE_HOME || resolve12(process.env.HOME || "", ".local/state");
   let selectedRelease;
   if (command2 === "start") {
     for (let i = 1; i < args.length; i++) {
@@ -26523,13 +26621,13 @@ async function main() {
     const requested = agentFlag >= 0 ? args[agentFlag + 1] : args[1] && !args[1].startsWith("--") ? args[1] : void 0;
     if (agentFlag >= 0 && !requested)
       throw new Error("--agent requires an agent public key");
-    const agentRoot = resolve11(stateRoot, "beeline/agents");
+    const agentRoot = resolve12(stateRoot, "beeline/agents");
     const ids = (await readdir5(agentRoot).catch(() => [])).filter((id) => /^[0-9a-f]{64}$/.test(id));
     const selected = requested ? ids.filter((id) => id.startsWith(requested)) : args.includes("--all") ? ids : [];
     if (requested && selected.length !== 1)
       throw new Error(`no unique paired agent matches ${requested}`);
     for (const id of selected)
-      await unlink(resolve11(agentRoot, id, "stopped")).catch((error) => {
+      await unlink(resolve12(agentRoot, id, "stopped")).catch((error) => {
         if (error.code !== "ENOENT")
           throw error;
       });
@@ -26553,7 +26651,7 @@ async function main() {
   const entry = await resolveBundleEntrypoint(layout.libDir);
   if (!entry)
     throw new Error("no installed Beeline body; run npx usebeeline connect");
-  const child = spawn8(process.execPath, [entry, ...args], {
+  const child = spawn9(process.execPath, [entry, ...args], {
     env: {
       ...process.env,
       BEELINE_LIB_DIR: layout.libDir,
@@ -26571,7 +26669,7 @@ async function convergeDependencies(layout, _deadlineAt) {
   if (!entry)
     throw new Error("dependency phase has no selected body");
   await new Promise((done, reject) => {
-    const child = spawn8(process.execPath, [entry, "converge-dependencies"], {
+    const child = spawn9(process.execPath, [entry, "converge-dependencies"], {
       env: { ...process.env, BEELINE_LIB_DIR: layout.libDir, BEELINE_INTERNAL_RECOVERY: "1" },
       stdio: "inherit"
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "usebeeline",
-  "version": "0.1.181",
+  "version": "0.1.184-rc.2",
   "description": "Connect an AI coding agent to Beeline with one command.",
   "homepage": "https://usebeeline.app",
   "bugs": {