usebeeline 0.0.132 → 0.0.134

package/dist/usebeeline.mjs

@@ -8713,13 +8713,13 @@ var init_esm = __esm({
         let count = last - first;
         while (count > 0) {
           let it = first;
-          let step4 = Math.floor(count / 2);
-          it += step4;
+          let step3 = Math.floor(count / 2);
+          it += step3;
           if (cmp(arr[it])) {
             first = ++it;
-            count -= step4 + 1;
+            count -= step3 + 1;
           } else {
-            count = step4;
+            count = step3;
           }
         }
         return first;
@@ -9349,10 +9349,210 @@ var init_runtime = __esm({
   }
 });
 
+// apps/body/dist/squire-broker-link.js
+import { randomUUID } from "node:crypto";
+import { createConnection } from "node:net";
+function frameLines(chunk, buffered, receive) {
+  let input = Buffer.concat([buffered, chunk]);
+  for (; ; ) {
+    const end = input.indexOf(10);
+    if (end < 0)
+      return input;
+    receive(input.subarray(0, end).toString("utf8"));
+    input = input.subarray(end + 1);
+  }
+}
+async function runSquireBrokerLink(options) {
+  const { agentId, socketPath, giveUpMs = SQUIRE_RELAY_GIVE_UP_MS, input = process.stdin, output = process.stdout, logError = (message) => process.stderr.write(`${message}
+`), connect = (path) => createConnection(path), onShutdownSignal = (handler) => {
+    process.once("SIGHUP", handler);
+    process.once("SIGTERM", handler);
+    process.once("SIGINT", handler);
+  } } = options;
+  let socket;
+  let retryTimer;
+  let disconnectedSince;
+  let inBuffer = Buffer.alloc(0);
+  let outBuffer = Buffer.alloc(0);
+  let initializeLine;
+  let initializedLine;
+  let replayId;
+  let delayMs = SQUIRE_RELAY_INITIAL_DELAY_MS;
+  let stopped = false;
+  let gaveUp = false;
+  let connectedOnce = false;
+  let ready = false;
+  const pending = /* @__PURE__ */ new Map();
+  const queued = [];
+  let resolveDone;
+  const done = new Promise((resolve40) => {
+    resolveDone = resolve40;
+  });
+  const failResponse = (id) => `${JSON.stringify({
+    jsonrpc: "2.0",
+    id,
+    error: { code: -32e3, message: "Trusty Squire broker connection lost" }
+  })}
+`;
+  const flush = () => {
+    while (queued.length) {
+      const line = queued.shift();
+      const frame = JSON.parse(line);
+      if (frame.id !== void 0 && frame.method)
+        pending.set(JSON.stringify(frame.id), frame.id);
+      socket?.write(`${line}
+`);
+    }
+  };
+  function stop(ok2) {
+    if (stopped)
+      return;
+    stopped = true;
+    if (retryTimer)
+      clearTimeout(retryTimer);
+    socket?.destroy();
+    resolveDone(ok2);
+  }
+  const giveUp = () => {
+    if (gaveUp)
+      return;
+    gaveUp = true;
+    logError(`${SQUIRE_BROKER_UNAVAILABLE}: ${TRUSTY_SQUIRE_BROKER_UNIT_NAME} is not reachable at ${socketPath}`);
+    for (const id of pending.values())
+      output.write(failResponse(id));
+    pending.clear();
+    for (const line of queued.splice(0)) {
+      const frame = JSON.parse(line);
+      if (frame.id !== void 0 && frame.method)
+        output.write(failResponse(frame.id));
+    }
+    stop(false);
+  };
+  const reconnect = () => {
+    if (stopped || retryTimer || gaveUp)
+      return;
+    disconnectedSince ??= Date.now();
+    if (Date.now() - disconnectedSince >= giveUpMs) {
+      giveUp();
+      return;
+    }
+    retryTimer = setTimeout(() => {
+      retryTimer = void 0;
+      doConnect();
+    }, delayMs);
+    delayMs = Math.min(delayMs * 2, SQUIRE_RELAY_MAX_DELAY_MS);
+  };
+  const attach = (peer) => {
+    if (stopped) {
+      peer.destroy();
+      return;
+    }
+    socket = peer;
+    outBuffer = Buffer.alloc(0);
+    peer.once("connect", () => {
+      delayMs = SQUIRE_RELAY_INITIAL_DELAY_MS;
+      disconnectedSince = void 0;
+      peer.write(`${agentId}
+`);
+      if (connectedOnce && initializeLine) {
+        replayId = `beeline-squire-relay-${randomUUID()}`;
+        const frame = JSON.parse(initializeLine);
+        peer.write(`${JSON.stringify({ ...frame, id: replayId })}
+`);
+      } else {
+        ready = true;
+        flush();
+      }
+      connectedOnce = true;
+    });
+    peer.on("data", (chunk) => {
+      outBuffer = frameLines(chunk, outBuffer, (line) => {
+        const frame = JSON.parse(line);
+        if (frame.id === replayId) {
+          replayId = void 0;
+          if (frame.error) {
+            peer.destroy(new Error("broker rejected relay initialization"));
+            return;
+          }
+          if (initializedLine)
+            peer.write(`${initializedLine}
+`);
+          ready = true;
+          flush();
+          return;
+        }
+        if (frame.id !== void 0 && !frame.method)
+          pending.delete(JSON.stringify(frame.id));
+        output.write(`${line}
+`);
+      });
+    });
+    peer.on("error", (error) => {
+      if (!stopped)
+        logError(`squire relay: ${error instanceof Error ? error.message : String(error)}`);
+    });
+    peer.once("close", () => {
+      if (socket !== peer || stopped)
+        return;
+      socket = void 0;
+      ready = false;
+      replayId = void 0;
+      for (const id of pending.values())
+        output.write(failResponse(id));
+      pending.clear();
+      reconnect();
+    });
+  };
+  const doConnect = () => {
+    if (stopped)
+      return;
+    try {
+      attach(connect(socketPath));
+    } catch {
+      reconnect();
+    }
+  };
+  input.on("data", (chunk) => {
+    inBuffer = frameLines(chunk, inBuffer, (line) => {
+      const frame = JSON.parse(line);
+      if (gaveUp) {
+        if (frame.id !== void 0 && frame.method)
+          output.write(failResponse(frame.id));
+        return;
+      }
+      if (frame.method === "initialize")
+        initializeLine = line;
+      if (frame.method === "notifications/initialized")
+        initializedLine = line;
+      queued.push(line);
+      if (ready)
+        flush();
+    });
+  });
+  const close = () => stop(!gaveUp);
+  input.once("end", close);
+  input.once("close", close);
+  onShutdownSignal(close);
+  doConnect();
+  const ok = await done;
+  return { ok };
+}
+var SQUIRE_RELAY_INITIAL_DELAY_MS, SQUIRE_RELAY_MAX_DELAY_MS, SQUIRE_RELAY_GIVE_UP_MS;
+var init_squire_broker_link = __esm({
+  "apps/body/dist/squire-broker-link.js"() {
+    "use strict";
+    init_squire_host();
+    SQUIRE_RELAY_INITIAL_DELAY_MS = 100;
+    SQUIRE_RELAY_MAX_DELAY_MS = 1e3;
+    SQUIRE_RELAY_GIVE_UP_MS = 1e4;
+  }
+});
+
 // apps/body/dist/squire-host.js
 import { spawn as spawn3 } from "node:child_process";
-import { existsSync as existsSync2, lstatSync, mkdirSync } from "node:fs";
+import { accessSync, constants as fsConstants, existsSync as existsSync2, mkdirSync } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
+import { createConnection as createConnection2 } from "node:net";
 import { homedir as homedir2 } from "node:os";
 import { dirname as dirname2, join as join2, resolve as resolve2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
@@ -9362,7 +9562,8 @@ function squireHostPaths(home) {
     dir,
     profileDir: join2(dir, "chrome-profile"),
     configHome: join2(resolve2(home), ".config"),
-    brokerSocket: join2(dir, "broker.sock")
+    brokerSocket: join2(dir, "broker.sock"),
+    mcpSocket: join2(dir, "mcp.sock")
   };
 }
 function squireHostRewriteEnv(home) {
@@ -9379,13 +9580,27 @@ function ensureSquireHostDir(home) {
   mkdirSync(paths.profileDir, { recursive: true, mode: 448 });
   return paths;
 }
-function squireBrokerSocketReady(socketPath) {
+function squireHostDirWritable(socketPath) {
   try {
-    return lstatSync(socketPath).isSocket();
+    accessSync(dirname2(socketPath), fsConstants.W_OK);
+    return true;
   } catch {
     return false;
   }
 }
+async function squireBrokerSocketReady(socketPath) {
+  return await new Promise((resolveReady) => {
+    const probe = createConnection2(socketPath);
+    probe.once("connect", () => {
+      probe.destroy();
+      resolveReady(true);
+    });
+    probe.once("error", () => {
+      probe.destroy();
+      resolveReady(false);
+    });
+  });
+}
 function squireFacadeLaunch(home, scope) {
   if (!scope.agentId || !scope.roomId)
     throw new Error("Squire agent and Room IDs are required");
@@ -9461,20 +9676,26 @@ function runSquireBroker(env = process.env) {
   const paths = ensureSquireHostDir(home);
   spawnSquireServer({ ...env, ...squireHostRewriteEnv(home), TRUSTY_SQUIRE_BROKER_SOCKET: paths.brokerSocket }, true, SQUIRE_BROKER_ARGS);
 }
-function runSquireFacade(env = process.env) {
+async function runSquireFacade(env = process.env) {
   const socket = env.TRUSTY_SQUIRE_BROKER_SOCKET ?? squireHostPaths(env.HOME?.trim() || homedir2()).brokerSocket;
-  if (!squireBrokerSocketReady(socket)) {
-    process.stderr.write(`${SQUIRE_BROKER_UNAVAILABLE}
+  if (!squireHostDirWritable(socket) || !await squireBrokerSocketReady(socket)) {
+    process.stderr.write(`${SQUIRE_BROKER_UNAVAILABLE}: ${TRUSTY_SQUIRE_BROKER_UNIT_NAME} is not reachable at ${socket}
 `);
     process.exitCode = 1;
     return;
   }
-  spawnSquireServer({ ...env, TRUSTY_SQUIRE_BROKER_SOCKET: socket }, false, SQUIRE_SERVER_ARGS);
+  const mcpSocket = join2(dirname2(socket), "mcp.sock");
+  const { ok } = await runSquireBrokerLink({
+    agentId: env.TRUSTY_SQUIRE_AGENT_IDENTITY?.trim() || "unknown",
+    socketPath: mcpSocket
+  });
+  process.exit(ok ? 0 : 1);
 }
 var SQUIRE_BROKER_UNAVAILABLE, TRUSTY_SQUIRE_BROKER_UNIT_NAME, SQUIRE_FACADE_FLAG, SQUIRE_BROKER_FLAG, SQUIRE_SERVER_ARGS, SQUIRE_BROKER_ARGS;
 var init_squire_host = __esm({
   "apps/body/dist/squire-host.js"() {
     "use strict";
+    init_squire_broker_link();
     SQUIRE_BROKER_UNAVAILABLE = "broker unavailable";
     TRUSTY_SQUIRE_BROKER_UNIT_NAME = "trusty-squire-broker.service";
     SQUIRE_FACADE_FLAG = "--squire-facade";
@@ -9513,7 +9734,7 @@ RestartPreventExitStatus=${DAEMON_DISTRESS_EXIT_STATUS} ${DELIBERATE_REMOVAL_EXI
 SuccessExitStatus=${UNKNOWN_AGENT_EXIT_STATUS}
 WatchdogSec=180s
 TimeoutStartSec=90s
-TimeoutStopSec=10min
+TimeoutStopSec=90s
 KillMode=control-group
 UMask=0077
 # A desktop-launched user manager may inherit Ubuntu's unprivileged_userns
@@ -9736,7 +9957,7 @@ var init_systemd = __esm({
     UNKNOWN_AGENT_EXIT_STATUS = 79;
     SYSTEMD_UNIT_NAME = "beeline-agent@.service";
     SYSTEMD_COMMAND_TIMEOUT_MS = 15e3;
-    SYSTEMD_RESTART_WAIT_MS = 10 * 6e4 + 3e4;
+    SYSTEMD_RESTART_WAIT_MS = 9e4 + 3e4;
     AGENT_SERVICE = /^beeline-agent@([0-9a-f]{64})\.service$/i;
     runSystemctl = async (args) => {
       const result = await execFileAsync2("systemctl", ["--user", ...args], {
@@ -10180,7 +10401,7 @@ __export(self_update_exports, {
   writeUpdateState: () => writeUpdateState
 });
 import { createHash } from "node:crypto";
-import { constants as fsConstants } from "node:fs";
+import { constants as fsConstants2 } from "node:fs";
 import { access, chmod as chmod2, lstat, mkdir as mkdir4, open, readFile as readFile5, rename as rename3, rm as rm2, symlink, writeFile as writeFile4 } from "node:fs/promises";
 import { spawn as spawn4 } from "node:child_process";
 import { homedir as homedir5 } from "node:os";
@@ -10378,7 +10599,7 @@ function entrypointCandidates(bundleDir) {
 async function resolveBundleEntrypoint(bundleDir) {
   for (const candidate of entrypointCandidates(bundleDir)) {
     try {
-      await access(candidate, fsConstants.F_OK);
+      await access(candidate, fsConstants2.F_OK);
       return candidate;
     } catch {
     }
@@ -10443,7 +10664,7 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
       throw new Error(`extracting bundle failed: ${extract2.stderr}`);
     for (const relative4 of requiredBundlePaths()) {
       try {
-        await access(join3(releaseDir, relative4), fsConstants.F_OK);
+        await access(join3(releaseDir, relative4), fsConstants2.F_OK);
       } catch {
         throw new Error(`staged bundle is missing ${relative4}`);
       }
@@ -10488,7 +10709,7 @@ async function replaceFile(path, contents, mode) {
 }
 async function activateRelease(layout, releaseId) {
   const releaseDir = join3(layout.releasesRoot, releaseId);
-  await access(join3(releaseDir, BUNDLE_ENTRYPOINT), fsConstants.F_OK);
+  await access(join3(releaseDir, BUNDLE_ENTRYPOINT), fsConstants2.F_OK);
   await mkdir4(layout.releasesRoot, { recursive: true });
   await mkdir4(layout.binDir, { recursive: true });
   let previousReleaseId = await activeReleaseId(layout);
@@ -10498,7 +10719,7 @@ async function activateRelease(layout, releaseId) {
     const legacyId = sanitizeReleaseId(legacyIdentity?.commit ?? legacyIdentity?.version ?? `legacy-${Date.now()}`);
     const legacyDir = join3(layout.releasesRoot, legacyId);
     try {
-      await access(legacyDir, fsConstants.F_OK);
+      await access(legacyDir, fsConstants2.F_OK);
       previousReleaseId = `${legacyId}-${Date.now()}`;
       await rename3(layout.libDir, join3(layout.releasesRoot, previousReleaseId));
       await normalizeLegacyBundleShape(join3(layout.releasesRoot, previousReleaseId));
@@ -10521,7 +10742,7 @@ async function normalizeLegacyBundleShape(bundleDir) {
   let anyFlat = false;
   for (const name of LEGACY_FLAT_BUNDLE_FILES) {
     try {
-      await access(join3(bundleDir, name), fsConstants.F_OK);
+      await access(join3(bundleDir, name), fsConstants2.F_OK);
       anyFlat = true;
       break;
     } catch {
@@ -10532,7 +10753,7 @@ async function normalizeLegacyBundleShape(bundleDir) {
   await mkdir4(innerLib, { recursive: true });
   for (const name of LEGACY_FLAT_BUNDLE_FILES) {
     try {
-      await access(join3(innerLib, name), fsConstants.F_OK);
+      await access(join3(innerLib, name), fsConstants2.F_OK);
       continue;
     } catch {
     }
@@ -10547,7 +10768,7 @@ async function writeBinForwarders(layout, activeBundleRoot) {
   for (const [name, tool] of entries) {
     const target = join3(activeBundleRoot, "bin", tool);
     try {
-      await access(target, fsConstants.X_OK);
+      await access(target, fsConstants2.X_OK);
     } catch {
       continue;
     }
@@ -11028,7 +11249,7 @@ import { createRequire as createRequire3 } from "node:module";
 import { createInterface as createInterface3 } from "node:readline";
 import { basename, dirname as dirname7, resolve as resolvePath } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { randomUUID } from "node:crypto";
+import { randomUUID as randomUUID2 } from "node:crypto";
 function harnessIdentityLabel(agent) {
   if (agent.kind === "cursor")
     return CURSOR_ACP_BRIDGE_LABEL;
@@ -11092,7 +11313,7 @@ async function writeIsolatedCursorFile(path, content) {
   if (!parentStats.isDirectory() || parentStats.isSymbolicLink()) {
     throw new Error(`isolated cursor parent is not a real directory: ${parent}`);
   }
-  const temporary = resolvePath(parent, `.${basename(path)}.${process.pid}.${randomUUID()}.tmp`);
+  const temporary = resolvePath(parent, `.${basename(path)}.${process.pid}.${randomUUID2()}.tmp`);
   try {
     await writeFile5(temporary, content, { mode: 384, flag: "wx" });
     await chmod3(temporary, 384);
@@ -11384,7 +11605,7 @@ var init_cursor_acp_bridge = __esm({
         });
         const catalog = await this.loadModels();
         const session = {
-          id: randomUUID(),
+          id: randomUUID2(),
           cwd,
           ...systemPrompt ? { systemPrompt } : {},
           model: catalog.currentValue
@@ -11507,7 +11728,7 @@ var init_cursor_acp_bridge = __esm({
           });
           if (pending.length)
             consumeLine(pending.join(""));
-          const failure2 = describeCursorTurnFailure({
+          const failure = describeCursorTurnFailure({
             isError: resultEvent ? cursorResultIsError(resultEvent) : false,
             resultText: resultEvent ? resultEventText(resultEvent) : void 0,
             exitCode: spawnError ? 1 : code,
@@ -11515,8 +11736,8 @@ var init_cursor_acp_bridge = __esm({
             stderr,
             spawnError
           });
-          if (failure2)
-            throw new Error(failure2);
+          if (failure)
+            throw new Error(failure);
           if (!sawAssistant) {
             const fallback = resultEvent && !cursorResultIsError(resultEvent) ? resultEventText(resultEvent) : "";
             if (fallback)
@@ -11558,7 +11779,7 @@ var init_cursor_acp_bridge = __esm({
 
 // apps/body/dist/agent-command.js
 import { execFile as execFile4, spawn as spawn7 } from "node:child_process";
-import { accessSync, constants, existsSync as existsSync4, readdirSync } from "node:fs";
+import { accessSync as accessSync2, constants, existsSync as existsSync4, readdirSync } from "node:fs";
 import { readFile as readFile7 } from "node:fs/promises";
 import { homedir as homedir6 } from "node:os";
 import { delimiter, isAbsolute, join as join4, resolve as resolve7 } from "node:path";
@@ -11697,7 +11918,7 @@ function executableOnPath(name, env = process.env) {
   for (const directory of augmentedSearchDirectories(env)) {
     const candidate = resolve7(directory, name);
     try {
-      accessSync(candidate, constants.X_OK);
+      accessSync2(candidate, constants.X_OK);
       return candidate;
     } catch {
     }
@@ -11709,7 +11930,7 @@ function requireExecutable(command, env, cwd, missingMessage) {
   const candidate = pathLike ? resolve7(cwd, command) : executableOnPath(command, env);
   if (candidate) {
     try {
-      accessSync(candidate, constants.X_OK);
+      accessSync2(candidate, constants.X_OK);
       return candidate;
     } catch {
     }
@@ -14158,7 +14379,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net2 = __require("net");
     var tls = __require("tls");
-    var { randomBytes: randomBytes8, createHash: createHash14 } = __require("crypto");
+    var { randomBytes: randomBytes8, createHash: createHash13 } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -14826,7 +15047,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash14("sha1").update(key + GUID).digest("base64");
+        const digest = createHash13("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -15195,7 +15416,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter2 = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash: createHash14 } = __require("crypto");
+    var { createHash: createHash13 } = __require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -15502,7 +15723,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash14("sha1").update(key + GUID).digest("base64");
+        const digest = createHash13("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -22925,8 +23146,6 @@ import { readFile } from "node:fs/promises";
 import { createInterface } from "node:readline";
 
 // packages/api-contract/dist/app-connections.js
-var APP_TRANSPORTS = ["registry-mcp", "squire-api", "squire-browser"];
-var APP_ROUTES = ["workbench", ...APP_TRANSPORTS];
 var APP_KEY_MAX_LENGTH = 63;
 var APP_INPUT_MAX_LENGTH = 200;
 var SECOND_LEVEL_SUFFIXES = /* @__PURE__ */ new Set(["co", "com", "net", "org", "gov", "edu", "ac"]);
@@ -23003,108 +23222,11 @@ function squireCallAppKeys(args) {
   return [...keys].sort();
 }
 
-// packages/api-contract/dist/connector-adapter.js
-var CONNECTOR_ADAPTER_DENIED = "connector not found (access denied)";
-function ownerOnly(offered, action, requester) {
-  if (!offered.includes(action) || requester !== "owner") {
-    return { allowed: false, reason: CONNECTOR_ADAPTER_DENIED };
-  }
-  return { allowed: true };
-}
-var SQUIRE_ACTIONS = [
-  "connect",
-  "reconnect",
-  "disconnect",
-  "revoke-grants"
-];
-var SQUIRE_CONNECTOR_ADAPTER = {
-  kind: "trusty-squire",
-  actions: SQUIRE_ACTIONS,
-  authorize: (action, requester) => ownerOnly(SQUIRE_ACTIONS, action, requester),
-  workbenchActions: (status) => {
-    switch (status) {
-      case "installing":
-        return ["disconnect"];
-      case "connected":
-        return ["reconnect", "disconnect", "revoke-grants"];
-      case "error":
-        return ["connect", "reconnect", "disconnect"];
-      default:
-        return ["connect"];
-    }
-  },
-  assignmentKinds: (status) => {
-    if (status === "installing")
-      return ["install"];
-    if (status === "disconnected")
-      return ["uninstall"];
-    return [];
-  }
-};
-var YOUTUBE_ACTIONS = [
-  "connect",
-  "reconnect",
-  "disconnect"
-];
-var YOUTUBE_CONNECTOR_ADAPTER = {
-  kind: "google-youtube",
-  actions: YOUTUBE_ACTIONS,
-  authorize: (action, requester) => ownerOnly(YOUTUBE_ACTIONS, action, requester),
-  workbenchActions: (status) => {
-    switch (status) {
-      case "installing":
-        return ["disconnect"];
-      case "connected":
-        return ["reconnect", "disconnect"];
-      case "error":
-        return ["connect", "reconnect", "disconnect"];
-      default:
-        return ["connect"];
-    }
-  },
-  assignmentKinds: (status) => {
-    if (status === "installing")
-      return ["install"];
-    if (status === "disconnected")
-      return ["uninstall"];
-    if (status === "connected")
-      return ["refresh-google-grant"];
-    return [];
-  }
-};
-var ADAPTERS = {
-  "trusty-squire": SQUIRE_CONNECTOR_ADAPTER,
-  "google-youtube": YOUTUBE_CONNECTOR_ADAPTER
-};
-function connectorAdapter(kind) {
-  return ADAPTERS[kind];
-}
-
 // packages/api-contract/dist/workbench.js
 var CONNECTABLE_CONNECTOR_KINDS = [
   "trusty-squire",
-  "tailscale",
-  "google-gmail",
-  "google-calendar",
-  "google-drive",
-  "google-youtube"
+  "tailscale"
 ];
-var GOOGLE_TOOL_SCOPES = {
-  "google-gmail": [
-    "https://www.googleapis.com/auth/gmail.send",
-    "https://www.googleapis.com/auth/gmail.readonly",
-    "https://www.googleapis.com/auth/gmail.compose"
-  ],
-  "google-calendar": [
-    "https://www.googleapis.com/auth/calendar.events",
-    "https://www.googleapis.com/auth/calendar.readonly"
-  ],
-  "google-drive": ["https://www.googleapis.com/auth/drive.readonly"],
-  "google-youtube": [
-    "https://www.googleapis.com/auth/youtube.readonly",
-    "https://www.googleapis.com/auth/yt-analytics.readonly"
-  ]
-};
 
 // apps/body/dist/resource-mcp-facade.js
 var RESOURCE_FACADE_FLAG = "--resource-mcp-facade";
@@ -23603,7 +23725,7 @@ function configureNetworkFamilyDefaults(network = net) {
 configureNetworkFamilyDefaults();
 
 // apps/body/dist/cli.js
-import { dirname as dirname27, resolve as resolve39 } from "node:path";
+import { dirname as dirname26, resolve as resolve39 } from "node:path";
 import { stdin as stdin4, stdout as stdout5 } from "node:process";
 
 // node_modules/@clack/core/dist/index.mjs
@@ -25014,7 +25136,7 @@ var import_picocolors3 = __toESM(require_picocolors(), 1);
 
 // apps/body/dist/config.js
 init_agent_command();
-import { accessSync as accessSync2, constants as constants2, existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
+import { accessSync as accessSync3, constants as constants2, existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
 import { basename as basename2, dirname as dirname8, resolve as resolve8 } from "node:path";
 function firstExisting2(paths) {
   for (const p of paths) {
@@ -25036,7 +25158,7 @@ function commandInRunningBundle(command) {
   ];
   for (const candidate of candidates) {
     try {
-      accessSync2(candidate, constants2.X_OK);
+      accessSync3(candidate, constants2.X_OK);
       return candidate;
     } catch {
     }
@@ -25061,7 +25183,7 @@ function resolveReadonlyMcpCommand(env = process.env) {
   const configuredBinary = env.BEELINE_READONLY_MCP_BIN;
   if (configuredBinary) {
     try {
-      accessSync2(configuredBinary, constants2.X_OK);
+      accessSync3(configuredBinary, constants2.X_OK);
       return { command: resolve8(configuredBinary), args: [] };
     } catch {
       throw new Error(`read-only tools unavailable: BEELINE_READONLY_MCP_BIN is not executable: ${configuredBinary}`);
@@ -25099,7 +25221,7 @@ function resolveCodegraphCommand(env = process.env) {
   const configured = env.BEELINE_CODEGRAPH_BIN ?? env.BUZZ_CODEGRAPH_BIN;
   if (configured) {
     try {
-      accessSync2(configured, constants2.X_OK);
+      accessSync3(configured, constants2.X_OK);
       return resolve8(configured);
     } catch {
       return void 0;
@@ -25153,6 +25275,7 @@ var AGENT_ENV_PASSTHROUGH_NAMES = [
   "NODE_EXTRA_CA_CERTS",
   "NODE_OPTIONS",
   "OPENCODE_API_KEY",
+  "GOOGLE_API_KEY",
   "http_proxy",
   "https_proxy",
   "no_proxy",
@@ -25194,7 +25317,6 @@ var AGENT_ENV_PASSTHROUGH_PREFIXES = [
   "OPENROUTER_",
   "AZURE_",
   "AWS_",
-  "GOOGLE_",
   "GEMINI_",
   "VERTEX_",
   "BEDROCK_",
@@ -25337,7 +25459,7 @@ init_cursor_acp_bridge();
 init_squire_host();
 
 // apps/body/dist/squire-task-relay.js
-import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash2, randomUUID as randomUUID3 } from "node:crypto";
 import { createServer } from "node:http";
 import { readFile as readFile8 } from "node:fs/promises";
 import { createInterface as createInterface4 } from "node:readline";
@@ -26017,6 +26139,43 @@ function sessionIds(value, depth = 0) {
 function redactedSessionId(id) {
   return id ? createHash2("sha256").update(id).digest("hex").slice(0, 16) : null;
 }
+function staleLeaseResult(value) {
+  if (!value || typeof value !== "object")
+    return false;
+  const result = value;
+  if (result.isError !== true || !Array.isArray(result.content))
+    return false;
+  const text2 = result.content.find((entry) => entry && typeof entry === "object" && entry.type === "text")?.text;
+  if (!text2)
+    return false;
+  try {
+    const body = JSON.parse(text2);
+    return body.error?.code === "stale_lease";
+  } catch {
+    return false;
+  }
+}
+function resultStatus(value, depth = 0) {
+  if (depth > 8 || !value)
+    return void 0;
+  if (typeof value === "string") {
+    if (value.length > 1e5 || !value.trimStart().startsWith("{"))
+      return void 0;
+    try {
+      return resultStatus(JSON.parse(value), depth + 1);
+    } catch {
+      return void 0;
+    }
+  }
+  if (Array.isArray(value))
+    return value.map((item2) => resultStatus(item2, depth + 1)).find(Boolean);
+  if (typeof value !== "object")
+    return void 0;
+  const item = value;
+  if (typeof item.status === "string")
+    return item.status;
+  return Object.values(item).map((entry) => resultStatus(entry, depth + 1)).find(Boolean);
+}
 var SquireTaskRelay = class {
   agentId;
   roomId;
@@ -26025,10 +26184,11 @@ var SquireTaskRelay = class {
   makeClient;
   server;
   url;
-  token = randomUUID2();
+  token = randomUUID3();
   active;
   task;
   leaseTimer;
+  approvalRequestId;
   closed = false;
   callTail = Promise.resolve();
   constructor(agentId, roomId, contextFile, authorize, home = homedir9(), makeClient = (callbacks) => new StdioSquireMcpClient({ scope: { agentId, roomId }, home, processGroup: true, ...callbacks })) {
@@ -26078,46 +26238,59 @@ var SquireTaskRelay = class {
     if (this.leaseTimer)
       clearTimeout(this.leaseTimer);
     this.leaseTimer = void 0;
-    if (this.task && this.task.taskId !== command.rootCommandId)
-      this.retire("task-ended");
     this.active = {
       roomId: command.roomId,
       requestId: command.turnRequestId,
       taskId: command.rootCommandId,
       generationId
     };
-    if (this.task)
+    if (this.task) {
+      this.task.taskId = command.rootCommandId;
       this.task.lastRequestId = command.turnRequestId;
+    }
   }
-  deactivate(requestId, continuation = null) {
+  deactivate(requestId, approvalRequestId) {
     if (this.active?.requestId !== requestId)
       return;
-    const taskId = this.active.taskId;
     this.active = void 0;
-    if (!this.task || this.task.taskId !== taskId)
+    this.approvalRequestId = approvalRequestId;
+    if (approvalRequestId)
       return;
-    if (continuation !== "grant-decision") {
-      this.retire("task-complete");
+    this.scheduleIdle();
+  }
+  scheduleIdle() {
+    if (this.leaseTimer)
+      clearTimeout(this.leaseTimer);
+    this.leaseTimer = void 0;
+    if (!this.task || this.approvalRequestId || this.task.pendingApprovals.size)
       return;
-    }
+    const task = this.task;
     this.leaseTimer = setTimeout(() => {
       this.leaseTimer = void 0;
-      if (!this.active && this.task?.taskId === taskId)
-        this.retire("task-lease-expired");
+      if (!this.active && !this.approvalRequestId && !task.pendingApprovals.size && this.task === task)
+        this.retire("conversation-idle");
     }, SQUIRE_TASK_IDLE_LEASE_MS);
     this.leaseTimer.unref?.();
   }
   cancel(requestId) {
-    if (this.active?.requestId !== requestId)
+    if (this.active?.requestId !== requestId && this.approvalRequestId !== requestId && ![...this.task?.pendingApprovals.values() ?? []].some((approval) => approval.requestId === requestId))
       return;
-    this.active = void 0;
-    this.retire("cancelled");
+    if (this.active?.requestId === requestId)
+      this.active = void 0;
+    if (this.approvalRequestId === requestId)
+      this.approvalRequestId = void 0;
+    for (const [id, approval] of this.task?.pendingApprovals ?? [])
+      if (approval.requestId === requestId)
+        this.task?.pendingApprovals.delete(id);
+    if (!this.active && !this.approvalRequestId)
+      this.scheduleIdle();
   }
   close() {
     if (this.closed)
       return;
     this.closed = true;
     this.active = void 0;
+    this.approvalRequestId = void 0;
     this.retire("helper-exit");
     this.server?.close();
   }
@@ -26126,6 +26299,7 @@ var SquireTaskRelay = class {
     console.info("[squire-task]", JSON.stringify({
       event,
       agentId: this.agentId,
+      conversationId: this.roomId,
       taskId: task.taskId,
       requestId: this.active?.requestId ?? task.lastRequestId,
       squireSessionId: sessionId ?? null,
@@ -26141,8 +26315,9 @@ var SquireTaskRelay = class {
     const task = {
       taskId,
       lastRequestId: this.active?.requestId ?? "",
-      connectionId: randomUUID2(),
+      connectionId: randomUUID3(),
       sessions: /* @__PURE__ */ new Set(),
+      pendingApprovals: /* @__PURE__ */ new Map(),
       dead: false
     };
     task.client = this.makeClient({
@@ -26155,6 +26330,7 @@ var SquireTaskRelay = class {
           sessionId: redactedSessionId(task.sessions.values().next().value)
         });
         task.sessions.clear();
+        task.pendingApprovals.clear();
       }
     });
     this.task = task;
@@ -26172,6 +26348,7 @@ var SquireTaskRelay = class {
     });
     this.task.client.close();
     this.task.sessions.clear();
+    this.task.pendingApprovals.clear();
     this.task = void 0;
   }
   handle(input) {
@@ -26208,9 +26385,13 @@ var SquireTaskRelay = class {
       this.log("call-end", task, { method: input.method, source: "cached" });
       return task.tools;
     }
+    if (input.method === "tools/call" && task.dead && toolName2 !== "operate_start") {
+      this.log("call-refused", task, { reason: "connection-died" });
+      throw new Error("Squire MCP connection died and its browser session is gone; call operate_start");
+    }
     if (input.method === "tools/call" && (!safeToolName || requestedIds.some((id) => !task.sessions.has(id)))) {
       this.log("call-refused", task, { reason: "session-not-owned" });
-      throw new Error("Squire browser session is no longer owned by this task; call operate_start");
+      throw new Error("Squire browser session is no longer owned by this conversation; call operate_start");
     }
     if (input.method === "tools/call" && !await this.authorize({
       ...active,
@@ -26234,8 +26415,47 @@ var SquireTaskRelay = class {
         throw new Error("Squire task ended while the call was running");
       if (input.method === "tools/list")
         task.tools = result;
-      for (const id of sessionIds(result))
-        task.sessions.add(id);
+      if (staleLeaseResult(result)) {
+        for (const id of requestedIds)
+          task.sessions.delete(id);
+        this.releasePendingApprovals(task, requestedIds);
+        this.log("call-error", task, {
+          method: input.method,
+          tool: safeToolName ?? null,
+          reason: "stale-lease",
+          sessionId: redactedSessionId(requestedIds[0])
+        });
+        return { isError: true, content: [{ type: "text", text: JSON.stringify({
+          error: { code: "stale_lease", message: "Squire browser session is gone; call operate_start for a fresh session" }
+        }) }] };
+      }
+      if (safeToolName === "operate_finish" && !(result && typeof result === "object" && result.isError === true)) {
+        for (const id of requestedIds)
+          task.sessions.delete(id);
+        this.releasePendingApprovals(task, requestedIds);
+      } else {
+        for (const id of sessionIds(result))
+          task.sessions.add(id);
+      }
+      const approval = input.method === "tools/call" && squireApprovalFromMcp({ id: 1, method: input.method, params: input.params }, { id: 1, result });
+      if (approval) {
+        const ids = requestedIds.length ? requestedIds : [...task.sessions];
+        const approvalKey = createHash2("sha256").update(approval.approvalId ?? approval.approvalUrl).digest("hex");
+        const status = resultStatus(result);
+        const pending = status === "approval_pending" || status === "pending_approval";
+        if (pending && ids.length) {
+          task.pendingApprovals.set(approvalKey, {
+            requestId: active.requestId,
+            sessionIds: new Set(ids)
+          });
+          this.log("approval-pending", task, {
+            tool: safeToolName ?? null,
+            sessionId: redactedSessionId(ids[0])
+          });
+        } else if (!pending) {
+          task.pendingApprovals.delete(approvalKey);
+        }
+      }
       this.log("call-end", task, {
         method: input.method,
         tool: safeToolName ?? null,
@@ -26246,6 +26466,7 @@ var SquireTaskRelay = class {
       if (error instanceof Error && /timed out/.test(error.message)) {
         task.dead = true;
         task.sessions.clear();
+        task.pendingApprovals.clear();
         task.client.close();
       }
       this.log("call-error", task, {
@@ -26253,9 +26474,19 @@ var SquireTaskRelay = class {
         tool: safeToolName ?? null,
         sessionId: redactedSessionId(requestedIds[0] ?? task.sessions.values().next().value)
       });
+      if (task.dead)
+        throw new Error("Squire MCP connection died and its browser session is gone; call operate_start");
       throw error;
     }
   }
+  releasePendingApprovals(task, sessionIdsToRelease) {
+    for (const [id, approval] of task.pendingApprovals) {
+      for (const sessionId of sessionIdsToRelease)
+        approval.sessionIds.delete(sessionId);
+      if (!approval.sessionIds.size)
+        task.pendingApprovals.delete(id);
+    }
+  }
 };
 function runSquireTaskProxy(env = process.env) {
   const url = env.BEELINE_SQUIRE_RELAY_URL;
@@ -26310,7 +26541,7 @@ function isAllowedAgentModelConfigCategory(category, id) {
 }
 
 // apps/body/dist/model-config.js
-import { lstatSync as lstatSync2, readFileSync as readFileSync3 } from "node:fs";
+import { lstatSync, readFileSync as readFileSync3 } from "node:fs";
 import { basename as basename3, resolve as resolve9 } from "node:path";
 var GROK_SESSION_MODEL_AXIS_ID = "beeline:grok-session-model";
 var GROK_LAUNCH_EFFORT_AXIS_ID = "beeline:grok-launch-reasoning-effort";
@@ -26486,7 +26717,7 @@ function credentialedPiCustomProviders(env) {
     return held;
   const path = resolve9(agentDir, "models.json");
   try {
-    const stats = lstatSync2(path);
+    const stats = lstatSync(path);
     if (!stats.isFile() || stats.isSymbolicLink() || stats.nlink !== 1 || stats.size > 1048576) {
       return held;
     }
@@ -27923,519 +28154,12 @@ async function syncAgentModelCatalog(input) {
   }
 }
 
-// apps/body/dist/connector-google.js
-import { mkdirSync as mkdirSync2, writeFileSync } from "node:fs";
-import { dirname as dirname9, join as join5 } from "node:path";
-
-// apps/body/dist/google-workspace-client.js
-function credentialsTokenSource(credentials) {
-  return {
-    accessToken: () => Promise.resolve(credentials.accessToken),
-    accountEmail: credentials.accountEmail ? () => credentials.accountEmail : void 0
-  };
-}
-var googleOAuthTokenTransport = {
-  async request(method, url, body) {
-    const fields = body && typeof body === "object" ? body : {};
-    const response = await fetch(url, {
-      method,
-      headers: { "content-type": "application/x-www-form-urlencoded" },
-      body: new URLSearchParams(fields).toString()
-    });
-    let json = null;
-    const text2 = await response.text();
-    if (text2) {
-      try {
-        json = JSON.parse(text2);
-      } catch {
-        json = { raw: text2 };
-      }
-    }
-    return { status: response.status, json };
-  }
-};
-async function refreshGoogleAccessToken(credentials, clientId, clientSecret, transport = googleOAuthTokenTransport) {
-  if (!credentials.refreshToken) {
-    throw new GoogleApiError(401, "Google grant has no refresh token; reconnect Google Workspace");
-  }
-  const response = await transport.request("POST", "https://oauth2.googleapis.com/token", {
-    client_id: clientId,
-    client_secret: clientSecret,
-    refresh_token: credentials.refreshToken,
-    grant_type: "refresh_token"
-  });
-  if (response.status >= 300) {
-    throw new GoogleApiError(response.status, "Google refused to refresh the access token");
-  }
-  const payload = response.json;
-  if (!payload.access_token) {
-    throw new GoogleApiError(401, "Google refresh returned no access token");
-  }
-  return {
-    ...credentials,
-    accessToken: payload.access_token,
-    expiresAt: typeof payload.expires_in === "number" ? Date.now() + payload.expires_in * 1e3 : void 0
-  };
-}
-function refreshableTokenSource(credentials, clientId, clientSecret, transport = googleOAuthTokenTransport) {
-  let current = credentials;
-  return {
-    async accessToken() {
-      const stale = current.expiresAt !== void 0 && current.expiresAt <= Date.now() + 3e4;
-      if (stale && clientId && clientSecret && current.refreshToken) {
-        current = await refreshGoogleAccessToken(current, clientId, clientSecret, transport);
-      }
-      return current.accessToken;
-    },
-    accountEmail: current.accountEmail ? () => current.accountEmail : void 0
-  };
-}
-var defaultGoogleApiTransport = {
-  async request(method, url, body, headers) {
-    const response = await fetch(url, {
-      method,
-      headers: {
-        "content-type": "application/json",
-        ...headers
-      },
-      ...body !== void 0 ? { body: JSON.stringify(body) } : {}
-    });
-    let json = null;
-    const text2 = await response.text();
-    if (text2) {
-      try {
-        json = JSON.parse(text2);
-      } catch {
-        json = { raw: text2 };
-      }
-    }
-    return { status: response.status, json };
-  }
-};
-var GoogleApiError = class extends Error {
-  status;
-  detail;
-  constructor(status, detail) {
-    super(`Google API ${status}: ${detail}`);
-    this.status = status;
-    this.detail = detail;
-  }
-};
-var MAX_RESULTS = 25;
-function assertOk(status, json) {
-  if (status >= 200 && status < 300)
-    return;
-  const detail = json && typeof json === "object" && "error" in json ? JSON.stringify(json.error) : `HTTP ${status}`;
-  throw new GoogleApiError(status, detail);
-}
-var YOUTUBE_ANALYTICS_OWNER_LIMIT = "YouTube Analytics requires the Google account that owns the channel, not a manager.";
-function defaultAnalyticsDateRange(days = 28, now2 = /* @__PURE__ */ new Date()) {
-  const end = new Date(Date.UTC(now2.getUTCFullYear(), now2.getUTCMonth(), now2.getUTCDate()));
-  const start = new Date(end);
-  start.setUTCDate(start.getUTCDate() - days);
-  return { startDate: start.toISOString().slice(0, 10), endDate: end.toISOString().slice(0, 10) };
-}
-function rfc822(input) {
-  return `To: ${input.to}\r
-Subject: ${input.subject}\r
-Content-Type: text/plain; charset="UTF-8"\r
-\r
-${input.body}`;
-}
-function googleWorkspaceClient(tokenSource, transport = defaultGoogleApiTransport) {
-  const authorized = {
-    async request(method, url, body) {
-      const token = await tokenSource.accessToken();
-      const response = await transport.request(method, url, body, {
-        authorization: `Bearer ${token}`
-      });
-      if (response.status === 401) {
-        throw new GoogleApiError(401, "access token rejected; reconnect the Google tool");
-      }
-      return response;
-    }
-  };
-  const gmailFetch = async (path) => {
-    const { status, json } = await authorized.request("GET", `https://gmail.googleapis.com/gmail/v1/users/me${path}`);
-    assertOk(status, json);
-    return json;
-  };
-  return {
-    gmail: {
-      async listMessages(query) {
-        const params = new URLSearchParams({ maxResults: String(MAX_RESULTS) });
-        if (query)
-          params.set("q", query);
-        const { status, json } = await authorized.request("GET", `https://gmail.googleapis.com/gmail/v1/users/me/messages?${params}`);
-        assertOk(status, json);
-        const messages = json.messages ?? [];
-        return messages.map((entry) => ({ id: entry.id, snippet: entry.snippet }));
-      },
-      async getMessage(id) {
-        const message = await gmailFetch(`/messages/${encodeURIComponent(id)}?format=metadata`);
-        const snippet = typeof message.snippet === "string" ? message.snippet : void 0;
-        const payload = message.payload;
-        const subject = payload?.headers?.find((header) => header.name === "Subject")?.value;
-        const bodyText = payload?.body?.data !== void 0 ? Buffer.from(payload.body.data, "base64url").toString("utf8") : void 0;
-        return { id, snippet: subject ?? snippet, body: bodyText };
-      },
-      async createDraft(input) {
-        const { status, json } = await authorized.request("POST", "https://gmail.googleapis.com/gmail/v1/users/me/drafts", { message: { raw: Buffer.from(rfc822(input), "utf8").toString("base64url") } });
-        assertOk(status, json);
-        return { id: String(json.id) };
-      },
-      async sendMessage(input) {
-        const raw = Buffer.from(rfc822(input), "utf8").toString("base64url");
-        const { status, json } = await authorized.request("POST", "https://gmail.googleapis.com/gmail/v1/users/me/messages/send", { raw });
-        assertOk(status, json);
-        return { id: String(json.id) };
-      }
-    },
-    calendar: {
-      async listEvents(input) {
-        const params = new URLSearchParams({
-          maxResults: String(input?.maxResults ?? MAX_RESULTS),
-          singleEvents: "true",
-          orderBy: "startTime",
-          timeMin: (/* @__PURE__ */ new Date()).toISOString()
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/calendar/v3/calendars/primary/events?${params}`);
-        assertOk(status, json);
-        const events = json.items ?? [];
-        return events.map((event) => ({
-          id: String(event.id),
-          summary: typeof event.summary === "string" ? event.summary : void 0,
-          start: event.start?.dateTime,
-          end: event.end?.dateTime
-        }));
-      },
-      async createEvent(input) {
-        const { status, json } = await authorized.request("POST", `https://www.googleapis.com/calendar/v3/calendars/${encodeURIComponent(input.calendarId ?? "primary")}/events`, {
-          summary: input.summary,
-          ...input.description ? { description: input.description } : {},
-          start: { dateTime: input.start },
-          end: { dateTime: input.end }
-        });
-        assertOk(status, json);
-        const event = json;
-        return { id: event.id, ...event.htmlLink ? { htmlLink: event.htmlLink } : {} };
-      }
-    },
-    drive: {
-      async listFiles() {
-        const params = new URLSearchParams({
-          q: "trashed = false",
-          pageSize: String(MAX_RESULTS),
-          fields: "files(id,name,mimeType)"
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/drive/v3/files?${params}`);
-        assertOk(status, json);
-        return (json.files ?? []).map((file) => ({
-          id: String(file.id),
-          name: typeof file.name === "string" ? file.name : void 0,
-          mimeType: typeof file.mimeType === "string" ? file.mimeType : void 0
-        }));
-      },
-      async searchFiles(query) {
-        const params = new URLSearchParams({
-          q: `name contains '${query.replace(/'/g, "\\'")}' and trashed = false`,
-          pageSize: String(MAX_RESULTS),
-          fields: "files(id,name,mimeType)"
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/drive/v3/files?${params}`);
-        assertOk(status, json);
-        return (json.files ?? []).map((file) => ({
-          id: String(file.id),
-          name: typeof file.name === "string" ? file.name : void 0,
-          mimeType: typeof file.mimeType === "string" ? file.mimeType : void 0
-        }));
-      },
-      async readFile(fileId) {
-        const meta = await authorized.request("GET", `https://www.googleapis.com/drive/v3/files/${encodeURIComponent(fileId)}?fields=id,name`);
-        assertOk(meta.status, meta.json);
-        const content = await authorized.request("GET", `https://www.googleapis.com/drive/v3/files/${encodeURIComponent(fileId)}?alt=media`);
-        assertOk(content.status, content.json);
-        const body = content.json;
-        return {
-          id: fileId,
-          name: meta.json.name,
-          content: body.raw ?? JSON.stringify(content.json)
-        };
-      }
-    },
-    youtube: {
-      async getChannel(mine = true) {
-        const params = new URLSearchParams({
-          part: "snippet,statistics",
-          maxResults: "1",
-          ...mine ? { mine: "true" } : {}
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/youtube/v3/channels?${params}`);
-        assertOk(status, json);
-        const item = (json.items ?? [])[0];
-        if (!item)
-          throw new GoogleApiError(404, "no YouTube channel on this Google account");
-        const snippet = item.snippet ?? {};
-        const statistics = item.statistics ?? {};
-        return {
-          id: String(item.id),
-          ...typeof snippet.title === "string" ? { title: snippet.title } : {},
-          ...typeof snippet.customUrl === "string" ? { handle: snippet.customUrl } : {},
-          ...typeof statistics.subscriberCount === "string" ? { subscriberCount: statistics.subscriberCount } : {}
-        };
-      },
-      async listVideos() {
-        const params = new URLSearchParams({
-          part: "snippet",
-          forMine: "true",
-          type: "video",
-          maxResults: String(MAX_RESULTS)
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/youtube/v3/search?${params}`);
-        assertOk(status, json);
-        return (json.items ?? []).map((item) => ({
-          videoId: String(item.id?.videoId ?? item.id),
-          title: item.snippet?.title
-        }));
-      },
-      async getVideo(videoId) {
-        const params = new URLSearchParams({
-          part: "snippet,statistics",
-          id: videoId
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/youtube/v3/videos?${params}`);
-        assertOk(status, json);
-        const item = (json.items ?? [])[0];
-        if (!item)
-          throw new GoogleApiError(404, `video ${videoId} was not found`);
-        const snippet = item.snippet ?? {};
-        const statistics = item.statistics ?? {};
-        return {
-          id: String(item.id),
-          ...typeof snippet.title === "string" ? { title: snippet.title } : {},
-          ...typeof snippet.description === "string" ? { description: snippet.description } : {},
-          ...typeof statistics.viewCount === "string" ? { viewCount: statistics.viewCount } : {}
-        };
-      },
-      async listPlaylists(mine = true) {
-        const params = new URLSearchParams({
-          part: "snippet",
-          maxResults: String(MAX_RESULTS),
-          ...mine ? { mine: "true" } : {}
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/youtube/v3/playlists?${params}`);
-        assertOk(status, json);
-        return (json.items ?? []).map((item) => ({
-          id: String(item.id),
-          title: item.snippet?.title
-        }));
-      },
-      async listPlaylistItems(playlistId) {
-        const params = new URLSearchParams({
-          part: "snippet",
-          maxResults: String(MAX_RESULTS),
-          playlistId
-        });
-        const { status, json } = await authorized.request("GET", `https://www.googleapis.com/youtube/v3/playlistItems?${params}`);
-        assertOk(status, json);
-        return (json.items ?? []).map((item) => ({
-          videoId: String(item.snippet?.resourceId?.videoId ?? item.id),
-          title: item.snippet?.title
-        }));
-      },
-      async getTranscript(videoId) {
-        const params = new URLSearchParams({ lang: "en", v: videoId });
-        const { status, json } = await authorized.request("GET", `https://video.google.com/timedtext?${params}`);
-        if (status < 200 || status >= 300) {
-          throw new GoogleApiError(status, `no caption track could be fetched for ${videoId} (timedtext ${status})`);
-        }
-        const raw = json.raw ?? "";
-        const transcript = raw.replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim();
-        if (!transcript) {
-          throw new GoogleApiError(404, `video ${videoId} has no fetchable captions`);
-        }
-        return { videoId, transcript };
-      },
-      async analyticsQuery(input) {
-        const range = input.startDate && input.endDate ? { startDate: input.startDate, endDate: input.endDate } : defaultAnalyticsDateRange();
-        const params = new URLSearchParams({
-          ids: "channel==MINE",
-          startDate: range.startDate,
-          endDate: range.endDate,
-          metrics: input.metrics
-        });
-        if (input.dimensions)
-          params.set("dimensions", input.dimensions);
-        if (input.filters)
-          params.set("filters", input.filters);
-        if (input.sort)
-          params.set("sort", input.sort);
-        if (input.maxResults)
-          params.set("maxResults", String(input.maxResults));
-        const { status, json } = await authorized.request("GET", `https://youtubeanalytics.googleapis.com/v2/reports?${params}`);
-        if (status === 403) {
-          throw new GoogleApiError(403, YOUTUBE_ANALYTICS_OWNER_LIMIT);
-        }
-        assertOk(status, json);
-        const report = json;
-        const columns = (report.columnHeaders ?? []).map((header) => header.name);
-        const results = (report.rows ?? []).map((row) => {
-          const record6 = {};
-          columns.forEach((column, index) => {
-            record6[column] = row[index];
-          });
-          return record6;
-        });
-        return {
-          startDate: range.startDate,
-          endDate: range.endDate,
-          columns,
-          results,
-          totalRows: results.length
-        };
-      }
-    },
-    async verify() {
-      try {
-        const { status, json } = await authorized.request("GET", "https://www.googleapis.com/oauth2/v3/userinfo");
-        if (status === 401)
-          return { ok: false, reason: "Google rejected the access token" };
-        assertOk(status, json);
-        const email = json.email;
-        return { ok: true, ...email ? { account: email } : {} };
-      } catch (error) {
-        return {
-          ok: false,
-          reason: error instanceof Error ? error.message : String(error)
-        };
-      }
-    }
-  };
-}
-
-// apps/body/dist/connector-google.js
-function isGoogleToolConnectorType(type) {
-  return Object.hasOwn(GOOGLE_TOOL_SCOPES, type);
-}
-function manualGoogleCredentialsSearchPaths(home) {
-  return [join5(home, "google-credentials.json")];
-}
-function persistManualGoogleCredentials(home, credentials) {
-  const path = manualGoogleCredentialsSearchPaths(home)[0];
-  mkdirSync2(dirname9(path), { recursive: true, mode: 448 });
-  writeFileSync(path, `${JSON.stringify({
-    accessToken: credentials.accessToken,
-    ...credentials.expiresAt ? { expiresAt: credentials.expiresAt } : {},
-    ...credentials.accountEmail ? { accountEmail: credentials.accountEmail } : {},
-    ...credentials.scopes ? { scopes: credentials.scopes } : {}
-  })}
-`, { encoding: "utf8", mode: 384 });
-  return path;
-}
-var step2 = (label, status, extra) => ({
-  label,
-  status,
-  ...extra
-});
-function outputTail(text2, maxChars = 800) {
-  const trimmed = text2.trim();
-  return trimmed.length <= maxChars ? trimmed : `\u2026${trimmed.slice(-maxChars)}`;
-}
-async function installGoogleTool(options) {
-  const steps2 = [step2("helper reached", "done")];
-  const emit = () => options.onProgress?.([...steps2]);
-  const push = (next) => {
-    steps2.push(next);
-    emit();
-  };
-  const fail = (label, reason, output) => {
-    push(step2(label, "failed", { reason, ...output ? { output } : {} }));
-    return { status: "error", steps: steps2, errorMessage: reason };
-  };
-  emit();
-  if (!isGoogleToolConnectorType(options.connectorType)) {
-    return fail("connector type", `${options.connectorType} is not a Google tool connector`);
-  }
-  push(step2("Google credentials resolved", "running", { output: "resolving\u2026" }));
-  const resolved = options.resolvedCredentials ? await options.resolvedCredentials : options.resolveCredentials ? await options.resolveCredentials() : { source: "pending", reason: "waiting for Google sign-in" };
-  if (!("credentials" in resolved)) {
-    const reason = resolved.reason;
-    steps2[1] = step2("Google credentials resolved", resolved.source === "pending" ? "running" : "failed", { ...resolved.source === "error" ? { reason } : {}, output: outputTail(reason) });
-    emit();
-    return resolved.source === "pending" ? { status: "installing", steps: steps2 } : { status: "error", steps: steps2, errorMessage: reason };
-  }
-  steps2[1] = step2("Google credentials resolved", "done", {
-    output: "Google sign-in completed through Beeline"
-  });
-  emit();
-  const missing = GOOGLE_TOOL_SCOPES[options.connectorType].filter((scope) => !resolved.credentials.scopes?.includes(scope));
-  if (missing.length)
-    return fail("tools enabled", `Google did not grant ${options.connectorType} permission`);
-  const client = options.client ?? googleWorkspaceClient(refreshableTokenSource(resolved.credentials, options.env?.BEELINE_GOOGLE_CLIENT_ID, options.env?.BEELINE_GOOGLE_CLIENT_SECRET));
-  push(step2("authorized with Google", "running", { output: "verifying the grant with Google\u2026" }));
-  const verify = await client.verify();
-  if (!verify.ok) {
-    return fail("authorized with Google", verify.reason, outputTail(verify.reason));
-  }
-  steps2[2] = step2("authorized with Google", "done", {
-    ...verify.account ? { output: `signed in as ${verify.account}` } : {}
-  });
-  emit();
-  push(step2("tools enabled", "running", { output: "verifying this Google tool\u2026" }));
-  try {
-    switch (options.connectorType) {
-      case "google-gmail":
-        await client.gmail.listMessages();
-        break;
-      case "google-calendar":
-        await client.calendar.listEvents({ maxResults: 1 });
-        break;
-      case "google-drive":
-        await client.drive.searchFiles("");
-        break;
-      case "google-youtube":
-        await client.youtube.listVideos();
-        break;
-    }
-  } catch (error) {
-    const reason = error instanceof Error ? error.message : String(error);
-    steps2[3] = step2("tools enabled", "failed", { reason, output: outputTail(reason) });
-    emit();
-    return { status: "error", steps: steps2, errorMessage: reason };
-  }
-  steps2[3] = step2("tools enabled", "done", {
-    output: `${GOOGLE_TOOL_SCOPES[options.connectorType].length} Google scopes granted; tool verified`
-  });
-  emit();
-  if (options.connectorType === "google-youtube")
-    persistManualGoogleCredentials(options.home, resolved.credentials);
-  return {
-    status: "connected",
-    steps: steps2,
-    ...verify.account ? { signedInAs: verify.account } : {}
-  };
-}
-
-// apps/body/dist/connector-adapters.js
-import { unlinkSync } from "node:fs";
-function isAdaptedYoutube(type) {
-  return type !== void 0 && connectorAdapter(type)?.kind === "google-youtube";
-}
-function clearYoutubeGrant(home, log2) {
-  try {
-    unlinkSync(manualGoogleCredentialsSearchPaths(home)[0]);
-  } catch (error) {
-    if (error.code !== "ENOENT")
-      log2(`could not clear YouTube grant: ${error instanceof Error ? error.message : String(error)}`);
-  }
-}
-
 // apps/body/dist/connector-tailscale.js
 import { execFile as execFile6 } from "node:child_process";
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { rm as rm4 } from "node:fs/promises";
 import { tmpdir as tmpdir2, userInfo } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join5 } from "node:path";
 var COMMAND_TIMEOUT_MS = 2 * 6e4;
 var OUTPUT_LIMIT = 32 * 1024;
 var LOGIN_URL = /https:\/\/login\.tailscale\.com\/[A-Za-z0-9_/-]+/u;
@@ -28470,7 +28194,7 @@ function accountName(status) {
   const user = userId === void 0 ? void 0 : status.User?.[String(userId)];
   return user?.LoginName ?? user?.DisplayName ?? status.CurrentTailnet?.Name;
 }
-function step3(label, status, details = {}) {
+function step2(label, status, details = {}) {
   return { label, status, ...details };
 }
 async function readStatus(run2) {
@@ -28508,7 +28232,7 @@ async function ensureInstalled(run2, onProgress, platform) {
   if (version.code === 0) {
     return {
       ok: true,
-      steps: [step3("Tailscale installed", "done", { output: version.stdout.trim() })]
+      steps: [step2("Tailscale installed", "done", { output: version.stdout.trim() })]
     };
   }
   if (platform !== "linux") {
@@ -28517,17 +28241,17 @@ async function ensureInstalled(run2, onProgress, platform) {
       ok: false,
       result: {
         status: "error",
-        steps: [step3("Tailscale installed", "failed", { reason })],
+        steps: [step2("Tailscale installed", "failed", { reason })],
         errorMessage: reason
       }
     };
   }
-  const script = join6(tmpdir2(), `beeline-tailscale-install-${process.pid}-${randomUUID3()}.sh`);
+  const script = join5(tmpdir2(), `beeline-tailscale-install-${process.pid}-${randomUUID4()}.sh`);
   const steps2 = [
-    step3("Tailscale installed", "running", {
+    step2("Tailscale installed", "running", {
       command: "curl -fsSL https://tailscale.com/install.sh"
     }),
-    step3("Tailnet signed in", "pending")
+    step2("Tailnet signed in", "pending")
   ];
   onProgress(steps2);
   try {
@@ -28538,7 +28262,7 @@ async function ensureInstalled(run2, onProgress, platform) {
         ok: false,
         result: {
           status: "error",
-          steps: [step3("Tailscale installed", "failed", { reason })],
+          steps: [step2("Tailscale installed", "failed", { reason })],
           errorMessage: reason
         }
       };
@@ -28550,14 +28274,14 @@ async function ensureInstalled(run2, onProgress, platform) {
         ok: false,
         result: {
           status: "error",
-          steps: [step3("Tailscale installed", "failed", { reason })],
+          steps: [step2("Tailscale installed", "failed", { reason })],
           errorMessage: reason
         }
       };
     }
     return {
       ok: true,
-      steps: [step3("Tailscale installed", "done", { output: install.stdout.trim() })]
+      steps: [step2("Tailscale installed", "done", { output: install.stdout.trim() })]
     };
   } finally {
     await rm4(script, { force: true }).catch(() => {
@@ -28576,14 +28300,14 @@ async function installTailscale(options = {}) {
   if (current?.BackendState === "Running") {
     return {
       status: "connected",
-      steps: [...installed.steps, step3("Tailnet signed in", "done")],
+      steps: [...installed.steps, step2("Tailnet signed in", "done")],
       ...accountName(current) ? { signedInAs: accountName(current) } : {}
     };
   }
   if (options.signIn) {
     const steps3 = [
       ...installed.steps,
-      step3("Tailnet signed in", "running", { command: "tailscale up" })
+      step2("Tailnet signed in", "running", { command: "tailscale up" })
     ];
     return { status: "installing", steps: steps3, signIn: options.signIn };
   }
@@ -28591,13 +28315,13 @@ async function installTailscale(options = {}) {
   if (pendingUrl) {
     return {
       status: "installing",
-      steps: [...installed.steps, step3("Tailnet signed in", "running", { command: "tailscale up" })],
+      steps: [...installed.steps, step2("Tailnet signed in", "running", { command: "tailscale up" })],
       signIn: { method: "oauth", url: pendingUrl, browserLocation: { kind: "none" } }
     };
   }
   const steps2 = [
     ...installed.steps,
-    step3("Tailnet signed in", "running", { command: "tailscale up" })
+    step2("Tailnet signed in", "running", { command: "tailscale up" })
   ];
   onProgress(steps2);
   let accountUsername;
@@ -28616,7 +28340,7 @@ async function installTailscale(options = {}) {
   if (after?.BackendState === "Running") {
     return {
       status: "connected",
-      steps: [...installed.steps, step3("Tailnet signed in", "done")],
+      steps: [...installed.steps, step2("Tailnet signed in", "done")],
       ...accountName(after) ? { signedInAs: accountName(after) } : {}
     };
   }
@@ -28633,7 +28357,7 @@ ${up.stderr}`;
   const reason = (up.stderr || up.stdout || "Tailscale could not start on this helper").trim();
   return {
     status: "error",
-    steps: [...installed.steps, step3("Tailnet signed in", "failed", { reason })],
+    steps: [...installed.steps, step2("Tailnet signed in", "failed", { reason })],
     errorMessage: reason
   };
 }
@@ -28642,10 +28366,10 @@ ${up.stderr}`;
 import { createHash as createHash4, randomBytes as randomBytes6 } from "node:crypto";
 import { lookup } from "node:dns/promises";
 import { createRequire as createRequire4 } from "node:module";
-import { chmodSync, existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync4, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { createConnection, createServer as createServer2, isIPv4, isIPv6 } from "node:net";
+import { chmodSync, existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync4, rmSync, writeFileSync } from "node:fs";
+import { createConnection as createConnection3, createServer as createServer2, isIPv4, isIPv6 } from "node:net";
 import { homedir as homedir10 } from "node:os";
-import { dirname as dirname10, join as join7 } from "node:path";
+import { dirname as dirname9, join as join6 } from "node:path";
 import { createInterface as createInterface5 } from "node:readline";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 
@@ -28780,12 +28504,12 @@ async function assertNotOwnMachine(url, remoteIsOwnMachine, resolveHost) {
   return url;
 }
 function registryMcpStateRoot(home = homedir10()) {
-  return join7(home, ".beeline", "registry-mcp");
+  return join6(home, ".beeline", "registry-mcp");
 }
 function registryMcpStatePath(connectorId, home = homedir10()) {
   if (!/^[0-9a-f-]{20,}$/i.test(connectorId))
     throw new Error("Registry connector id is invalid");
-  return join7(registryMcpStateRoot(home), `${connectorId}.json`);
+  return join6(registryMcpStateRoot(home), `${connectorId}.json`);
 }
 function readState(path) {
   try {
@@ -28796,8 +28520,8 @@ function readState(path) {
   }
 }
 function writeState(path, state) {
-  mkdirSync3(dirname10(path), { recursive: true, mode: 448 });
-  writeFileSync2(path, `${JSON.stringify(state)}
+  mkdirSync2(dirname9(path), { recursive: true, mode: 448 });
+  writeFileSync(path, `${JSON.stringify(state)}
 `, { mode: 384 });
 }
 function challengeParameter(header, key) {
@@ -28821,13 +28545,13 @@ var CONNECTOR_STEPS = [
   { key: "connect", label: "Connect provider account" }
 ];
 function steps(active, failed) {
-  const activeIndex = CONNECTOR_STEPS.findIndex((step4) => step4.key === active);
-  return CONNECTOR_STEPS.map((step4, index) => {
+  const activeIndex = CONNECTOR_STEPS.findIndex((step3) => step3.key === active);
+  return CONNECTOR_STEPS.map((step3, index) => {
     if (activeIndex < 0 || index < activeIndex)
-      return { label: step4.label, status: "done" };
+      return { label: step3.label, status: "done" };
     if (index > activeIndex)
-      return { label: step4.label, status: "pending" };
-    return failed ? { label: step4.label, status: "failed", reason: failed } : { label: step4.label, status: "running" };
+      return { label: step3.label, status: "pending" };
+    return failed ? { label: step3.label, status: "failed", reason: failed } : { label: step3.label, status: "running" };
   });
 }
 var CEREMONY_EXPIRED = "the Trusty Squire sign-in page expired before it was used \xB7 tap Retry to open a new one";
@@ -29108,7 +28832,7 @@ function registryMcpHostDeclarations(routes, turnContextPath, brokerSocket = pro
   }));
 }
 function registryMcpHostBindPaths(routes, brokerSocket = process.env.BEELINE_REGISTRY_MCP_BROKER_SOCKET) {
-  return routes?.length && brokerSocket ? [dirname10(brokerSocket)] : [];
+  return routes?.length && brokerSocket ? [dirname9(brokerSocket)] : [];
 }
 async function refresh(state, transport) {
   if (!state.refreshToken || !state.tokenEndpoint || !state.clientId)
@@ -29171,7 +28895,7 @@ function jsonRpcToolName(line) {
   }
 }
 function brokerSocketPath(home = homedir10()) {
-  return join7(home, ".beeline", "registry-mcp-broker", `${process.pid}.sock`);
+  return join6(home, ".beeline", "registry-mcp-broker", `${process.pid}.sock`);
 }
 var RegistryMcpHostBroker = class {
   home;
@@ -29247,8 +28971,8 @@ var RegistryMcpHostBroker = class {
   async start() {
     if (this.server)
       return;
-    mkdirSync3(registryMcpStateRoot(this.home), { recursive: true, mode: 448 });
-    mkdirSync3(dirname10(this.socketPath), { recursive: true, mode: 448 });
+    mkdirSync2(registryMcpStateRoot(this.home), { recursive: true, mode: 448 });
+    mkdirSync2(dirname9(this.socketPath), { recursive: true, mode: 448 });
     rmSync(this.socketPath, { force: true });
     this.server = createServer2({ allowHalfOpen: true }, (socket) => {
       let buffer = "";
@@ -29295,7 +29019,7 @@ var RegistryMcpHostBroker = class {
 };
 async function brokerRequest(socketPath, request) {
   return new Promise((resolve40, reject) => {
-    const socket = createConnection(socketPath);
+    const socket = createConnection3(socketPath);
     let output = "";
     socket.setEncoding("utf8");
     socket.setTimeout(125e3, () => socket.destroy(new Error("Registry MCP broker timed out")));
@@ -29375,11 +29099,9 @@ var ConnectorAssignmentLoop = class {
   api;
   log;
   install;
-  installGoogle;
   installTailscale;
   watchTailscaleSignIn;
   tailscaleWatch;
-  googleHomeDir;
   registryHomeDir;
   installRegistry;
   /** When each registry sign-in attempt's SERVER clock ends, so one can time
@@ -29402,15 +29124,8 @@ var ConnectorAssignmentLoop = class {
     this.log = options.log ?? (() => {
     });
     this.install = options.install ?? installSquire;
-    this.installGoogle = options.installGoogle ?? ((connectorType, onProgress, sharedCredentials) => installGoogleTool({
-      connectorType,
-      home: this.googleHome(),
-      onProgress,
-      resolvedCredentials: sharedCredentials ? sharedCredentials() : Promise.resolve({ source: "pending", reason: "waiting for Google sign-in" })
-    }));
     this.installTailscale = options.installTailscale ?? installTailscale;
     this.watchTailscaleSignIn = options.watchTailscaleSignIn ?? watchTailscaleSignIn;
-    this.googleHomeDir = options.googleHome ?? process.env.BEELINE_AGENT_HOME ?? process.cwd();
     this.registryHomeDir = options.registryHome ?? process.env.HOME ?? process.cwd();
     this.installRegistry = options.installRegistry ?? installRegistryMcp;
     this.readVaultFn = options.readVault ?? readVault;
@@ -29463,61 +29178,15 @@ var ConnectorAssignmentLoop = class {
       this.log(`connector assignments unavailable: ${describe(error)}`);
       return;
     }
-    const youtubeRows = assignments.filter((assignment) => isAdaptedYoutube(assignment.connectorType));
-    if (youtubeRows.some((assignment) => assignment.kind === "uninstall") && youtubeRows.every((assignment) => assignment.kind === "uninstall")) {
-      clearYoutubeGrant(this.googleHome(), (message) => this.log(message));
-    }
-    let googleBatch;
     for (const assignment of assignments) {
       const key = `${assignment.kind}:${assignment.connectorId}`;
       if (assignment.kind === "uninstall")
         continue;
-      if (assignment.kind === "install" && isGoogleToolConnectorType(assignment.connectorType)) {
-        if (this.inFlight.has(key))
-          continue;
-        this.inFlight.add(key);
-        (googleBatch ??= []).push(assignment);
-        continue;
-      }
       if (this.inFlight.has(key))
         continue;
       this.inFlight.add(key);
       void this.handle(assignment).catch((error) => this.log(`connector assignment ${key} failed: ${describe(error)}`)).finally(() => this.inFlight.delete(key));
     }
-    if (googleBatch) {
-      const keys = googleBatch.map((assignment) => `${assignment.kind}:${assignment.connectorId}`);
-      void this.runGoogleBatch(googleBatch).catch((error) => this.log(`google connector installs failed: ${describe(error)}`)).finally(() => {
-        for (const key of keys)
-          this.inFlight.delete(key);
-      });
-    }
-  }
-  /** Google tools share a machine grant, but each connector has its own OAuth
-   * readiness. Resolve it per connector while installs run sequentially. */
-  async runGoogleBatch(batch) {
-    for (const assignment of batch) {
-      await this.runGoogleInstall(assignment.connectorId, assignment.connectorType, () => this.resolveGoogleCredentials(assignment.connectorId), assignment.kind === "install" ? assignment.pairingGeneration : void 0);
-    }
-  }
-  /** A failed grant lookup becomes an error for this connector. */
-  resolveGoogleCredentials(connectorId) {
-    return (async () => {
-      try {
-        const grant = await this.api.execute("getGoogleOAuthGrant", {
-          agentId: this.agentId,
-          connectorId
-        });
-        if (grant.status === "ready" && grant.credentials)
-          return { source: "beeline", credentials: grant.credentials };
-      } catch (error) {
-        this.log(`Google grant lookup failed: ${describe(error)}`);
-        return {
-          source: "error",
-          reason: "Beeline could not read the Google grant; retry the connection"
-        };
-      }
-      return { source: "pending", reason: "waiting for Google sign-in" };
-    })();
   }
   squire() {
     this.mcp ??= defaultSquireMcpClient({ agentId: this.agentId, roomId: "connector" });
@@ -29526,7 +29195,19 @@ var ConnectorAssignmentLoop = class {
   async handle(assignment) {
     const pairingGeneration = assignment.kind === "install" || assignment.kind === "uninstall" ? assignment.pairingGeneration : void 0;
     if (assignment.kind === "install") {
-      if (assignment.connectorType === "registry-mcp") {
+      if (assignment.connectorType?.startsWith("google-")) {
+        await this.api.execute("postConnectorStatus", {
+          agentId: this.agentId,
+          connectorId: assignment.connectorId,
+          steps: [{
+            label: "Connect app",
+            status: "failed",
+            reason: "Reconnect through Connect an app"
+          }],
+          errorMessage: "Reconnect through Connect an app",
+          ...pairingGeneration !== void 0 ? { pairingGeneration } : {}
+        });
+      } else if (assignment.connectorType === "registry-mcp") {
         await this.runRegistryMcpInstall(assignment);
       } else if (assignment.connectorType === "tailscale") {
         await this.runTailscaleInstall(assignment.connectorId, pairingGeneration);
@@ -29538,9 +29219,7 @@ var ConnectorAssignmentLoop = class {
     } else if (assignment.kind === "sync") {
       await this.runSync();
     } else if (assignment.kind === "refresh-google-grant") {
-      const grant = await this.resolveGoogleCredentials(assignment.connectorId);
-      if ("credentials" in grant)
-        persistManualGoogleCredentials(this.googleHome(), grant.credentials);
+      this.log("retired Google grant assignment ignored; reconnect through Connect an app");
     } else if (assignment.kind === "revoke-grants")
       await this.runRevoke(assignment.connectorId, assignment.reference);
   }
@@ -29655,49 +29334,6 @@ var ConnectorAssignmentLoop = class {
           this.wake();
       });
   }
-  /** Google tool connectors keep their manual credentials next to the runtime. */
-  googleHome() {
-    return this.googleHomeDir;
-  }
-  /** Install one Google tool connector (Gmail/Calendar/Drive/YouTube),
-   * riding the drain's shared grant resolution. */
-  async runGoogleInstall(connectorId, connectorType, sharedCredentials, pairingGeneration) {
-    const generation = pairingGeneration !== void 0 ? { pairingGeneration } : {};
-    const report = async (steps2) => {
-      try {
-        await this.api.execute("postConnectorStatus", {
-          agentId: this.agentId,
-          connectorId,
-          steps: steps2,
-          ...generation
-        });
-      } catch (error) {
-        this.log(`step report failed: ${describe(error)}`);
-      }
-    };
-    const result = await this.installGoogle(connectorType, report, sharedCredentials);
-    if (result.status === "installing")
-      return;
-    if (result.status === "error") {
-      if (isAdaptedYoutube(connectorType)) {
-        clearYoutubeGrant(this.googleHome(), (message) => this.log(message));
-      }
-      await this.api.execute("postConnectorStatus", {
-        agentId: this.agentId,
-        connectorId,
-        steps: result.steps,
-        errorMessage: result.errorMessage,
-        ...generation
-      });
-      return;
-    }
-    await this.api.execute("installConnector", {
-      agentId: this.agentId,
-      connectorId,
-      ...result.signedInAs ? { signedInAs: result.signedInAs } : {},
-      ...generation
-    });
-  }
   /** Install Trusty Squire, reporting every step as it settles. */
   async runInstall(connectorId, pairingGeneration) {
     const generation = pairingGeneration !== void 0 ? { pairingGeneration } : {};
@@ -29795,7 +29431,7 @@ var ConnectorAssignmentLoop = class {
     const status = await this.connectorRow(connectorId);
     if (!status)
       return false;
-    return status.steps.length > 0 && status.steps.every((step4) => step4.status === "pending");
+    return status.steps.length > 0 && status.steps.every((step3) => step3.status === "pending");
   }
   /** One vault report covers every live trusty-squire connector on this helper. */
   async runSync() {
@@ -30585,7 +30221,7 @@ var InstitutionalMemoryShadowWorker = class {
           leaseToken: job.leaseToken,
           error: errorText(error),
           retryable: true
-        }).catch((failure2) => this.log(`shadow failure report failed: ${errorText(failure2)}`));
+        }).catch((failure) => this.log(`shadow failure report failed: ${errorText(failure)}`));
       }
       return false;
     } finally {
@@ -30600,7 +30236,7 @@ var InstitutionalMemoryShadowWorker = class {
 
 // apps/body/dist/daemon-api-client.js
 import { resolve as resolve13 } from "node:path";
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 
 // node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -30622,10 +30258,10 @@ function helperVersionHeader(value) {
 }
 
 // apps/body/dist/host-read-budget.js
-import { createHash as createHash5, randomUUID as randomUUID4 } from "node:crypto";
+import { createHash as createHash5, randomUUID as randomUUID5 } from "node:crypto";
 import { mkdir as mkdir7, open as open3, readFile as readFile10, readdir as readdir3, stat as stat5, unlink as unlink4, writeFile as writeFile7 } from "node:fs/promises";
 import { tmpdir as tmpdir4 } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 var READ_SLOTS = 6;
 var BACKGROUND_SLOTS = 4;
 var MAX_WAITERS = 256;
@@ -30656,15 +30292,15 @@ var HostReadBudget = class {
     const uid = process.getuid?.() ?? "unknown";
     const origin = new URL(baseUrl).origin;
     const key = createHash5("sha256").update(origin).digest("hex").slice(0, 16);
-    this.directory = join8(root, `beeline-read-budget-${uid}-${key}`);
+    this.directory = join7(root, `beeline-read-budget-${uid}-${key}`);
   }
   metrics() {
     return { waiting: this.waiting, active: this.active, totalWaitMs: this.totalWaitMs };
   }
   async acquire(priority, deadlineAt) {
     await mkdir7(this.directory, { recursive: true, mode: 448 });
-    const ticket = `wait-${priority === "urgent" ? "0" : "1"}-${String(Date.now()).padStart(13, "0")}-${randomUUID4()}`;
-    const ticketPath = join8(this.directory, ticket);
+    const ticket = `wait-${priority === "urgent" ? "0" : "1"}-${String(Date.now()).padStart(13, "0")}-${randomUUID5()}`;
+    const ticketPath = join7(this.directory, ticket);
     const tickets = (await readdir3(this.directory)).filter((name) => name.startsWith("wait-"));
     if (tickets.length >= MAX_WAITERS)
       throw new ReadBudgetFullError();
@@ -30676,14 +30312,14 @@ var HostReadBudget = class {
         const queue = (await readdir3(this.directory)).filter((name) => name.startsWith("wait-")).sort();
         for (const name of queue.slice(0, READ_SLOTS)) {
           if (name !== ticket)
-            await this.reapStaleTicket(join8(this.directory, name));
+            await this.reapStaleTicket(join7(this.directory, name));
         }
         const liveQueue = (await readdir3(this.directory)).filter((name) => name.startsWith("wait-")).sort();
         const rank = liveQueue.indexOf(ticket);
         const available = priority === "urgent" ? READ_SLOTS : BACKGROUND_SLOTS;
         if (rank >= 0 && rank < available) {
           for (let slot = 0; slot < available; slot += 1) {
-            const slotPath = join8(this.directory, `slot-${slot}`);
+            const slotPath = join7(this.directory, `slot-${slot}`);
             try {
               const handle2 = await open3(slotPath, "wx", 384);
               try {
@@ -30754,7 +30390,7 @@ var HostReadBudget = class {
     await unlink4(path).catch(() => void 0);
   }
   async takeRateToken(deadlineAt) {
-    const lock = join8(this.directory, "rate.lock");
+    const lock = join7(this.directory, "rate.lock");
     let handle2;
     try {
       handle2 = await open3(lock, "wx", 384);
@@ -30765,7 +30401,7 @@ var HostReadBudget = class {
       return false;
     }
     try {
-      const path = join8(this.directory, "next-admission");
+      const path = join7(this.directory, "next-admission");
       const next = Number(await readFile10(path, "utf8").catch(() => "0")) || 0;
       const now2 = Date.now();
       if (next > now2 || now2 >= deadlineAt)
@@ -30842,7 +30478,7 @@ var DaemonApiClient = class {
   agentId;
   fetchImpl;
   webSocketFactory;
-  presenceLifecycleId = randomUUID5();
+  presenceLifecycleId = randomUUID6();
   liveSocket;
   liveReconnect;
   liveReconnectDelayMs = 1e3;
@@ -31288,10 +30924,10 @@ async function activateDaemonTransport(path, fetchImpl = fetch) {
 
 // apps/body/dist/room-runtime.js
 import { execFile as execFile12 } from "node:child_process";
-import { createHash as createHash11 } from "node:crypto";
-import { existsSync as existsSync8, mkdirSync as mkdirSync4 } from "node:fs";
-import { mkdir as mkdir20, readdir as readdir8, realpath as realpath2, rm as rm9 } from "node:fs/promises";
-import { dirname as dirname19, relative as relative3, resolve as resolve29, sep as sep2 } from "node:path";
+import { createHash as createHash10 } from "node:crypto";
+import { existsSync as existsSync8, mkdirSync as mkdirSync3 } from "node:fs";
+import { cp, mkdir as mkdir20, readdir as readdir8, realpath as realpath2, rm as rm9 } from "node:fs/promises";
+import { dirname as dirname18, relative as relative3, resolve as resolve29, sep as sep2 } from "node:path";
 import { promisify as promisify8 } from "node:util";
 
 // apps/body/dist/grant-runner.js
@@ -31299,7 +30935,7 @@ import { execFile as execFile8 } from "node:child_process";
 import { createHash as createHash6, randomBytes as randomBytes7 } from "node:crypto";
 import { readFile as readFile12 } from "node:fs/promises";
 import { createServer as createServer3 } from "node:http";
-import { dirname as dirname12, resolve as resolve16 } from "node:path";
+import { dirname as dirname11, resolve as resolve16 } from "node:path";
 
 // packages/api-contract/dist/agent-grants.js
 var AGENT_GRANT_KINDS = [
@@ -31546,7 +31182,7 @@ function surfaceAllows(surface, capability) {
 init_agent_command();
 init_cursor_acp_bridge();
 import { execFile as execFile7, spawnSync } from "node:child_process";
-import { lstatSync as lstatSync3, readFileSync as readFileSync5, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { lstatSync as lstatSync2, readFileSync as readFileSync5, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir11 } from "node:os";
 import { isAbsolute as isAbsolute2, relative, resolve as resolve14 } from "node:path";
 var DEFAULT_SANDBOX_POLICY = "bwrap";
@@ -31607,7 +31243,7 @@ var KNOWN_CREDENTIAL_MASK_PATHS = [
 ];
 function credentialMaskPaths(extraPaths, home = homedir11(), stat8 = (path) => {
   try {
-    const info = lstatSync3(path);
+    const info = lstatSync2(path);
     return { isDirectory: info.isDirectory() };
   } catch {
     return void 0;
@@ -31825,7 +31461,7 @@ function recordInstallFailure(stateDir, at) {
   if (!stateDir)
     return;
   try {
-    writeFileSync3(installFailureMarker(stateDir), `${at}
+    writeFileSync2(installFailureMarker(stateDir), `${at}
 `, "utf8");
   } catch {
   }
@@ -31950,7 +31586,7 @@ async function ensureBwrapSandbox(options = {}) {
 // apps/body/dist/provider-key-store.js
 import { chmod as chmod4, mkdir as mkdir8, readFile as readFile11, writeFile as writeFile8 } from "node:fs/promises";
 import { homedir as homedir12 } from "node:os";
-import { dirname as dirname11, resolve as resolve15 } from "node:path";
+import { dirname as dirname10, resolve as resolve15 } from "node:path";
 var PROVIDER_KEY_ENV_VARS = {
   openrouter: "OPENROUTER_API_KEY",
   openai: "OPENAI_API_KEY",
@@ -31984,7 +31620,7 @@ async function readSavedProviderKey(provider, env = process.env) {
 async function saveProviderKey(provider, key, env = process.env) {
   const path = providerKeyStorePath(env);
   const store = { ...await readProviderKeyStore(env), [provider]: key };
-  await mkdir8(dirname11(path), { recursive: true, mode: 448 });
+  await mkdir8(dirname10(path), { recursive: true, mode: 448 });
   await writeFile8(path, `${JSON.stringify(store, null, 2)}
 `, { mode: 384 });
   await chmod4(path, 384);
@@ -32022,7 +31658,7 @@ function operatorSecretResolver(env = process.env) {
       if (saved)
         return saved;
     }
-    const raw = await readFile12(resolve16(dirname12(providerKeyStorePath(env)), "secrets.json"), "utf8").catch(() => void 0);
+    const raw = await readFile12(resolve16(dirname11(providerKeyStorePath(env)), "secrets.json"), "utf8").catch(() => void 0);
     if (!raw)
       return void 0;
     try {
@@ -32152,13 +31788,13 @@ var GrantCommandRunner = class {
         encoding: "utf8"
       }, (error, stdout6, stderr) => {
         const combined = [stdout6, stderr].filter(Boolean).join(stderr && stdout6 ? "\n" : "");
-        const failure2 = error;
-        const spawnFailure = Boolean(failure2 && typeof failure2.code === "string");
+        const failure = error;
+        const spawnFailure = Boolean(failure && typeof failure.code === "string");
         resolveRun({
-          exitCode: spawnFailure ? null : child.exitCode ?? (typeof failure2?.code === "number" ? failure2.code : 0),
-          ...failure2?.signal ? { signal: failure2.signal } : {},
-          timedOut: Boolean(failure2?.killed && failure2?.signal === "SIGKILL"),
-          output: spawnFailure ? `${combined}${combined ? "\n" : ""}${failure2.message}` : combined
+          exitCode: spawnFailure ? null : child.exitCode ?? (typeof failure?.code === "number" ? failure.code : 0),
+          ...failure?.signal ? { signal: failure.signal } : {},
+          timedOut: Boolean(failure?.killed && failure?.signal === "SIGKILL"),
+          output: spawnFailure ? `${combined}${combined ? "\n" : ""}${failure.message}` : combined
         });
       });
     });
@@ -32294,16 +31930,16 @@ var GrantRunnerServer = class {
     await new Promise((resolveClose) => server.close(() => resolveClose()));
   }
   async handle(request, response, token) {
-    const send2 = (status, body) => {
+    const send = (status, body) => {
       response.writeHead(status, { "content-type": "application/json" });
       response.end(JSON.stringify(body));
     };
     if (request.headers.authorization !== `Bearer ${token}`) {
-      send2(401, { error: "grant runner token required" });
+      send(401, { error: "grant runner token required" });
       return;
     }
     if (request.method !== "POST" || request.url !== "/run") {
-      send2(404, { error: "not found" });
+      send(404, { error: "not found" });
       return;
     }
     const chunks = [];
@@ -32311,9 +31947,9 @@ var GrantRunnerServer = class {
       chunks.push(chunk);
     try {
       const body = JSON.parse(Buffer.concat(chunks).toString("utf8"));
-      send2(200, await this.runner.run({ roomId: body.roomId, argv: body.argv }));
+      send(200, await this.runner.run({ roomId: body.roomId, argv: body.argv }));
     } catch (error) {
-      send2(400, { error: error instanceof Error ? error.message : String(error) });
+      send(400, { error: error instanceof Error ? error.message : String(error) });
     }
   }
 };
@@ -32324,11 +31960,6 @@ function toolName(call) {
   const match = raw.match(/(?:^|__|\b)(use_credential|fetch_credential|grant_app_access|revoke_app_access)\b/);
   return match?.[1] ?? "";
 }
-function youtubeToolName(call) {
-  const raw = `${call.title ?? ""} ${call.kind ?? ""}`;
-  const match = raw.match(/(?:^|__|\.|\/)(youtube_[a-z0-9_]+)\b/);
-  return match?.[1] ?? "";
-}
 var SQUIRE_EVENT_CLASS = {
   fetch_credential: "approval",
   // the credential was read in clear
@@ -32415,23 +32046,9 @@ var ConnectorUsageRecorder = class {
     }
   }
 };
-function youtubeUsageFromToolCall(call) {
-  const tool = youtubeToolName(call);
-  if (!tool.startsWith("youtube_"))
-    return void 0;
-  const result = record4(call.content ?? call.rawOutput);
-  const resultPayload = record4(result.content ?? result);
-  return {
-    ref: "google-youtube",
-    service: "youtube",
-    operation: tool.slice(0, 300),
-    statusCode: typeof resultPayload.status === "number" ? resultPayload.status : /failed|error|denied/i.test(call.status ?? "") ? 0 : 200,
-    bytes: serializedSize(resultPayload)
-  };
-}
 function captureConnectionUsage(recorder, turn, calls) {
   for (const call of calls) {
-    const usage2 = squireUsageFromToolCall(call) ?? youtubeUsageFromToolCall(call);
+    const usage2 = squireUsageFromToolCall(call);
     if (usage2)
       recorder.record(turn, usage2);
   }
@@ -32610,20 +32227,20 @@ async function readHarnessTurnUsage(input) {
 }
 
 // apps/body/dist/server-command-intake.js
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID7 } from "node:crypto";
 import { mkdir as mkdir9, writeFile as writeFile9 } from "node:fs/promises";
 import { tmpdir as tmpdir5 } from "node:os";
-import { dirname as dirname13, join as join9 } from "node:path";
+import { dirname as dirname12, join as join8 } from "node:path";
 var CommandExecutionContext = class {
-  generationId = randomUUID6();
+  generationId = randomUUID7();
   path;
   current;
   constructor(root) {
-    this.path = join9(root ?? tmpdir5(), `beeline-command-${this.generationId}.json`);
+    this.path = join8(root ?? tmpdir5(), `beeline-command-${this.generationId}.json`);
   }
   async enter(command) {
     this.current = command;
-    await mkdir9(dirname13(this.path), { recursive: true });
+    await mkdir9(dirname12(this.path), { recursive: true });
     await writeFile9(this.path, JSON.stringify({
       roomId: command.roomId,
       requestId: command.turnRequestId,
@@ -32788,10 +32405,10 @@ async function runServerCommandIntake(options) {
 
 // apps/body/dist/monolith-corner-turn.js
 import { execFile as execFile11 } from "node:child_process";
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 import { mkdir as mkdir18, readFile as readFile19, writeFile as writeFile14 } from "node:fs/promises";
 import { homedir as homedir14, hostname } from "node:os";
-import { dirname as dirname17, join as join14, resolve as resolve28 } from "node:path";
+import { dirname as dirname16, join as join13, resolve as resolve28 } from "node:path";
 import { promisify as promisify7 } from "node:util";
 
 // apps/body/dist/agent-home.js
@@ -33593,10 +33210,10 @@ function stringify(obj, { maxDepth = 1e3, numbersAsFloat = false } = {}) {
 }
 
 // apps/body/dist/agent-home.js
-import { createHash as createHash7, randomUUID as randomUUID7 } from "node:crypto";
+import { createHash as createHash7, randomUUID as randomUUID8 } from "node:crypto";
 import { chmod as chmod5, copyFile, lstat as lstat3, mkdir as mkdir11, readFile as readFile16, readlink, readdir as readdir5, realpath, rename as rename5, rm as rm6, symlink as symlink2, unlink as unlink5, writeFile as writeFile11 } from "node:fs/promises";
 import { homedir as homedir13 } from "node:os";
-import { basename as basename4, dirname as dirname14, join as join11, relative as relative2, resolve as resolve21, sep } from "node:path";
+import { basename as basename4, dirname as dirname13, join as join10, relative as relative2, resolve as resolve21, sep } from "node:path";
 
 // apps/body/dist/draw-avatar-skill.js
 var DRAW_AVATAR_SKILL_NAME = "draw-avatar";
@@ -33768,11 +33385,9 @@ Follow your own owner first, then this Workspace's owner and admins, then member
 
 A **tool** is something you can use once a human adds it; a **key** is the credential that tool holds for that human. You spend a key through the mounted connector and never see the credential itself.
 
-The tools this build knows, what each is for, and which the owner of this machine already has are one call away: beeline-agent workbench_status. That read is the Workbench of the machine and owner you actually run on, not the person who asked. Trusty Squire is vaulted credentials plus a browser that signs up and signs in for you; the Google tools (Gmail, Calendar, Drive, YouTube) work through the person's own Google sign-in \u2014 the same Workbench overlay, never a second Google window. YouTube Analytics answers only the channel owner account, not a manager. Tailscale installs its CLI on the selected helper and opens Tailscale's own browser sign-in; once connected, use the CLI for tailnet resources and tailscale file cp or tailscale file get for Taildrop. The wallet is created only from the Workbench page.
+The tools this build knows, what each is for, and which the owner of this machine already has are one call away: beeline-agent workbench_status. That read is the Workbench of the machine and owner you actually run on, not the person who asked. Connected apps are listed once per app with a stable ID. Their sign-in and credentials stay with the server. Trusty Squire is vaulted credentials plus a browser for the separate key and browser routes. Tailscale installs its CLI on the selected helper and opens Tailscale's own browser sign-in; once connected, use the CLI for tailnet resources and tailscale file cp or tailscale file get for Taildrop. The wallet is created only from the Workbench page. When you cannot reach a tool, say: I can't reach X on this machine because Y; to fix it, Z. Give one explanation, then take or offer Z.
 
-When you cannot use a tool or reach something on this machine, say it in one sentence: I can't reach X on this machine because Y; to fix it, Z. Give one explanation, then take or offer Z.
-
-**Offer the tool at the moment you need it.** When the work in front of you needs a tool the person does not have, do not send them to a settings page and do not stop at naming it. Call workbench_status first - a tool they already have is used, not offered. Then call offer_connector with the connectorType and one short reason: a card appears in this Room, spoken by you, addressed to the person you are answering, with one action. Only that person or a Workspace admin can accept it; accepting adds the tool on your machine, and the sign-in or keys stay theirs. Your turn pauses on the card - say in prose what you are waiting for and end the turn; you are woken when it is added, and then you carry on.
+**Offer the tool at the moment you need it.** When the work in front of you needs a tool the person does not have, do not send them to a settings page and do not stop at naming it. Call workbench_status first - a tool they already have is used, not offered. Then call offer_connector with the connectorType and one short reason: a card appears in this Room, spoken by you, addressed to the person you are answering, with one action. Your turn pauses on the card - say in prose what you are waiting for and end the turn; you are woken when it is added, and then you carry on.
 
 **Research before you offer, and say so.** Never offer a tool you cannot describe. If someone asks you to install or add something you do not already know - by name, by purpose, or by what it will hold - say plainly that you are looking it up first, find out what it is and what it does with credentials, and state what you learned in your reply BEFORE the card appears. A person reading "Add X?" must already have read, in your own words, what X is. Refusing to act blind is part of being trusted with keys.
 
@@ -33782,13 +33397,9 @@ Keys belong to the human who provisioned them. Your owner's keys serve whoever a
 
 ## Connect an app
 
-When a request needs an app or service you cannot reach with a mounted tool, there is ONE way in: beeline-agent \`connect_app\` with the app's name or website and one short reason. You do not choose the route and you do not search for servers yourself. The server resolves it in a fixed order and records the choice: an app already connected in this owner's Workbench is reused; otherwise the app's official hosted MCP server is connected; otherwise Trusty Squire signs up or signs in, vaults an API key, and you call the app's API through Squire; only when Squire establishes that the app has no API is it served through Squire's browser.
+When a request needs an app or service, call beeline-agent \`workbench_status\` first. For a connected app, use its ID with \`list_app_tools\`, then call \`execute_app_tool\` with the selected tool slug and arguments. The server executes against that person\u2019s account and decides permission on every call. An empty tool list or \`needs_connection\` means the account must be reconnected; \`needs_permission\` means wait for the connected person's decision. Do not switch paths after denial or provider unavailability. No app token, provider key, or sign-in URL belongs in chat or a model prompt.
 
-1. Call \`workbench_status\` first; an app listed there as connected is used, not connected again.
-2. Call \`connect_app\` and do exactly what its \`next\` says. Repeating the call is safe and is how you report a finished step.
-3. Trusty Squire handles every sign-in, sign-up and payment, on every route - including an MCP server's OAuth page (\`authorizationUrl\`: \`operate_start\`, \`operate_login\`, \`operate_observe\`, \`operate_finish\`). Any passkey or vouch step goes to the owner through Squire. Never paste a sign-in link or a key into chat. If Squire is not connected, offer it with \`offer_connector\` (trusty-squire) and call \`connect_app\` again once it is added.
-4. On the API route, store the key with Squire's \`store_credential\` under the service the result names, call \`connect_app\` again, then call the API with \`use_credential\`. Pass \`noApi: true\` only when you established that the app offers no API at all.
-5. Every use of the app, whichever route serves it, is authorized as \`app:<key>\` and recorded once. A refusal or a pending approval is final for that call: wait for the owner's decision, and never try another route to get around it.
+For an app that is not connected, call \`connect_app\` with its name, one short reason, and a request-specific \`continuation\`: one sentence stating what you will do right after sign-in. Do not include a link, credential, account identifier, or private data in that sentence. The server chooses the route and returns \`next\`. A managed OAuth app presents a sign-in card to its owner; end the turn and wait for the connection wake. If the provider reports managed OAuth unsupported, follow the server's Squire route and its instructions. A provider outage is unavailable, not permission to change routes. After the person connects, read Workbench again and use the app ID. Trusty Squire handles the separate API key and browser routes; never ask for a raw key in chat. Every use is authorized as \`app:<key>\` and recorded once.
 
 ## Showing a mock
 
@@ -34065,7 +33676,7 @@ var SQUIRE_GOVERNED_TOOLS = [
 var SQUIRE_GOVERNED_TOOL_SET = new Set(SQUIRE_GOVERNED_TOOLS);
 
 // apps/body/dist/host-mcp-route.js
-import { join as join10, resolve as resolve19 } from "node:path";
+import { join as join9, resolve as resolve19 } from "node:path";
 var import_yaml = __toESM(require_dist(), 1);
 init_squire_host();
 function grantedMcpServerNames(grants) {
@@ -34120,7 +33731,7 @@ function grantedSquireHostRouteNames(granted, declarations = {}) {
   });
 }
 function hostRouteEnv(hostHome) {
-  return { XDG_CONFIG_HOME: join10(resolve19(hostHome), ".config") };
+  return { XDG_CONFIG_HOME: join9(resolve19(hostHome), ".config") };
 }
 function rewriteHostMcpDeclaration(name, declaration, hostHome, resourceAuthFile, squireScope) {
   const next = { ...declaration };
@@ -34143,10 +33754,6 @@ function rewriteHostMcpDeclaration(name, declaration, hostHome, resourceAuthFile
     next.envs = { ...recordValue(declaration.envs), ...routeEnv };
   else
     next.env = { ...recordValue(declaration.env), ...routeEnv };
-  if (launch) {
-    delete next.env?.TRUSTY_SQUIRE_AGENT_IDENTITY;
-    delete next.envs?.TRUSTY_SQUIRE_AGENT_IDENTITY;
-  }
   if (resourceAuthFile) {
     const target = explicitResourceTarget ?? (isSquireDeclaration(name, declaration) ? "squire" : name);
     const env = {
@@ -34520,7 +34127,7 @@ async function resolveUptimeRouting(input) {
   if (cached?.input !== void 0 && now2() - cached.fetchedAt < OPENROUTER_ROUTING_CACHE_TTL_MS) {
     return decision(input.model, cached.providers, cached.bar, "cache", void 0, true, cached.input ?? void 0);
   }
-  let failure2;
+  let failure;
   try {
     const doFetch = input.fetchImpl ?? fetch;
     const response = await doFetch(`${OPENROUTER_ENDPOINTS_BASE_URL}/${input.model}/endpoints`, {
@@ -34546,12 +34153,12 @@ async function resolveUptimeRouting(input) {
     }).catch(() => void 0);
     return decision(input.model, selected.providers, selected.bar, "live", void 0, true, modelInput);
   } catch (error) {
-    failure2 = error instanceof Error ? error.message : String(error);
+    failure = error instanceof Error ? error.message : String(error);
   }
   if (cached) {
-    return decision(input.model, cached.providers, cached.bar, "stale-cache", `api unreachable: ${failure2}`, true, cached.input ?? void 0);
+    return decision(input.model, cached.providers, cached.bar, "stale-cache", `api unreachable: ${failure}`, true, cached.input ?? void 0);
   }
-  return decision(input.model, OPENROUTER_FALLBACK_PROVIDERS, null, "fallback", `api unreachable: ${failure2}`);
+  return decision(input.model, OPENROUTER_FALLBACK_PROVIDERS, null, "fallback", `api unreachable: ${failure}`);
 }
 var inFlightProbes = /* @__PURE__ */ new Map();
 function answeringProviders(probe, candidates) {
@@ -34927,7 +34534,7 @@ async function repairRoomAgentCredentialLinks(input) {
     if (!existsSync7(source))
       continue;
     const target = resolve21(root, credential.dir, credential.target);
-    await mkdir11(dirname14(target), { recursive: true, mode: 448 });
+    await mkdir11(dirname13(target), { recursive: true, mode: 448 });
     const stats = await lstat3(target).catch((error) => {
       if (isMissingPathError(error))
         return void 0;
@@ -34935,11 +34542,11 @@ async function repairRoomAgentCredentialLinks(input) {
     });
     if (stats?.isSymbolicLink()) {
       const linked = await readlink(target);
-      if (resolve21(dirname14(target), linked) === source)
+      if (resolve21(dirname13(target), linked) === source)
         continue;
     }
     if (stats) {
-      const quarantine = `${target}.beeline-quarantine-${Date.now()}-${randomUUID7()}`;
+      const quarantine = `${target}.beeline-quarantine-${Date.now()}-${randomUUID8()}`;
       await rename5(target, quarantine);
     }
     await symlink2(source, target);
@@ -35392,12 +34999,12 @@ function readJsonObject(path) {
   }
 }
 async function provisionManagedSkillsDir(target, managedSkills, sharedSkills, optionalShares) {
-  const parent = dirname14(target);
-  await assertRealContainedDirectory(parent, dirname14(parent));
+  const parent = dirname13(target);
+  await assertRealContainedDirectory(parent, dirname13(parent));
   const plan = await planManagedSkills(managedSkills, sharedSkills, optionalShares);
   if (await materializedSkillManifest(target) === plan.manifest)
     return;
-  const staged = resolve21(parent, `.skills.${process.pid}.${randomUUID7()}.tmp`);
+  const staged = resolve21(parent, `.skills.${process.pid}.${randomUUID8()}.tmp`);
   await mkdir11(staged, { mode: 448 });
   try {
     for (const entry of plan.entries) {
@@ -35433,8 +35040,8 @@ async function planManagedSkills(managedSkills, sharedSkills, optionalShares) {
     try {
       const tree = [];
       await walkSafeSkillTree(shared.source, shared.source, {
-        directory: async (rel) => void tree.push(`d ${join11(shared.name, rel)}`),
-        file: async (rel, realPath) => void tree.push(`f ${join11(shared.name, rel)} ${sha2563(await readFile16(realPath))}`)
+        directory: async (rel) => void tree.push(`d ${join10(shared.name, rel)}`),
+        file: async (rel, realPath) => void tree.push(`f ${join10(shared.name, rel)} ${sha2563(await readFile16(realPath))}`)
       });
       entries.push({ kind: "shared", name: shared.name, source: shared.source });
       lines.push(...tree);
@@ -35454,7 +35061,7 @@ async function materializedSkillManifest(target) {
   const visit = async (directory, prefix) => {
     for (const entry of await readdir5(directory)) {
       const path = resolve21(directory, entry);
-      const rel = prefix ? join11(prefix, entry) : entry;
+      const rel = prefix ? join10(prefix, entry) : entry;
       const entryStats = await lstat3(path);
       if (entryStats.isSymbolicLink())
         return false;
@@ -35622,7 +35229,7 @@ async function walkSafeSkillTree(source, sourceRoot, visitor, rel = "") {
     for (const entry of await readdir5(resolvedSource)) {
       if (entry === "." || entry === "..")
         throw new Error("invalid shared skill entry");
-      await walkSafeSkillTree(resolve21(source, entry), sourceRoot, visitor, rel ? join11(rel, entry) : entry);
+      await walkSafeSkillTree(resolve21(source, entry), sourceRoot, visitor, rel ? join10(rel, entry) : entry);
     }
     return;
   }
@@ -35644,12 +35251,12 @@ async function copySafeSkillTree(source, target, sourceRoot) {
   });
 }
 async function writeIsolatedHarnessFile(path, content) {
-  const parent = dirname14(path);
+  const parent = dirname13(path);
   const parentStats = await lstat3(parent);
   if (!parentStats.isDirectory() || parentStats.isSymbolicLink()) {
     throw new Error(`isolated harness parent is not a real directory: ${parent}`);
   }
-  const temporary = resolve21(parent, `.${basename4(path)}.${process.pid}.${randomUUID7()}.tmp`);
+  const temporary = resolve21(parent, `.${basename4(path)}.${process.pid}.${randomUUID8()}.tmp`);
   try {
     await writeFile11(temporary, content, { mode: 384, flag: "wx" });
     await chmod5(temporary, 384);
@@ -35717,7 +35324,7 @@ function agentCommandCatalogPublisher(input) {
 
 // apps/body/dist/attachment-delivery.js
 import { mkdir as mkdir12, writeFile as writeFile12 } from "node:fs/promises";
-import { basename as basename5, extname, join as join12 } from "node:path";
+import { basename as basename5, extname, join as join11 } from "node:path";
 var MAX_ATTACHMENT_BYTES = 25 * 1024 * 1024;
 var EXPIRED_REASON = "expired: these attachment bytes are past their retention window";
 var FETCH_TIMEOUT_MS = 3e4;
@@ -35776,7 +35383,7 @@ async function deliverAttachments(attachments, dir, fetchImpl = fetch) {
         return { attachment, reason: EXPIRED_REASON };
       if (!fetched.ok)
         throw new Error(`HTTP ${fetched.status}`);
-      const path = join12(dir, safeFileName(attachment, index, taken));
+      const path = join11(dir, safeFileName(attachment, index, taken));
       await writeFile12(path, fetched.bytes);
       const bytes = fetched.bytes;
       const mimeType = attachment.mimeType ?? fetched.mimeType;
@@ -36711,288 +36318,7 @@ function isMcpShapedPermissionRequest(request, hostServers = CODE_OWNED_HOST_MCP
   return /^mcp__[^_].*__[^_]/.test(title) || /^mcp\.[^.]+\.[^.]/.test(title);
 }
 
-// apps/body/dist/youtube-mcp.js
-import { createInterface as createInterface6 } from "node:readline";
-import { readFileSync as readFileSync8 } from "node:fs";
-var YOUTUBE_MCP_SERVER_NAME = "youtube";
-var YOUTUBE_MCP_SURFACE = "youtube";
-var dateProps = {
-  startDate: { type: "string", description: "YYYY-MM-DD. Defaults to 28 days ago." },
-  endDate: { type: "string", description: "YYYY-MM-DD. Defaults to today (UTC)." }
-};
-var analyticsOwnerNote = ` ${YOUTUBE_ANALYTICS_OWNER_LIMIT}`;
-var YOUTUBE_MCP_TOOLS = [
-  {
-    name: "youtube_get_channel",
-    description: "Get the signed-in channel (id, title, handle, subscribers).",
-    inputSchema: { type: "object", properties: {}, additionalProperties: false }
-  },
-  {
-    name: "youtube_list_videos",
-    description: "List videos on the signed-in channel.",
-    inputSchema: { type: "object", properties: {}, additionalProperties: false }
-  },
-  {
-    name: "youtube_get_video",
-    description: "Get one video\u2019s title, description, and view count.",
-    inputSchema: {
-      type: "object",
-      required: ["videoId"],
-      properties: { videoId: { type: "string", minLength: 1 } },
-      additionalProperties: false
-    }
-  },
-  {
-    name: "youtube_list_playlists",
-    description: "List playlists on the signed-in channel.",
-    inputSchema: { type: "object", properties: {}, additionalProperties: false }
-  },
-  {
-    name: "youtube_list_playlist_items",
-    description: "List videos in one playlist.",
-    inputSchema: {
-      type: "object",
-      required: ["playlistId"],
-      properties: { playlistId: { type: "string", minLength: 1 } },
-      additionalProperties: false
-    }
-  },
-  {
-    name: "youtube_get_transcript",
-    description: "Fetch captions for a video when a public timedtext track exists.",
-    inputSchema: {
-      type: "object",
-      required: ["videoId"],
-      properties: { videoId: { type: "string", minLength: 1 } },
-      additionalProperties: false
-    }
-  },
-  {
-    name: "youtube_analytics_overview",
-    description: `Channel views, watch time, subscribers, likes for a date range.${analyticsOwnerNote}`,
-    inputSchema: { type: "object", properties: dateProps, additionalProperties: false }
-  },
-  {
-    name: "youtube_analytics_top_videos",
-    description: `Top long-form videos by views (excludes Shorts).${analyticsOwnerNote}`,
-    inputSchema: {
-      type: "object",
-      properties: {
-        ...dateProps,
-        maxResults: { type: "integer", minimum: 1, maximum: 25 }
-      },
-      additionalProperties: false
-    }
-  },
-  {
-    name: "youtube_analytics_traffic_sources",
-    description: `How viewers found the channel (search, suggested, browse\u2026).${analyticsOwnerNote}`,
-    inputSchema: { type: "object", properties: dateProps, additionalProperties: false }
-  },
-  {
-    name: "youtube_analytics_demographics",
-    description: `Audience age-group and gender breakdown.${analyticsOwnerNote}`,
-    inputSchema: { type: "object", properties: dateProps, additionalProperties: false }
-  }
-];
-function stringArg2(args, key) {
-  const value = args[key];
-  return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-function dateArgs(args) {
-  const startDate = stringArg2(args, "startDate");
-  const endDate = stringArg2(args, "endDate");
-  if (startDate && endDate)
-    return { startDate, endDate };
-  return defaultAnalyticsDateRange();
-}
-function youtubeClientFromToken(accessToken) {
-  return googleWorkspaceClient(credentialsTokenSource({ accessToken }));
-}
-async function callYoutubeTool(name, args, client) {
-  try {
-    return JSON.stringify(await invokeYoutubeTool(name, args, client));
-  } catch (error) {
-    if (error instanceof GoogleApiError && error.status === 403 && name.startsWith("youtube_analytics_")) {
-      throw new Error(YOUTUBE_ANALYTICS_OWNER_LIMIT);
-    }
-    throw error;
-  }
-}
-async function invokeYoutubeTool(name, args, client) {
-  switch (name) {
-    case "youtube_get_channel":
-      return client.youtube.getChannel(true);
-    case "youtube_list_videos":
-      return client.youtube.listVideos();
-    case "youtube_get_video": {
-      const videoId = stringArg2(args, "videoId");
-      if (!videoId)
-        throw new Error("videoId is required");
-      return client.youtube.getVideo(videoId);
-    }
-    case "youtube_list_playlists":
-      return client.youtube.listPlaylists(true);
-    case "youtube_list_playlist_items": {
-      const playlistId = stringArg2(args, "playlistId");
-      if (!playlistId)
-        throw new Error("playlistId is required");
-      return client.youtube.listPlaylistItems(playlistId);
-    }
-    case "youtube_get_transcript": {
-      const videoId = stringArg2(args, "videoId");
-      if (!videoId)
-        throw new Error("videoId is required");
-      return client.youtube.getTranscript(videoId);
-    }
-    case "youtube_analytics_overview":
-      return client.youtube.analyticsQuery({
-        metrics: "views,estimatedMinutesWatched,averageViewDuration,subscribersGained,subscribersLost,likes,comments,shares",
-        ...dateArgs(args)
-      });
-    case "youtube_analytics_top_videos":
-      return client.youtube.analyticsQuery({
-        metrics: "views,estimatedMinutesWatched,averageViewDuration,likes,comments,shares",
-        dimensions: "video",
-        filters: "creatorContentType==video_on_demand",
-        sort: "-views",
-        maxResults: typeof args.maxResults === "number" ? args.maxResults : 20,
-        ...dateArgs(args)
-      });
-    case "youtube_analytics_traffic_sources":
-      return client.youtube.analyticsQuery({
-        metrics: "views,estimatedMinutesWatched",
-        dimensions: "insightTrafficSourceType",
-        sort: "-views",
-        ...dateArgs(args)
-      });
-    case "youtube_analytics_demographics":
-      return client.youtube.analyticsQuery({
-        metrics: "viewerPercentage",
-        dimensions: "ageGroup,gender",
-        sort: "-viewerPercentage",
-        ...dateArgs(args)
-      });
-    default:
-      throw new Error(`unknown YouTube tool: ${name}`);
-  }
-}
-function youtubeAccessToken(env = process.env) {
-  let token = env.BEELINE_YOUTUBE_ACCESS_TOKEN?.trim();
-  const path = env.BEELINE_GOOGLE_CREDENTIALS_PATH;
-  if (path) {
-    try {
-      const stored = JSON.parse(readFileSync8(path, "utf8"));
-      token = stored.accessToken?.trim();
-    } catch {
-      token = void 0;
-    }
-  }
-  if (!token) {
-    throw new Error("YouTube is not signed in on this helper. Connect Google Workspace from the Workbench \u2014 the same in-app sign-in, not a second overlay.");
-  }
-  return token;
-}
-function asObject(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-function send(message) {
-  process.stdout.write(`${JSON.stringify(message)}
-`);
-}
-function success(id, result) {
-  send({ jsonrpc: "2.0", id: id ?? null, result });
-}
-function failure(id, code, message) {
-  send({ jsonrpc: "2.0", id: id ?? null, error: { code, message } });
-}
-async function handleYoutubeMcpLine(line, clientFactory = () => youtubeClientFromToken(youtubeAccessToken())) {
-  let request;
-  try {
-    request = JSON.parse(line);
-  } catch {
-    failure(null, -32700, "invalid JSON");
-    return;
-  }
-  if (request.id === void 0)
-    return;
-  try {
-    if (request.method === "initialize") {
-      const params = asObject(request.params);
-      success(request.id, {
-        protocolVersion: typeof params.protocolVersion === "string" ? params.protocolVersion : "2024-11-05",
-        capabilities: { tools: {} },
-        serverInfo: { name: YOUTUBE_MCP_SERVER_NAME, version: "1.0.0" }
-      });
-      return;
-    }
-    if (request.method === "ping") {
-      success(request.id, {});
-      return;
-    }
-    if (request.method === "tools/list") {
-      success(request.id, { tools: YOUTUBE_MCP_TOOLS });
-      return;
-    }
-    if (request.method === "tools/call") {
-      const params = asObject(request.params);
-      if (typeof params.name !== "string")
-        throw new Error("tool name must be a string");
-      try {
-        const output = await callYoutubeTool(params.name, asObject(params.arguments), clientFactory());
-        success(request.id, { content: [{ type: "text", text: output }] });
-      } catch (error) {
-        success(request.id, {
-          content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }],
-          isError: true
-        });
-      }
-      return;
-    }
-    failure(request.id, -32601, `method not found: ${request.method ?? ""}`);
-  } catch (error) {
-    failure(request.id, -32602, error instanceof Error ? error.message : String(error));
-  }
-}
-function listenYoutubeMcpStdio() {
-  const lines = createInterface6({ input: process.stdin, crlfDelay: Infinity });
-  lines.on("line", (line) => void handleYoutubeMcpLine(line));
-}
-if (/(?:^|\/)youtube-mcp\.(?:js|mjs|ts)$/.test(process.argv[1] ?? "")) {
-  listenYoutubeMcpStdio();
-}
-
-// apps/body/dist/google-drive-mcp.js
-var GOOGLE_DRIVE_MCP_SURFACE = "google-drive";
-var GOOGLE_DRIVE_MCP_SERVER_NAME = "google-drive";
-
 // apps/body/dist/room-session.js
-function googleDriveMcpServer(config, accessToken, resourceAuthFile) {
-  if (!accessToken || !config.readonlyMcpCommand)
-    return void 0;
-  const server = {
-    name: GOOGLE_DRIVE_MCP_SERVER_NAME,
-    command: config.readonlyMcpCommand,
-    args: [...config.readonlyMcpArgs ?? []],
-    env: [
-      { name: "BEELINE_MCP_SURFACE", value: GOOGLE_DRIVE_MCP_SURFACE },
-      { name: "BEELINE_GOOGLE_DRIVE_ACCESS_TOKEN", value: accessToken }
-    ]
-  };
-  if (!resourceAuthFile)
-    return server;
-  const route = rewriteHostMcpDeclaration(server.name, {
-    command: server.command,
-    args: server.args,
-    env: Object.fromEntries((server.env ?? []).map((entry) => [entry.name, entry.value]))
-  }, config.operatorHome ?? "", resourceAuthFile);
-  return {
-    name: server.name,
-    command: String(route.command),
-    args: route.args,
-    env: Object.entries(route.env).map(([name, value]) => ({ name, value }))
-  };
-}
 var ReadOnlyToolsUnavailableError = class extends Error {
   name = "ReadOnlyToolsUnavailableError";
 };
@@ -37049,79 +36375,18 @@ function readOnlyMcpServer(config, cwd, agentMemoryDir) {
     ]
   };
 }
-function youtubeMcpServer(config, accessToken, resourceAuthFile) {
-  if (!accessToken || !config.readonlyMcpCommand)
-    return void 0;
-  const server = {
-    name: YOUTUBE_MCP_SERVER_NAME,
-    command: config.readonlyMcpCommand,
-    args: [...config.readonlyMcpArgs ?? []],
-    env: [
-      { name: "BEELINE_MCP_SURFACE", value: YOUTUBE_MCP_SURFACE },
-      { name: "BEELINE_YOUTUBE_ACCESS_TOKEN", value: accessToken },
-      {
-        name: "BEELINE_GOOGLE_CREDENTIALS_PATH",
-        value: resolve23(process.env.BEELINE_AGENT_HOME ?? process.cwd(), "google-credentials.json")
-      }
-    ]
-  };
-  if (!resourceAuthFile)
-    return server;
-  const route = rewriteHostMcpDeclaration(server.name, {
-    command: server.command,
-    args: server.args,
-    env: Object.fromEntries((server.env ?? []).map((entry) => [entry.name, entry.value]))
-  }, config.operatorHome ?? "", resourceAuthFile);
-  return {
-    name: server.name,
-    command: String(route.command),
-    args: route.args,
-    env: Object.entries(route.env).map(([name, value]) => ({ name, value }))
-  };
-}
-
-// apps/body/dist/room-google-grant.js
-import { createHash as createHash8 } from "node:crypto";
-async function roomGoogleToolTokens(api, roomId) {
-  try {
-    let timeout;
-    const grant = await Promise.race([
-      api.execute("getRoomGoogleGrant", { roomId }),
-      new Promise((_resolve, reject) => {
-        timeout = setTimeout(() => reject(new Error("Google grant lookup timed out")), 3e3);
-      })
-    ]).finally(() => {
-      if (timeout)
-        clearTimeout(timeout);
-    });
-    if (grant.status !== "ready" || !grant.credentials)
-      return {};
-    const { accessToken, scopes } = grant.credentials;
-    const types = grant.connectedTypes ?? [];
-    const hasScopes = (type) => GOOGLE_TOOL_SCOPES[type].every((scope) => scopes.includes(scope));
-    return {
-      ...(types.includes("google-gmail") || types.includes("google-drive")) && hasScopes("google-drive") ? { drive: accessToken } : {},
-      ...types.includes("google-youtube") && hasScopes("google-youtube") ? { youtube: accessToken } : {}
-    };
-  } catch {
-    return {};
-  }
-}
-function roomGoogleToolFingerprint(tokens) {
-  return Object.entries(tokens).map(([name, token]) => `google-${name}:${createHash8("sha256").update(token).digest("hex")}`);
-}
 
 // apps/body/dist/codegraph.js
 import { execFile as execFile10 } from "node:child_process";
 import { access as access2, appendFile, mkdir as mkdir14, readFile as readFile17 } from "node:fs/promises";
-import { dirname as dirname15, isAbsolute as isAbsolute3, resolve as resolve24 } from "node:path";
+import { dirname as dirname14, isAbsolute as isAbsolute3, resolve as resolve24 } from "node:path";
 import { promisify as promisify6 } from "node:util";
 var execFileAsync6 = promisify6(execFile10);
 var CODEGRAPH_MCP_SERVER_NAME = "codegraph";
 var CODEGRAPH_INDEX_PATH = ".codegraph/codegraph.db";
 var CODEGRAPH_PREPARE_TIMEOUT_MS = 12e4;
 function codegraphIndexDirectory(cwd) {
-  return resolve24(cwd, dirname15(CODEGRAPH_INDEX_PATH));
+  return resolve24(cwd, dirname14(CODEGRAPH_INDEX_PATH));
 }
 function codegraphMcpServer(config, cwd, options) {
   if (!config.codegraphCommand)
@@ -37162,7 +36427,7 @@ async function excludeIndexFromGitStatus(cwd) {
     if (!gitPath)
       return;
     const path = isAbsolute3(gitPath) ? gitPath : resolve24(cwd, gitPath);
-    await mkdir14(dirname15(path), { recursive: true });
+    await mkdir14(dirname14(path), { recursive: true });
     const existing = await readFile17(path, "utf8").catch(() => "");
     if (existing.split("\n").includes(".codegraph/"))
       return;
@@ -37255,6 +36520,57 @@ function isAccountOrProviderRefusal(record6) {
 // apps/body/dist/monolith-corner-turn.js
 init_runtime();
 
+// apps/body/dist/transcript-budget.js
+function budgetTranscript(lines, modelContextTokens, otherPromptBytes) {
+  const context = modelContextTokens && modelContextTokens > 0 ? modelContextTokens : 32768;
+  const reserveTokens = Math.max(4096, Math.ceil(context * 0.3));
+  const available = Math.max(0, context - Math.ceil(otherPromptBytes / 2) - reserveTokens);
+  const budget = Math.max(0, Math.min(24e3, Math.floor(context * 0.25), available * 2) - 128);
+  if (!budget)
+    return [];
+  const selected = [];
+  let used = 0;
+  const rowLimit = Math.min(4096, Math.floor(budget / 2));
+  for (let index = lines.length - 1; index >= 0; index -= 1) {
+    const row = boundMessageText(lines[index], rowLimit);
+    const bytes = Buffer.byteLength(row) + 1;
+    if (used + bytes > budget)
+      break;
+    selected.push(row);
+    used += bytes;
+  }
+  selected.reverse();
+  if (selected.length < lines.length) {
+    selected.unshift(`[${lines.length - selected.length} older messages omitted from this prompt]`);
+  }
+  return selected;
+}
+function boundRoomTaskBody(body, modelContextTokens) {
+  const context = modelContextTokens && modelContextTokens > 0 ? modelContextTokens : 32768;
+  return boundMessageText(body, Math.min(8e3, Math.floor(context / 4)));
+}
+function boundMessageText(original, maxBytes) {
+  const sanitized = stripInlineData(original);
+  const clean4 = sanitized === original ? original : sanitized + fetchPointer(original, "inline content omitted");
+  return Buffer.byteLength(clean4) > maxBytes ? truncateRow(clean4, maxBytes) : clean4;
+}
+function stripInlineData(text2) {
+  return text2.replace(/data:[^\s"'<>)]*/gi, "[inline data omitted]").replace(/\b[A-Za-z0-9+/]{512,}={0,2}\b/g, (candidate) => /[A-Z]/.test(candidate) && /[a-z]/.test(candidate) && /[0-9+/]/.test(candidate) ? "[inline binary data omitted]" : candidate);
+}
+function truncateRow(row, maxBytes) {
+  const pointer = fetchPointer(row, "message truncated");
+  const contentBytes = Math.max(0, maxBytes - Buffer.byteLength(pointer));
+  let prefix = Buffer.from(row).subarray(0, contentBytes).toString("utf8");
+  prefix = prefix.replace(/\uFFFD$/, "");
+  return prefix + pointer;
+}
+function fetchPointer(row, reason) {
+  const id = /^\[message id: ([^\]\n]+)\]/.exec(row)?.[1];
+  return id ? `
+[${reason}; call get_room_message with messageId "${id}" and offset 0 for the full text]` : `
+[${reason}; read the source conversation for the full text]`;
+}
+
 // apps/body/dist/prompt-assembly.js
 var PROMPT_SURFACES = [
   "room",
@@ -37756,7 +37072,23 @@ ${task.body}`,
   }
 ];
 function assembleTurnPrompt(context) {
-  const entries = applicable(TURN_SECTIONS, context);
+  const boundedContext = ROOMS.includes(context.surface) ? {
+    ...context,
+    task: {
+      ...context.task,
+      body: boundRoomTaskBody(context.task.body, context.modelContextTokens)
+    }
+  } : context;
+  const withoutTranscript = applicable(TURN_SECTIONS, {
+    ...boundedContext,
+    transcript: void 0
+  });
+  const otherBytes = withoutTranscript.reduce((sum, entry) => sum + Buffer.byteLength(entry.text) + 2, 0);
+  const lines = budgetTranscript(boundedContext.transcript?.lines ?? [], boundedContext.modelContextTokens, otherBytes);
+  const entries = applicable(TURN_SECTIONS, {
+    ...boundedContext,
+    transcript: boundedContext.transcript ? { ...boundedContext.transcript, lines } : void 0
+  });
   return {
     text: entries.map((entry) => entry.text).join("\n\n"),
     report: entries.map(({ section, text: text2 }) => ({
@@ -38264,10 +37596,10 @@ process.exit(result.status ?? 1);
 }
 
 // apps/body/dist/warm-node-modules.js
-import { createHash as createHash9, randomUUID as randomUUID8 } from "node:crypto";
-import { constants as fsConstants2 } from "node:fs";
+import { createHash as createHash8, randomUUID as randomUUID9 } from "node:crypto";
+import { constants as fsConstants3 } from "node:fs";
 import { chmod as chmod7, copyFile as copyFile2, link, lstat as lstat4, mkdir as mkdir17, readdir as readdir7, readFile as readFile18, readlink as readlink2, rename as rename6, rm as rm8, stat as stat6, symlink as symlink3, utimes } from "node:fs/promises";
-import { dirname as dirname16, join as join13, resolve as resolve27 } from "node:path";
+import { dirname as dirname15, join as join12, resolve as resolve27 } from "node:path";
 var STORE_FORMAT = "v1";
 var STAGING_PREFIX = ".beeline-warm-";
 var STAGING_SWEEP_MS = 24 * 60 * 60 * 1e3;
@@ -38303,7 +37635,7 @@ async function readWarmPlan(worktreePath) {
   const unsafe = trees.find((tree) => !isContainedTreePath(tree));
   if (unsafe)
     return { failure: "unsafe-lockfile", detail: unsafe };
-  const key = createHash9("sha256").update(`${STORE_FORMAT}\0${process.platform}\0${process.arch}\0${process.versions.modules}\0`).update(lockfile).digest("hex").slice(0, 32);
+  const key = createHash8("sha256").update(`${STORE_FORMAT}\0${process.platform}\0${process.arch}\0${process.versions.modules}\0`).update(lockfile).digest("hex").slice(0, 32);
   return { key, trees };
 }
 function nodeModulesTreePaths(packages) {
@@ -38341,7 +37673,7 @@ async function seedWarmNodeModules(input) {
   if (storeDevice === void 0 || storeDevice !== checkoutDevice) {
     return { reason: "cross-device", key: plan.key };
   }
-  const staging = resolve27(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID8()}`);
+  const staging = resolve27(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID9()}`);
   const placed = [];
   const now2 = (input.now ?? Date.now)();
   try {
@@ -38352,7 +37684,7 @@ async function seedWarmNodeModules(input) {
     }
     for (const tree of plan.trees) {
       const target = resolve27(input.worktreePath, tree);
-      await mkdir17(dirname16(target), { recursive: true });
+      await mkdir17(dirname15(target), { recursive: true });
       await rename6(resolve27(staging, tree), target);
       placed.push(target);
     }
@@ -38387,7 +37719,7 @@ async function harvestWarmNodeModules(input) {
       detail: `${missing.length} absent, e.g. ${missing.slice(0, 3).join(", ")}`
     };
   }
-  const staging = resolve27(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID8()}`);
+  const staging = resolve27(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID9()}`);
   try {
     await mkdir17(input.storeRoot, { recursive: true, mode: 493 });
     await sweepStaleStaging(input.storeRoot, (input.now ?? Date.now)());
@@ -38413,7 +37745,7 @@ async function stagedTreeIsPublishable(worktreePath, staging, key) {
   const settled = await readWarmPlan(worktreePath);
   if (isPlanRefusal(settled) || settled.key !== key)
     return false;
-  const hidden = join13("node_modules", ".package-lock.json");
+  const hidden = join12("node_modules", ".package-lock.json");
   const [copied, current] = await Promise.all([
     readFile18(resolve27(staging, hidden)).catch(() => void 0),
     readFile18(resolve27(worktreePath, hidden)).catch(() => void 0)
@@ -38451,7 +37783,7 @@ async function missingInstalledPackages(worktreePath, treeRoot = worktreePath) {
   return missing.sort();
 }
 async function isInstalledPackage(path) {
-  return stat6(join13(path, "package.json")).then((info) => info.isFile(), () => false);
+  return stat6(join12(path, "package.json")).then((info) => info.isFile(), () => false);
 }
 var INTEGRITY_READ_CONCURRENCY = 64;
 async function mapWithLimit(values, limit, visit) {
@@ -38485,8 +37817,8 @@ function isContainedTreePath(value) {
 async function cloneTree(source, target, file, topLevel = true) {
   await mkdir17(target, { recursive: true, mode: 493 });
   for (const entry of await readdir7(source, { withFileTypes: true })) {
-    const from = join13(source, entry.name);
-    const to = join13(target, entry.name);
+    const from = join12(source, entry.name);
+    const to = join12(target, entry.name);
     if (entry.isSymbolicLink()) {
       await symlink3(await readlink2(from), to);
       continue;
@@ -38500,7 +37832,7 @@ async function cloneTree(source, target, file, topLevel = true) {
   }
 }
 var harvestFile = async (source, target) => {
-  await copyFile2(source, target, fsConstants2.COPYFILE_FICLONE);
+  await copyFile2(source, target, fsConstants3.COPYFILE_FICLONE);
   const info = await stat6(source);
   await chmod7(target, info.mode & 4095 & ~146);
 };
@@ -38516,13 +37848,13 @@ async function pruneWarmStore(storeRoot, keep) {
   const names = (await readdir7(storeRoot).catch(() => [])).filter((name) => !name.startsWith(STAGING_PREFIX));
   const entries = [];
   for (const name of names) {
-    const info = await lstat4(join13(storeRoot, name)).catch(() => void 0);
+    const info = await lstat4(join12(storeRoot, name)).catch(() => void 0);
     if (info?.isDirectory())
       entries.push({ name, usedAt: info.mtimeMs });
   }
   const dropped = entries.sort((a2, b) => b.usedAt - a2.usedAt || a2.name.localeCompare(b.name)).slice(keep);
   for (const entry of dropped) {
-    await rm8(join13(storeRoot, entry.name), { recursive: true, force: true }).catch(() => void 0);
+    await rm8(join12(storeRoot, entry.name), { recursive: true, force: true }).catch(() => void 0);
   }
   return dropped.map((entry) => entry.name);
 }
@@ -38531,7 +37863,7 @@ async function sweepStaleStaging(storeRoot, now2) {
   for (const name of entries) {
     if (!name.startsWith(STAGING_PREFIX))
       continue;
-    const path = join13(storeRoot, name);
+    const path = join12(storeRoot, name);
     const info = await lstat4(path).catch(() => void 0);
     if (!info || now2 - info.mtimeMs < STAGING_SWEEP_MS)
       continue;
@@ -38692,7 +38024,7 @@ function filePaths(value, worktreePath) {
   visit(value);
   return [...paths];
 }
-function resultStatus(call) {
+function resultStatus2(call) {
   const content = record5(call.content) ?? (typeof call.content === "string" ? (() => {
     try {
       return record5(JSON.parse(call.content));
@@ -38721,7 +38053,7 @@ function spentAuthorityOnLaneUpgrade(call) {
   return /(?:^|[._:/-])upgrade_corner_to_code$/i.test(call.title ?? "") && isCompletedToolCall(call);
 }
 function toolCallKey(call, index) {
-  return call.id ? `id-${createHash10("sha256").update(call.id).digest("hex")}` : `tool-${index}`;
+  return call.id ? `id-${createHash9("sha256").update(call.id).digest("hex")}` : `tool-${index}`;
 }
 function toolCallSettled(call) {
   if (call.resultReceived)
@@ -38753,7 +38085,7 @@ async function cornerToolActivity(call, worktreePath, requestedBy) {
     kind: "tool",
     title: title.slice(0, 240),
     operation: operation.slice(0, 80),
-    status: resultStatus(call),
+    status: resultStatus2(call),
     ...argumentsSummary,
     ...output ? { output } : {},
     ...requestedBy ? { requestedBy } : {},
@@ -38964,14 +38296,13 @@ var MonolithCornerTurnLoop = class {
     return await this.currentSessionFingerprint() === this.sessionFingerprint;
   }
   async currentSessionFingerprint() {
-    const [configuration, roster, grantedHostRoutes, googleTokens] = await Promise.all([
+    const [configuration, roster, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.cornerId
       }),
       this.roster(),
-      this.grantedHostRoutes(),
-      roomGoogleToolTokens(this.options.api, this.options.cornerId)
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     const registryRoutes = configuration.registryMcpRoutes ?? [];
@@ -38991,8 +38322,7 @@ var MonolithCornerTurnLoop = class {
             ...registryRoutes.map((route) => route.routeName)
           ]
         }),
-        ...registryRoutes.map((route) => route.routeName),
-        ...roomGoogleToolFingerprint(googleTokens)
+        ...registryRoutes.map((route) => route.routeName)
       ], this.sessionCodegraphReady),
       reviewerHandle: configuration.reviewerHandle
     });
@@ -39027,14 +38357,13 @@ var MonolithCornerTurnLoop = class {
       return this.sessionId;
     }
     trace?.noteActivation("cold");
-    const [configuration, roster, grantedHostRoutes, googleTokens] = await Promise.all([
+    const [configuration, roster, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.cornerId
       }),
       this.roster(),
-      this.grantedHostRoutes(),
-      roomGoogleToolTokens(this.options.api, this.options.cornerId)
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     this.yoloMode = configuration.yoloMode;
@@ -39074,7 +38403,7 @@ var MonolithCornerTurnLoop = class {
       }) ? { relay: await this.squireRelay.listen() } : {}
     };
     const resourceAuthFile = `${this.commandContext.path}.resource-auth.json`;
-    await mkdir18(dirname17(resourceAuthFile), { recursive: true, mode: 448 });
+    await mkdir18(dirname16(resourceAuthFile), { recursive: true, mode: 448 });
     await writeFile14(resourceAuthFile, JSON.stringify({
       ...this.options.api.connection(),
       turnContextPath: this.commandContext.path
@@ -39141,7 +38470,7 @@ var MonolithCornerTurnLoop = class {
       args: this.options.config.agentArgs ?? []
     }, selection);
     const { stateDirs, tmpDir } = harnessStateDirsFromEnv(agentEnv);
-    this.attachmentDir = tmpDir ? join14(tmpDir, "beeline-attachments") : void 0;
+    this.attachmentDir = tmpDir ? join13(tmpDir, "beeline-attachments") : void 0;
     this.sessionScratchDir = tmpDir;
     const homeStateDirs = harnessHomeStateDirs(harnessLabel, agentEnv.HOME ?? operatorHome);
     await Promise.all(homeStateDirs.map((dir) => mkdir18(dir, { recursive: true })));
@@ -39210,8 +38539,7 @@ var MonolithCornerTurnLoop = class {
           agentKind: this.options.config.agentKind,
           grantedHostRoutes: mountedHostRoutes
         }),
-        ...Object.keys(registryHostDeclarations),
-        ...roomGoogleToolFingerprint(googleTokens)
+        ...Object.keys(registryHostDeclarations)
       ], codegraphReady),
       reviewerHandle: configuration.reviewerHandle
     });
@@ -39259,12 +38587,6 @@ var MonolithCornerTurnLoop = class {
       if (codegraph)
         servers.push(codegraph);
     }
-    const youtube = youtubeMcpServer(this.options.config, googleTokens.youtube, resourceAuthFile);
-    if (youtube)
-      servers.push(youtube);
-    const drive = googleDriveMcpServer(this.options.config, googleTokens.drive, resourceAuthFile);
-    if (drive)
-      servers.push(drive);
     const grantedRouteServers = grantedHostRouteWires(mountedHostRoutes, operatorHome, { ...hostDeclarations, ...registryHostDeclarations }, resourceAuthFile, squireScope);
     await installPiMcpBridge({
       agentCommand: harnessLabel,
@@ -39484,10 +38806,10 @@ var MonolithCornerTurnLoop = class {
             size: file.size
           }));
           const allAttachments = [...attachments, ...briefAttachments];
-          const delivered = this.attachmentDir && allAttachments.length ? await deliverAttachments(allAttachments, join14(this.attachmentDir, requestId.replace(/[^\w-]/g, "_")), this.options.fetchImpl) : [];
+          const delivered = this.attachmentDir && allAttachments.length ? await deliverAttachments(allAttachments, join13(this.attachmentDir, requestId.replace(/[^\w-]/g, "_")), this.options.fetchImpl) : [];
           const briefFileLines = await Promise.all((restored.brief?.attachments ?? []).map(async (file, index) => {
             const entry = delivered.find((item) => item.attachment === briefAttachments[index]);
-            const verified = entry?.path && createHash10("sha256").update(await readFile19(entry.path)).digest("hex") === file.sha256;
+            const verified = entry?.path && createHash9("sha256").update(await readFile19(entry.path)).digest("hex") === file.sha256;
             return `- ${file.title} (${file.purpose}; ${file.required ? "required" : "optional"}; sha256 ${file.sha256}): ${verified ? entry.path : "UNAVAILABLE OR CONTENT MISMATCH"}`;
           }));
           const missingRequiredBriefFile = (restored.brief?.attachments ?? []).some((file, index) => file.required && briefFileLines[index]?.includes("UNAVAILABLE OR CONTENT MISMATCH"));
@@ -39763,9 +39085,9 @@ var MonolithCornerTurnLoop = class {
             answer = durableReplyText(stream.remainderOf(result.agentText));
           const reply = withNudgeReply(answer);
           for (const call of result.toolCalls) {
-            const failure2 = toolCallFailureLine(call);
-            if (failure2)
-              console.warn(`[thin-core] corner ${cornerId} ${failure2}`);
+            const failure = toolCallFailureLine(call);
+            if (failure)
+              console.warn(`[thin-core] corner ${cornerId} ${failure}`);
           }
           stream.close();
           if (!reply && explained) {
@@ -39958,12 +39280,34 @@ var MonolithCornerTurnLoop = class {
 // apps/body/dist/monolith-room-turn.js
 import { mkdir as mkdir19, writeFile as writeFile15 } from "node:fs/promises";
 import { homedir as homedir15, hostname as hostname2 } from "node:os";
-import { dirname as dirname18, join as join15 } from "node:path";
+import { dirname as dirname17, join as join15 } from "node:path";
 
 // packages/api-contract/dist/scheduled-prompts.js
 var SCHEDULE_SCHEDULER_NAME = "Beeline Scheduler";
 var SCHEDULE_RAN_VERB = "ran a schedule for";
 
+// apps/body/dist/model-context-window.js
+import { readFile as readFile20 } from "node:fs/promises";
+import { join as join14 } from "node:path";
+async function modelContextWindowTokens(model, piHome) {
+  if (!model || !piHome)
+    return void 0;
+  try {
+    const catalog = JSON.parse(await readFile20(join14(piHome, "models.json"), "utf8"));
+    const parts = model.split("/");
+    const preferredProvider = parts.length > 2 ? parts.shift() : void 0;
+    const modelId = parts.join("/");
+    const providers = preferredProvider ? [catalog.providers?.[preferredProvider]].filter(Boolean) : Object.values(catalog.providers ?? {});
+    for (const provider of providers) {
+      const window = provider?.models?.find((entry) => entry.id === modelId)?.contextWindow;
+      if (window && Number.isFinite(window) && window > 0)
+        return Math.floor(window);
+    }
+  } catch {
+  }
+  return void 0;
+}
+
 // apps/body/dist/monolith-room-turn.js
 init_cursor_acp_bridge();
 init_runtime();
@@ -40005,10 +39349,11 @@ function inboxItemAuthorName(item, names) {
 function inboxItemPromptBody(item) {
   return isScheduledPrompt(item) ? item.systemEvent?.consequence ?? item.body : item.body;
 }
-function pendingGrantToolCall(call) {
-  if (!/(?:^|[._:/-])(?:request_grant|offer_connector)$/i.test(call.title ?? ""))
-    return false;
-  return /(?:pending|already offered), card (?:posted|still open)/i.test(typeof call.content === "string" ? call.content : JSON.stringify(call.content ?? ""));
+function pendingCardKind(call) {
+  const kind = /(?:^|[._:/-])(request_grant|offer_connector)$/i.exec(call.title ?? "")?.[1];
+  if (!kind || !/(?:pending|already offered), card (?:posted|still open)/i.test(typeof call.content === "string" ? call.content : JSON.stringify(call.content ?? "")))
+    return void 0;
+  return kind.toLowerCase() === "request_grant" ? "grant" : "connector";
 }
 function resumePrompt(item) {
   if (item.systemEvent?.kind === "connector-offer-decided") {
@@ -40071,6 +39416,7 @@ var MonolithRoomTurnLoop = class {
   queuedTurns = [];
   /** Session scratch directory attachments are downloaded into (`TMPDIR/beeline-attachments`). */
   attachmentDir;
+  modelContextTokens;
   /** Whether the pinned model takes images; `undefined` when the pin did not say. */
   modelTakesImages;
   /** The session's TMPDIR: writable to a granted command in a Room, as it is to the harness (C94). */
@@ -40085,6 +39431,7 @@ var MonolithRoomTurnLoop = class {
   memberNames = /* @__PURE__ */ new Map();
   /** The request id of the turn that paused on a grant card, until its decision arrives. */
   pausedOnGrantRequestId;
+  pausedOnGrantKind;
   /** Operator-local turn traces; built once when the daemon configured a directory. */
   turnTraceSink;
   constructor(options) {
@@ -40283,14 +39630,13 @@ var MonolithRoomTurnLoop = class {
     });
   }
   async currentSessionFingerprint() {
-    const [configuration, roster, grantedHostRoutes, googleTokens] = await Promise.all([
+    const [configuration, roster, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.roomId
       }),
       this.roster(),
-      this.grantedHostRoutes(),
-      roomGoogleToolTokens(this.options.api, this.options.roomId)
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     const registryRoutes = configuration.registryMcpRoutes ?? [];
@@ -40309,8 +39655,7 @@ var MonolithRoomTurnLoop = class {
             ...registryRoutes.map((route) => route.routeName)
           ]
         }),
-        ...registryRoutes.map((route) => route.routeName),
-        ...roomGoogleToolFingerprint(googleTokens)
+        ...registryRoutes.map((route) => route.routeName)
       ], this.sessionCodegraphReady)
     });
   }
@@ -40352,15 +39697,14 @@ var MonolithRoomTurnLoop = class {
       return this.sessionId;
     }
     trace?.noteActivation("cold");
-    const [configuration, roster, repositoryState, grantedHostRoutes, googleTokens] = await Promise.all([
+    const [configuration, roster, repositoryState, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.roomId
       }),
       this.roster(),
       this.repositoryState(),
-      this.grantedHostRoutes(),
-      roomGoogleToolTokens(this.options.api, this.options.roomId)
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     const directMessage = Array.isArray(repositoryState.directParticipants) && repositoryState.directParticipants.length === 2;
@@ -40384,7 +39728,7 @@ var MonolithRoomTurnLoop = class {
       }) ? { relay: await this.squireRelay.listen() } : {}
     };
     const resourceAuthFile = `${this.commandContext.path}.resource-auth.json`;
-    await mkdir19(dirname18(resourceAuthFile), { recursive: true, mode: 448 });
+    await mkdir19(dirname17(resourceAuthFile), { recursive: true, mode: 448 });
     await writeFile15(resourceAuthFile, JSON.stringify({
       ...this.options.api.connection(),
       turnContextPath: this.commandContext.path
@@ -40415,6 +39759,7 @@ var MonolithRoomTurnLoop = class {
     });
     const agentEnv = { ...this.options.config.agentEnv, ...homeOverlay };
     this.agentEnv = agentEnv;
+    this.modelContextTokens = await modelContextWindowTokens(selectionModel, agentEnv.PI_CODING_AGENT_DIR);
     const agentArgs = agentArgsWithModelSelection({
       kind: this.options.config.agentKind,
       command,
@@ -40442,8 +39787,7 @@ var MonolithRoomTurnLoop = class {
           agentKind: this.options.config.agentKind,
           grantedHostRoutes: mountedHostRoutes
         }),
-        ...Object.keys(registryHostDeclarations),
-        ...roomGoogleToolFingerprint(googleTokens)
+        ...Object.keys(registryHostDeclarations)
       ], codegraphReady)
     });
     const spawnCommand = wrapAgentCommand({
@@ -40487,12 +39831,6 @@ var MonolithRoomTurnLoop = class {
       if (codegraph)
         servers.push(codegraph);
     }
-    const youtube = youtubeMcpServer(this.options.config, googleTokens.youtube, resourceAuthFile);
-    if (youtube)
-      servers.push(youtube);
-    const drive = googleDriveMcpServer(this.options.config, googleTokens.drive, resourceAuthFile);
-    if (drive)
-      servers.push(drive);
     const hostDeclarations = hostImportedMcpDeclarations({
       operatorHome,
       agentKind: this.options.config.agentKind
@@ -40672,6 +40010,10 @@ var MonolithRoomTurnLoop = class {
    * the press and the delivery, and the server's own receipt already said so.
    */
   stopTurn(requestId) {
+    if (this.pausedOnGrantRequestId === requestId) {
+      this.pausedOnGrantRequestId = void 0;
+      this.pausedOnGrantKind = void 0;
+    }
     this.squireRelay.cancel(requestId);
     for (let index = this.queuedTurns.length - 1; index >= 0; index -= 1)
       if (this.queuedTurns[index].id === requestId)
@@ -40736,10 +40078,15 @@ var MonolithRoomTurnLoop = class {
             authorId: message.authorId,
             line: roomMessagePrompt(names.get(message.authorId) ?? message.authorId.slice(0, 12), message.body, message.attachments, this.deliveredAttachments.get(message.id), this.acceptsImages(), message.id)
           }));
-          const grantDecision = this.commandContext.current?.action === "resume";
-          const resumedRequestId = grantDecision ? this.pausedOnGrantRequestId : void 0;
-          if (grantDecision)
+          const command = this.commandContext.current;
+          const grantDecision = command?.action === "resume";
+          const decisionKind = command?.source.systemEvent?.kind;
+          const decisionResume = grantDecision && command.turnRequestId === this.pausedOnGrantRequestId && (decisionKind === "grant-decided" && this.pausedOnGrantKind === "grant" || decisionKind === "connector-offer-decided" && this.pausedOnGrantKind === "connector");
+          const resumedRequestId = decisionResume ? this.pausedOnGrantRequestId : void 0;
+          if (decisionResume) {
             this.pausedOnGrantRequestId = void 0;
+            this.pausedOnGrantKind = void 0;
+          }
           const openCorners = (corners.corners ?? []).filter((corner) => !corner.archived);
           const closedSince = Math.floor(Date.now() / 1e3) - 24 * 60 * 60;
           const closedCorners = (corners.corners ?? []).filter((corner) => corner.archived && corner.closedAt !== void 0 && corner.closedAt >= closedSince).sort((a2, b) => (b.closedAt ?? 0) - (a2.closedAt ?? 0));
@@ -40747,6 +40094,7 @@ var MonolithRoomTurnLoop = class {
             const transcript = this.warmTranscript.select(this.sessionId, transcriptRows, this.agent.publicKey);
             const assembled = assembleTurnPrompt({
               surface: this.sessionSurface,
+              modelContextTokens: this.modelContextTokens,
               sessionPrefix: this.turnInstructionPrefix,
               ...institutionalContext.standingPreference ? {
                 standingPreference: {
@@ -40860,8 +40208,10 @@ var MonolithRoomTurnLoop = class {
             throw new TurnStoppedError("turn stopped by the requester");
           }
           active.phase = "finishing";
-          if (result.toolCalls.some((call) => pendingGrantToolCall(call))) {
+          const pendingCard = result.toolCalls.map((call) => pendingCardKind(call)).find(Boolean);
+          if (pendingCard) {
             this.pausedOnGrantRequestId = item.id;
+            this.pausedOnGrantKind = pendingCard;
             console.log(`[thin-core] monolith Room ${this.options.roomId} turn ${item.id} paused on a grant card`);
           } else if (resumedRequestId) {
             console.log(`[thin-core] monolith Room ${this.options.roomId} turn ${resumedRequestId} resumed by card decision ${item.id}`);
@@ -40872,9 +40222,9 @@ var MonolithRoomTurnLoop = class {
               this.options.onCornerOpened?.();
           }
           for (const call of result?.toolCalls ?? []) {
-            const failure2 = toolCallFailureLine(call);
-            if (failure2) {
-              console.warn(`[thin-core] monolith Room ${this.options.roomId} ${failure2}`);
+            const failure = toolCallFailureLine(call);
+            if (failure) {
+              console.warn(`[thin-core] monolith Room ${this.options.roomId} ${failure}`);
             }
           }
           stream.close();
@@ -40978,7 +40328,7 @@ var MonolithRoomTurnLoop = class {
           console.error("[thin-core] Room command failed", error);
         },
         onEnter: (command) => this.squireRelay.activate(command, this.commandContext.generationId),
-        onLeave: (command) => this.squireRelay.deactivate(command.turnRequestId, this.pausedOnGrantRequestId === command.turnRequestId ? "grant-decision" : null),
+        onLeave: (command) => this.squireRelay.deactivate(command.turnRequestId, this.pausedOnGrantRequestId),
         stop: (requestId) => this.stopTurn(requestId),
         restart: () => this.options.onRestartRequested?.(),
         canStartTurn: this.options.canStartTurn,
@@ -41535,8 +40885,8 @@ var DiscoveryWakes = class {
     this.served = Math.max(this.served, covered);
   }
 };
-function shouldPostInitialCornerWorkingState(restore, isOpener = true) {
-  return isOpener && !restore.featureBranch && !restore.lifecycle?.branch && !restore.lifecycle?.pr;
+function shouldPostInitialCornerWorkingState(restore) {
+  return !restore.lifecycle?.branch && !restore.lifecycle?.pr;
 }
 function cornerBranchIsSafeToDelete(lifecycle) {
   const pr = lifecycle?.pr;
@@ -41552,7 +40902,7 @@ function cornerStartConfigKey(repository, objective) {
 }
 function cornerRepositoryCacheDir(supervisorRoot, remote) {
   const normalizedRemote = roomCheckoutRemote(remote);
-  const repositoryHash = createHash11("sha256").update(normalizedRemote).digest("hex").slice(0, 24);
+  const repositoryHash = createHash10("sha256").update(normalizedRemote).digest("hex").slice(0, 24);
   return resolve29(supervisorRoot, "beeline", "repositories", `${repositoryHash}.git`);
 }
 function isStandingCornerStartFault(error) {
@@ -41563,8 +40913,8 @@ async function materializeCornerWorktree(input) {
   const remote = roomCheckoutRemote(input.remote);
   const gitCommonDir = cornerRepositoryCacheDir(input.supervisorRoot, remote);
   const path = resolve29(input.supervisorRoot, "beeline", "corners", input.cornerId);
-  await mkdir20(dirname19(gitCommonDir), { recursive: true, mode: 448 });
-  await mkdir20(dirname19(path), { recursive: true, mode: 448 });
+  await mkdir20(dirname18(gitCommonDir), { recursive: true, mode: 448 });
+  await mkdir20(dirname18(path), { recursive: true, mode: 448 });
   const authEnv = githubGitEnv(input.token);
   if (!existsSync8(resolve29(gitCommonDir, "HEAD"))) {
     await execFileAsync8("git", ["clone", "--bare", remote, gitCommonDir], {
@@ -41645,6 +40995,34 @@ async function materializeCornerWorktree(input) {
   }
   return { path, gitCommonDir };
 }
+async function cornerScratchFiles(root) {
+  const files = [];
+  const visit = async (directory, prefix) => {
+    for (const entry of await readdir8(directory, { withFileTypes: true })) {
+      const name = prefix ? `${prefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory())
+        await visit(resolve29(directory, entry.name), name);
+      else
+        files.push(name);
+    }
+  };
+  await visit(root, "");
+  return files;
+}
+async function ignoredGitPaths(worktree, paths) {
+  if (!paths.length)
+    return /* @__PURE__ */ new Set();
+  return new Promise((resolve40, reject) => {
+    const child = execFile12("git", ["-C", worktree, "check-ignore", "-z", "--stdin"], { maxBuffer: 16 * 1024 * 1024 }, (error, stdout6) => {
+      if (error && error.code !== 1)
+        reject(error);
+      else
+        resolve40(new Set(stdout6.split("\0").filter(Boolean)));
+    });
+    child.stdin?.on("error", reject);
+    child.stdin?.end(`${paths.join("\0")}\0`);
+  });
+}
 async function mapWithConcurrency(values, limit, visit) {
   let cursor3 = 0;
   await Promise.all(Array.from({ length: Math.min(limit, values.length) }, async () => {
@@ -41657,7 +41035,7 @@ async function mapWithConcurrency(values, limit, visit) {
 async function discoverCornerWorktree(supervisorRoot, cornerId) {
   const cornersRoot = resolve29(supervisorRoot, "beeline", "corners");
   const path = resolve29(cornersRoot, cornerId);
-  if (dirname19(path) !== cornersRoot || !existsSync8(resolve29(path, ".git")))
+  if (dirname18(path) !== cornersRoot || !existsSync8(resolve29(path, ".git")))
     return void 0;
   const [canonicalRoot, canonicalPath] = await Promise.all([
     realpath2(cornersRoot),
@@ -41790,6 +41168,8 @@ var RoomRuntimeCoordinator = class {
   localWorktreeIds;
   /** Event-driven cleanup retries stay scoped to the failed local corner. */
   archiveCleanupFaults = /* @__PURE__ */ new Map();
+  /** A refused local checkout is kept until a later Room listing proves membership again. */
+  archiveCleanupAccessDenied = /* @__PURE__ */ new Set();
   startingCorners = /* @__PURE__ */ new Set();
   /**
    * Rooms whose start is in flight. `running` is not set until the checkout
@@ -41986,12 +41366,16 @@ var RoomRuntimeCoordinator = class {
     return turns;
   }
   async reconcile() {
+    if (this.stopped)
+      return "member";
     this.confirmationPending = false;
     const existingRooms = new Set(this.running.keys());
     const coveredWakes = this.discoveryWakes.beginReconcile();
     const bootstrap = await this.options.daemonApi.execute("getDaemonBootstrap", {
       agentId: this.agent.publicKey
     });
+    if (this.stopped)
+      return "member";
     if (!bootstrap.workspaceIds.includes(this.runtime.communityId)) {
       this.workspaceRemovalConfirmations += 1;
       if (this.workspaceRemovalConfirmations < REMOVAL_CONFIRMATION_READS) {
@@ -42027,6 +41411,8 @@ var RoomRuntimeCoordinator = class {
     const desiredCorners = /* @__PURE__ */ new Map();
     const archivedCorners = /* @__PURE__ */ new Map();
     await mapWithConcurrency(topLevelRooms, ROOM_JOIN_CONCURRENCY, async (room) => {
+      if (this.stopped)
+        return;
       try {
         const result = await this.options.daemonApi.execute("listRoomCorners", {
           roomId: room.roomId
@@ -42057,6 +41443,8 @@ var RoomRuntimeCoordinator = class {
         console.error(`[thin-core] monolith Room ${room.roomId} corner listing failed; keeping known corners:`, error);
       }
     });
+    if (this.stopped)
+      return "member";
     for (const roomId of desiredTopRooms)
       this.surfaceHealth.discover(roomId, "room");
     for (const cornerId of desiredCorners.keys())
@@ -42064,7 +41452,11 @@ var RoomRuntimeCoordinator = class {
     for (const channelId of desired)
       this.roomRemovalConfirmations.delete(channelId);
     await this.retryPendingCornerReaps(desired);
+    if (this.stopped)
+      return "member";
     await this.sweepArchivedCornerWorktrees(archivedCorners, desired);
+    if (this.stopped)
+      return "member";
     for (const cornerId of this.idleCornerSubscriptions.keys()) {
       if (desired.has(cornerId))
         continue;
@@ -42084,6 +41476,8 @@ var RoomRuntimeCoordinator = class {
     }
     this.surfaceHealth.retain(/* @__PURE__ */ new Set([...desired, ...this.running.keys()]));
     await mapWithConcurrency(desiredTopRooms, ROOM_JOIN_CONCURRENCY, async (roomId) => {
+      if (this.stopped)
+        return;
       if (this.running.has(roomId))
         return;
       try {
@@ -42093,6 +41487,8 @@ var RoomRuntimeCoordinator = class {
       }
     });
     await mapWithConcurrency([...desiredCorners.values()], ROOM_JOIN_CONCURRENCY, async (corner) => {
+      if (this.stopped)
+        return;
       if (!this.running.has(corner.cornerId))
         await this.watchCorner(corner);
     });
@@ -42134,6 +41530,8 @@ var RoomRuntimeCoordinator = class {
    * An unscoped wake still uses the slow reconcile as recovery.
    */
   async applyMembershipEvent(event) {
+    if (this.stopped)
+      return;
     const roomId = event.roomId;
     if (!roomId) {
       this.wakeDiscovery();
@@ -42179,22 +41577,24 @@ var RoomRuntimeCoordinator = class {
   /** Retire the scratch runtime. Ordinary desired-state reconciliation starts
    * the same corner id again and re-reads its now-code lane. */
   async applyCornerRestart(cornerId) {
+    if (this.stopped)
+      return;
     const running = this.running.get(cornerId);
     if (!running) {
       this.wakeDiscovery();
       return;
     }
-    await this.stopRunning(cornerId, running);
+    await this.stopRunning(cornerId, running, true);
     this.wakeDiscovery();
   }
-  async stopRunning(channelId, running) {
+  async stopRunning(channelId, running, preserveScratch = false) {
     this.deferredRepositoryRestarts.delete(channelId);
     running.controller.abort();
     await running.promise.catch(() => void 0);
     try {
       if (running.worktree)
         await this.reapCornerWorktree(running.worktree);
-      else if (running.scratch)
+      else if (running.scratch && !preserveScratch)
         await this.reapCornerScratch(running.scratch);
     } catch (error) {
       console.error(`[thin-core] corner ${channelId} cleanup failed; will retry:`, error);
@@ -42205,7 +41605,7 @@ var RoomRuntimeCoordinator = class {
     return this.runtime.rooms.find((room) => room.channelId === roomId);
   }
   roomRoot(roomId) {
-    return this.roomRecord(roomId)?.root ?? resolve29(dirname19(this.configPath), "rooms", roomId);
+    return this.roomRecord(roomId)?.root ?? resolve29(dirname18(this.configPath), "rooms", roomId);
   }
   roomAgentHomeRoot(workspaceRoot, required = false) {
     const flag = process.env.BUZZY_BODY_ROOM_HOME;
@@ -42215,7 +41615,7 @@ var RoomRuntimeCoordinator = class {
     if (!required && flag !== "1" && !existsSync8(home) && existsSync8(workspaceRoot))
       return void 0;
     try {
-      mkdirSync4(home, { recursive: true, mode: 448 });
+      mkdirSync3(home, { recursive: true, mode: 448 });
       return home;
     } catch (error) {
       console.error(`[thin-core] per-room agent home unavailable at ${home}:`, error);
@@ -42228,9 +41628,9 @@ var RoomRuntimeCoordinator = class {
       ...this.baseConfig,
       workspaceRoot,
       agentPrivateRoot: resolve29(workspaceRoot, "agent-private"),
-      agentMemoryRoot: resolve29(dirname19(this.configPath), "memory"),
-      openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname19(this.configPath)),
-      turnTraceDir: turnTraceDirectory(dirname19(this.configPath)),
+      agentMemoryRoot: resolve29(dirname18(this.configPath), "memory"),
+      openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname18(this.configPath)),
+      turnTraceDir: turnTraceDirectory(dirname18(this.configPath)),
       ...agentHomeRoot ? { agentHomeRoot } : {}
     };
   }
@@ -42242,6 +41642,8 @@ var RoomRuntimeCoordinator = class {
     });
   }
   async startRoom(roomId) {
+    if (this.stopped)
+      return;
     if (this.running.has(roomId) || this.startingRooms.has(roomId))
       return;
     this.surfaceHealth.discover(roomId, "room");
@@ -42322,9 +41724,9 @@ var RoomRuntimeCoordinator = class {
       return this.roomRoot(roomId);
     const remote = roomCheckoutRemote(repository.remote);
     const targetBranch = repository.targetBranch || "main";
-    const checkoutId = createHash11("sha256").update(`${roomId}\0${remote}\0${targetBranch}`).digest("hex").slice(0, 24);
+    const checkoutId = createHash10("sha256").update(`${roomId}\0${remote}\0${targetBranch}`).digest("hex").slice(0, 24);
     const path = resolve29(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
-    await mkdir20(dirname19(path), { recursive: true, mode: 448 });
+    await mkdir20(dirname18(path), { recursive: true, mode: 448 });
     const token = remote.startsWith("https://github.com/") ? await this.parentRepositoryToken(roomId) : void 0;
     const env = token ? githubGitEnv(token.token) : process.env;
     if (!existsSync8(resolve29(path, ".git"))) {
@@ -42372,6 +41774,8 @@ var RoomRuntimeCoordinator = class {
     }
   }
   async startCorner(corner) {
+    if (this.stopped)
+      return;
     if (this.running.has(corner.cornerId) || this.startingCorners.has(corner.cornerId))
       return;
     this.surfaceHealth.discover(corner.cornerId, "corner");
@@ -42400,6 +41804,9 @@ var RoomRuntimeCoordinator = class {
       if (!objective)
         throw new Error("corner has no authoritative objective fact");
       const repositoryBacked = repository.resolution === "repository" && restore.lane !== "no_code";
+      const scratchPath = resolve29(this.roomRoot(corner.cornerId), "scratch");
+      if (repositoryBacked && existsSync8(scratchPath) && !restore.featureBranch)
+        throw new Error("promoted corner has no server-assigned feature branch");
       const targetBranch = repositoryBacked ? repository.targetBranch || "main" : void 0;
       const featureBranch = repositoryBacked ? restore.featureBranch ?? `feature/corner-${corner.cornerId.replaceAll("-", "").slice(0, 12)}` : void 0;
       const granted = repositoryBacked ? await this.cornerRepositoryToken(corner.parentRoomId) : void 0;
@@ -42410,11 +41817,51 @@ var RoomRuntimeCoordinator = class {
         featureBranch,
         token: granted.token
       }) : void 0;
+      if (worktree) {
+        if (existsSync8(scratchPath)) {
+          const entries = await readdir8(scratchPath);
+          if (entries.includes(".git"))
+            throw new Error("corner scratch contains a Git repository");
+          const files = await cornerScratchFiles(scratchPath);
+          const baselineIgnored = await ignoredGitPaths(worktree.path, files);
+          for (const entry of entries)
+            await cp(resolve29(scratchPath, entry), resolve29(worktree.path, entry), {
+              recursive: true,
+              force: true
+            });
+          if (entries.length) {
+            const scratchIgnored = await ignoredGitPaths(worktree.path, files);
+            const stageable = files.filter((file) => !baselineIgnored.has(file) && !scratchIgnored.has(file));
+            for (let offset = 0; offset < stageable.length; offset += 256)
+              await execFileAsync8("git", [
+                "-C",
+                worktree.path,
+                "add",
+                "-A",
+                "--",
+                ...stageable.slice(offset, offset + 256)
+              ]);
+            const changed = await execFileAsync8("git", ["-C", worktree.path, "diff", "--cached", "--quiet"]).then(() => false, (error) => {
+              if (error.code === 1)
+                return true;
+              throw error;
+            });
+            if (changed)
+              await execFileAsync8("git", [
+                "-C",
+                worktree.path,
+                "commit",
+                "-m",
+                "Carry no-code corner files into code branch"
+              ]);
+          }
+          await this.reapCornerScratch({ path: scratchPath, cornerId: corner.cornerId });
+        }
+      }
       const workspacePath = worktree?.path ?? resolve29(this.roomRoot(corner.cornerId), "scratch");
       if (!worktree)
         await mkdir20(workspacePath, { recursive: true, mode: 448 });
-      const isOpener = corner.openedBy === this.agent.publicKey;
-      if (worktree && shouldPostInitialCornerWorkingState(restore, isOpener)) {
+      if (worktree && shouldPostInitialCornerWorkingState(restore)) {
         await this.options.daemonApi.execute("postCornerRemoteState", {
           cornerId: corner.cornerId,
           branch: featureBranch,
@@ -42516,6 +41963,8 @@ var RoomRuntimeCoordinator = class {
     }
   }
   async watchCorner(corner) {
+    if (this.stopped)
+      return;
     const cornerId = corner.cornerId;
     if (this.running.has(cornerId))
       return;
@@ -42700,6 +42149,9 @@ var RoomRuntimeCoordinator = class {
         continue;
       if (!this.archiveCleanupDue(cornerId))
         continue;
+      if (this.archiveCleanupAccessDenied.has(cornerId) && !corners.has(cornerId))
+        continue;
+      this.archiveCleanupAccessDenied.delete(cornerId);
       let corner = corners.get(cornerId);
       let discovered;
       try {
@@ -42743,7 +42195,10 @@ var RoomRuntimeCoordinator = class {
         });
         console.log(`[thin-core] swept archived corner worktree ${cornerId}`);
       } catch (error) {
-        this.deferArchiveCleanup(cornerId);
+        if (error instanceof DaemonApiError && error.status === 403)
+          this.archiveCleanupAccessDenied.add(cornerId);
+        else
+          this.deferArchiveCleanup(cornerId);
         console.error(`[thin-core] archived corner ${cornerId} cleanup deferred:`, error);
       }
     }
@@ -42819,6 +42274,8 @@ var RoomRuntimeCoordinator = class {
       room.backoffUntil = Math.max(room.backoffUntil, this.now() + retryInMs);
   }
   async watchdogTick() {
+    if (this.stopped)
+      return;
     for (const [roomId, room] of [...this.running]) {
       if (room.recovering || room.body.isBusy())
         continue;
@@ -42829,17 +42286,25 @@ var RoomRuntimeCoordinator = class {
       await room.promise.catch(() => void 0);
       if (room.worktree) {
         this.confirmationPending = true;
-      } else if (!this.running.has(roomId)) {
+      } else if (!this.stopped && !this.running.has(roomId)) {
         this.startRoom(roomId);
       }
     }
   }
-  async shutdown() {
+  beginShutdown() {
+    if (this.stopped)
+      return;
     this.stopped = true;
+    this.restartRequested = true;
     for (const cornerId of this.idleCornerSubscriptions.keys())
       this.unwatchCorner(cornerId);
     this.options.daemonApi.closeLive?.();
     this.pendingMembershipEvents.clear();
+    for (const room of this.running.values())
+      room.controller.abort();
+  }
+  async shutdown() {
+    this.beginShutdown();
     const deadlineAt = Math.min(this.now() + this.drainDeadlineMs, this.drainDeadlineAt ?? Number.POSITIVE_INFINITY);
     const untilDeadline = async (work) => {
       let timer;
@@ -43024,8 +42489,16 @@ var ThinDaemonCore = class {
     this.roomRuntime.setDrainDeadlineAt(deadlineAt);
   }
   async run(opts = {}) {
-    await opts.onEstablished?.();
+    const stop = () => {
+      this.roomRuntime.setDrainDeadlineAt(Date.now() + 45e3);
+      this.roomRuntime.beginShutdown();
+    };
+    opts.signal?.addEventListener("abort", stop, { once: true });
+    if (opts.signal?.aborted)
+      stop();
     try {
+      if (!opts.signal?.aborted)
+        await opts.onEstablished?.();
       while (!opts.signal?.aborted) {
         this.pendingDiscovery = false;
         try {
@@ -43040,19 +42513,46 @@ var ThinDaemonCore = class {
           this.discoveryStatus = `monolith discovery degraded: ${error instanceof Error ? error.message : String(error)}`;
           this.roomRuntime.reconnectAfterFailure();
         }
+        if (opts.signal?.aborted)
+          break;
         await opts.onProgress?.(this.healthStatus());
         if (!this.pendingDiscovery)
           await this.waitForDiscovery(opts.signal);
       }
       return "aborted";
     } finally {
+      opts.signal?.removeEventListener("abort", stop);
       await this.roomRuntime.shutdown();
     }
   }
 };
 
+// apps/body/dist/daemon-shutdown.js
+var DAEMON_HARD_STOP_MS = 75e3;
+function installDaemonStopSignals(controller, options = {}) {
+  const emitter = options.emitter ?? process;
+  let timer;
+  const stop = () => {
+    if (controller.signal.aborted)
+      return;
+    timer = setTimeout(() => {
+      console.error("[thin-core] shutdown deadline reached; exiting old helper");
+      (options.hardExit ?? (() => process.exit(0)))();
+    }, options.timeoutMs ?? DAEMON_HARD_STOP_MS);
+    controller.abort();
+  };
+  emitter.once("SIGINT", stop);
+  emitter.once("SIGTERM", stop);
+  return () => {
+    if (timer)
+      clearTimeout(timer);
+    emitter.removeListener("SIGINT", stop);
+    emitter.removeListener("SIGTERM", stop);
+  };
+}
+
 // apps/body/dist/force-update-journal.js
-import { mkdirSync as mkdirSync5, readFileSync as readFileSync9, renameSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync8, renameSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { resolve as resolve30 } from "node:path";
 var NAME = "force-update-interruptions.json";
 function pathFor(runtimeDir) {
@@ -43060,7 +42560,7 @@ function pathFor(runtimeDir) {
 }
 function read(runtimeDir) {
   try {
-    const rows = JSON.parse(readFileSync9(pathFor(runtimeDir), "utf8"));
+    const rows = JSON.parse(readFileSync8(pathFor(runtimeDir), "utf8"));
     if (!Array.isArray(rows))
       throw new Error("invalid force-update interruption journal");
     return rows.map((row) => {
@@ -43078,10 +42578,10 @@ function read(runtimeDir) {
   }
 }
 function write(runtimeDir, rows) {
-  mkdirSync5(runtimeDir, { recursive: true, mode: 448 });
+  mkdirSync4(runtimeDir, { recursive: true, mode: 448 });
   const target = pathFor(runtimeDir);
   const temporary = `${target}.${process.pid}.tmp`;
-  writeFileSync4(temporary, `${JSON.stringify(rows)}
+  writeFileSync3(temporary, `${JSON.stringify(rows)}
 `, { mode: 384 });
   renameSync(temporary, target);
 }
@@ -43136,9 +42636,9 @@ init_runtime();
 init_launchd();
 init_systemd();
 import { spawn as spawn11 } from "node:child_process";
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 import { mkdir as mkdir23, rm as rm11, stat as stat7, writeFile as writeFile17 } from "node:fs/promises";
-import { dirname as dirname21, resolve as resolve33 } from "node:path";
+import { dirname as dirname20, resolve as resolve33 } from "node:path";
 
 // apps/body/dist/update-functional-probe.js
 import { mkdir as mkdir21, rm as rm10 } from "node:fs/promises";
@@ -43406,8 +42906,8 @@ async function runUpdateFunctionalProbe(input) {
         }
         let error = initialError;
         let detail = error instanceof Error ? error.message : String(error);
-        let failure2 = classifyAcpTurnFailure(error);
-        if (failure2) {
+        let failure = classifyAcpTurnFailure(error);
+        if (failure) {
           await new Promise((resolveWait) => setTimeout(resolveWait, input.retryDelayMs ?? UPDATE_PROBE_RETRY_DELAY_MS));
           try {
             const retried = await openSessionAndPrompt();
@@ -43420,27 +42920,27 @@ async function runUpdateFunctionalProbe(input) {
           } catch (retryError) {
             const retryDetail = retryError instanceof Error ? retryError.message : String(retryError);
             const retryFailure = classifyAcpTurnFailure(retryError);
-            if (!retryFailure || !sameAcpTurnFailure(failure2, retryFailure)) {
+            if (!retryFailure || !sameAcpTurnFailure(failure, retryFailure)) {
               throw new UpdateFunctionalProbeError("turn-failed", retryDetail, {
                 cause: retryError
               });
             }
             error = retryError;
             detail = retryDetail;
-            failure2 = retryFailure;
+            failure = retryFailure;
           }
         }
         if (error === void 0) {
-        } else if (!failure2 || !input.compareWithCurrentRelease) {
+        } else if (!failure || !input.compareWithCurrentRelease) {
           throw new UpdateFunctionalProbeError("turn-failed", detail, { cause: error });
         } else {
           const current = await input.compareWithCurrentRelease({
             kind: "acp-turn-failure",
             reason: detail,
-            failure: failure2
+            failure
           });
           const currentFailure = current.kind === "unavailable" ? classifyAcpTurnFailure(current.reason) : void 0;
-          if (!currentFailure || !sameAcpTurnFailure(failure2, currentFailure)) {
+          if (!currentFailure || !sameAcpTurnFailure(failure, currentFailure)) {
             throw new UpdateFunctionalProbeError("turn-failed", `${detail}; ${describeCurrentReleaseOutcome(current)}`, { cause: error });
           }
           console.warn(`[body] update probe: the probe turn failed the same way on this release and the current release (${detail}); that failure is not this bundle's doing, so the probe passes as inconclusive`);
@@ -43471,8 +42971,8 @@ async function runUpdateFunctionalProbe(input) {
 }
 
 // apps/body/dist/update-rollback-alert.js
-import { mkdir as mkdir22, readFile as readFile20, rename as rename7, unlink as unlink6, writeFile as writeFile16 } from "node:fs/promises";
-import { dirname as dirname20, resolve as resolve32 } from "node:path";
+import { mkdir as mkdir22, readFile as readFile21, rename as rename7, unlink as unlink6, writeFile as writeFile16 } from "node:fs/promises";
+import { dirname as dirname19, resolve as resolve32 } from "node:path";
 var REPORT_INTERVAL_MS = 60 * 60 * 1e3;
 var lastLogged = /* @__PURE__ */ new Map();
 function updateRollbackAlertPath(runtimeDir) {
@@ -43481,7 +42981,7 @@ function updateRollbackAlertPath(runtimeDir) {
 async function writeAlert(runtimeDir, alert) {
   const path = updateRollbackAlertPath(runtimeDir);
   const staged = `${path}.${process.pid}.tmp`;
-  await mkdir22(dirname20(path), { recursive: true });
+  await mkdir22(dirname19(path), { recursive: true });
   await writeFile16(staged, `${JSON.stringify(alert, null, 2)}
 `, { mode: 384 });
   await rename7(staged, path);
@@ -43494,7 +42994,7 @@ async function queueUpdateRollbackAlert(runtimeDir, releaseId, now2 = Date.now()
 }
 async function readUpdateRollbackAlert(runtimeDir) {
   try {
-    const value = JSON.parse(await readFile20(updateRollbackAlertPath(runtimeDir), "utf8"));
+    const value = JSON.parse(await readFile21(updateRollbackAlertPath(runtimeDir), "utf8"));
     if (value.version !== 1 || typeof value.releaseId !== "string")
       return void 0;
     return value;
@@ -43540,21 +43040,21 @@ async function reportUpdateRollback(input) {
 init_adapter_install_lock();
 var UPDATE_CONVERGENCE_SLO_MS = 10 * 6e4;
 var DEFAULT_UPDATE_INTERVAL_MS = 3e4;
-var UPDATE_DRAIN_DEADLINE_MS = UPDATE_CONVERGENCE_SLO_MS - 6e4;
+var UPDATE_DRAIN_DEADLINE_MS = UPDATE_CONVERGENCE_SLO_MS - 15e4;
 var MAX_HOST_RESTART_STAGGER_MS = 15e3;
 function managedRestartStaggerMs(agentId, desiredRelease, drainDeadlineAt, now2 = Date.now()) {
-  const digest = createHash12("sha256").update(agentId).update("\0").update(desiredRelease).digest();
+  const digest = createHash11("sha256").update(agentId).update("\0").update(desiredRelease).digest();
   const spread = digest.readUInt32BE(0) % (MAX_HOST_RESTART_STAGGER_MS + 1);
   return Math.min(spread, Math.max(0, drainDeadlineAt - now2));
 }
-var UPDATE_WORKER_DEADLINE_MS = UPDATE_DRAIN_DEADLINE_MS;
+var UPDATE_WORKER_DEADLINE_MS = UPDATE_CONVERGENCE_SLO_MS - 6e4;
 var LOCK_STALE_MS = UPDATE_WORKER_DEADLINE_MS + 5 * 6e4;
 var DEFAULT_UPDATE_INITIAL_DELAY_MS = 0;
 async function withInstallLock(layout, work, options = {}) {
   const now2 = options.now ?? Date.now;
   const lock = resolve33(layout.releasesRoot, ".state", "install.lock");
   const deadline = now2() + (options.waitMs ?? 1e4);
-  await mkdir23(dirname21(lock), { recursive: true });
+  await mkdir23(dirname20(lock), { recursive: true });
   for (; ; ) {
     try {
       await mkdir23(lock);
@@ -44028,12 +43528,12 @@ async function proveLoadedReleaseReady(layout, runtimeDir, loadedRelease, option
     if (!current || current.releaseId !== loadedRelease || current.status !== "pending")
       return false;
     const confirmed = [.../* @__PURE__ */ new Set([...current.confirmedProbeIds ?? [], probeId])].sort();
-    const required = current.requiredProbeIds ?? [probeId];
-    const satisfied = [...confirmed, ...current.unavailableProbeIds ?? []];
     await replaceUpdateAttempt(layout, {
       ...current,
       confirmedProbeIds: confirmed,
-      ...required.every((id) => satisfied.includes(id)) ? { status: "confirmed" } : {}
+      // One verified successor is sufficient to validate the shared bundle.
+      // A peer still running the old release cannot hold this journal pending.
+      status: "confirmed"
     });
     return true;
   });
@@ -44180,7 +43680,7 @@ init_launchd();
 init_systemd();
 init_runtime();
 import { mkdir as mkdir24, rename as rename8 } from "node:fs/promises";
-import { dirname as dirname22, resolve as resolve34 } from "node:path";
+import { dirname as dirname21, resolve as resolve34 } from "node:path";
 async function retireRemovedAgent(runtime, options = {}) {
   const deletedRoot = resolve34(runtime.supervisorRoot, "beeline", "deleted-runtimes");
   const target = resolve34(deletedRoot, `${runtime.agent.publicKey}-${Date.now()}`);
@@ -44203,13 +43703,13 @@ async function relocateAgentRuntime(runtime, target, options = {}) {
       ...options.run ? { run: options.run } : {}
     });
   }
-  await mkdir24(dirname22(destination), { recursive: true, mode: 448 });
+  await mkdir24(dirname21(destination), { recursive: true, mode: 448 });
   await rename8(source, destination);
   return destination;
 }
 
 // apps/body/dist/start-command.js
-import { basename as basename6, dirname as dirname23 } from "node:path";
+import { basename as basename6, dirname as dirname22 } from "node:path";
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 init_agent_command();
 init_runtime();
@@ -44424,7 +43924,7 @@ async function startStoredRuntime(configPath, opts = {}, dependencyOverrides = {
   return { status: "started", pid };
 }
 function agentStartId(configPath) {
-  return basename6(dirname23(configPath));
+  return basename6(dirname22(configPath));
 }
 async function startRuntime(configPath, spinnerHandle) {
   const report = (text2) => spinnerHandle ? spinnerHandle.message(text2) : console.log(text2);
@@ -44505,7 +44005,7 @@ async function runStartCommand(args, interactiveUi, dependencyOverrides = {}) {
   for (const path of unique) {
     const id = agentStartId(path);
     const spinnerHandle = interactiveUi ? spinner() : void 0;
-    spinnerHandle?.start(`Starting ${dirname23(path)}\u2026`);
+    spinnerHandle?.start(`Starting ${dirname22(path)}\u2026`);
     try {
       const outcome = await deps.startOne(path, spinnerHandle);
       const report = { id, path, ...outcome };
@@ -44538,10 +44038,10 @@ async function runStartCommand(args, interactiveUi, dependencyOverrides = {}) {
 
 // apps/body/dist/connect-command.js
 import { spawn as spawn12 } from "node:child_process";
-import { createHash as createHash13, randomUUID as randomUUID9 } from "node:crypto";
-import { chmod as chmod8, mkdir as mkdir25, readFile as readFile21, unlink as unlink7, writeFile as writeFile18 } from "node:fs/promises";
+import { createHash as createHash12, randomUUID as randomUUID10 } from "node:crypto";
+import { chmod as chmod8, mkdir as mkdir25, readFile as readFile22, unlink as unlink7, writeFile as writeFile18 } from "node:fs/promises";
 import { homedir as homedir17, hostname as hostname3 } from "node:os";
-import { dirname as dirname24, resolve as resolve35 } from "node:path";
+import { dirname as dirname23, resolve as resolve35 } from "node:path";
 import { stdin as stdin3, stdout as stdout4 } from "node:process";
 init_access_policy();
 init_agent_command();
@@ -45213,18 +44713,18 @@ async function readMachineId(env = process.env) {
   let machineId;
   let machineName = hostname3();
   try {
-    const existing = await readFile21(machineIdPath, "utf8");
+    const existing = await readFile22(machineIdPath, "utf8");
     machineId = existing.trim();
     if (!/^[0-9a-f-]{32,}$/.test(machineId))
       throw new Error("invalid persisted machine id");
   } catch {
-    machineId = randomUUID9();
+    machineId = randomUUID10();
     try {
       await mkdir25(configDir, { recursive: true, mode: 448 });
       await writeFile18(machineIdPath, `${machineId}
 `, { mode: 384 });
     } catch {
-      machineId = createHash13("sha256").update(machineName).digest("hex").slice(0, 36);
+      machineId = createHash12("sha256").update(machineName).digest("hex").slice(0, 36);
     }
   }
   return { machineId, machineName };
@@ -45233,7 +44733,7 @@ function requestConnectGrant(baseUrl, pairingCode, selection, fetchImpl, machine
   const normalizedPairingCode = normalizeAgentPairingCode(pairingCode);
   if (!normalizedPairingCode)
     throw new Error("invalid pairing code");
-  const avatarSeed = createHash13("sha256").update(normalizedPairingCode.toUpperCase()).digest("hex").slice(0, 32);
+  const avatarSeed = createHash12("sha256").update(normalizedPairingCode.toUpperCase()).digest("hex").slice(0, 32);
   return jsonRequest(`${baseUrl}/auth/agent/connect`, {
     pairing_code: normalizedPairingCode,
     harness: selection.harness,
@@ -45305,7 +44805,7 @@ function providerEnvironment(selection) {
   };
 }
 async function writePrivateJson(path, value) {
-  await mkdir25(dirname24(path), { recursive: true, mode: 448 });
+  await mkdir25(dirname23(path), { recursive: true, mode: 448 });
   await writeFile18(path, `${JSON.stringify(value, null, 2)}
 `, { mode: 384 });
   await chmod8(path, 384);
@@ -45315,7 +44815,7 @@ async function writeProviderEnv(selection, agentPubkey) {
   if (Object.keys(values).length === 0)
     return void 0;
   const path = resolve35(defaultSupervisorRoot(process.env), "beeline", "connect", `${agentPubkey}.env`);
-  await mkdir25(dirname24(path), { recursive: true, mode: 448 });
+  await mkdir25(dirname23(path), { recursive: true, mode: 448 });
   const contents = Object.entries(values).map(([key, value]) => `${key}=${JSON.stringify(value)}`).join("\n");
   await writeFile18(path, `${contents}
 `, { mode: 384 });
@@ -45469,18 +44969,18 @@ async function runConnectFinishCommand(path) {
     throw new Error("connect-finish may run only from the canonical installed Beeline launcher");
   }
   try {
-    const grant = JSON.parse(await readFile21(resolve35(path), "utf8"));
+    const grant = JSON.parse(await readFile22(resolve35(path), "utf8"));
     if (!isDevicePairingGrant(grant))
       throw new Error("device connection grant is invalid");
     const connected = await completeDevicePairing(grant);
     await unlink7(resolve35(path));
-    const providerEnv = grant.llmEnvFile ? await readFile21(grant.llmEnvFile, "utf8").catch(() => "") : "";
+    const providerEnv = grant.llmEnvFile ? await readFile22(grant.llmEnvFile, "utf8").catch(() => "") : "";
     const apiKey = (/^OPENROUTER_API_KEY=(\S+)/m.exec(providerEnv)?.[1] ?? "").replace(/^["']|["']$/g, "");
     const model = openRouterModelId(grant.model, { OPENROUTER_API_KEY: apiKey });
     if (model) {
       const decision2 = await resolveOpenRouterRouting({
         model,
-        cacheDir: openRouterRoutingCacheDir(dirname24(connected.configPath)),
+        cacheDir: openRouterRoutingCacheDir(dirname23(connected.configPath)),
         ...apiKey ? { apiKey } : {},
         probeTimeoutMs: 1e4
       });
@@ -45498,8 +44998,8 @@ async function runConnectFinishCommand(path) {
 init_self_update();
 
 // apps/body/dist/daemon-failure.js
-import { mkdir as mkdir26, readFile as readFile22, rename as rename9, rm as rm12, writeFile as writeFile19 } from "node:fs/promises";
-import { dirname as dirname25, resolve as resolve36 } from "node:path";
+import { mkdir as mkdir26, readFile as readFile23, rename as rename9, rm as rm12, writeFile as writeFile19 } from "node:fs/promises";
+import { dirname as dirname24, resolve as resolve36 } from "node:path";
 var DAEMON_FAILURE_LIMIT = 3;
 var DAEMON_FAILURE_WINDOW_MS = 5 * 6e4;
 function daemonFailurePath(runtimeDir) {
@@ -45507,8 +45007,8 @@ function daemonFailurePath(runtimeDir) {
 }
 async function readFailureRecord(runtimeDir) {
   try {
-    const value = JSON.parse(await readFile22(daemonFailurePath(runtimeDir), "utf8"));
-    if (value.version !== 1 || !Array.isArray(value.failures) || value.failures.some((failure2) => typeof failure2 !== "number") || typeof value.lastError !== "string") {
+    const value = JSON.parse(await readFile23(daemonFailurePath(runtimeDir), "utf8"));
+    if (value.version !== 1 || !Array.isArray(value.failures) || value.failures.some((failure) => typeof failure !== "number") || typeof value.lastError !== "string") {
       return void 0;
     }
     return value;
@@ -45519,14 +45019,14 @@ async function readFailureRecord(runtimeDir) {
 async function writeFailureRecord(runtimeDir, record6) {
   const path = daemonFailurePath(runtimeDir);
   const staged = `${path}.${process.pid}.tmp`;
-  await mkdir26(dirname25(path), { recursive: true, mode: 448 });
+  await mkdir26(dirname24(path), { recursive: true, mode: 448 });
   await writeFile19(staged, `${JSON.stringify(record6, null, 2)}
 `, { mode: 384 });
   await rename9(staged, path);
 }
 async function recordDaemonStartFailure(runtimeDir, error, now2 = Date.now()) {
   const prior = await readFailureRecord(runtimeDir);
-  const failures = [...prior?.failures ?? [], now2].filter((failure2) => now2 - failure2 <= DAEMON_FAILURE_WINDOW_MS);
+  const failures = [...prior?.failures ?? [], now2].filter((failure) => now2 - failure <= DAEMON_FAILURE_WINDOW_MS);
   const distressed = failures.length >= DAEMON_FAILURE_LIMIT;
   const record6 = {
     version: 1,
@@ -45546,7 +45046,7 @@ init_systemd();
 
 // apps/body/dist/current-release-probe.js
 import { spawn as spawn13 } from "node:child_process";
-import { dirname as dirname26, join as join16 } from "node:path";
+import { dirname as dirname25, join as join16 } from "node:path";
 init_runtime();
 init_self_update();
 var CURRENT_RELEASE_PROBE_TIMEOUT_MS = 12e4;
@@ -45653,7 +45153,7 @@ async function runUpdateProbeCommand(args, options = {}) {
   const runtime = await readRuntimeRecord(configPath);
   const agent = runtimeAgentCommand(runtime);
   const config = loadBodyConfig({
-    workspaceRoot: join16(dirname26(configPath), "workspace"),
+    workspaceRoot: join16(dirname25(configPath), "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env: { ...env, BUZZ_AGENT_BIN: agent.command, BUZZ_DEV_MCP_BIN: runtime.mcpBinary },
     agent
@@ -45671,7 +45171,7 @@ async function runUpdateProbeCommand(args, options = {}) {
   }
   const layout = beelineInstallLayout(env);
   const releaseId = (layout && await activeReleaseId(layout).catch(() => void 0)) ?? "unknown";
-  const runtimeDir = dirname26(configPath);
+  const runtimeDir = dirname25(configPath);
   const outcome = await probeOutcome(() => (options.probe ?? runUpdateFunctionalProbe)({
     config,
     runtimeDir,
@@ -45686,7 +45186,7 @@ async function runUpdateProbeCommand(args, options = {}) {
 }
 
 // apps/body/dist/release-status.js
-import { readFile as readFile23, readdir as readdir9, rename as rename10, writeFile as writeFile20 } from "node:fs/promises";
+import { readFile as readFile24, readdir as readdir9, rename as rename10, writeFile as writeFile20 } from "node:fs/promises";
 import { resolve as resolve37 } from "node:path";
 var DAEMON_RELEASE_STATUS_FILE = "release-status.json";
 var RELEASE_VERSION = /^v\d+\.\d+\.\d+$/;
@@ -45842,7 +45342,7 @@ var DaemonExitError = class extends Error {
 };
 async function runStoredDaemon(pathOrPointer) {
   const configPath = await resolveRuntimeConfigPath(pathOrPointer);
-  daemonFailureRuntimeDir = dirname27(configPath);
+  daemonFailureRuntimeDir = dirname26(configPath);
   const accessMigration = await migrateRuntimeRecordAccessPolicy(configPath);
   let runtime = accessMigration.runtime;
   if (!runtime.transport) {
@@ -45876,7 +45376,7 @@ async function runStoredDaemon(pathOrPointer) {
     BUZZ_DEV_MCP_BIN: runtime.mcpBinary
   };
   const config = loadBodyConfig({
-    workspaceRoot: resolve39(dirname27(configPath), "workspace"),
+    workspaceRoot: resolve39(dirname26(configPath), "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env,
     agent
@@ -45903,7 +45403,7 @@ async function runStoredDaemon(pathOrPointer) {
   config.runtimeConfigPath = configPath;
   const sandbox = await ensureBwrapSandbox({
     ...runtime.sandbox ? { policy: runtime.sandbox } : {},
-    stateDir: dirname27(configPath),
+    stateDir: dirname26(configPath),
     beforeInstall: () => extendSystemdStartTimeout(BUBBLEWRAP_INSTALL_BUDGET_MS)
   });
   if (sandbox.path)
@@ -45914,10 +45414,8 @@ async function runStoredDaemon(pathOrPointer) {
     config.sandboxMaskPaths = [...config.sandboxMaskPaths ?? [], ...runtime.sandboxMaskPaths];
   }
   const controller = new AbortController();
-  const stop = () => controller.abort();
-  process.once("SIGINT", stop);
-  process.once("SIGTERM", stop);
-  const runtimeDir = dirname27(configPath);
+  const disposeStopSignals = installDaemonStopSignals(controller);
+  const runtimeDir = dirname26(configPath);
   const layout = beelineInstallLayout(process.env);
   const notifier = new SystemdNotifier();
   let rollbackAlertDrain;
@@ -46259,6 +45757,7 @@ async function runStoredDaemon(pathOrPointer) {
     institutionalMemoryWorker?.stop();
     await notifier.stopping(stoppingStatus).catch(() => void 0);
     await clearDaemonPidRecordIfPid(configPath, process.pid);
+    disposeStopSignals();
   }
 }
 async function main() {
@@ -46282,7 +45781,7 @@ async function main() {
     if (process.env.BEELINE_SQUIRE_RELAY_URL)
       runSquireTaskProxy();
     else
-      runSquireFacade();
+      await runSquireFacade();
     return;
   }
   if (command === SQUIRE_BROKER_FLAG) {
@@ -46363,7 +45862,7 @@ async function main() {
     }
     if (!configPath && agentPubkey) {
       const configs = await findAgentRuntimeConfigPaths(process.env, process.cwd());
-      configPath = configs.find((candidate) => dirname27(candidate).endsWith(agentPubkey));
+      configPath = configs.find((candidate) => dirname26(candidate).endsWith(agentPubkey));
     }
     if (!configPath && agentPubkey) {
       throw new DaemonExitError(`unknown agent ${agentPubkey}: no durable runtime exists; refusing service restart loop`, UNKNOWN_AGENT_EXIT_STATUS);
@@ -46391,7 +45890,7 @@ async function main() {
     if (!agentPubkey)
       throw new Error("stop requires --agent <pubkey>");
     const configs = await findAgentRuntimeConfigPaths(process.env, process.cwd());
-    const configPath = configs.find((candidate) => dirname27(candidate).endsWith(agentPubkey));
+    const configPath = configs.find((candidate) => dirname26(candidate).endsWith(agentPubkey));
     if (!configPath)
       throw new Error(`no stored runtime found for agent ${agentPubkey}`);
     const runtime = await readRuntimeRecord(configPath);
@@ -46425,10 +45924,10 @@ main().catch(async (err) => {
   let exitStatus = err instanceof DaemonExitError ? err.exitStatus : 1;
   if (process.argv[2] === "daemon" && daemonFailureRuntimeDir && exitStatus === 1) {
     try {
-      const failure2 = await recordDaemonStartFailure(daemonFailureRuntimeDir, err);
-      if (failure2.distressed) {
+      const failure = await recordDaemonStartFailure(daemonFailureRuntimeDir, err);
+      if (failure.distressed) {
         exitStatus = DAEMON_DISTRESS_EXIT_STATUS;
-        console.error(`[thin-core] daemon start failed ${failure2.count} times; service restart stopped. operator record: ${failure2.path}`);
+        console.error(`[thin-core] daemon start failed ${failure.count} times; service restart stopped. operator record: ${failure.path}`);
       }
     } catch (recordError) {
       console.error("[thin-core] could not persist daemon distress record:", recordError);