usebeeline 0.0.121 → 0.0.122

package/dist/usebeeline.mjs

@@ -11315,12 +11315,12 @@ __export(self_update_exports, {
 });
 import { createHash as createHash8 } from "node:crypto";
 import { constants as fsConstants2 } from "node:fs";
-import { access, chmod as chmod6, lstat as lstat4, mkdir as mkdir17, open, readFile as readFile10, rename as rename6, rm as rm6, symlink as symlink3, writeFile as writeFile11 } from "node:fs/promises";
+import { access as access2, chmod as chmod6, lstat as lstat4, mkdir as mkdir18, open, readFile as readFile11, rename as rename6, rm as rm6, symlink as symlink3, writeFile as writeFile11 } from "node:fs/promises";
 import { spawn as spawn8 } from "node:child_process";
 import { homedir as homedir12 } from "node:os";
-import { dirname as dirname15, join as join13, resolve as resolve26 } from "node:path";
+import { dirname as dirname16, join as join13, resolve as resolve27 } from "node:path";
 function anchorLayout(rawLibDir) {
-  const libDir = resolve26(rawLibDir);
+  const libDir = resolve27(rawLibDir);
   const segments = libDir.split(/[/\\]/);
   const idx = segments.lastIndexOf(RELEASES_SEGMENT);
   if (idx >= 2 && segments[idx - 1] === "lib") {
@@ -11336,9 +11336,9 @@ function anchorLayout(rawLibDir) {
     // prefix's bin, NOT <prefix>/lib/bin — deriving it one level up was the
     // defect that made activateRelease write its stable forwarders where
     // nothing executed them, leaving stale raw wrappers in <prefix>/bin.
-    binDir: resolve26(libDir, "../../bin"),
+    binDir: resolve27(libDir, "../../bin"),
     libDir,
-    releasesRoot: resolve26(libDir, `../${RELEASES_SEGMENT}`)
+    releasesRoot: resolve27(libDir, `../${RELEASES_SEGMENT}`)
   };
 }
 function beelineInstallLayout(env = process.env) {
@@ -11350,18 +11350,18 @@ function beelineInstallLayout(env = process.env) {
 function releaseIdFromPath(path) {
   if (!path?.trim())
     return void 0;
-  const segments = resolve26(path.trim()).split(/[/\\]/);
+  const segments = resolve27(path.trim()).split(/[/\\]/);
   const idx = segments.lastIndexOf(RELEASES_SEGMENT);
   const id = idx >= 0 ? segments[idx + 1] : void 0;
   return id ? sanitizeReleaseId(id) : void 0;
 }
 function runningReleaseId(layout, env = process.env, invocationPath = process.argv[1]) {
-  const releasesRoot = resolve26(layout.releasesRoot);
-  const anchor = resolve26(layout.libDir);
+  const releasesRoot = resolve27(layout.releasesRoot);
+  const anchor = resolve27(layout.libDir);
   for (const raw of [env.BEELINE_LIB_DIR, invocationPath]) {
     if (!raw?.trim())
       continue;
-    const resolved = resolve26(raw.trim());
+    const resolved = resolve27(raw.trim());
     if (resolved !== anchor && !resolved.startsWith(`${releasesRoot}/`))
       continue;
     const id = releaseIdFromPath(resolved);
@@ -11372,7 +11372,7 @@ function runningReleaseId(layout, env = process.env, invocationPath = process.ar
 }
 function defaultBeelineInstallLayout(env = process.env) {
   const home = env.HOME?.trim() || homedir12();
-  return anchorLayout(resolve26(home, ".local", "lib", "beeline"));
+  return anchorLayout(resolve27(home, ".local", "lib", "beeline"));
 }
 function discoveredBeelineInstallLayout(env = process.env) {
   const explicitAnchor = env.BEELINE_INSTALL_LIB_DIR?.trim();
@@ -11380,7 +11380,7 @@ function discoveredBeelineInstallLayout(env = process.env) {
     return anchorLayout(explicitAnchor);
   const explicitBinDir = env.BEELINE_INSTALL_DIR?.trim();
   if (explicitBinDir)
-    return anchorLayout(resolve26(dirname15(resolve26(explicitBinDir)), "lib", "beeline"));
+    return anchorLayout(resolve27(dirname16(resolve27(explicitBinDir)), "lib", "beeline"));
   return defaultBeelineInstallLayout(env);
 }
 function hostPlatformKey() {
@@ -11397,7 +11397,7 @@ async function readBundleJson(bundleDir) {
   let raw;
   for (const candidate of bundleJsonCandidates(bundleDir)) {
     try {
-      raw = await readFile10(candidate, "utf8");
+      raw = await readFile11(candidate, "utf8");
       break;
     } catch {
     }
@@ -11419,13 +11419,13 @@ function updateStatePath(layout) {
 }
 async function readUpdateState(layout) {
   try {
-    return JSON.parse(await readFile10(updateStatePath(layout), "utf8"));
+    return JSON.parse(await readFile11(updateStatePath(layout), "utf8"));
   } catch {
     return {};
   }
 }
 async function writeUpdateState(layout, state) {
-  await mkdir17(join13(layout.releasesRoot, ".state"), { recursive: true });
+  await mkdir18(join13(layout.releasesRoot, ".state"), { recursive: true });
   await writeFile11(updateStatePath(layout), `${JSON.stringify(state, null, 2)}
 `, "utf8");
 }
@@ -11512,7 +11512,7 @@ function entrypointCandidates(bundleDir) {
 async function resolveBundleEntrypoint(bundleDir) {
   for (const candidate of entrypointCandidates(bundleDir)) {
     try {
-      await access(candidate, fsConstants2.F_OK);
+      await access2(candidate, fsConstants2.F_OK);
       return candidate;
     } catch {
     }
@@ -11520,10 +11520,7 @@ async function resolveBundleEntrypoint(bundleDir) {
   return void 0;
 }
 function requiredBundlePaths() {
-  return [
-    BUNDLE_ENTRYPOINT,
-    PI_MCP_ADAPTER_ENTRYPOINT
-  ];
+  return [BUNDLE_ENTRYPOINT, PI_MCP_ADAPTER_ENTRYPOINT, CODEGRAPH_ENTRYPOINT];
 }
 async function stageRelease(layout, manifestUrl, published, opts = {}) {
   const fetchImpl = opts.fetchImpl ?? fetch;
@@ -11533,13 +11530,13 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
   const okMarker = join13(releaseDir, ".stage-ok");
   let previouslyVerified = false;
   try {
-    const recorded = await readFile10(okMarker, "utf8");
+    const recorded = await readFile11(okMarker, "utf8");
     if (recorded.trim() === published.sha256)
       return releaseId;
     previouslyVerified = true;
   } catch {
   }
-  await mkdir17(releaseDir, { recursive: true });
+  await mkdir18(releaseDir, { recursive: true });
   const tempArchive = join13(layout.releasesRoot, `.download-${releaseId}-${process.pid}.tar.gz`);
   try {
     log2(`downloading ${published.file}`);
@@ -11580,7 +11577,7 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
       throw new Error(`extracting bundle failed: ${extract2.stderr}`);
     for (const relative3 of requiredBundlePaths()) {
       try {
-        await access(join13(releaseDir, relative3), fsConstants2.F_OK);
+        await access2(join13(releaseDir, relative3), fsConstants2.F_OK);
       } catch {
         throw new Error(`staged bundle is missing ${relative3}`);
       }
@@ -11625,9 +11622,9 @@ async function replaceFile(path, contents, mode) {
 }
 async function activateRelease(layout, releaseId) {
   const releaseDir = join13(layout.releasesRoot, releaseId);
-  await access(join13(releaseDir, BUNDLE_ENTRYPOINT), fsConstants2.F_OK);
-  await mkdir17(layout.releasesRoot, { recursive: true });
-  await mkdir17(layout.binDir, { recursive: true });
+  await access2(join13(releaseDir, BUNDLE_ENTRYPOINT), fsConstants2.F_OK);
+  await mkdir18(layout.releasesRoot, { recursive: true });
+  await mkdir18(layout.binDir, { recursive: true });
   let previousReleaseId = await activeReleaseId(layout);
   const kind = await pathKind(layout.libDir);
   if (kind === "directory") {
@@ -11635,7 +11632,7 @@ async function activateRelease(layout, releaseId) {
     const legacyId = sanitizeReleaseId(legacyIdentity?.commit ?? legacyIdentity?.version ?? `legacy-${Date.now()}`);
     const legacyDir = join13(layout.releasesRoot, legacyId);
     try {
-      await access(legacyDir, fsConstants2.F_OK);
+      await access2(legacyDir, fsConstants2.F_OK);
       previousReleaseId = `${legacyId}-${Date.now()}`;
       await rename6(layout.libDir, join13(layout.releasesRoot, previousReleaseId));
       await normalizeLegacyBundleShape(join13(layout.releasesRoot, previousReleaseId));
@@ -11649,7 +11646,7 @@ async function activateRelease(layout, releaseId) {
   await rm6(tempLink, { force: true });
   await symlink3(join13("beeline-releases", releaseId), tempLink);
   await rename6(tempLink, layout.libDir);
-  await fsyncDir(dirname15(layout.libDir));
+  await fsyncDir(dirname16(layout.libDir));
   await writeBinForwarders(layout, releaseDir);
   return { previousReleaseId };
 }
@@ -11658,7 +11655,7 @@ async function normalizeLegacyBundleShape(bundleDir) {
   let anyFlat = false;
   for (const name of LEGACY_FLAT_BUNDLE_FILES) {
     try {
-      await access(join13(bundleDir, name), fsConstants2.F_OK);
+      await access2(join13(bundleDir, name), fsConstants2.F_OK);
       anyFlat = true;
       break;
     } catch {
@@ -11666,10 +11663,10 @@ async function normalizeLegacyBundleShape(bundleDir) {
   }
   if (!anyFlat)
     return;
-  await mkdir17(innerLib, { recursive: true });
+  await mkdir18(innerLib, { recursive: true });
   for (const name of LEGACY_FLAT_BUNDLE_FILES) {
     try {
-      await access(join13(innerLib, name), fsConstants2.F_OK);
+      await access2(join13(innerLib, name), fsConstants2.F_OK);
       continue;
     } catch {
     }
@@ -11684,7 +11681,7 @@ async function writeBinForwarders(layout, activeBundleRoot) {
   for (const [name, tool] of entries) {
     const target = join13(activeBundleRoot, "bin", tool);
     try {
-      await access(target, fsConstants2.X_OK);
+      await access2(target, fsConstants2.X_OK);
     } catch {
       continue;
     }
@@ -11697,7 +11694,7 @@ async function repairInstallForwarders(layout, opts = {}) {
   const forwarderHealthy = async (name, tool) => {
     let current;
     try {
-      current = await readFile10(join13(layout.binDir, name), "utf8");
+      current = await readFile11(join13(layout.binDir, name), "utf8");
     } catch {
       current = void 0;
     }
@@ -11710,7 +11707,7 @@ async function repairInstallForwarders(layout, opts = {}) {
   }
   if (healthy)
     return false;
-  await mkdir17(layout.binDir, { recursive: true });
+  await mkdir18(layout.binDir, { recursive: true });
   await writeBinForwarders(layout, layout.libDir);
   opts.logger?.(`[body] self-update: repaired <prefix>/bin forwarders to follow the active-bundle anchor (${layout.libDir})`);
   return true;
@@ -11725,14 +11722,14 @@ async function rollbackToPreviousRelease(layout, previousReleaseId) {
   await rm6(tempLink, { force: true });
   await symlink3(join13("beeline-releases", previousReleaseId), tempLink);
   await rename6(tempLink, layout.libDir);
-  await fsyncDir(dirname15(layout.libDir));
+  await fsyncDir(dirname16(layout.libDir));
 }
 function updateAttemptPath(layout) {
   return join13(layout.releasesRoot, ".state", "update-attempt.json");
 }
 async function readUpdateAttempt(layout) {
   try {
-    const raw = JSON.parse(await readFile10(updateAttemptPath(layout), "utf8"));
+    const raw = JSON.parse(await readFile11(updateAttemptPath(layout), "utf8"));
     if (raw.version !== 1 || typeof raw.appliedAt !== "number" || typeof raw.confirmBy !== "number" || typeof raw.releaseId !== "string" || !["pending", "confirmed", "reverted"].includes(raw.status)) {
       return void 0;
     }
@@ -11742,7 +11739,7 @@ async function readUpdateAttempt(layout) {
   }
 }
 async function writeUpdateAttempt(layout, record3) {
-  await mkdir17(join13(layout.releasesRoot, ".state"), { recursive: true });
+  await mkdir18(join13(layout.releasesRoot, ".state"), { recursive: true });
   const path = updateAttemptPath(layout);
   const staged = `${path}.${process.pid}.tmp`;
   await writeFile11(staged, `${JSON.stringify(record3, null, 2)}
@@ -11790,7 +11787,7 @@ function describeIdentity(identity) {
     parts.push(identity.commit.slice(0, 12));
   return parts.join(" ") || "unknown";
 }
-var RELEASES_SEGMENT, BUNDLE_ENTRYPOINT, PI_MCP_ADAPTER_ENTRYPOINT, FORWARDER_TOOLS, FORWARDER_ALIASES, LEGACY_FLAT_BUNDLE_FILES, DEFAULT_UPDATE_CONFIRM_WINDOW_MS, SelfUpdateManager;
+var RELEASES_SEGMENT, BUNDLE_ENTRYPOINT, PI_MCP_ADAPTER_ENTRYPOINT, CODEGRAPH_ENTRYPOINT, FORWARDER_TOOLS, FORWARDER_ALIASES, LEGACY_FLAT_BUNDLE_FILES, DEFAULT_UPDATE_CONFIRM_WINDOW_MS, SelfUpdateManager;
 var init_self_update = __esm({
   "apps/body/dist/self-update.js"() {
     "use strict";
@@ -11798,7 +11795,14 @@ var init_self_update = __esm({
     RELEASES_SEGMENT = "beeline-releases";
     BUNDLE_ENTRYPOINT = "lib/beeline/beeline-cli.mjs";
     PI_MCP_ADAPTER_ENTRYPOINT = "lib/beeline/pi-mcp-adapter.mjs";
-    FORWARDER_TOOLS = ["beeline", "buzz-agent", "buzz-dev-mcp", "beeline-readonly-mcp"];
+    CODEGRAPH_ENTRYPOINT = "lib/beeline/codegraph/bin/codegraph";
+    FORWARDER_TOOLS = [
+      "beeline",
+      "buzz-agent",
+      "buzz-dev-mcp",
+      "beeline-readonly-mcp",
+      "codegraph"
+    ];
     FORWARDER_ALIASES = {
       usebeeline: "beeline"
     };
@@ -12020,7 +12024,7 @@ function configureNetworkFamilyDefaults(network = net) {
 configureNetworkFamilyDefaults();
 
 // apps/body/dist/cli.js
-import { dirname as dirname22, resolve as resolve34 } from "node:path";
+import { dirname as dirname23, resolve as resolve35 } from "node:path";
 import { stdin as stdin4, stdout as stdout5 } from "node:process";
 
 // node_modules/@clack/core/dist/index.mjs
@@ -13469,7 +13473,7 @@ function parseCursorModelsOutput(output) {
   };
 }
 async function enumerateCursorModels(env = process.env) {
-  return new Promise((resolve35) => {
+  return new Promise((resolve36) => {
     const child = spawn("cursor-agent", ["models"], {
       env,
       stdio: ["ignore", "pipe", "ignore"]
@@ -13483,11 +13487,11 @@ async function enumerateCursorModels(env = process.env) {
     });
     child.on("error", () => {
       clearTimeout(timer);
-      resolve35(void 0);
+      resolve36(void 0);
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve35(code === 0 ? parseCursorModelsOutput(output) : void 0);
+      resolve36(code === 0 ? parseCursorModelsOutput(output) : void 0);
     });
   });
 }
@@ -13914,13 +13918,13 @@ var CursorAcpServer = class {
         consumeLine(line);
     });
     try {
-      const { code, signal } = await new Promise((resolve35) => {
+      const { code, signal } = await new Promise((resolve36) => {
         let settled = false;
         const finish = (exitCode, exitSignal) => {
           if (settled)
             return;
           settled = true;
-          resolve35({ code: exitCode, signal: exitSignal });
+          resolve36({ code: exitCode, signal: exitSignal });
         };
         child.once("error", (error) => {
           spawnError = error instanceof Error ? error.message : String(error);
@@ -14364,7 +14368,10 @@ function resolveReadonlyMcpCommand(env = process.env) {
   throw new Error("read-only tools unavailable: beeline-readonly-mcp was not found. Reinstall Beeline or set BEELINE_READONLY_MCP_BIN / BEELINE_READONLY_MCP_SCRIPT");
 }
 function resolveCodegraphCommand(env = process.env) {
-  const configured = env.BUZZ_CODEGRAPH_BIN;
+  const bundledBinary = commandInRunningBundle("codegraph");
+  if (bundledBinary)
+    return bundledBinary;
+  const configured = env.BEELINE_CODEGRAPH_BIN ?? env.BUZZ_CODEGRAPH_BIN;
   if (configured) {
     try {
       accessSync2(configured, constants2.X_OK);
@@ -15172,6 +15179,7 @@ var AcpClient = class extends EventEmitter {
   osSandbox;
   permissionHandler;
   permissionAllowlist;
+  commandsHandler;
   constructor(opts) {
     super();
     const command = opts.agentCommand ?? opts.agentBinary;
@@ -15188,6 +15196,7 @@ var AcpClient = class extends EventEmitter {
     this.osSandbox = opts.osSandbox ?? false;
     this.permissionHandler = opts.permissionHandler;
     this.permissionAllowlist = opts.permissionAllowlist;
+    this.commandsHandler = opts.onCommands;
   }
   async start(timeoutMs = 6e4) {
     if (this.alive)
@@ -15562,6 +15571,7 @@ var AcpClient = class extends EventEmitter {
         if (params.update.sessionUpdate === "available_commands_update") {
           const commands = parseAvailableCommands(params.update.availableCommands);
           this.sessionCommands.set(params.sessionId, commands);
+          this.commandsHandler?.(commands);
           this.emit("commands", { sessionId: params.sessionId, commands });
         }
         const toolCallId = params.update.toolCallId;
@@ -15609,7 +15619,7 @@ var AcpClient = class extends EventEmitter {
     const current = this.activeRunIds.get(sessionId);
     if (current)
       return Promise.resolve(current);
-    return new Promise((resolve35, reject) => {
+    return new Promise((resolve36, reject) => {
       const onUpdate = (update) => {
         if (update.sessionId !== sessionId)
           return;
@@ -15617,7 +15627,7 @@ var AcpClient = class extends EventEmitter {
         if (!runId)
           return;
         cleanup();
-        resolve35(runId);
+        resolve36(runId);
       };
       const timer = setTimeout(() => {
         cleanup();
@@ -15701,13 +15711,13 @@ var AcpClient = class extends EventEmitter {
     }
     const id = this.nextId++;
     const payload = { jsonrpc: "2.0", id, method, params };
-    return new Promise((resolve35, reject) => {
+    return new Promise((resolve36, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
         reject(new AcpRequestTimeoutError(method, timeoutMs, this.stderrTail, Boolean(onStart), detail));
       }, timeoutMs);
       this.pending.set(id, {
-        resolve: resolve35,
+        resolve: resolve36,
         reject,
         timer,
         method,
@@ -16226,8 +16236,8 @@ async function syncAgentModelCatalog(input) {
 }
 
 // apps/body/dist/connector-google.js
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync } from "node:fs";
-import { dirname as dirname5, join as join4 } from "node:path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync } from "node:fs";
+import { dirname as dirname4, join as join3 } from "node:path";
 
 // apps/body/dist/google-workspace-client.js
 function credentialsTokenSource(credentials) {
@@ -16601,14 +16611,170 @@ function googleWorkspaceClient(tokenSource, transport = defaultGoogleApiTranspor
   };
 }
 
+// apps/body/dist/connector-google.js
+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"
+  ]
+};
+function isGoogleToolConnectorType(type) {
+  return type in GOOGLE_TOOL_SCOPES;
+}
+async function readGoogleCredentialsFromVault(mcp) {
+  if (!mcp)
+    return { source: "unavailable", reason: "no Trusty Squire connector is paired" };
+  let raw;
+  try {
+    raw = await mcp.call("google_oauth_credentials", {});
+  } catch (error) {
+    const detail = describe(error);
+    return {
+      source: "unavailable",
+      reason: `Squire has no Google OAuth grant on record yet (connect your Google account in Squire first: ${detail})`
+    };
+  }
+  const record3 = raw && typeof raw === "object" ? raw : {};
+  const inner = record3.credentials && typeof record3.credentials === "object" ? record3.credentials : record3;
+  const accessToken = inner.accessToken ?? inner.access_token;
+  if (!accessToken || typeof accessToken !== "string") {
+    return { source: "unavailable", reason: "Squire returned a Google grant without an access token" };
+  }
+  return {
+    source: "squire",
+    credentials: {
+      accessToken,
+      refreshToken: typeof record3.refreshToken === "string" ? record3.refreshToken : typeof record3.refresh_token === "string" ? record3.refresh_token : void 0,
+      expiresAt: typeof record3.expiresAt === "number" ? record3.expiresAt : void 0,
+      accountEmail: typeof record3.accountEmail === "string" ? record3.accountEmail : typeof record3.email === "string" ? record3.email : void 0
+    }
+  };
+}
+function manualGoogleCredentialsSearchPaths(home) {
+  return [join3(home, "google-credentials.json")];
+}
+function loadManualGoogleCredentials(home, env = process.env) {
+  if (env.BEELINE_GOOGLE_ACCESS_TOKEN) {
+    return {
+      source: "manual",
+      credentials: { accessToken: env.BEELINE_GOOGLE_ACCESS_TOKEN }
+    };
+  }
+  for (const path of manualGoogleCredentialsSearchPaths(home)) {
+    try {
+      const parsed = JSON.parse(readFileSync3(path, "utf8"));
+      if (typeof parsed.accessToken === "string" || typeof parsed.access_token === "string") {
+        return {
+          source: "manual",
+          credentials: {
+            accessToken: parsed.accessToken ?? parsed.access_token,
+            refreshToken: typeof parsed.refreshToken === "string" ? parsed.refreshToken : void 0,
+            expiresAt: typeof parsed.expiresAt === "number" ? parsed.expiresAt : void 0,
+            accountEmail: typeof parsed.accountEmail === "string" ? parsed.accountEmail : void 0
+          }
+        };
+      }
+    } catch {
+    }
+  }
+  return {
+    source: "manual-missing",
+    reason: `no Google credentials found. Put a google-credentials.json (OAuth access token) at ${manualGoogleCredentialsSearchPaths(home)[0]} or connect your Google account in Trusty Squire first.`
+  };
+}
+function persistManualGoogleCredentials(home, credentials) {
+  const path = manualGoogleCredentialsSearchPaths(home)[0];
+  mkdirSync2(dirname4(path), { recursive: true, mode: 448 });
+  writeFileSync(path, `${JSON.stringify({
+    accessToken: credentials.accessToken,
+    ...credentials.refreshToken ? { refreshToken: credentials.refreshToken } : {},
+    ...credentials.expiresAt ? { expiresAt: credentials.expiresAt } : {},
+    ...credentials.accountEmail ? { accountEmail: credentials.accountEmail } : {}
+  })}
+`, { encoding: "utf8", mode: 384 });
+  return path;
+}
+var step = (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 steps = [step("helper reached", "done")];
+  const emit = () => options.onProgress?.([...steps]);
+  const push = (next) => {
+    steps.push(next);
+    emit();
+  };
+  const fail = (label, reason, output) => {
+    push(step(label, "failed", { reason, ...output ? { output } : {} }));
+    return { status: "error", steps, errorMessage: reason };
+  };
+  emit();
+  if (!isGoogleToolConnectorType(options.connectorType)) {
+    return fail("connector type", `${options.connectorType} is not a Google tool connector`);
+  }
+  push(step("Google credentials resolved", "running", { output: "resolving\u2026" }));
+  const resolved = options.resolvedCredentials ? await options.resolvedCredentials : options.resolveCredentials ? await options.resolveCredentials() : await (async () => {
+    const oneClick = await readGoogleCredentialsFromVault(options.squire);
+    if (oneClick.source === "squire")
+      return oneClick;
+    return loadManualGoogleCredentials(options.home, options.env);
+  })();
+  if (!("credentials" in resolved)) {
+    const reason = resolved.reason;
+    steps[1] = step("Google credentials resolved", "failed", { reason, output: outputTail(reason) });
+    emit();
+    return { status: "error", steps, errorMessage: reason };
+  }
+  steps[1] = step("Google credentials resolved", "done", {
+    output: resolved.source === "squire" ? "one-click: read the Google grant from Trusty Squire" : "manual: local google-credentials.json"
+  });
+  emit();
+  const client = options.client ?? googleWorkspaceClient(refreshableTokenSource(resolved.credentials, options.env?.BEELINE_GOOGLE_CLIENT_ID, options.env?.BEELINE_GOOGLE_CLIENT_SECRET));
+  push(step("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));
+  }
+  steps[2] = step("authorized with Google", "done", {
+    ...verify.account ? { output: `signed in as ${verify.account}` } : {}
+  });
+  emit();
+  push(step("tools enabled", "done", {
+    output: `${GOOGLE_TOOL_SCOPES[options.connectorType].length} Google scopes granted`
+  }));
+  persistManualGoogleCredentials(options.home, resolved.credentials);
+  return {
+    status: "connected",
+    steps,
+    ...verify.account ? { signedInAs: verify.account } : {}
+  };
+}
+function describe(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
 // apps/body/dist/connector-squire.js
 import { execFile, spawn as spawn5 } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
-import { lstatSync as lstatSync3, readFileSync as readFileSync3, realpathSync, rmSync } from "node:fs";
+import { lstatSync as lstatSync3, readFileSync as readFileSync4, realpathSync, rmSync } from "node:fs";
 import { homedir as homedir3, hostname, tmpdir as tmpdir2 } from "node:os";
-import { basename as basename4, dirname as dirname4, join as join3, resolve as resolve7 } from "node:path";
+import { basename as basename4, dirname as dirname5, join as join4, resolve as resolve7 } from "node:path";
 var SQUIRE_MCP_NAME = "@trusty-squire/mcp";
-var SQUIRE_CONNECT_PACKAGE = `${SQUIRE_MCP_NAME}@latest`;
+var SQUIRE_CONNECT_VERSION = "1.1.16-rc.4";
+var SQUIRE_CONNECT_PACKAGE = `${SQUIRE_MCP_NAME}@${SQUIRE_CONNECT_VERSION}`;
 var activeConnectSession;
 function squireConnectSession() {
   return activeConnectSession;
@@ -16644,9 +16810,9 @@ function squireProfilePathIdentity(profileDir) {
   let candidate = absolute;
   for (; ; ) {
     try {
-      return join3(realpathSync.native(candidate), ...suffix.reverse());
+      return join4(realpathSync.native(candidate), ...suffix.reverse());
     } catch {
-      const parent = dirname4(candidate);
+      const parent = dirname5(candidate);
       if (parent === candidate)
         return absolute;
       suffix.push(basename4(candidate));
@@ -16656,20 +16822,14 @@ function squireProfilePathIdentity(profileDir) {
 }
 function squireProfileLockPath(profileDir = squireChromeProfileDir(), lockRoot = tmpdir2()) {
   const digest = createHash2("sha256").update(squireProfilePathIdentity(profileDir)).digest("hex").slice(0, 24);
-  return join3(lockRoot, `trusty-squire-profile-${digest}.lock`);
-}
-var SQUIRE_BROWSER_BUSY_GOOGLE_REASON = "Trusty Squire is still using the browser \u2014 connect Trusty Squire first";
-function isSquireBrowserSessionFailure(text2) {
-  if (typeof text2 !== "string" || text2.length === 0)
-    return false;
-  return /Trusty Squire[\s\S]{0,80}browser/i.test(text2) || /browser[\s\S]{0,80}Trusty Squire/i.test(text2);
+  return join4(lockRoot, `trusty-squire-profile-${digest}.lock`);
 }
 function squireForeignClaimAction(owner) {
   return `Trusty Squire's browser is in use by another process (pid ${owner.pid}). Finish or close that Trusty Squire session, then press Connect again.`;
 }
 function readLinuxStartTime(pid) {
   try {
-    const stat5 = readFileSync3(`/proc/${pid}/stat`, "utf8");
+    const stat5 = readFileSync4(`/proc/${pid}/stat`, "utf8");
     const close = stat5.lastIndexOf(")");
     return close < 0 ? void 0 : stat5.slice(close + 2).split(" ")[19];
   } catch {
@@ -16688,8 +16848,8 @@ function lockOwnerIsAlive(owner) {
 }
 function readLockFileOwner(lockPath) {
   try {
-    const target = lstatSync3(lockPath).isDirectory() ? join3(lockPath, "owner.json") : lockPath;
-    const parsed = JSON.parse(readFileSync3(target, "utf8"));
+    const target = lstatSync3(lockPath).isDirectory() ? join4(lockPath, "owner.json") : lockPath;
+    const parsed = JSON.parse(readFileSync4(target, "utf8"));
     if (typeof parsed.host !== "string" || typeof parsed.pid !== "number")
       return void 0;
     return {
@@ -16727,10 +16887,10 @@ function reclaimSquireProfileClaim(options) {
   options?.log?.(`cleared dead trusty-squire on-disk browser claim (pid ${owner.pid} gone)`);
   return { kind: "reclaimed-dead", owner };
 }
-var defaultShellRunner = (command, args) => new Promise((resolve35) => {
+var defaultShellRunner = (command, args) => new Promise((resolve36) => {
   execFile(command, [...args], { timeout: 12e4, maxBuffer: 4 * 1024 * 1024, encoding: "utf8" }, (error, stdout6, stderr) => {
     const code = error?.code;
-    resolve35({
+    resolve36({
       code: typeof code === "number" ? code : error ? 1 : 0,
       stdout: String(stdout6 ?? ""),
       stderr: String(stderr ?? "")
@@ -16755,7 +16915,7 @@ function killConnectTree(child) {
   }
   child.kill();
 }
-var defaultStreamedRunner = (command, args, env) => new Promise((resolve35) => {
+var defaultStreamedRunner = (command, args, env) => new Promise((resolve36) => {
   const child = spawn5(command, args, {
     stdio: ["ignore", "pipe", "pipe"],
     env: env ?? squireConnectProcessEnv(),
@@ -16764,10 +16924,12 @@ var defaultStreamedRunner = (command, args, env) => new Promise((resolve35) => {
   let stdout6 = "";
   let stderr = "";
   let resolved = false;
+  let consumed = 0;
+  let report;
   const safetyTimer = setTimeout(() => {
     if (!resolved) {
       resolved = true;
-      resolve35({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
+      resolve36({ stdout: stdout6, stderr, pid: child.pid ?? void 0, report, abort: () => {
       } });
     }
     killConnectTree(child);
@@ -16785,128 +16947,163 @@ var defaultStreamedRunner = (command, args, env) => new Promise((resolve35) => {
   const finish = (result) => {
     if (!resolved) {
       resolved = true;
-      resolve35(result);
+      resolve36(result);
     }
   };
   const settle = (result) => {
     clearTimeout(safetyTimer);
     finish(result);
   };
-  const checkOutput = () => {
-    const signIn = parseConnectOutput(stdout6) ?? parseConnectOutput(stderr);
-    if (signIn) {
-      finish({ stdout: stdout6, stderr, signIn, abort });
+  const consumeReports = (final) => {
+    const pending = stdout6.slice(consumed);
+    const lastNewline = pending.lastIndexOf("\n");
+    if (lastNewline < 0 && !final)
+      return;
+    const complete = lastNewline < 0 ? pending : pending.slice(0, lastNewline);
+    for (const line of complete.split("\n")) {
+      if (line.trim() === "")
+        continue;
+      const parsed = parseConnectReport(line);
+      if (parsed)
+        report = parsed;
+    }
+    consumed += lastNewline < 0 ? pending.length : lastNewline + 1;
+  };
+  const publishSignIn = () => {
+    consumeReports(false);
+    if (report && isPublishableConnectReport(report)) {
+      finish({ stdout: stdout6, stderr, pid: child.pid ?? void 0, report, abort });
     }
   };
-  const finalSignIn = () => parseConnectOutput(`${stdout6}
-`) ?? parseConnectOutput(`${stderr}
-`);
   child.stdout?.on("data", (chunk) => {
     stdout6 += String(chunk);
-    checkOutput();
+    publishSignIn();
   });
   child.stderr?.on("data", (chunk) => {
     stderr += String(chunk);
-    checkOutput();
   });
   child.on("close", () => {
+    consumeReports(true);
     settle({
       stdout: stdout6,
       stderr,
       pid: child.pid ?? void 0,
-      signIn: finalSignIn(),
+      report,
       abort: () => {
       }
     });
   });
   child.on("error", () => {
-    settle({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
+    settle({ stdout: stdout6, stderr, pid: child.pid ?? void 0, report, abort: () => {
     } });
   });
 });
-var step = (label, status, reason) => ({
+var step2 = (label, status, reason) => ({
   label,
   status,
   ...reason ? { reason } : {}
 });
-function isKnownCeremonySurface(url) {
-  try {
-    const parsed = new URL(url);
-    if (parsed.protocol !== "https:")
-      return false;
-    return parsed.hash.startsWith("#p=") || /(^|\/)install(\/|$)/.test(parsed.pathname);
-  } catch {
-    return false;
-  }
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-function isForeignUrl(url) {
+function connectAccount(raw) {
+  if (!isRecord(raw) || typeof raw.id !== "string")
+    return null;
+  return {
+    id: raw.id,
+    // An absent or unreadable `providers` is `null` (could not look), never
+    // `[]` (looked and found nothing).
+    providers: Array.isArray(raw.providers) ? raw.providers.filter((provider) => typeof provider === "string") : null
+  };
+}
+function parseConnectReport(line) {
+  let parsed;
   try {
-    const parsed = new URL(url);
-    const host = parsed.hostname.toLowerCase();
-    if (host === "developers.cloudflare.com")
-      return true;
-    if (host === "github.com" && parsed.pathname.toLowerCase().startsWith("/npm/cli"))
-      return true;
-    return host === "npmjs.com" || host === "www.npmjs.com";
+    parsed = JSON.parse(line);
   } catch {
-    return true;
+    return void 0;
   }
+  if (!isRecord(parsed) || typeof parsed.state !== "string")
+    return void 0;
+  return {
+    state: parsed.state,
+    terminal: parsed.terminal === true,
+    reason: typeof parsed.reason === "string" ? parsed.reason : null,
+    sign_in_url: typeof parsed.sign_in_url === "string" ? parsed.sign_in_url : null,
+    account: connectAccount(parsed.account),
+    holder: parsed.holder,
+    browser_location: parsed.browser_location
+  };
 }
-var BOXED_ROW = /^\s*\u2502(.*)\u2502\s*$/;
-var BOX_BORDER = /^\s*[\u2500-\u257F]+\s*$/;
-function rejoinBoxRows(cells) {
-  const written = cells.filter((cell) => cell.trim() !== "");
-  const pad2 = (measure) => written.length === 0 ? 0 : Math.min(...written.map(measure));
-  const left = pad2((cell) => cell.length - cell.trimStart().length);
-  const right = pad2((cell) => cell.length - cell.trimEnd().length);
-  const lines = [];
-  let carry;
-  for (const cell of cells) {
-    const content = cell.slice(left, cell.length - right);
-    const text2 = content.replace(/\s+$/, "");
-    carry = (carry ?? "") + text2;
-    if (text2.length < content.length) {
-      lines.push(carry);
-      carry = void 0;
-    }
+function isOutstandingSignIn(report) {
+  if (report.terminal || report.state !== "needs-sign-in" || !report.sign_in_url)
+    return false;
+  const location = report.browser_location;
+  if (!isRecord(location) || typeof location.kind !== "string")
+    return false;
+  return location.kind !== "none" && location.kind !== "unreachable";
+}
+function isPublishableConnectReport(report) {
+  return report.terminal || isOutstandingSignIn(report);
+}
+var CONNECT_REASON_LINES = {
+  provider_session_missing: "the bot's Chrome profile has no live provider session",
+  requested_provider_missing: "the provider sign-in you asked to refresh did not complete",
+  account_mismatch: "this machine is bound to a different account",
+  profile_unverifiable: "the bot's Chrome profile could not be verified",
+  install_expired: "the sign-in page expired before it was used",
+  cached_cookie_evidence: "the shared profile already carried the session",
+  run_failed: "the connect run failed before it could finish"
+};
+function holderLine(raw) {
+  if (!isRecord(raw))
+    return void 0;
+  if (raw.kind === "other") {
+    const pid = typeof raw.pid === "number" ? raw.pid : void 0;
+    return pid === void 0 ? "another Trusty Squire session is using the browser" : squireForeignClaimAction({ host: hostname(), pid, startTime: null });
   }
-  if (carry !== void 0)
-    lines.push(carry);
-  return lines;
+  if (raw.kind === "unknown")
+    return "another process may be using the browser";
+  return void 0;
 }
-function unframeBoxedOutput(output) {
-  const lines = [];
-  let box = [];
-  for (const row of output.split("\n")) {
-    const framed = BOXED_ROW.exec(row);
-    if (framed) {
-      box.push(framed[1] ?? "");
-      continue;
-    }
-    if (box.length > 0 && BOX_BORDER.test(row))
-      lines.push(...rejoinBoxRows(box));
-    box = [];
-    lines.push(row);
+function connectBlockedLine(report) {
+  if (report.state === "connected" || isOutstandingSignIn(report))
+    return void 0;
+  if (report.reason && CONNECT_REASON_LINES[report.reason]) {
+    return CONNECT_REASON_LINES[report.reason];
   }
-  return lines.join("\n");
-}
-function parseConnectOutput(output) {
-  const urls = unframeBoxedOutput(output).match(/https:\/\/[^\s"'<>]+(?=[\s"'<>])/g) ?? [];
-  const preferred = urls.find(isKnownCeremonySurface);
-  if (preferred)
-    return { method: "streamed-page", url: preferred };
-  const fallback = urls.find((url) => !isForeignUrl(url));
-  if (fallback) {
-    console.log(`[body] squire connect: no known ceremony surface matched; using fallback URL ${fallback}`);
-    return { method: "streamed-page", url: fallback };
+  const location = isRecord(report.browser_location) ? report.browser_location : void 0;
+  if (location?.kind === "unreachable") {
+    return "the sign-in page could not be shown on this machine";
   }
-  return void 0;
-}
-function parseConnectAlreadyConnected(output) {
-  return /Already connected \(/i.test(output) && /config refreshed/i.test(output);
+  if (report.state === "needs-sign-in") {
+    return "the connect run ended before the sign-in was completed";
+  }
+  const holder = holderLine(report.holder);
+  if (holder)
+    return holder;
+  return `Trusty Squire reported the connect state "${report.state}"`;
 }
-function withoutForceReloginHint(output) {
-  return output.split("\n").filter((line) => !/--force-relogin/.test(line)).join("\n").trim();
+function connectBrowserLocation(raw) {
+  if (!isRecord(raw))
+    return void 0;
+  switch (raw.kind) {
+    case "host_screen":
+      return { kind: "host_screen" };
+    case "virtual":
+      return typeof raw.url === "string" ? { kind: "virtual", url: raw.url } : void 0;
+    case "unreachable":
+      return {
+        kind: "unreachable",
+        reason: typeof raw.reason === "string" ? raw.reason : "the sign-in page could not be shown"
+      };
+    case "none":
+      return { kind: "none" };
+    case "unknown":
+      return typeof raw.reason === "string" ? { kind: "unknown", reason: raw.reason } : void 0;
+    default:
+      return void 0;
+  }
 }
 async function installedSquireVersion(run2, spec = SQUIRE_CONNECT_PACKAGE, preferOnline = false) {
   const probe = await run2("npx", [
@@ -16919,7 +17116,7 @@ async function installedSquireVersion(run2, spec = SQUIRE_CONNECT_PACKAGE, prefe
   return version;
 }
 async function currentSquireRelease(run2) {
-  const probe = await run2("npm", ["view", SQUIRE_MCP_NAME, "version"]);
+  const probe = await run2("npm", ["view", SQUIRE_CONNECT_PACKAGE, "version"]);
   if (probe.code !== 0)
     return void 0;
   return probe.stdout.match(/\d+\.\d+\.\d+[^\s]*/)?.[0];
@@ -16951,9 +17148,6 @@ async function resolveSquireConnectSpec(run2) {
     reResolved: true
   };
 }
-function parseSignedInAs(output) {
-  return output.match(/signed in as ([^\s,;]+)/i)?.[1];
-}
 async function installSquire(options) {
   const profileDir = options.profileDir ?? squireChromeProfileDir();
   const lockRoot = options.lockRoot ?? tmpdir2();
@@ -16961,14 +17155,14 @@ async function installSquire(options) {
   const streamRun = options.streamRun ?? defaultStreamedRunner;
   const log2 = options.log ?? (() => {
   });
-  const steps = [step("helper reached", "done")];
+  const steps = [step2("helper reached", "done")];
   const emit = () => options.onProgress?.([...steps]);
   const push = (next) => {
     steps.push(next);
     emit();
   };
   const fail = (reason) => {
-    steps.push(step("waiting for sign-in", "pending"));
+    steps.push(step2("waiting for sign-in", "pending"));
     emit();
     return { status: "error", steps, errorMessage: reason };
   };
@@ -16982,62 +17176,62 @@ async function installSquire(options) {
     ...previousPid !== void 0 ? { ourPids: [previousPid] } : {}
   });
   if (claim.kind === "blocked-foreign") {
-    push(step("trusty-squire installed", "failed", claim.action));
+    push(step2("trusty-squire installed", "failed", claim.action));
     return fail(claim.action);
   }
   const resolution = await resolveSquireConnectSpec(run2);
   if (resolution.reResolved) {
     log2(`trusty-squire stale copy ${resolution.resolvedVersion ?? "unknown"} re-resolved against current release ${resolution.currentRelease}`);
   }
-  const install = await streamRun("npx", [...resolution.npxArgs, "connect", "--target=codex"], squireConnectProcessEnv(profileDir));
-  const alreadyConnected = !install.signIn && parseConnectAlreadyConnected(`${install.stdout}
-${install.stderr}`);
-  if (!install.signIn && !alreadyConnected) {
-    const stderr = withoutForceReloginHint(install.stderr);
-    let stepReason = stderr || "connect printed no sign-in URL";
-    let failReason = stderr || "the trusty-squire connect command printed no sign-in surface";
-    if (isSquireBrowserSessionFailure(stderr)) {
-      const again = reclaimSquireProfileClaim({ log: log2, profileDir, lockRoot });
-      if (again.kind === "blocked-foreign") {
-        stepReason = again.action;
-        failReason = again.action;
-      }
-    }
-    push(step("trusty-squire installed", "failed", stepReason));
-    return fail(failReason);
-  }
+  const install = await streamRun("npx", [...resolution.npxArgs, "connect", "--target=codex", "--json"], squireConnectProcessEnv(profileDir));
+  const report = install.report;
   const version = resolution.resolvedVersion;
-  push(step(`trusty-squire${version ? ` ${version}` : ""} installed`, "done"));
-  const signIn = install.signIn;
-  const signedInAs = parseSignedInAs(`${install.stdout}
-${install.stderr}`);
-  push(step("waiting for sign-in", signIn ? "pending" : "done"));
+  if (!report) {
+    const reason = "Trusty Squire did not report a connect result";
+    push(step2("trusty-squire installed", "failed", reason));
+    return fail(reason);
+  }
+  if (report.state === "needs-sign-in" && !report.sign_in_url) {
+    const reason = "Trusty Squire reported a sign-in without a page";
+    push(step2("trusty-squire installed", "failed", reason));
+    return fail(reason);
+  }
+  if (report.state !== "connected" && !isOutstandingSignIn(report)) {
+    const reason = connectBlockedLine(report) ?? "Trusty Squire could not connect";
+    push(step2("trusty-squire installed", "failed", reason));
+    return fail(reason);
+  }
+  push(step2(`trusty-squire${version ? ` ${version}` : ""} installed`, "done"));
+  const location = connectBrowserLocation(report.browser_location);
+  const signIn = isOutstandingSignIn(report) && report.sign_in_url ? {
+    method: "streamed-page",
+    url: report.sign_in_url,
+    ...location ? { browserLocation: location } : {}
+  } : void 0;
+  push(step2("waiting for sign-in", signIn ? "pending" : "done"));
   const pair = await pairSquire(options.mcp, options.workspaceId);
   if (!pair.ok) {
-    push(step("paired to workspace", "failed", pair.reason));
+    push(step2("paired to workspace", "failed", pair.reason));
     return {
       status: "installing",
       steps,
-      signIn,
-      ...version ? { squireVersion: version } : {},
-      ...signedInAs ? { signedInAs } : {}
+      ...signIn ? { signIn } : {},
+      ...version ? { squireVersion: version } : {}
     };
   }
-  push(step("paired to workspace", "done"));
+  push(step2("paired to workspace", "done"));
   if (signIn) {
     return {
       status: "installing",
       steps,
       signIn,
-      ...version ? { squireVersion: version } : {},
-      ...signedInAs ? { signedInAs } : {}
+      ...version ? { squireVersion: version } : {}
     };
   }
   return {
     status: "connected",
     steps,
-    ...version ? { squireVersion: version } : {},
-    ...signedInAs ? { signedInAs } : {}
+    ...version ? { squireVersion: version } : {}
   };
 }
 async function pairSquire(mcp, _workspaceId) {
@@ -17115,174 +17309,11 @@ async function revokeGrants(mcp, ref) {
         failed += 1;
       else
         revoked += 1;
-    } catch {
-      failed += 1;
-    }
-  }
-  return { revoked, failed };
-}
-
-// apps/body/dist/connector-google.js
-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"
-  ]
-};
-function isGoogleToolConnectorType(type) {
-  return type in GOOGLE_TOOL_SCOPES;
-}
-async function readGoogleCredentialsFromVault(mcp) {
-  if (!mcp)
-    return { source: "unavailable", reason: "no Trusty Squire connector is paired" };
-  let raw;
-  try {
-    raw = await mcp.call("google_oauth_credentials", {});
-  } catch (error) {
-    const detail = describe(error);
-    if (isSquireBrowserSessionFailure(detail)) {
-      return {
-        source: "unavailable",
-        reason: SQUIRE_BROWSER_BUSY_GOOGLE_REASON
-      };
-    }
-    return {
-      source: "unavailable",
-      reason: `Squire has no Google OAuth grant on record yet (connect your Google account in Squire first: ${detail})`
-    };
-  }
-  const record3 = raw && typeof raw === "object" ? raw : {};
-  const inner = record3.credentials && typeof record3.credentials === "object" ? record3.credentials : record3;
-  const accessToken = inner.accessToken ?? inner.access_token;
-  if (!accessToken || typeof accessToken !== "string") {
-    return { source: "unavailable", reason: "Squire returned a Google grant without an access token" };
-  }
-  return {
-    source: "squire",
-    credentials: {
-      accessToken,
-      refreshToken: typeof record3.refreshToken === "string" ? record3.refreshToken : typeof record3.refresh_token === "string" ? record3.refresh_token : void 0,
-      expiresAt: typeof record3.expiresAt === "number" ? record3.expiresAt : void 0,
-      accountEmail: typeof record3.accountEmail === "string" ? record3.accountEmail : typeof record3.email === "string" ? record3.email : void 0
-    }
-  };
-}
-function manualGoogleCredentialsSearchPaths(home) {
-  return [join4(home, "google-credentials.json")];
-}
-function loadManualGoogleCredentials(home, env = process.env) {
-  if (env.BEELINE_GOOGLE_ACCESS_TOKEN) {
-    return {
-      source: "manual",
-      credentials: { accessToken: env.BEELINE_GOOGLE_ACCESS_TOKEN }
-    };
-  }
-  for (const path of manualGoogleCredentialsSearchPaths(home)) {
-    try {
-      const parsed = JSON.parse(readFileSync4(path, "utf8"));
-      if (typeof parsed.accessToken === "string" || typeof parsed.access_token === "string") {
-        return {
-          source: "manual",
-          credentials: {
-            accessToken: parsed.accessToken ?? parsed.access_token,
-            refreshToken: typeof parsed.refreshToken === "string" ? parsed.refreshToken : void 0,
-            expiresAt: typeof parsed.expiresAt === "number" ? parsed.expiresAt : void 0,
-            accountEmail: typeof parsed.accountEmail === "string" ? parsed.accountEmail : void 0
-          }
-        };
-      }
-    } catch {
-    }
-  }
-  return {
-    source: "manual-missing",
-    reason: `no Google credentials found. Put a google-credentials.json (OAuth access token) at ${manualGoogleCredentialsSearchPaths(home)[0]} or connect your Google account in Trusty Squire first.`
-  };
-}
-function persistManualGoogleCredentials(home, credentials) {
-  const path = manualGoogleCredentialsSearchPaths(home)[0];
-  mkdirSync2(dirname5(path), { recursive: true, mode: 448 });
-  writeFileSync(path, `${JSON.stringify({
-    accessToken: credentials.accessToken,
-    ...credentials.refreshToken ? { refreshToken: credentials.refreshToken } : {},
-    ...credentials.expiresAt ? { expiresAt: credentials.expiresAt } : {},
-    ...credentials.accountEmail ? { accountEmail: credentials.accountEmail } : {}
-  })}
-`, { 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 steps = [step2("helper reached", "done")];
-  const emit = () => options.onProgress?.([...steps]);
-  const push = (next) => {
-    steps.push(next);
-    emit();
-  };
-  const fail = (label, reason, output) => {
-    push(step2(label, "failed", { reason, ...output ? { output } : {} }));
-    return { status: "error", steps, 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() : await (async () => {
-    const oneClick = await readGoogleCredentialsFromVault(options.squire);
-    if (oneClick.source === "squire")
-      return oneClick;
-    if (isSquireBrowserSessionFailure(oneClick.reason))
-      return oneClick;
-    return loadManualGoogleCredentials(options.home, options.env);
-  })();
-  if (!("credentials" in resolved)) {
-    const reason = resolved.reason;
-    steps[1] = step2("Google credentials resolved", "failed", { reason, output: outputTail(reason) });
-    emit();
-    return { status: "error", steps, errorMessage: reason };
-  }
-  steps[1] = step2("Google credentials resolved", "done", {
-    output: resolved.source === "squire" ? "one-click: read the Google grant from Trusty Squire" : "manual: local google-credentials.json"
-  });
-  emit();
-  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));
-  }
-  steps[2] = step2("authorized with Google", "done", {
-    ...verify.account ? { output: `signed in as ${verify.account}` } : {}
-  });
-  emit();
-  push(step2("tools enabled", "done", {
-    output: `${GOOGLE_TOOL_SCOPES[options.connectorType].length} Google scopes granted`
-  }));
-  persistManualGoogleCredentials(options.home, resolved.credentials);
-  return {
-    status: "connected",
-    steps,
-    ...verify.account ? { signedInAs: verify.account } : {}
-  };
-}
-function describe(error) {
-  return error instanceof Error ? error.message : String(error);
+    } catch {
+      failed += 1;
+    }
+  }
+  return { revoked, failed };
 }
 
 // apps/body/dist/squire-mcp-client.js
@@ -17378,12 +17409,12 @@ var StdioSquireMcpClient = class {
     const child = this.child;
     if (!child)
       return Promise.reject(new Error("Squire MCP session is not running"));
-    return new Promise((resolve35, reject) => {
+    return new Promise((resolve36, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
         reject(new Error(`${method} timed out`));
       }, method === "initialize" ? INITIALIZE_TIMEOUT_MS : CALL_TIMEOUT_MS);
-      this.pending.set(id, { resolve: resolve35, reject, timer });
+      this.pending.set(id, { resolve: resolve36, reject, timer });
       child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
 `);
     });
@@ -17426,7 +17457,8 @@ function defaultSquireMcpClient() {
 }
 
 // apps/body/dist/connector-assignments.js
-var CONNECTOR_POLL_INTERVAL_MS = 1e4;
+var CONNECTOR_POLL_INTERVAL_MS = 5 * 6e4;
+var CONNECT_WATCH_INTERVAL_MS = 2e3;
 var CEREMONY_EXPIRED = "the Trusty Squire sign-in page expired before it was used \xB7 tap Retry to open a new one";
 var ConnectorAssignmentLoop = class {
   agentId;
@@ -17441,6 +17473,8 @@ var ConnectorAssignmentLoop = class {
   schedule;
   cancel;
   timer;
+  /** Armed only while this helper owns a live sign-in ceremony. */
+  connectWatch;
   started = false;
   stopped = false;
   /** One install at a time per connector; other polls skip it. */
@@ -17476,12 +17510,56 @@ var ConnectorAssignmentLoop = class {
     void this.runOnce();
     this.timer = this.schedule(() => this.poll(), this.intervalMs);
   }
+  /** Event-driven drain. The interval stays the recovery net. */
+  wake() {
+    if (this.stopped)
+      return;
+    void this.runOnce();
+  }
   stop() {
     this.stopped = true;
     if (this.timer !== void 0) {
       this.cancel(this.timer);
       this.timer = void 0;
     }
+    if (this.connectWatch !== void 0) {
+      this.cancel(this.connectWatch);
+      this.connectWatch = void 0;
+    }
+  }
+  /**
+   * Watch the sign-in this helper is holding open. The phone paints
+   * `installing` for the whole ceremony and only a drain that reaches
+   * Squire's already-connected short-circuit flips the row to `connected`;
+   * nothing on the wire announces that the human finished, so the connect
+   * process exiting is the signal. Drain on that, and the row settles on the
+   * same cadence it always has instead of waiting out the recovery poll.
+   */
+  watchConnectSignIn() {
+    if (this.stopped || this.connectWatch !== void 0)
+      return;
+    if (!this.connectCeremonyLive())
+      return;
+    this.connectWatch = this.schedule(() => this.checkConnectSignIn(), CONNECT_WATCH_INTERVAL_MS);
+  }
+  /** A ceremony of ours still worth waiting on: claimed, unspent, alive. */
+  connectCeremonyLive() {
+    const claim = squireConnectSession();
+    if (!claim)
+      return false;
+    if (Date.now() - claim.claimedAt >= CONNECT_TIMEOUT_MS)
+      return false;
+    return isProcessAlive(claim.pid);
+  }
+  checkConnectSignIn() {
+    this.connectWatch = void 0;
+    if (this.stopped)
+      return;
+    if (this.connectCeremonyLive()) {
+      this.connectWatch = this.schedule(() => this.checkConnectSignIn(), CONNECT_WATCH_INTERVAL_MS);
+      return;
+    }
+    void this.runOnce();
   }
   /** One interval tick: poll, then re-arm. */
   poll() {
@@ -17548,8 +17626,6 @@ var ConnectorAssignmentLoop = class {
         const oneClick = await readGoogleCredentialsFromVault(this.squire());
         if (oneClick.source === "squire")
           return oneClick;
-        if (isSquireBrowserSessionFailure(oneClick.reason))
-          return oneClick;
       } catch (error) {
         this.log(`google one-click grant lookup failed: ${describe2(error)}`);
       }
@@ -17605,6 +17681,7 @@ var ConnectorAssignmentLoop = class {
     if (claim && !spent && isProcessAlive(claim.pid)) {
       if (!await this.rearmedByHuman(connectorId)) {
         this.log(`trusty-squire connect still waiting for sign-in (pid ${String(claim.pid)}); leaving it alone`);
+        this.watchConnectSignIn();
         return;
       }
       this.log("trusty-squire re-pair requested; superseding the connect holding the browser");
@@ -17646,8 +17723,7 @@ var ConnectorAssignmentLoop = class {
       await this.api.execute("installConnector", {
         agentId: this.agentId,
         connectorId,
-        ...result.squireVersion ? { squireVersion: result.squireVersion } : {},
-        ...result.signedInAs ? { signedInAs: result.signedInAs } : {}
+        ...result.squireVersion ? { squireVersion: result.squireVersion } : {}
       });
       await this.reportVault(connectorId);
       return;
@@ -17657,9 +17733,9 @@ var ConnectorAssignmentLoop = class {
       connectorId,
       steps: result.steps,
       signIn: result.signIn ?? null,
-      ...result.squireVersion ? { squireVersion: result.squireVersion } : {},
-      ...result.signedInAs ? { signedInAs: result.signedInAs } : {}
+      ...result.squireVersion ? { squireVersion: result.squireVersion } : {}
     });
+    this.watchConnectSignIn();
   }
   /** This connector's own row, or undefined when the server cannot answer. */
   async connectorRow(connectorId) {
@@ -23759,9 +23835,9 @@ function isHex32(input) {
   return true;
 }
 var verifiedSymbol = /* @__PURE__ */ Symbol("verified");
-var isRecord = (obj) => obj instanceof Object;
+var isRecord2 = (obj) => obj instanceof Object;
 function validateEvent(event) {
-  if (!isRecord(event))
+  if (!isRecord2(event))
     return false;
   if (typeof event.kind !== "number")
     return false;
@@ -26685,6 +26761,15 @@ var AGENT_REMOVED_CODE = "agent_removed";
 function isAgentRemovedError(error) {
   return error instanceof DaemonApiError && error.status === 403 && error.code === AGENT_REMOVED_CODE;
 }
+function membershipChange(event) {
+  return {
+    ...typeof event.roomId === "string" && event.roomId ? { roomId: event.roomId } : {},
+    ...typeof event.parentRoomId === "string" ? { parentRoomId: event.parentRoomId } : {},
+    ...typeof event.openedBy === "string" ? { openedBy: event.openedBy } : {},
+    ...event.archived === true ? { archived: true } : {},
+    ...event.removed === true ? { removed: true } : {}
+  };
+}
 function endpoint(origin, path) {
   return new URL(path, `${origin}/`).toString();
 }
@@ -26712,6 +26797,8 @@ var DaemonApiClient = class {
   roomsChangedListener;
   configChangedListener;
   hiccupRestartListener;
+  connectorAssignmentListener;
+  cornerCompleteListener;
   constructor(baseUrl, daemonToken, agentId, fetchImpl = fetch, webSocketFactory = (url, protocols) => new wrapper_default(url, protocols)) {
     this.baseUrl = baseUrl;
     this.daemonToken = daemonToken;
@@ -26759,8 +26846,8 @@ var DaemonApiClient = class {
     };
   }
   /** Register the one listener invoked when the server reports this agent's
-   * Room/corner memberships changed — the wake that discovers a freshly
-   * created Room without waiting for the reconciliation heartbeat. */
+   * Room/corner memberships changed — a scoped event applies incrementally;
+   * an unscoped wake (reconnect) still runs the recovery reconcile. */
   setRoomsChangedListener(listener) {
     this.roomsChangedListener = listener;
   }
@@ -26774,6 +26861,14 @@ var DaemonApiClient = class {
   setHiccupRestartListener(listener) {
     this.hiccupRestartListener = listener;
   }
+  /** Connect / pending_ops drain wake. Never a catalog. */
+  setConnectorAssignmentListener(listener) {
+    this.connectorAssignmentListener = listener;
+  }
+  /** corner-complete on the subscribed corner — close now, poll is recovery. */
+  setCornerCompleteListener(listener) {
+    this.cornerCompleteListener = listener;
+  }
   updateLiveCursor(roomId, cursor3) {
     const room = this.liveRooms.get(roomId);
     if (room && cursor3)
@@ -26815,6 +26910,7 @@ var DaemonApiClient = class {
       for (const roomId of this.liveRooms.keys())
         this.sendLiveSubscription(roomId);
       this.roomsChangedListener?.();
+      this.connectorAssignmentListener?.();
     };
     socket.onmessage = (message) => {
       let value;
@@ -26827,7 +26923,15 @@ var DaemonApiClient = class {
         return;
       const event = value;
       if (event.type === "rooms-changed") {
-        this.roomsChangedListener?.();
+        this.roomsChangedListener?.(membershipChange(event));
+        return;
+      }
+      if (event.type === "corner-complete" && typeof event.roomId === "string") {
+        this.cornerCompleteListener?.(event.roomId);
+        return;
+      }
+      if (event.type === "connector-assignment") {
+        this.connectorAssignmentListener?.();
         return;
       }
       if (event.type === "config-changed") {
@@ -26954,12 +27058,12 @@ async function activateDaemonTransport(path, fetchImpl = fetch) {
 }
 
 // apps/body/dist/room-runtime.js
-import { execFile as execFile6 } from "node:child_process";
+import { execFile as execFile7 } from "node:child_process";
 import { createHash as createHash7 } from "node:crypto";
 import { existsSync as existsSync6, mkdirSync as mkdirSync3 } from "node:fs";
-import { mkdir as mkdir14, rm as rm5 } from "node:fs/promises";
-import { dirname as dirname12, resolve as resolve23 } from "node:path";
-import { promisify as promisify4 } from "node:util";
+import { mkdir as mkdir15, rm as rm5 } from "node:fs/promises";
+import { dirname as dirname13, resolve as resolve24 } from "node:path";
+import { promisify as promisify5 } from "node:util";
 
 // apps/body/dist/grant-runner.js
 import { execFile as execFile3 } from "node:child_process";
@@ -27297,9 +27401,10 @@ function sandboxMountPlan(spec) {
     ...spec.additionalWritablePaths ?? [],
     ...harnessState
   ] : (
-    // A Room writes no checkout and no host path — only its own harness
-    // state, explicitly granted agent-private paths (persistent memory and
-    // the ephemeral workbench — never the repo), and the private /tmp.
+    // A Room keeps source files read-only. Its explicit capabilities are
+    // limited to harness state, agent-private paths, and release-owned
+    // generated state such as the repository's .codegraph index; callers
+    // must name each path. /tmp remains private.
     [...spec.additionalWritablePaths ?? [], ...harnessState]
   ));
   const tmpRestores = normalize([
@@ -27426,8 +27531,8 @@ function detectBwrapSandbox(options = {}) {
   });
   const result = run2(probe.command, probe.args);
   if (result.status !== 0) {
-    const detail = (result.stderr ?? "").trim().split("\n").pop() ?? `exit ${result.status}`;
-    const appArmorRemediation = /No permissions to create new namespace|setting up uid map: Permission denied|userns_create/i.test(result.stderr ?? "") ? " Ubuntu AppArmor may be blocking unprivileged user namespaces. Keep the system-wide restriction enabled; install a narrow userns profile for /usr/bin/bwrap as documented in apps/body/README.md, then restart the agent." : "";
+    const detail = (result.stderr ?? "").trim().split("\n").filter(Boolean).pop() ?? `exit ${result.status}`;
+    const appArmorRemediation = /No permissions to create (?:a )?new namespace|setting up uid map: Permission denied|userns_create/i.test(result.stderr ?? "") ? " Ubuntu AppArmor may be blocking unprivileged user namespaces. If the agent's user service inherited an AppArmor profile, reinstall the Beeline user unit and restart the agent; the unit explicitly transitions to unconfined before /usr/bin/bwrap enters Ubuntu's bwrap profile." : "";
     return {
       advisory: `harness OS sandbox UNAVAILABLE: ${bwrapPath} self-test failed (${detail}); ACP children run unconfined and the Room read-only rule rests on the permission handler alone.${appArmorRemediation}`
     };
@@ -27501,6 +27606,7 @@ var GRANT_COMMAND_OUTPUT_CAP_BYTES = 64 * 1024;
 var ARGV_MAX_WORDS = 256;
 var ARGV_WORD_MAX_LENGTH = 4096;
 var WRITE_REFUSED = /Read-only file system|EROFS/;
+var SANDBOX_STARTED_SCRIPT = ['printf "%s\\n" "$1" >&2', "shift", 'exec "$@"'].join("\n");
 var ROOM_SANDBOX_UNAVAILABLE = "this Room cannot run granted commands: a Room promises a read-only filesystem and that promise is enforced by bubblewrap, which is not usable on this host. Open a corner with open_corner and run it there, where writes belong.";
 var ROOM_WRITE_REFUSED_NOTE = "[beeline] the Room filesystem is read-only outside your scratch directory, so this write was refused by the kernel. Open a corner with open_corner to change files.";
 function operatorSecretResolver(env = process.env) {
@@ -27624,7 +27730,9 @@ var GrantCommandRunner = class {
       ...Object.fromEntries(secrets)
     };
     const cap = this.options.outputCapBytes ?? GRANT_COMMAND_OUTPUT_CAP_BYTES;
-    const spawn13 = surfaceAllows(policy.surface, "run-host-command") ? { command: argv[0], args: argv.slice(1) } : roomSandboxCommand(policy, room.cwd, argv);
+    const runsOnHost = surfaceAllows(policy.surface, "run-host-command");
+    const sandboxMarker = runsOnHost ? void 0 : `[beeline-sandbox-started:${randomBytes6(16).toString("hex")}]`;
+    const spawn13 = runsOnHost ? { command: argv[0], args: argv.slice(1) } : roomSandboxCommand(policy, room.cwd, argv, sandboxMarker);
     const outcome = await new Promise((resolveRun) => {
       const child = execFile3(spawn13.command, spawn13.args, {
         cwd: room.cwd,
@@ -27645,7 +27753,13 @@ var GrantCommandRunner = class {
         });
       });
     });
-    const writeRefused = !surfaceAllows(policy.surface, "run-host-command") && WRITE_REFUSED.test(outcome.output);
+    const sandboxStarted = sandboxMarker ? outcome.output.includes(sandboxMarker) : true;
+    if (sandboxMarker && sandboxStarted) {
+      outcome.output = outcome.output.replace(`${sandboxMarker}
+`, "").replace(sandboxMarker, "");
+    }
+    const writeRefused = !runsOnHost && WRITE_REFUSED.test(outcome.output);
+    const sandboxFailure = !runsOnHost && !sandboxStarted;
     const output = capOutput(scrubSecrets(writeRefused ? `${outcome.output.trimEnd()}
 ${ROOM_WRITE_REFUSED_NOTE}` : outcome.output, secrets), cap);
     const turn = room.turn();
@@ -27653,7 +27767,7 @@ ${ROOM_WRITE_REFUSED_NOTE}` : outcome.output, secrets), cap);
       pubkey: grant.requestedBy,
       ...grant.requestedByName ? { name: grant.requestedByName } : {}
     };
-    const status = outcome.timedOut ? "timed out" : outcome.exitCode === null ? "error" : `exit ${outcome.exitCode}`;
+    const status = sandboxFailure ? "sandbox failed" : outcome.timedOut ? "timed out" : outcome.exitCode === null ? "error" : `exit ${outcome.exitCode}`;
     await this.options.api.execute("postAgentActivity", {
       agentId: this.options.agentId,
       roomId: input.roomId,
@@ -27677,7 +27791,8 @@ ${ROOM_WRITE_REFUSED_NOTE}` : outcome.output, secrets), cap);
       ...outcome.signal ? { signal: outcome.signal } : {},
       timedOut: outcome.timedOut,
       output,
-      ...writeRefused ? { writeRefused: true } : {}
+      ...writeRefused ? { writeRefused: true } : {},
+      ...sandboxFailure ? { sandboxFailure: true } : {}
     };
   }
   /**
@@ -27719,7 +27834,7 @@ function scriptCandidates(cwd, scratch, argv) {
   ];
   return [...new Set(paths)];
 }
-function roomSandboxCommand(policy, cwd, argv) {
+function roomSandboxCommand(policy, cwd, argv, sandboxMarker) {
   if (!policy.bwrapPath)
     throw new Error(ROOM_SANDBOX_UNAVAILABLE);
   return wrapAgentCommand({
@@ -27734,8 +27849,8 @@ function roomSandboxCommand(policy, cwd, argv) {
       ...policy.scratch ? { tmpDir: policy.scratch } : {},
       ...policy.maskPaths ? { maskPaths: policy.maskPaths } : {}
     },
-    command: argv[0],
-    args: argv.slice(1)
+    command: "/bin/sh",
+    args: ["-c", SANDBOX_STARTED_SCRIPT, "beeline-grant-sandbox", sandboxMarker, ...argv]
   });
 }
 var GrantRunnerServer = class {
@@ -28050,13 +28165,13 @@ async function runServerCommandIntake(options) {
         }
       }
       options.onPoll?.();
-      const reconcile = await new Promise((resolve35) => {
+      const reconcile = await new Promise((resolve36) => {
         const done = (needed) => {
           if (timer)
             clearTimeout(timer);
           signal?.removeEventListener("abort", aborted);
           wake = void 0;
-          resolve35(needed);
+          resolve36(needed);
         };
         const aborted = () => done(false);
         wake = done;
@@ -28081,12 +28196,12 @@ async function runServerCommandIntake(options) {
 }
 
 // apps/body/dist/monolith-corner-turn.js
-import { execFile as execFile5 } from "node:child_process";
+import { execFile as execFile6 } from "node:child_process";
 import { createHash as createHash6 } from "node:crypto";
-import { mkdir as mkdir13 } from "node:fs/promises";
+import { mkdir as mkdir14 } from "node:fs/promises";
 import { homedir as homedir10 } from "node:os";
 import { join as join12 } from "node:path";
-import { promisify as promisify3 } from "node:util";
+import { promisify as promisify4 } from "node:util";
 
 // apps/body/dist/agent-home.js
 var import_yaml2 = __toESM(require_dist(), 1);
@@ -28896,6 +29011,9 @@ import { basename as basename5, dirname as dirname10, join as join8, relative as
 import { readFileSync as readFileSync6 } from "node:fs";
 import { resolve as resolve13 } from "node:path";
 
+// packages/api-contract/dist/phone-types.js
+var MESSAGE_REACTION_EMOJIS = ["\u{1F44D}", "\u2764\uFE0F", "\u{1F602}", "\u{1F389}", "\u{1F440}", "\u2705"];
+
 // packages/api-contract/dist/workbench.js
 var CONNECTABLE_CONNECTOR_KINDS = [
   "trusty-squire",
@@ -28942,11 +29060,13 @@ var BEELINE_ROOM_CAPABILITIES = [
   "You may address any Room member, including another agent, by writing @name in your reply; the server routes that mention to them. Each turn prompt lists the Room members and the exact spelling that tags each one - use those spellings, and never guess or reuse one from an older message.",
   "Tag another agent only when you need something from them: a question, a handoff, a task. Never tag to acknowledge, agree, or say you are ready. If nothing is actionable, do not reply.",
   "Tag the user only when you need a decision or input, or when the task they asked for is finished. Never tag for progress, acknowledgement, or questions the transcript already answers.",
+  "If shell access is blocked, continue with read-only inspection instead of retrying it: call beeline-readonly-mcp.search_text to find code and beeline-readonly-mcp.read_file to read it. Use CodeGraph first when it is available for indexed code relationships.",
   "Every MCP server mounted into this session is approved tool by tool - use operator and host tools freely; the read-only filesystem sandbox is the boundary, not a tool list. Network web search is enabled.",
   BEELINE_AMBIENT_CONNECTOR_CAPABILITY,
   "Files and photos people share are downloaded for you: read them at the local path named in the prompt (photos may also arrive inline); never fetch the reference URL.",
   "To create a file (this Room has no other way to write one), call beeline-agent write_scratch_file with a relative path and content - text by default, or base64 for bytes you computed; it returns a path in your writable session home. To send a file, call beeline-agent post_artifact with a path inside your checkout or anywhere in your writable session home (wherever a file you or your harness generated actually landed, including one you just wrote), or with html/bytes content directly; it is uploaded and attached to your reply, and title and mime default from the file when you post by path. write_scratch_file produces the file, not a picture. To put a real photograph in an artifact, call beeline-agent fetch_image with the photo URL; it writes the bytes to your session scratch and returns the path, mime, and size \u2014 read them, base64-encode, and embed as a data: URL. The validator still refuses every http(s) image reference, and drawing an SVG stand-in is not a photograph.",
   "To run something later or repeatedly, call beeline-agent create_schedule (interval in minutes or a 5-field cron, optional maxRuns); list_schedules / delete_schedule manage them.",
+  `To react to a message in this Room, call beeline-agent react_to_message with its message id and one supported emoji (${MESSAGE_REACTION_EMOJIS.join(" ")}).`,
   `To react to things that HAPPEN in this Room rather than only to what is said to you, call beeline-agent subscribe_events with the kinds you want (${SERVER_EVENT_KINDS.join(", ")}); each one then wakes you for a turn. Subscriptions are per Room and cover every way the event lands: joining a Room you subscribed to wakes you, and so does a person arriving in the Workspace when that arrival projects into this Room - subscribe to joined in an onboarding Room and every newcomer wakes you, exactly like a greeter. It replaces your list, so send every kind you want - list_event_subscriptions shows the current one. You do this yourself: nobody has to configure it for you. grant-decided carries the grant id and status and resumes the turn that asked for the grant. choice-answered, choice-skipped, and poll-closed start a new input turn for the asking agent; they do not resume a paused grant.`,
   "If you need reach outside the sandbox, call beeline-agent request_grant. If you already know discrete options, call beeline-agent ask_choice (one human, optional) or open_poll (every human in this Room, required deadline). A poll is refused below two electors and above fifty, and in a DM. A plurality is a fact, never permission to deploy, delete, merge, or spend. Open-ended asks stay tagged prose. Never put Always / Once / No on a preference.",
   "To state something that happened so the Room and other agents can act on it, call beeline-agent emit_event with your own agent:<slug> kind, one sentence, and optionally the agent members to wake. Chains of events are bounded and a refused emit posts nothing.",
@@ -28966,6 +29086,7 @@ var BEELINE_DM_CAPABILITIES = [
   "Files and photos people share are downloaded for you: read them at the local path named in the prompt (photos may also arrive inline); never fetch the reference URL.",
   "To create a file (this Room has no other way to write one), call beeline-agent write_scratch_file with a relative path and content - text by default, or base64 for bytes you computed; it returns a path in your writable session home. To send a file, call beeline-agent post_artifact with a path inside your checkout or anywhere in your writable session home (wherever a file you or your harness generated actually landed, including one you just wrote), or with html/bytes content directly; it is uploaded and attached to your reply, and title and mime default from the file when you post by path. write_scratch_file produces the file, not a picture. To put a real photograph in an artifact, call beeline-agent fetch_image with the photo URL; it writes the bytes to your session scratch and returns the path, mime, and size \u2014 read them, base64-encode, and embed as a data: URL. The validator still refuses every http(s) image reference, and drawing an SVG stand-in is not a photograph.",
   "Tag the person only when you need a decision or input, or when the task they asked for is finished.",
+  `To react to a message in this Room, call beeline-agent react_to_message with its message id and one supported emoji (${MESSAGE_REACTION_EMOJIS.join(" ")}).`,
   "If you already know discrete options, call beeline-agent ask_choice. A pick is a preference, never sandbox, spend, or merge authority. open_poll is refused here: one human is a question.",
   "Never claim an action or reply happened unless the prompt or a tool result proves it."
 ].join(" ");
@@ -30807,12 +30928,22 @@ function harnessStateDirsFromEnv(env) {
   return { stateDirs, ...tmp ? { tmpDir: resolve16(tmp) } : {} };
 }
 
+// apps/body/dist/agent-command-catalog.js
+function agentCommandCatalogPublisher(input) {
+  return (commands) => {
+    void input.api.execute("postAgentCommands", {
+      agentId: input.agentId,
+      workspaceId: input.workspaceId,
+      commands
+    }).catch(input.report ?? ((error) => console.error("[body] agent command catalog publish failed:", error)));
+  };
+}
+
 // apps/body/dist/attachment-delivery.js
 import { mkdir as mkdir7, writeFile as writeFile8 } from "node:fs/promises";
 import { basename as basename6, extname, join as join9 } from "node:path";
 var MAX_ATTACHMENT_BYTES = 25 * 1024 * 1024;
-var MEDIA_TTL_HOURS = 24;
-var EXPIRED_REASON = `expired: attachments are kept for ${MEDIA_TTL_HOURS} hours and these bytes are past that window`;
+var EXPIRED_REASON = "expired: these attachment bytes are past their retention window";
 var FETCH_TIMEOUT_MS = 3e4;
 var BoundedSizeError = class extends Error {
   bytes;
@@ -31996,9 +32127,91 @@ function youtubeMcpServer(config, accessToken) {
   };
 }
 
+// apps/body/dist/codegraph.js
+import { execFile as execFile5 } from "node:child_process";
+import { access, appendFile, mkdir as mkdir9, readFile as readFile7 } from "node:fs/promises";
+import { dirname as dirname11, isAbsolute as isAbsolute3, resolve as resolve19 } from "node:path";
+import { promisify as promisify3 } from "node:util";
+var execFileAsync3 = promisify3(execFile5);
+var CODEGRAPH_MCP_SERVER_NAME = "codegraph";
+var CODEGRAPH_INDEX_PATH = ".codegraph/codegraph.db";
+var CODEGRAPH_PREPARE_TIMEOUT_MS = 12e4;
+function codegraphIndexDirectory(cwd) {
+  return resolve19(cwd, dirname11(CODEGRAPH_INDEX_PATH));
+}
+function codegraphMcpServer(config, cwd, options) {
+  if (!config.codegraphCommand)
+    return void 0;
+  return {
+    name: CODEGRAPH_MCP_SERVER_NAME,
+    command: config.codegraphCommand,
+    args: ["serve", "--mcp", "--path", resolve19(cwd), ...options.readonly ? ["--no-watch"] : []],
+    env: [
+      { name: "CODEGRAPH_TELEMETRY", value: "0" },
+      // One MCP child per harness session is easier to contain than a daemon
+      // that can outlive the Room/corner whose index and permissions it used.
+      { name: "CODEGRAPH_NO_DAEMON", value: "1" }
+    ]
+  };
+}
+function codegraphFingerprintServers(config, servers, mounted = Boolean(config.codegraphCommand)) {
+  return config.codegraphCommand && mounted ? [...servers, CODEGRAPH_MCP_SERVER_NAME] : [...servers];
+}
+async function isGitWorktree(cwd) {
+  try {
+    const { stdout: stdout6 } = await execFileAsync3("git", ["rev-parse", "--show-toplevel"], {
+      cwd,
+      timeout: 1e4
+    });
+    return resolve19(stdout6.trim()) === resolve19(cwd);
+  } catch {
+    return false;
+  }
+}
+async function excludeIndexFromGitStatus(cwd) {
+  try {
+    const { stdout: stdout6 } = await execFileAsync3("git", ["rev-parse", "--git-path", "info/exclude"], {
+      cwd,
+      timeout: 1e4
+    });
+    const gitPath = stdout6.trim();
+    if (!gitPath)
+      return;
+    const path = isAbsolute3(gitPath) ? gitPath : resolve19(cwd, gitPath);
+    await mkdir9(dirname11(path), { recursive: true });
+    const existing = await readFile7(path, "utf8").catch(() => "");
+    if (existing.split("\n").includes(".codegraph/"))
+      return;
+    await appendFile(path, `${existing && !existing.endsWith("\n") ? "\n" : ""}.codegraph/
+`);
+  } catch {
+  }
+}
+async function prepareCodegraphIndex(config, cwd) {
+  const command = config.codegraphCommand;
+  if (!command || !await isGitWorktree(cwd))
+    return false;
+  await excludeIndexFromGitStatus(cwd);
+  const indexPath = resolve19(cwd, CODEGRAPH_INDEX_PATH);
+  const indexed = await access(indexPath).then(() => true, () => false);
+  const args = indexed ? ["sync", "--quiet", cwd] : ["init", "--yes", cwd];
+  try {
+    await execFileAsync3(command, args, {
+      cwd,
+      env: { ...process.env, CODEGRAPH_TELEMETRY: "0", CODEGRAPH_NO_DAEMON: "1" },
+      timeout: CODEGRAPH_PREPARE_TIMEOUT_MS,
+      maxBuffer: 4 * 1024 * 1024
+    });
+    return true;
+  } catch (error) {
+    console.warn(`[body] CodeGraph ${args[0]} failed for ${cwd}; continuing with Beeline read tools:`, error);
+    return false;
+  }
+}
+
 // apps/body/dist/pi-turn-record.js
-import { readdir as readdir3, readFile as readFile7 } from "node:fs/promises";
-import { resolve as resolve19 } from "node:path";
+import { readdir as readdir3, readFile as readFile8 } from "node:fs/promises";
+import { resolve as resolve20 } from "node:path";
 function summarizeProviderError(errorMessage2) {
   const trimmed = errorMessage2.trim();
   const statusMatch = /^(\d{3}):\s*([\s\S]*)$/.exec(trimmed);
@@ -32019,7 +32232,7 @@ function summarizeProviderError(errorMessage2) {
 }
 async function sessionFileFromMap(home, sessionId) {
   try {
-    const raw = await readFile7(resolve19(home, ".pi", "pi-acp", "session-map.json"), "utf8");
+    const raw = await readFile8(resolve20(home, ".pi", "pi-acp", "session-map.json"), "utf8");
     const map = JSON.parse(raw);
     const file = map.sessions?.[sessionId]?.sessionFile;
     return typeof file === "string" && file ? file : void 0;
@@ -32028,7 +32241,7 @@ async function sessionFileFromMap(home, sessionId) {
   }
 }
 async function sessionFileFromLayout(piDir, sessionId) {
-  const sessionsRoot = resolve19(piDir, "sessions");
+  const sessionsRoot = resolve20(piDir, "sessions");
   const suffix = `_${sessionId}.jsonl`;
   let projects;
   try {
@@ -32037,7 +32250,7 @@ async function sessionFileFromLayout(piDir, sessionId) {
     return void 0;
   }
   for (const project of projects) {
-    const dir = resolve19(sessionsRoot, project);
+    const dir = resolve20(sessionsRoot, project);
     let files;
     try {
       files = await readdir3(dir);
@@ -32046,7 +32259,7 @@ async function sessionFileFromLayout(piDir, sessionId) {
     }
     const match = files.find((file) => file.endsWith(suffix));
     if (match)
-      return resolve19(dir, match);
+      return resolve20(dir, match);
   }
   return void 0;
 }
@@ -32064,7 +32277,7 @@ async function readPiTurnRecord(input) {
     return void 0;
   let raw;
   try {
-    raw = await readFile7(file, "utf8");
+    raw = await readFile8(file, "utf8");
   } catch {
     return void 0;
   }
@@ -32220,8 +32433,8 @@ async function withTurnReceiptHeartbeat(api, receipt, task, onHeartbeatError) {
 }
 
 // apps/body/dist/turn-trace.js
-import { appendFile, mkdir as mkdir9, readdir as readdir4, rm as rm3 } from "node:fs/promises";
-import { resolve as resolve20 } from "node:path";
+import { appendFile as appendFile2, mkdir as mkdir10, readdir as readdir4, rm as rm3 } from "node:fs/promises";
+import { resolve as resolve21 } from "node:path";
 import { performance as performance2 } from "node:perf_hooks";
 var TURN_PHASES = [
   /** Enqueued on `SessionScheduler` until this turn holds a slot. A capacity wait lives here. */
@@ -32451,7 +32664,7 @@ function formatTurnTraceLine(record3) {
   return [head, ...record3.attempts.map((attempt) => formatTurnAttempt(attempt))].join("\n  ");
 }
 function turnTraceDirectory(runtimeDir) {
-  return resolve20(runtimeDir, "turn-traces");
+  return resolve21(runtimeDir, "turn-traces");
 }
 var TURN_TRACE_RETENTION_DAYS = 7;
 function traceFileName(date) {
@@ -32468,14 +32681,14 @@ var TurnTraceFile = class {
     this.options = options;
   }
   path(now2 = (this.options.clock ?? (() => /* @__PURE__ */ new Date()))()) {
-    return resolve20(this.directory, traceFileName(now2));
+    return resolve21(this.directory, traceFileName(now2));
   }
   write(record3) {
     this.tail = this.tail.catch(() => void 0).then(async () => {
       const now2 = (this.options.clock ?? (() => /* @__PURE__ */ new Date()))();
       const path = this.path(now2);
-      await mkdir9(this.directory, { recursive: true, mode: 448 });
-      await appendFile(path, `${JSON.stringify(record3)}
+      await mkdir10(this.directory, { recursive: true, mode: 448 });
+      await appendFile2(path, `${JSON.stringify(record3)}
 `, { mode: 384 });
       await this.prune(now2);
       const log2 = this.options.log ?? ((line) => console.log(line));
@@ -32492,16 +32705,16 @@ var TurnTraceFile = class {
     this.prunedDay = day;
     const cutoff = traceFileName(new Date(now2.getTime() - TURN_TRACE_RETENTION_DAYS * 864e5));
     const names = await readdir4(this.directory).catch(() => []);
-    await Promise.all(names.filter((name) => /^turns-\d{4}-\d{2}-\d{2}\.jsonl$/.test(name) && name < cutoff).map((name) => rm3(resolve20(this.directory, name), { force: true })));
+    await Promise.all(names.filter((name) => /^turns-\d{4}-\d{2}-\d{2}\.jsonl$/.test(name) && name < cutoff).map((name) => rm3(resolve21(this.directory, name), { force: true })));
   }
 };
 
 // apps/body/dist/corner-github-auth.js
-import { chmod as chmod4, mkdir as mkdir10, writeFile as writeFile9 } from "node:fs/promises";
-import { delimiter as delimiter2, resolve as resolve21 } from "node:path";
+import { chmod as chmod4, mkdir as mkdir11, writeFile as writeFile9 } from "node:fs/promises";
+import { delimiter as delimiter2, resolve as resolve22 } from "node:path";
 async function installCornerGitHubWrappers(input) {
-  const bin = resolve21(input.root, "beeline-github-bin");
-  await mkdir10(bin, { recursive: true, mode: 448 });
+  const bin = resolve22(input.root, "beeline-github-bin");
+  await mkdir11(bin, { recursive: true, mode: 448 });
   const common = {
     node: process.execPath,
     cli: input.cliEntrypoint,
@@ -32510,13 +32723,13 @@ async function installCornerGitHubWrappers(input) {
     featureBranch: input.featureBranch,
     targetBranch: input.targetBranch
   };
-  await writeLauncher(resolve21(bin, "git"), {
+  await writeLauncher(resolve22(bin, "git"), {
     ...common,
     command: input.gitBinary,
     launcher: "git"
   });
   if (input.ghBinary)
-    await writeLauncher(resolve21(bin, "gh"), {
+    await writeLauncher(resolve22(bin, "gh"), {
       ...common,
       command: input.ghBinary,
       launcher: "gh"
@@ -32653,23 +32866,23 @@ process.exit(result.status ?? 1);
 // apps/body/dist/warm-node-modules.js
 import { createHash as createHash5, randomUUID as randomUUID5 } from "node:crypto";
 import { constants as fsConstants } from "node:fs";
-import { chmod as chmod5, copyFile as copyFile2, link, lstat as lstat3, mkdir as mkdir11, readdir as readdir5, readFile as readFile8, readlink, rename as rename4, rm as rm4, stat as stat2, symlink as symlink2, utimes } from "node:fs/promises";
-import { dirname as dirname11, join as join10, resolve as resolve22 } from "node:path";
+import { chmod as chmod5, copyFile as copyFile2, link, lstat as lstat3, mkdir as mkdir12, readdir as readdir5, readFile as readFile9, readlink, rename as rename4, rm as rm4, stat as stat2, symlink as symlink2, utimes } from "node:fs/promises";
+import { dirname as dirname12, join as join10, resolve as resolve23 } from "node:path";
 var STORE_FORMAT = "v1";
 var STAGING_PREFIX = ".beeline-warm-";
 var STAGING_SWEEP_MS = 24 * 60 * 60 * 1e3;
 var WARM_STORE_MAX_ENTRIES = 3;
 function sharedNpmCacheDir(supervisorRoot) {
-  return resolve22(supervisorRoot, "beeline", "npm-cache");
+  return resolve23(supervisorRoot, "beeline", "npm-cache");
 }
 function warmNodeModulesStoreDir(supervisorRoot) {
-  return resolve22(supervisorRoot, "beeline", "node-modules");
+  return resolve23(supervisorRoot, "beeline", "node-modules");
 }
 function isPlanRefusal(value) {
   return "failure" in value;
 }
 async function readWarmPlan(worktreePath) {
-  const lockfile = await readFile8(resolve22(worktreePath, "package-lock.json")).catch(() => void 0);
+  const lockfile = await readFile9(resolve23(worktreePath, "package-lock.json")).catch(() => void 0);
   if (!lockfile)
     return { failure: "no-lockfile" };
   const packages = parseLockfilePackages(lockfile);
@@ -32708,11 +32921,11 @@ async function seedWarmNodeModules(input) {
     return { reason: plan.failure, ...plan.detail ? { detail: plan.detail } : {} };
   }
   for (const tree of plan.trees) {
-    if (await pathExists(resolve22(input.worktreePath, tree))) {
+    if (await pathExists(resolve23(input.worktreePath, tree))) {
       return { reason: "present", key: plan.key };
     }
   }
-  const entry = resolve22(input.storeRoot, plan.key);
+  const entry = resolve23(input.storeRoot, plan.key);
   if (!await isDirectory(entry))
     return { reason: "cold", key: plan.key };
   const [storeDevice, checkoutDevice] = await Promise.all([
@@ -32722,19 +32935,19 @@ async function seedWarmNodeModules(input) {
   if (storeDevice === void 0 || storeDevice !== checkoutDevice) {
     return { reason: "cross-device", key: plan.key };
   }
-  const staging = resolve22(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
+  const staging = resolve23(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
   const placed = [];
   const now2 = (input.now ?? Date.now)();
   try {
     await sweepStaleStaging(input.storeRoot, now2);
     await utimes(entry, now2 / 1e3, now2 / 1e3).catch(() => void 0);
     for (const tree of plan.trees) {
-      await cloneTree(resolve22(entry, tree), resolve22(staging, tree), seedFile);
+      await cloneTree(resolve23(entry, tree), resolve23(staging, tree), seedFile);
     }
     for (const tree of plan.trees) {
-      const target = resolve22(input.worktreePath, tree);
-      await mkdir11(dirname11(target), { recursive: true });
-      await rename4(resolve22(staging, tree), target);
+      const target = resolve23(input.worktreePath, tree);
+      await mkdir12(dirname12(target), { recursive: true });
+      await rename4(resolve23(staging, tree), target);
       placed.push(target);
     }
     return { reason: "seeded", key: plan.key };
@@ -32752,11 +32965,11 @@ async function harvestWarmNodeModules(input) {
   if (isPlanRefusal(plan)) {
     return { reason: plan.failure, ...plan.detail ? { detail: plan.detail } : {} };
   }
-  const entry = resolve22(input.storeRoot, plan.key);
+  const entry = resolve23(input.storeRoot, plan.key);
   if (await pathExists(entry))
     return { reason: "already-warm", key: plan.key };
   for (const tree of plan.trees) {
-    if (!await isDirectory(resolve22(input.worktreePath, tree))) {
+    if (!await isDirectory(resolve23(input.worktreePath, tree))) {
       return { reason: "no-node-modules", key: plan.key, detail: tree };
     }
   }
@@ -32768,12 +32981,12 @@ async function harvestWarmNodeModules(input) {
       detail: `${missing.length} absent, e.g. ${missing.slice(0, 3).join(", ")}`
     };
   }
-  const staging = resolve22(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
+  const staging = resolve23(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
   try {
-    await mkdir11(input.storeRoot, { recursive: true, mode: 493 });
+    await mkdir12(input.storeRoot, { recursive: true, mode: 493 });
     await sweepStaleStaging(input.storeRoot, (input.now ?? Date.now)());
     for (const tree of plan.trees) {
-      await cloneTree(resolve22(input.worktreePath, tree), resolve22(staging, tree), harvestFile);
+      await cloneTree(resolve23(input.worktreePath, tree), resolve23(staging, tree), harvestFile);
     }
     await input.onCopied?.();
     if (!await stagedTreeIsPublishable(input.worktreePath, staging, plan.key)) {
@@ -32796,16 +33009,16 @@ async function stagedTreeIsPublishable(worktreePath, staging, key) {
     return false;
   const hidden = join10("node_modules", ".package-lock.json");
   const [copied, current] = await Promise.all([
-    readFile8(resolve22(staging, hidden)).catch(() => void 0),
-    readFile8(resolve22(worktreePath, hidden)).catch(() => void 0)
+    readFile9(resolve23(staging, hidden)).catch(() => void 0),
+    readFile9(resolve23(worktreePath, hidden)).catch(() => void 0)
   ]);
   if (!copied || !current || !copied.equals(current))
     return false;
   return (await missingInstalledPackages(worktreePath, staging)).length === 0;
 }
 async function missingInstalledPackages(worktreePath, treeRoot = worktreePath) {
-  const wanted = parseLockfilePackages(await readFile8(resolve22(worktreePath, "package-lock.json")).catch(() => void 0));
-  const installed = parseLockfilePackages(await readFile8(resolve22(treeRoot, "node_modules", ".package-lock.json")).catch(() => void 0));
+  const wanted = parseLockfilePackages(await readFile9(resolve23(worktreePath, "package-lock.json")).catch(() => void 0));
+  const installed = parseLockfilePackages(await readFile9(resolve23(treeRoot, "node_modules", ".package-lock.json")).catch(() => void 0));
   if (!wanted)
     return ["package-lock.json is unreadable"];
   if (!installed)
@@ -32825,7 +33038,7 @@ async function missingInstalledPackages(worktreePath, treeRoot = worktreePath) {
       required.push(path);
   }
   await mapWithLimit(required, INTEGRITY_READ_CONCURRENCY, async (path) => {
-    if (!(path in installed) || !await isInstalledPackage(resolve22(treeRoot, path))) {
+    if (!(path in installed) || !await isInstalledPackage(resolve23(treeRoot, path))) {
       missing.push(path);
     }
   });
@@ -32864,7 +33077,7 @@ function isContainedTreePath(value) {
   return isContainedPath(value) && value.split("/").pop() === "node_modules";
 }
 async function cloneTree(source, target, file, topLevel = true) {
-  await mkdir11(target, { recursive: true, mode: 493 });
+  await mkdir12(target, { recursive: true, mode: 493 });
   for (const entry of await readdir5(source, { withFileTypes: true })) {
     const from = join10(source, entry.name);
     const to = join10(target, entry.name);
@@ -32933,7 +33146,7 @@ function describe3(error) {
 }
 
 // apps/body/dist/monolith-room-turn.js
-import { mkdir as mkdir12 } from "node:fs/promises";
+import { mkdir as mkdir13 } from "node:fs/promises";
 import { homedir as homedir9 } from "node:os";
 import { join as join11 } from "node:path";
 
@@ -33020,6 +33233,8 @@ var MonolithRoomTurnLoop = class {
   sessionId;
   /** The configuration the live session baked in; a change invalidates it. */
   sessionFingerprint;
+  /** Whether CodeGraph preparation succeeded for the live session. */
+  sessionCodegraphReady = false;
   /** The live session's environment, read back for pi's own turn record. */
   agentEnv = {};
   /** OpenRouter providers this activation pinned, in order (C92). */
@@ -33168,6 +33383,7 @@ var MonolithRoomTurnLoop = class {
     this.client = void 0;
     this.sessionId = void 0;
     this.sessionFingerprint = void 0;
+    this.sessionCodegraphReady = false;
     this.pinnedProviderOverride = void 0;
     if (client?.isAlive)
       await client.stop();
@@ -33199,11 +33415,11 @@ var MonolithRoomTurnLoop = class {
       effort: configuration.effort ?? this.options.config.modelSelection?.effort,
       soul: configuration.soul ?? self?.soul,
       agentName: self?.name ?? this.agent.name,
-      mcpServers: expectedMountedImportedMcpServerNames({
+      mcpServers: codegraphFingerprintServers(this.options.config, expectedMountedImportedMcpServerNames({
         operatorHome: this.options.config.operatorHome,
         agentKind: this.options.config.agentKind,
         grantedHostRoutes
-      })
+      }), this.sessionCodegraphReady)
     });
   }
   async grantedHostRoutes() {
@@ -33237,7 +33453,7 @@ var MonolithRoomTurnLoop = class {
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     const directMessage = Array.isArray(repositoryState.directParticipants) && repositoryState.directParticipants.length === 2;
-    await mkdir12(this.options.cwd, { recursive: true });
+    await mkdir13(this.options.cwd, { recursive: true });
     const selectionModel = configuration.model ?? this.options.config.modelSelection?.model;
     const selectionEffort = configuration.effort ?? this.options.config.modelSelection?.effort;
     const selection = selectionModel || selectionEffort ? { model: selectionModel, effort: selectionEffort } : void 0;
@@ -33264,17 +33480,6 @@ var MonolithRoomTurnLoop = class {
       command
     });
     const agentEnv = { ...this.options.config.agentEnv, ...homeOverlay };
-    const fingerprint = sessionConfigFingerprint({
-      model: configuration.model ?? this.options.config.modelSelection?.model,
-      effort: configuration.effort ?? this.options.config.modelSelection?.effort,
-      soul: configuration.soul ?? self?.soul,
-      agentName: self?.name ?? this.agent.name,
-      mcpServers: expectedMountedImportedMcpServerNames({
-        operatorHome: this.options.config.operatorHome,
-        agentKind: this.options.config.agentKind,
-        grantedHostRoutes
-      })
-    });
     this.agentEnv = agentEnv;
     const agentArgs = agentArgsWithModelSelection({
       kind: this.options.config.agentKind,
@@ -33286,10 +33491,22 @@ var MonolithRoomTurnLoop = class {
     this.sessionScratchDir = tmpDir;
     this.sessionStateDirs = stateDirs;
     const homeStateDirs = harnessHomeStateDirs(harnessLabel, agentEnv.HOME ?? operatorHome);
-    await Promise.all(homeStateDirs.map((dir) => mkdir12(dir, { recursive: true })));
+    await Promise.all(homeStateDirs.map((dir) => mkdir13(dir, { recursive: true })));
     const attachScratchRoot = this.options.config.agentHomeRoot ?? tmpDir;
     if (attachScratchRoot)
-      await mkdir12(attachScratchRoot, { recursive: true });
+      await mkdir13(attachScratchRoot, { recursive: true });
+    const codegraphReady = await prepareCodegraphIndex(this.options.config, this.options.cwd);
+    const fingerprint = sessionConfigFingerprint({
+      model: configuration.model ?? this.options.config.modelSelection?.model,
+      effort: configuration.effort ?? this.options.config.modelSelection?.effort,
+      soul: configuration.soul ?? self?.soul,
+      agentName: self?.name ?? this.agent.name,
+      mcpServers: codegraphFingerprintServers(this.options.config, expectedMountedImportedMcpServerNames({
+        operatorHome: this.options.config.operatorHome,
+        agentKind: this.options.config.agentKind,
+        grantedHostRoutes
+      }), codegraphReady)
+    });
     const spawnCommand = wrapAgentCommand({
       bwrapPath: this.options.config.bwrapPath,
       spec: {
@@ -33300,6 +33517,7 @@ var MonolithRoomTurnLoop = class {
         ...tmpDir ? { tmpDir } : {},
         additionalWritablePaths: [
           ...attachScratchRoot ? [attachScratchRoot] : [],
+          ...codegraphReady ? [codegraphIndexDirectory(this.options.cwd)] : [],
           ...grantedSquireHostBindPaths({
             operatorHome,
             agentKind: this.options.config.agentKind,
@@ -33324,9 +33542,16 @@ var MonolithRoomTurnLoop = class {
         attachScratchRoot,
         turnContextPath: this.commandContext.path,
         directMessage,
-        ...this.options.grantRunnerEndpoint ? { grantRunner: this.options.grantRunnerEndpoint } : {}
+        ...this.options.grantRunnerEndpoint && this.options.config.bwrapPath ? { grantRunner: this.options.grantRunnerEndpoint } : {}
       })
     ];
+    if (codegraphReady) {
+      const codegraph = codegraphMcpServer(this.options.config, this.options.cwd, {
+        readonly: true
+      });
+      if (codegraph)
+        servers.push(codegraph);
+    }
     const youtube = youtubeMcpServer(this.options.config, this.options.youtubeAccessToken);
     if (youtube)
       servers.push(youtube);
@@ -33358,7 +33583,12 @@ var MonolithRoomTurnLoop = class {
       // (`config.ts`), which is exactly when `wrapAgentCommand` above wraps.
       osSandbox: Boolean(this.options.config.bwrapPath),
       autoApprovePermissions: false,
-      permissionAllowlist: (request) => isRoomMcpPermissionRequest(request, mountedServers, hostServers)
+      permissionAllowlist: (request) => isRoomMcpPermissionRequest(request, mountedServers, hostServers),
+      onCommands: agentCommandCatalogPublisher({
+        api: this.options.api,
+        agentId: this.agent.publicKey,
+        workspaceId: this.options.workspaceId
+      })
     };
     this.client = (this.options.createAcpClient ?? ((value) => new AcpClient(value)))(clientOptions);
     await this.client.start();
@@ -33390,6 +33620,7 @@ var MonolithRoomTurnLoop = class {
     });
     this.sessionId = opened.sessionId;
     this.sessionFingerprint = fingerprint;
+    this.sessionCodegraphReady = codegraphReady;
     if (selection) {
       const options = filterAllowedModelConfigOptions(parseAdvertisedConfigOptions(opened.raw, selection.model));
       await applyAgentModelSelection(this.client, opened.sessionId, options, selection);
@@ -33453,6 +33684,7 @@ var MonolithRoomTurnLoop = class {
     this.client = void 0;
     this.sessionId = void 0;
     this.sessionFingerprint = void 0;
+    this.sessionCodegraphReady = false;
     if (client?.isAlive)
       await client.stop();
     this.pinnedProviderOverride = next;
@@ -33545,7 +33777,7 @@ var MonolithRoomTurnLoop = class {
           const names = new Map(roster.members.map((member) => [member.identityId, member.name]));
           const transcriptRows = conversation.items.filter((message) => message.type === "message" && message.id !== item.id && !active.steers.some((steerItem) => steerItem.id === message.id)).slice(-80).map((message) => ({
             id: message.id,
-            line: roomMessagePrompt(names.get(message.authorId) ?? message.authorId.slice(0, 12), message.body, message.attachments, this.deliveredAttachments.get(message.id), this.acceptsImages())
+            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;
@@ -33565,7 +33797,7 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
               MAINTAIN_ASSIGNED_IDENTITY_DIRECTIVE
             ].join(" "),
             `Current task selected by the server from ${inboxItemAuthorName(item, names)}:`,
-            roomMessagePrompt("", inboxItemPromptBody(item), item.attachments, delivered, this.acceptsImages())
+            roomMessagePrompt("", inboxItemPromptBody(item), item.attachments, delivered, this.acceptsImages(), item.type === "message" ? item.id : void 0)
           ].filter(Boolean).join("\n\n");
           const stream = new AgentTurnStream({
             api,
@@ -33608,7 +33840,7 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
                 "The previous run was cancelled because its harness could not accept every live steer.",
                 "Resume the same turn. Keep the original request and everything that happened before it was cancelled.",
                 "Human messages that arrived after the original request, in transcript order:",
-                ...active.steers.map((steerItem) => roomMessagePrompt(steerItem.authorId.slice(0, 12), steerItem.body, steerItem.attachments, this.deliveredAttachments.get(steerItem.id), this.acceptsImages())),
+                ...active.steers.map((steerItem) => roomMessagePrompt(steerItem.authorId.slice(0, 12), steerItem.body, steerItem.attachments, this.deliveredAttachments.get(steerItem.id), this.acceptsImages(), steerItem.type === "message" ? steerItem.id : void 0)),
                 "Continue now and answer the updated request without erasing the earlier context."
               ].join("\n\n");
             }
@@ -33766,14 +33998,18 @@ function openCornerToolCall(calls) {
 function openedACorner(call) {
   return !!call && isCompletedToolCall(call);
 }
-function roomMessagePrompt(author, body, attachments, delivered, harnessAcceptsImages = true) {
+function roomMessagePrompt(author, body, attachments, delivered, harnessAcceptsImages = true, messageId) {
   const message = body.trim() || "(shared attachments)";
   const rendered = author ? `${author}: ${message}` : message;
-  return [rendered, ...attachmentPromptLines(attachments, delivered, harnessAcceptsImages)].join("\n");
+  return [
+    ...messageId ? [`[message id: ${messageId}]`] : [],
+    rendered,
+    ...attachmentPromptLines(attachments, delivered, harnessAcceptsImages)
+  ].join("\n");
 }
 
 // apps/body/dist/monolith-corner-turn.js
-var execFileAsync3 = promisify3(execFile5);
+var execFileAsync4 = promisify4(execFile6);
 var TOOL_ARGUMENT_MAX_BYTES = 1200;
 var TOOL_OUTPUT_MAX_BYTES = 3200;
 var TOOL_PATH_LIMIT = 12;
@@ -33816,8 +34052,8 @@ function isCornerChecksTurn(trigger, restates) {
 async function cornerUndeliveredRepositoryState(worktreePath, featureBranch, targetBranch) {
   try {
     const [{ stdout: status }, ahead] = await Promise.all([
-      execFileAsync3("git", ["-C", worktreePath, "status", "--porcelain=v1"]),
-      featureBranch ? firstResolvedRemoteRef(worktreePath, [featureBranch, targetBranch]).then((remoteRef) => remoteRef ? execFileAsync3("git", [
+      execFileAsync4("git", ["-C", worktreePath, "status", "--porcelain=v1"]),
+      featureBranch ? firstResolvedRemoteRef(worktreePath, [featureBranch, targetBranch]).then((remoteRef) => remoteRef ? execFileAsync4("git", [
         "-C",
         worktreePath,
         "rev-list",
@@ -33837,7 +34073,7 @@ async function firstResolvedRemoteRef(worktreePath, branches) {
     if (!branch)
       continue;
     const ref = `refs/remotes/origin/${branch}`;
-    const resolved = await execFileAsync3("git", ["-C", worktreePath, "rev-parse", "--verify", ref]).then(() => true).catch(() => false);
+    const resolved = await execFileAsync4("git", ["-C", worktreePath, "rev-parse", "--verify", ref]).then(() => true).catch(() => false);
     if (resolved)
       return ref;
   }
@@ -33945,7 +34181,7 @@ async function cornerToolActivity(call, worktreePath, requestedBy) {
   let title = oneLine(redactToolDetail(call.title ?? "")) || `${operation} tool`;
   if (isSuccessfulCommit(call)) {
     try {
-      const shown = await execFileAsync3("git", ["-C", worktreePath, "show", "--format=%s", "--name-only", "--no-renames", "HEAD"], { maxBuffer: 1024 * 1024 });
+      const shown = await execFileAsync4("git", ["-C", worktreePath, "show", "--format=%s", "--name-only", "--no-renames", "HEAD"], { maxBuffer: 1024 * 1024 });
       const lines = shown.stdout.split(/\r?\n/);
       const subject = oneLine(lines.shift() ?? "commit");
       const files = new Set(lines.map(oneLine).filter(Boolean));
@@ -33967,20 +34203,36 @@ async function cornerToolActivity(call, worktreePath, requestedBy) {
     ...paths.length ? { files: paths.map((path) => ({ path })) } : {}
   };
 }
+var CORNER_CLOSE_POLL_BASE_MS = 10 * 6e4;
+function cornerClosePollMs(random = Math.random) {
+  return CORNER_CLOSE_POLL_BASE_MS + Math.floor(random() * 3e3);
+}
 var MonolithCornerTurnLoop = class {
   options;
   commandContext;
   agent;
   wakeIntake;
-  /** Called by the daemon's one slow workspace reconciliation sweep. */
+  /**
+   * Called by the daemon's one slow workspace reconciliation sweep, and by the
+   * fast reconcile a socket reconnect arms. A `corner-complete` published while
+   * that socket was down is never replayed, so the sweep clears the close
+   * throttle too: the durable read is what recovers the frame nobody heard.
+   *
+   * The wake is the intake loop's own stable notify and is handed back exactly
+   * once, so it is kept: clearing it here left `requestClose` waking nothing
+   * after the first sweep, and a pushed `corner-complete` then waited out the
+   * idle timer. Intake clears it itself when it exits.
+   */
   requestReconciliation() {
+    this.lastCloseCheck = 0;
     this.wakeIntake?.();
-    this.wakeIntake = void 0;
   }
   client;
   sessionId;
   /** The configuration the live session baked in; a change invalidates it. */
   sessionFingerprint;
+  /** Whether CodeGraph preparation succeeded for the live session. */
+  sessionCodegraphReady = false;
   /** What this exact ACP session has already been prompted with (`warm-transcript.ts`). */
   warmTranscript = new WarmTranscript();
   /** The live session's environment, read back for pi's own turn record. */
@@ -34023,10 +34275,17 @@ var MonolithCornerTurnLoop = class {
    * by the same replay window the inbox already de-duplicates over.
    */
   stoppedTurns = /* @__PURE__ */ new Set();
+  /** Live corner-complete: close now, do not wait for the recovery GET. */
+  closePushed = false;
+  /** Last durable close read; 0 means the first check still runs. */
+  lastCloseCheck = 0;
+  /** This corner's own jittered recovery interval, drawn once. */
+  closePollMs;
   /** In-flight warm-store harvest, awaited at shutdown and never by a turn. */
   harvest;
   constructor(options) {
     this.options = options;
+    this.closePollMs = options.closePollMs ?? cornerClosePollMs();
     this.agent = runtimeIdentity(options.runtime.agent);
     this.commandContext = new CommandExecutionContext(options.config.agentHomeRoot);
     this.options = { ...options, api: this.commandContext.bind(options.api) };
@@ -34046,6 +34305,11 @@ var MonolithCornerTurnLoop = class {
   isBusy() {
     return this.busy;
   }
+  /** corner-complete on the wire: wake intake so `closed()` reaps now. */
+  requestClose() {
+    this.closePushed = true;
+    this.wakeIntake?.();
+  }
   refreshPersonaForSoulUpdate() {
     return this.options.scheduler.suspend(this.options.cornerId);
   }
@@ -34091,6 +34355,7 @@ var MonolithCornerTurnLoop = class {
     this.client = void 0;
     this.sessionId = void 0;
     this.sessionFingerprint = void 0;
+    this.sessionCodegraphReady = false;
     this.pinnedProviderOverride = void 0;
     if (client?.isAlive)
       await client.stop();
@@ -34117,11 +34382,11 @@ var MonolithCornerTurnLoop = class {
       soul: configuration.soul ?? self?.soul,
       agentName: self?.name ?? this.agent.name,
       yoloMode: configuration.yoloMode,
-      mcpServers: expectedMountedImportedMcpServerNames({
+      mcpServers: codegraphFingerprintServers(this.options.config, expectedMountedImportedMcpServerNames({
         operatorHome: this.options.config.operatorHome,
         agentKind: this.options.config.agentKind,
         grantedHostRoutes
-      }),
+      }), this.sessionCodegraphReady),
       reviewerHandle: configuration.reviewerHandle
     });
   }
@@ -34169,7 +34434,7 @@ var MonolithCornerTurnLoop = class {
     }
     const selfReviewerInstruction = cornerSelfReviewerInstruction(reviewerInput);
     this.cornerTurnEndNudge = reviewerInstruction ?? selfReviewerInstruction ?? cornerMergeInstruction(configuration.yoloMode, configuration.reviewerHandle);
-    await mkdir13(this.options.worktreePath, { recursive: true });
+    await mkdir14(this.options.worktreePath, { recursive: true });
     const selection = configuration.model || configuration.effort ? { model: configuration.model, effort: configuration.effort } : this.options.config.modelSelection;
     const homeOverlay = this.options.config.agentHomeRoot ? await prepareRoomAgentHome({
       root: this.options.config.agentHomeRoot,
@@ -34195,8 +34460,8 @@ var MonolithCornerTurnLoop = class {
     const repository = this.options.repository;
     let githubEnv = repository ? { GH_TOKEN: repository.githubToken, GITHUB_TOKEN: repository.githubToken } : {};
     if (repository && this.options.config.runtimeConfigPath && this.options.config.agentHomeRoot) {
-      const gitBinary = (await execFileAsync3("which", ["git"])).stdout.trim();
-      const ghBinary = await execFileAsync3("which", ["gh"]).then((result) => result.stdout.trim()).catch(() => void 0);
+      const gitBinary = (await execFileAsync4("which", ["git"])).stdout.trim();
+      const ghBinary = await execFileAsync4("which", ["gh"]).then((result) => result.stdout.trim()).catch(() => void 0);
       githubEnv = await installCornerGitHubWrappers({
         root: this.options.config.agentHomeRoot,
         runtimeConfigPath: this.options.config.runtimeConfigPath,
@@ -34210,7 +34475,7 @@ var MonolithCornerTurnLoop = class {
       });
     }
     const npmCacheDir = sharedNpmCacheDir(this.options.runtime.supervisorRoot);
-    await mkdir13(npmCacheDir, { recursive: true, mode: 448 });
+    await mkdir14(npmCacheDir, { recursive: true, mode: 448 });
     const agentEnv = {
       ...this.options.config.agentEnv,
       ...homeOverlay,
@@ -34218,19 +34483,6 @@ var MonolithCornerTurnLoop = class {
       npm_config_cache: npmCacheDir
     };
     const operatorHome = this.options.config.operatorHome ?? homedir10();
-    const fingerprint = sessionConfigFingerprint({
-      model: configuration.model ?? this.options.config.modelSelection?.model,
-      effort: configuration.effort ?? this.options.config.modelSelection?.effort,
-      soul: configuration.soul ?? self?.soul,
-      agentName: self?.name ?? this.agent.name,
-      yoloMode: configuration.yoloMode,
-      mcpServers: expectedMountedImportedMcpServerNames({
-        operatorHome: this.options.config.operatorHome,
-        agentKind: this.options.config.agentKind,
-        grantedHostRoutes
-      }),
-      reviewerHandle: configuration.reviewerHandle
-    });
     this.agentEnv = agentEnv;
     const agentArgs = agentArgsWithModelSelection({
       kind: this.options.config.agentKind,
@@ -34241,10 +34493,10 @@ var MonolithCornerTurnLoop = class {
     this.attachmentDir = tmpDir ? join12(tmpDir, "beeline-attachments") : void 0;
     this.sessionScratchDir = tmpDir;
     const homeStateDirs = harnessHomeStateDirs(harnessLabel, agentEnv.HOME ?? operatorHome);
-    await Promise.all(homeStateDirs.map((dir) => mkdir13(dir, { recursive: true })));
+    await Promise.all(homeStateDirs.map((dir) => mkdir14(dir, { recursive: true })));
     const attachScratchRoot = this.options.config.agentHomeRoot ?? tmpDir;
     if (attachScratchRoot)
-      await mkdir13(attachScratchRoot, { recursive: true });
+      await mkdir14(attachScratchRoot, { recursive: true });
     const spawnCommand = wrapAgentCommand({
       bwrapPath: this.options.config.bwrapPath,
       spec: {
@@ -34280,10 +34532,29 @@ var MonolithCornerTurnLoop = class {
       agentCwd: this.options.worktreePath,
       agentLabel: harnessLabel,
       autoApprovePermissions: true,
-      permissionHandler: () => Promise.resolve("allow")
+      permissionHandler: () => Promise.resolve("allow"),
+      onCommands: agentCommandCatalogPublisher({
+        api: this.options.api,
+        agentId: this.agent.publicKey,
+        workspaceId: this.options.workspaceId
+      })
     };
     this.client = (this.options.createAcpClient ?? ((value) => new AcpClient(value)))(clientOptions);
     await this.client.start();
+    const codegraphReady = await prepareCodegraphIndex(this.options.config, this.options.worktreePath);
+    const fingerprint = sessionConfigFingerprint({
+      model: configuration.model ?? this.options.config.modelSelection?.model,
+      effort: configuration.effort ?? this.options.config.modelSelection?.effort,
+      soul: configuration.soul ?? self?.soul,
+      agentName: self?.name ?? this.agent.name,
+      yoloMode: configuration.yoloMode,
+      mcpServers: codegraphFingerprintServers(this.options.config, expectedMountedImportedMcpServerNames({
+        operatorHome: this.options.config.operatorHome,
+        agentKind: this.options.config.agentKind,
+        grantedHostRoutes
+      }), codegraphReady),
+      reviewerHandle: configuration.reviewerHandle
+    });
     const servers = [
       ...repository ? [
         {
@@ -34317,6 +34588,13 @@ var MonolithCornerTurnLoop = class {
         ...this.options.grantRunnerEndpoint ? { grantRunner: this.options.grantRunnerEndpoint } : {}
       })
     ];
+    if (codegraphReady) {
+      const codegraph = codegraphMcpServer(this.options.config, this.options.worktreePath, {
+        readonly: false
+      });
+      if (codegraph)
+        servers.push(codegraph);
+    }
     const youtube = youtubeMcpServer(this.options.config, this.options.youtubeAccessToken);
     if (youtube)
       servers.push(youtube);
@@ -34357,15 +34635,17 @@ var MonolithCornerTurnLoop = class {
           "This is a no-code corner with no repository checkout and no GitHub workflow.",
           "Work in this corner's writable workspace. Use write_scratch_file or ordinary tools to create files, then post_artifact with the path to send them back to the corner.",
           "Do not initialize a repository, create a branch, commit, push, open a pull request, or wait for GitHub checks.",
-          // This lane has no pull request URL and no merge card, so the
-          // artifacts and the tag ARE the completion signal. Without the
-          // tag the person who asked is never told the work finished.
-          this.options.requesterHandle ? `Deliver the result as artifacts: post_artifact everything the objective asked for, then finish by replying with @${this.options.requesterHandle} and one line on what you posted. That reply is this corner's only completion signal.` : `Deliver the result as artifacts: post_artifact everything the objective asked for, then finish by replying with one line on what you posted. That reply is this corner's only completion signal.`
+          // This lane has no pull request URL and no merge card, so its
+          // attached final reply is the requester-facing completion
+          // signal. close_corner is still the lifecycle completion: it
+          // archives the corner and reaps this scratch workspace.
+          this.options.requesterHandle ? `Deliver the result as artifacts: post_artifact everything the objective asked for, then call close_corner. Finish the turn by replying with @${this.options.requesterHandle} and one line on what you posted; that attached reply is the requester-facing completion signal.` : `Deliver the result as artifacts: post_artifact everything the objective asked for, then call close_corner. Finish the turn by replying with one line on what you posted; that attached reply is the requester-facing completion signal.`
         ]
       ].filter(Boolean).join("\n\n")
     });
     this.sessionId = opened.sessionId;
     this.sessionFingerprint = fingerprint;
+    this.sessionCodegraphReady = codegraphReady;
     if (selection) {
       const options = filterAllowedModelConfigOptions(parseAdvertisedConfigOptions(opened.raw, selection.model));
       await applyAgentModelSelection(this.client, opened.sessionId, options, selection);
@@ -34429,6 +34709,7 @@ var MonolithCornerTurnLoop = class {
     this.client = void 0;
     this.sessionId = void 0;
     this.sessionFingerprint = void 0;
+    this.sessionCodegraphReady = false;
     if (client?.isAlive)
       await client.stop();
     this.pinnedProviderOverride = next;
@@ -34448,7 +34729,7 @@ var MonolithCornerTurnLoop = class {
       ...this.turnTraceSink ? { sink: this.turnTraceSink } : {}
     });
   }
-  async prompt(requestId, trigger, attachments = [], requestedById, restates) {
+  async prompt(requestId, trigger, attachments = [], requestedById, restates, sourceMessageId) {
     const { api, cornerId } = this.options;
     if (this.stoppedTurns.has(requestId))
       return;
@@ -34487,7 +34768,10 @@ var MonolithCornerTurnLoop = class {
             this.currentTurn = { requestId, requester: requestedBy };
           const transcriptRows = conversation.items.slice(-120).map((message) => ({
             id: message.id,
-            line: `${names.get(message.authorId) ?? "Beeline"} [${message.type}]: ${message.body}`
+            line: [
+              ...message.type === "message" ? [`[message id: ${message.id}]`] : [],
+              `${names.get(message.authorId) ?? "Beeline"} [${message.type}]: ${message.body}`
+            ].join("\n")
           }));
           const buildPrompt = () => [
             this.turnIdentityInstructions,
@@ -34496,6 +34780,7 @@ ${this.options.objective}`,
             WarmTranscript.render(this.warmTranscript.select(this.sessionId, transcriptRows), "Corner transcript:", "New in the corner since your last turn (the earlier transcript is already in this session):"),
             roomMentionDirectory(roster, this.agent.publicKey),
             [
+              ...sourceMessageId ? [`Reaction target message id: ${sourceMessageId}`] : [],
               `Newest trigger:
 ${trigger}`,
               ...attachmentPromptLines(attachments, delivered, this.acceptsImages())
@@ -34779,6 +35064,16 @@ ${trigger}`,
         onError: (error) => console.error("[thin-core] corner command failed", error),
         stop: (requestId) => this.stopTurn(requestId),
         closed: async () => {
+          if (this.closePushed) {
+            this.closePushed = false;
+            await this.harvest;
+            await this.options.onCloseRequested();
+            return true;
+          }
+          const now2 = Date.now();
+          if (this.lastCloseCheck !== 0 && now2 - this.lastCloseCheck < this.closePollMs)
+            return false;
+          this.lastCloseCheck = now2;
           const state = await api.execute("getCornerRestoreState", { cornerId });
           if (!state.closeRequested)
             return false;
@@ -34786,7 +35081,9 @@ ${trigger}`,
           await this.options.onCloseRequested();
           return true;
         },
-        run: (command) => this.prompt(command.turnRequestId, command.source.body, command.source.attachments, command.source.authorId, command.reason === "corner_check" ? [command.source.body] : void 0)
+        run: (command) => this.prompt(command.turnRequestId, command.source.body, command.source.attachments, command.source.authorId, command.reason === "corner_check" ? [command.source.body] : void 0, command.source.type === "message" ? command.sourceMessageId : void 0).finally(() => {
+          this.lastCloseCheck = 0;
+        })
       });
     } finally {
       this.options.grantRunner?.unregister(cornerId);
@@ -35221,7 +35518,7 @@ var SessionScheduler = class {
 var REMOVAL_CONFIRMATION_READS = 2;
 var ROOM_JOIN_CONCURRENCY = 4;
 var DEFAULT_ROOM_WATCHDOG_STALE_MS = 9e4;
-var DEFAULT_RECONCILE_HEARTBEAT_MS = 6e4;
+var DEFAULT_RECONCILE_HEARTBEAT_MS = 10 * 6e4;
 var DEFAULT_DRAIN_DEADLINE_MS = 30 * 6e4;
 var CORNER_BRANCH_DELETE_ATTEMPTS = 3;
 var DiscoveryWakes = class {
@@ -35261,33 +35558,33 @@ function isStandingCornerStartFault(error) {
 async function materializeCornerWorktree(input) {
   const remote = roomCheckoutRemote(input.remote);
   const repositoryHash = createHash7("sha256").update(remote).digest("hex").slice(0, 24);
-  const gitCommonDir = resolve23(input.supervisorRoot, "beeline", "repositories", `${repositoryHash}.git`);
-  const path = resolve23(input.supervisorRoot, "beeline", "corners", input.cornerId);
-  await mkdir14(dirname12(gitCommonDir), { recursive: true, mode: 448 });
-  await mkdir14(dirname12(path), { recursive: true, mode: 448 });
+  const gitCommonDir = resolve24(input.supervisorRoot, "beeline", "repositories", `${repositoryHash}.git`);
+  const path = resolve24(input.supervisorRoot, "beeline", "corners", input.cornerId);
+  await mkdir15(dirname13(gitCommonDir), { recursive: true, mode: 448 });
+  await mkdir15(dirname13(path), { recursive: true, mode: 448 });
   const authEnv = githubGitEnv(input.token);
-  if (!existsSync6(resolve23(gitCommonDir, "HEAD"))) {
-    await execFileAsync4("git", ["clone", "--bare", remote, gitCommonDir], {
+  if (!existsSync6(resolve24(gitCommonDir, "HEAD"))) {
+    await execFileAsync5("git", ["clone", "--bare", remote, gitCommonDir], {
       env: authEnv,
       maxBuffer: 4 * 1024 * 1024
     });
   }
-  await execFileAsync4("git", [
+  await execFileAsync5("git", [
     `--git-dir=${gitCommonDir}`,
     "fetch",
     "--prune",
     "origin",
     `+refs/heads/${input.targetBranch}:refs/remotes/origin/${input.targetBranch}`
   ], { env: authEnv, maxBuffer: 4 * 1024 * 1024 });
-  const restored = await execFileAsync4("git", [
+  const restored = await execFileAsync5("git", [
     `--git-dir=${gitCommonDir}`,
     "fetch",
     "origin",
     `+refs/heads/${input.featureBranch}:refs/remotes/origin/${input.featureBranch}`
   ], { env: authEnv, maxBuffer: 4 * 1024 * 1024 }).then(() => true, () => false);
-  if (!existsSync6(resolve23(path, ".git"))) {
+  if (!existsSync6(resolve24(path, ".git"))) {
     await rm5(path, { recursive: true, force: true });
-    await execFileAsync4("git", [
+    await execFileAsync5("git", [
       `--git-dir=${gitCommonDir}`,
       "worktree",
       "add",
@@ -35304,14 +35601,14 @@ async function materializeCornerWorktree(input) {
       console.log(`[thin-core] corner ${input.cornerId} warm node_modules: ${seed.reason}${seed.detail ? ` (${seed.detail})` : ""}`);
     }
   }
-  await execFileAsync4("git", [
+  await execFileAsync5("git", [
     `--git-dir=${gitCommonDir}`,
     "config",
     "extensions.worktreeConfig",
     "true"
   ]);
-  await execFileAsync4("git", ["-C", path, "config", "--worktree", "core.bare", "false"]);
-  await execFileAsync4("git", [
+  await execFileAsync5("git", ["-C", path, "config", "--worktree", "core.bare", "false"]);
+  await execFileAsync5("git", [
     "-C",
     path,
     "config",
@@ -35319,7 +35616,7 @@ async function materializeCornerWorktree(input) {
     "credential.https://github.com.helper",
     "!f() { echo username=x-access-token; echo password=$GH_TOKEN; }; f"
   ]);
-  await execFileAsync4("git", [
+  await execFileAsync5("git", [
     "-C",
     path,
     "config",
@@ -35327,7 +35624,7 @@ async function materializeCornerWorktree(input) {
     "user.name",
     input.committer.name
   ]);
-  await execFileAsync4("git", [
+  await execFileAsync5("git", [
     "-C",
     path,
     "config",
@@ -35335,8 +35632,8 @@ async function materializeCornerWorktree(input) {
     "user.email",
     `${input.committer.publicKey.slice(0, 16)}@users.noreply.github.com`
   ]);
-  const top = await execFileAsync4("git", ["-C", path, "rev-parse", "--show-toplevel"]);
-  if (resolve23(top.stdout.trim()) !== resolve23(path)) {
+  const top = await execFileAsync5("git", ["-C", path, "rev-parse", "--show-toplevel"]);
+  if (resolve24(top.stdout.trim()) !== resolve24(path)) {
     throw new Error(`corner worktree escaped its isolated root: ${top.stdout.trim()}`);
   }
   return { path, gitCommonDir };
@@ -35360,7 +35657,7 @@ async function removeCornerWorktreeAndBranches(worktree) {
   const worktreeExists = existsSync6(worktree.path);
   const localExists = await gitRefExists(worktree.gitCommonDir, localRef);
   if (worktreeExists) {
-    const checkedOut = await execFileAsync4("git", [
+    const checkedOut = await execFileAsync5("git", [
       "-C",
       worktree.path,
       "symbolic-ref",
@@ -35370,7 +35667,7 @@ async function removeCornerWorktreeAndBranches(worktree) {
     if (checkedOut.stdout.trim() !== localRef) {
       throw new Error(`corner worktree branch mismatch: expected ${localRef}`);
     }
-    await execFileAsync4("git", [
+    await execFileAsync5("git", [
       `--git-dir=${worktree.gitCommonDir}`,
       "worktree",
       "remove",
@@ -35390,7 +35687,7 @@ async function removeCornerWorktreeAndBranches(worktree) {
   }
   await deleteExactRemoteBranch(worktree.gitCommonDir, remoteRef, worktree.token);
   if (await gitRefExists(worktree.gitCommonDir, localRef)) {
-    await execFileAsync4("git", [
+    await execFileAsync5("git", [
       `--git-dir=${worktree.gitCommonDir}`,
       "branch",
       "--delete",
@@ -35400,10 +35697,10 @@ async function removeCornerWorktreeAndBranches(worktree) {
     ]);
   }
 }
-var execFileAsync4 = promisify4(execFile6);
+var execFileAsync5 = promisify5(execFile7);
 async function removeCornerScratchWorkspace(input) {
-  const expected = resolve23(input.roomRoot, "scratch");
-  if (resolve23(input.scratchPath) !== expected) {
+  const expected = resolve24(input.roomRoot, "scratch");
+  if (resolve24(input.scratchPath) !== expected) {
     throw new Error(`refusing to remove scratch outside corner ${input.cornerId}`);
   }
   await rm5(expected, { recursive: true, force: true });
@@ -35417,6 +35714,19 @@ var RoomRuntimeCoordinator = class {
   /** Close/reconcile leftovers retried until local and remote refs are gone. */
   pendingCornerReaps = /* @__PURE__ */ new Map();
   startingCorners = /* @__PURE__ */ new Set();
+  /**
+   * Rooms whose start is in flight. `running` is not set until the checkout
+   * clone finishes, and three callers race for it — the membership push, the
+   * reconcile sweep, and the watchdog restart — so without this two checkouts
+   * run in the same shared directory and the second start orphans the first
+   * loop's AbortController.
+   */
+  startingRooms = /* @__PURE__ */ new Set();
+  /** Pushed membership changes awaiting a bounded apply, latest per Room. */
+  pendingMembershipEvents = /* @__PURE__ */ new Map();
+  membershipDrain;
+  /** Set by `shutdown`: a pushed event may no longer start anything. */
+  stopped = false;
   /** Corners whose start failure has already been said out loud, once each. */
   reportedCornerStartFailures = /* @__PURE__ */ new Set();
   /** Standing workspace-configuration faults, keyed by the config that failed. */
@@ -35433,10 +35743,11 @@ var RoomRuntimeCoordinator = class {
   workspaceRemovalConfirmations = 0;
   roomRemovalConfirmations = /* @__PURE__ */ new Map();
   confirmationPending = false;
-  /** Agent-directed discovery wakes (#1369), counted instead of flagged: a
-   *  wake that arrives while a reconcile is already running must survive its
-   *  start-pass clearing, or a corner opened mid-reconcile waits a heartbeat
-   *  for a wake the daemon already received. */
+  /** Unscoped agent-directed discovery wakes (#1369), counted instead of
+   *  flagged: a wake that arrives while a reconcile is already running must
+   *  survive its start-pass clearing, or a reconnect mid-reconcile waits a
+   *  heartbeat for a wake the daemon already received. A scoped membership
+   *  event applies incrementally and never touches this latch. */
   discoveryWakes = new DiscoveryWakes();
   /** One command-grant runner per daemon; Rooms and corners register their checkouts on it. */
   grantRunner;
@@ -35460,8 +35771,16 @@ var RoomRuntimeCoordinator = class {
     });
     this.grantRunnerServer = new GrantRunnerServer(this.grantRunner);
     this.connectorUsage = new ConnectorUsageRecorder();
-    this.options.daemonApi.setRoomsChangedListener?.(() => {
-      this.discoveryWakes.wake();
+    this.options.daemonApi.setRoomsChangedListener?.((event) => {
+      const roomId = event?.roomId;
+      if (!roomId) {
+        this.discoveryWakes.wake();
+        return;
+      }
+      this.queueMembershipEvent({ ...event, roomId });
+    });
+    this.options.daemonApi.setCornerCompleteListener?.((roomId) => {
+      void this.applyCornerComplete(roomId).catch((error) => console.error("[thin-core] live corner-complete apply failed", error));
     });
     this.options.daemonApi.setConfigChangedListener?.(() => {
       void this.scheduler.suspendIdle().catch((error) => console.error("[body] config-change session restart failed", error));
@@ -35590,17 +35909,7 @@ var RoomRuntimeCoordinator = class {
         this.confirmationPending = true;
         continue;
       }
-      running.controller.abort();
-      await running.promise.catch(() => void 0);
-      try {
-        if (running.worktree)
-          await this.reapCornerWorktree(running.worktree);
-        else if (running.scratch)
-          await this.reapCornerScratch(running.scratch);
-      } catch (error) {
-        console.error(`[thin-core] corner ${channelId} cleanup failed; will retry:`, error);
-        this.confirmationPending = true;
-      }
+      await this.stopRunning(channelId, running);
     }
     await mapWithConcurrency(desiredTopRooms, ROOM_JOIN_CONCURRENCY, async (roomId) => {
       if (this.running.has(roomId))
@@ -35620,17 +35929,97 @@ var RoomRuntimeCoordinator = class {
     this.discoveryWakes.completeReconcile(coveredWakes);
     return "member";
   }
+  /**
+   * Pushed membership changes are applied at the same bound the reconcile pass
+   * uses. One `rooms-changed` per row means a single human action (adding an
+   * agent to a Room inherits a membership per corner under it) arrives as a
+   * burst; unbounded, that burst is exactly the concurrent restore reads and
+   * worktree checkouts this change exists to stop.
+   */
+  queueMembershipEvent(event) {
+    if (this.stopped)
+      return;
+    this.pendingMembershipEvents.set(event.roomId, event);
+    this.membershipDrain ??= this.drainMembershipEvents().finally(() => {
+      this.membershipDrain = void 0;
+    });
+  }
+  async drainMembershipEvents() {
+    while (this.pendingMembershipEvents.size) {
+      const batch = [...this.pendingMembershipEvents.values()];
+      this.pendingMembershipEvents.clear();
+      await mapWithConcurrency(batch, ROOM_JOIN_CONCURRENCY, (event) => this.applyMembershipEvent(event).catch((error) => {
+        console.error("[thin-core] live membership apply failed", error);
+        this.discoveryWakes.wake();
+      }));
+    }
+  }
+  /**
+   * Incremental apply of one scoped membership push.
+   * An unscoped wake still uses the slow reconcile as recovery.
+   */
+  async applyMembershipEvent(event) {
+    const roomId = event.roomId;
+    if (!roomId) {
+      this.discoveryWakes.wake();
+      return;
+    }
+    if (event.removed === true) {
+      const running = this.running.get(roomId);
+      if (running)
+        await this.stopRunning(roomId, running);
+      this.monolithCornerParents.delete(roomId);
+      return;
+    }
+    if (event.archived === true)
+      return;
+    this.roomRemovalConfirmations.delete(roomId);
+    if (this.running.has(roomId) || this.startingCorners.has(roomId))
+      return;
+    if (event.parentRoomId) {
+      this.monolithCornerParents.set(roomId, event.parentRoomId);
+      if (!event.openedBy) {
+        this.discoveryWakes.wake();
+        return;
+      }
+      await this.startCorner({
+        cornerId: roomId,
+        parentRoomId: event.parentRoomId,
+        openedBy: event.openedBy
+      });
+      if (!this.running.has(roomId))
+        this.discoveryWakes.wake();
+      return;
+    }
+    await this.startRoom(roomId);
+  }
+  async applyCornerComplete(cornerId) {
+    this.running.get(cornerId)?.body.requestClose?.();
+  }
+  async stopRunning(channelId, running) {
+    running.controller.abort();
+    await running.promise.catch(() => void 0);
+    try {
+      if (running.worktree)
+        await this.reapCornerWorktree(running.worktree);
+      else if (running.scratch)
+        await this.reapCornerScratch(running.scratch);
+    } catch (error) {
+      console.error(`[thin-core] corner ${channelId} cleanup failed; will retry:`, error);
+      this.confirmationPending = true;
+    }
+  }
   roomRecord(roomId) {
     return this.runtime.rooms.find((room) => room.channelId === roomId);
   }
   roomRoot(roomId) {
-    return this.roomRecord(roomId)?.root ?? resolve23(dirname12(this.configPath), "rooms", roomId);
+    return this.roomRecord(roomId)?.root ?? resolve24(dirname13(this.configPath), "rooms", roomId);
   }
   roomAgentHomeRoot(workspaceRoot, required = false) {
     const flag = process.env.BUZZY_BODY_ROOM_HOME;
     if (!required && flag === "0")
       return void 0;
-    const home = resolve23(workspaceRoot, "agent-home");
+    const home = resolve24(workspaceRoot, "agent-home");
     if (!required && flag !== "1" && !existsSync6(home) && existsSync6(workspaceRoot))
       return void 0;
     try {
@@ -35646,10 +36035,10 @@ var RoomRuntimeCoordinator = class {
     return {
       ...this.baseConfig,
       workspaceRoot,
-      agentPrivateRoot: resolve23(workspaceRoot, "agent-private"),
-      agentMemoryRoot: resolve23(dirname12(this.configPath), "memory"),
-      openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname12(this.configPath)),
-      turnTraceDir: turnTraceDirectory(dirname12(this.configPath)),
+      agentPrivateRoot: resolve24(workspaceRoot, "agent-private"),
+      agentMemoryRoot: resolve24(dirname13(this.configPath), "memory"),
+      openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname13(this.configPath)),
+      turnTraceDir: turnTraceDirectory(dirname13(this.configPath)),
       ...agentHomeRoot ? { agentHomeRoot } : {}
     };
   }
@@ -35671,6 +36060,16 @@ var RoomRuntimeCoordinator = class {
     });
   }
   async startRoom(roomId) {
+    if (this.running.has(roomId) || this.startingRooms.has(roomId))
+      return;
+    this.startingRooms.add(roomId);
+    try {
+      await this.startRoomOnce(roomId);
+    } finally {
+      this.startingRooms.delete(roomId);
+    }
+  }
+  async startRoomOnce(roomId) {
     const controller = new AbortController();
     const cwd = await this.materializeRoomCheckout(roomId);
     const grantRunnerEndpoint = await this.grantRunnerEndpoint();
@@ -35703,6 +36102,11 @@ var RoomRuntimeCoordinator = class {
       if (this.running.get(roomId)?.body === loop)
         this.running.delete(roomId);
     });
+    if (this.stopped) {
+      controller.abort();
+      await promise;
+      return;
+    }
     this.running.set(roomId, {
       body: loop,
       controller,
@@ -35727,17 +36131,17 @@ var RoomRuntimeCoordinator = class {
     const remote = roomCheckoutRemote(repository.remote);
     const targetBranch = repository.targetBranch || "main";
     const checkoutId = createHash7("sha256").update(`${remote}\0${targetBranch}`).digest("hex").slice(0, 24);
-    const path = resolve23(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
-    await mkdir14(dirname12(path), { recursive: true, mode: 448 });
+    const path = resolve24(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
+    await mkdir15(dirname13(path), { recursive: true, mode: 448 });
     const token = remote.startsWith("https://github.com/") ? await this.options.daemonApi.execute("getRoomGitHubToken", { roomId }) : void 0;
     const env = token ? githubGitEnv(token.token) : process.env;
-    if (!existsSync6(resolve23(path, ".git"))) {
-      await execFileAsync4("git", ["clone", "--no-checkout", remote, path], {
+    if (!existsSync6(resolve24(path, ".git"))) {
+      await execFileAsync5("git", ["clone", "--no-checkout", remote, path], {
         env,
         maxBuffer: 4 * 1024 * 1024
       });
     }
-    await execFileAsync4("git", [
+    await execFileAsync5("git", [
       "-C",
       path,
       "fetch",
@@ -35745,7 +36149,7 @@ var RoomRuntimeCoordinator = class {
       "origin",
       `+refs/heads/${targetBranch}:refs/remotes/origin/${targetBranch}`
     ], { env, maxBuffer: 4 * 1024 * 1024 });
-    await execFileAsync4("git", ["-C", path, "checkout", "--detach", "--force", `origin/${targetBranch}`], {
+    await execFileAsync5("git", ["-C", path, "checkout", "--detach", "--force", `origin/${targetBranch}`], {
       env,
       maxBuffer: 4 * 1024 * 1024
     });
@@ -35763,7 +36167,8 @@ var RoomRuntimeCoordinator = class {
           roomId: corner.parentRoomId
         })
       ]);
-      configKey = cornerStartConfigKey(repository, restore.objective ?? "");
+      const objective = (restore.objective ?? "").trim() || (restore.kind === "human" ? (restore.title ?? "").trim() : "");
+      configKey = cornerStartConfigKey(repository, objective);
       const previousStanding = this.standingCornerStartFaults.get(corner.cornerId);
       if (previousStanding === configKey)
         return;
@@ -35777,7 +36182,6 @@ var RoomRuntimeCoordinator = class {
       if (repository.resolution === "repository" && (!repository.remote || !repository.key)) {
         throw new Error("corner parent Room has an incomplete repository binding");
       }
-      const objective = (restore.objective ?? "").trim();
       if (!objective)
         throw new Error("corner has no authoritative objective fact");
       const repositoryBacked = repository.resolution === "repository" && restore.lane !== "no_code";
@@ -35793,10 +36197,10 @@ var RoomRuntimeCoordinator = class {
         featureBranch,
         token: granted.token
       }) : void 0;
-      const workspacePath = worktree?.path ?? resolve23(this.roomRoot(corner.cornerId), "scratch");
+      const workspacePath = worktree?.path ?? resolve24(this.roomRoot(corner.cornerId), "scratch");
       if (!worktree)
-        await mkdir14(workspacePath, { recursive: true, mode: 448 });
-      const isOpener = !corner.openedBy || corner.openedBy === this.agent.publicKey;
+        await mkdir15(workspacePath, { recursive: true, mode: 448 });
+      const isOpener = corner.openedBy === this.agent.publicKey;
       if (worktree && shouldPostInitialCornerWorkingState(restore, isOpener)) {
         await this.options.daemonApi.execute("postCornerRemoteState", {
           cornerId: corner.cornerId,
@@ -35852,6 +36256,11 @@ var RoomRuntimeCoordinator = class {
           this.running.delete(corner.cornerId);
         }
       });
+      if (this.stopped) {
+        controller.abort();
+        await promise;
+        return;
+      }
       this.running.set(corner.cornerId, {
         body: loop,
         controller,
@@ -35997,18 +36406,28 @@ var RoomRuntimeCoordinator = class {
     }
   }
   async shutdown() {
+    this.stopped = true;
+    this.pendingMembershipEvents.clear();
+    const deadlineAt = Math.min(this.now() + this.drainDeadlineMs, this.drainDeadlineAt ?? Number.POSITIVE_INFINITY);
+    const untilDeadline = async (work) => {
+      let timer;
+      const deadline = new Promise((resolveDeadline) => {
+        timer = setTimeout(() => resolveDeadline("deadline"), Math.max(0, deadlineAt - this.now()));
+      });
+      try {
+        return await Promise.race([work, deadline]);
+      } finally {
+        if (timer)
+          clearTimeout(timer);
+      }
+    };
+    if (this.membershipDrain)
+      await untilDeadline(this.membershipDrain);
     const rooms = [...this.running.values()];
     for (const room of rooms)
       room.controller.abort();
     const drained = Promise.all(rooms.map((room) => room.promise.catch(() => void 0)));
-    const deadlineAt = Math.min(this.now() + this.drainDeadlineMs, this.drainDeadlineAt ?? Number.POSITIVE_INFINITY);
-    let timer;
-    const deadline = new Promise((resolveDeadline) => {
-      timer = setTimeout(() => resolveDeadline("deadline"), Math.max(0, deadlineAt - this.now()));
-    });
-    const result = await Promise.race([drained.then(() => "drained"), deadline]);
-    if (timer)
-      clearTimeout(timer);
+    const result = await untilDeadline(drained.then(() => "drained"));
     if (result === "deadline") {
       await Promise.allSettled(rooms.map((room) => room.body.forceRecoverRoom()));
       await drained;
@@ -36044,7 +36463,7 @@ function githubGitEnv(token) {
 }
 async function gitRefExists(gitCommonDir, ref) {
   try {
-    await execFileAsync4("git", [`--git-dir=${gitCommonDir}`, "show-ref", "--verify", "--quiet", ref]);
+    await execFileAsync5("git", [`--git-dir=${gitCommonDir}`, "show-ref", "--verify", "--quiet", ref]);
     return true;
   } catch (error) {
     if (error.code === 1)
@@ -36054,7 +36473,7 @@ async function gitRefExists(gitCommonDir, ref) {
 }
 async function repositoryHeadRef(gitCommonDir) {
   try {
-    const head = await execFileAsync4("git", [
+    const head = await execFileAsync5("git", [
       `--git-dir=${gitCommonDir}`,
       "symbolic-ref",
       "--quiet",
@@ -36074,7 +36493,7 @@ ${gitStderr(error)}`);
 }
 async function deleteExactRemoteBranch(gitCommonDir, remoteRef, token, options = {}) {
   const authEnv = githubGitEnv(token);
-  const listRemote = () => execFileAsync4("git", [`--git-dir=${gitCommonDir}`, "ls-remote", "--heads", "origin", remoteRef], {
+  const listRemote = () => execFileAsync5("git", [`--git-dir=${gitCommonDir}`, "ls-remote", "--heads", "origin", remoteRef], {
     env: authEnv,
     maxBuffer: 4 * 1024 * 1024
   });
@@ -36090,7 +36509,7 @@ async function deleteExactRemoteBranch(gitCommonDir, remoteRef, token, options =
     try {
       const remote = await listRemote();
       if (remote.stdout.trim()) {
-        await execFileAsync4("git", [`--git-dir=${gitCommonDir}`, "push", "origin", `:${remoteRef}`], {
+        await execFileAsync5("git", [`--git-dir=${gitCommonDir}`, "push", "origin", `:${remoteRef}`], {
           env: authEnv,
           maxBuffer: 4 * 1024 * 1024
         });
@@ -36185,17 +36604,17 @@ var ThinDaemonCore = class {
 };
 
 // apps/body/dist/agent-retirement.js
-import { mkdir as mkdir16, rename as rename5 } from "node:fs/promises";
-import { dirname as dirname14, resolve as resolve25 } from "node:path";
+import { mkdir as mkdir17, rename as rename5 } from "node:fs/promises";
+import { dirname as dirname15, resolve as resolve26 } from "node:path";
 
 // apps/body/dist/systemd.js
-import { execFile as execFile7 } from "node:child_process";
-import { mkdir as mkdir15, readFile as readFile9, stat as stat3, writeFile as writeFile10 } from "node:fs/promises";
+import { execFile as execFile8 } from "node:child_process";
+import { mkdir as mkdir16, readFile as readFile10, stat as stat3, writeFile as writeFile10 } from "node:fs/promises";
 import { homedir as homedir11 } from "node:os";
-import { dirname as dirname13, resolve as resolve24 } from "node:path";
+import { dirname as dirname14, resolve as resolve25 } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
-import { promisify as promisify5 } from "node:util";
-var execFileAsync5 = promisify5(execFile7);
+import { promisify as promisify6 } from "node:util";
+var execFileAsync6 = promisify6(execFile8);
 var DELIBERATE_REMOVAL_EXIT_STATUS = 78;
 var DAEMON_DISTRESS_EXIT_STATUS = 77;
 var UNKNOWN_AGENT_EXIT_STATUS = 79;
@@ -36227,8 +36646,13 @@ TimeoutStartSec=90s
 TimeoutStopSec=10min
 KillMode=control-group
 UMask=0077
-NoNewPrivileges=yes
-PrivateTmp=yes
+# A desktop-launched user manager may inherit Ubuntu's unprivileged_userns
+# AppArmor profile. Without an explicit transition every agent inherits it too,
+# so /usr/bin/bwrap cannot enter its package-provided bwrap profile.
+# Do not set NoNewPrivileges or PrivateTmp on this outer service: systemd applies
+# either before AppArmorProfile, which blocks this transition. Bubblewrap sets
+# no-new-privs and a private /tmp inside each agent sandbox it creates.
+AppArmorProfile=-unconfined
 
 [Install]
 WantedBy=default.target
@@ -36236,9 +36660,9 @@ WantedBy=default.target
 }
 function isCanonicalInstalledLauncher(env = process.env, invocationPath = process.argv[1]) {
   const home = env.HOME?.trim() || homedir11();
-  const expectedLibDir = resolve24(home, ".local", "lib", "beeline");
+  const expectedLibDir = resolve25(home, ".local", "lib", "beeline");
   const expectedPrefix = `${expectedLibDir}/`;
-  return resolve24(env.BEELINE_LIB_DIR?.trim() || "/") === expectedLibDir && Boolean(invocationPath) && resolve24(invocationPath).startsWith(expectedPrefix);
+  return resolve25(env.BEELINE_LIB_DIR?.trim() || "/") === expectedLibDir && Boolean(invocationPath) && resolve25(invocationPath).startsWith(expectedPrefix);
 }
 function assertCanonicalInstalledLauncher(env, invocationPath) {
   if (isCanonicalInstalledLauncher(env, invocationPath))
@@ -36246,12 +36670,12 @@ function assertCanonicalInstalledLauncher(env, invocationPath) {
   throw new Error("refusing to modify the shared Beeline systemd unit outside the canonical ~/.local/bin/beeline launcher");
 }
 function systemdUserUnitPath(env = process.env) {
-  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve24(homedir11(), ".config");
-  return resolve24(configRoot, "systemd", "user", SYSTEMD_UNIT_NAME);
+  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve25(homedir11(), ".config");
+  return resolve25(configRoot, "systemd", "user", SYSTEMD_UNIT_NAME);
 }
 function systemdBrokerUnitPath(env = process.env) {
-  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve24(homedir11(), ".config");
-  return resolve24(configRoot, "systemd", "user", TRUSTY_SQUIRE_BROKER_UNIT_NAME);
+  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve25(homedir11(), ".config");
+  return resolve25(configRoot, "systemd", "user", TRUSTY_SQUIRE_BROKER_UNIT_NAME);
 }
 async function installTrustySquireBrokerService(options = {}) {
   const env = options.env ?? process.env;
@@ -36260,9 +36684,9 @@ async function installTrustySquireBrokerService(options = {}) {
   ensureSquireHostDir(home);
   const path = systemdBrokerUnitPath(env);
   const content = trustySquireBrokerUnit();
-  const existing = await readFile9(path, "utf8").catch(() => "");
+  const existing = await readFile10(path, "utf8").catch(() => "");
   if (existing !== content) {
-    await mkdir15(dirname13(path), { recursive: true, mode: 448 });
+    await mkdir16(dirname14(path), { recursive: true, mode: 448 });
     await writeFile10(path, content, { mode: 384 });
   }
   const run2 = options.run ?? runSystemctl;
@@ -36271,7 +36695,7 @@ async function installTrustySquireBrokerService(options = {}) {
 }
 var AGENT_SERVICE = /^beeline-agent@([0-9a-f]{64})\.service$/i;
 var runSystemctl = async (args) => {
-  const result = await execFileAsync5("systemctl", ["--user", ...args], {
+  const result = await execFileAsync6("systemctl", ["--user", ...args], {
     timeout: SYSTEMD_COMMAND_TIMEOUT_MS,
     encoding: "utf8"
   });
@@ -36284,9 +36708,9 @@ async function installAgentService(publicKey, options = {}) {
   assertCanonicalInstalledLauncher(env, options.invocationPath);
   const path = systemdUserUnitPath(env);
   const content = agentServiceUnit();
-  const existing = await readFile9(path, "utf8").catch(() => "");
+  const existing = await readFile10(path, "utf8").catch(() => "");
   if (existing !== content) {
-    await mkdir15(dirname13(path), { recursive: true, mode: 448 });
+    await mkdir16(dirname14(path), { recursive: true, mode: 448 });
     await writeFile10(path, content, { mode: 384 });
   }
   const run2 = options.run ?? runSystemctl;
@@ -36407,7 +36831,7 @@ async function reconcileAgentServices(options = {}) {
 async function notify(fields) {
   if (process.env.BEELINE_MANAGED_BY_SYSTEMD !== "1")
     return;
-  await execFileAsync5("systemd-notify", fields, { timeout: SYSTEMD_COMMAND_TIMEOUT_MS });
+  await execFileAsync6("systemd-notify", fields, { timeout: SYSTEMD_COMMAND_TIMEOUT_MS });
 }
 async function extendSystemdStartTimeout(ms) {
   await notify([`EXTEND_TIMEOUT_USEC=${Math.max(0, Math.round(ms)) * 1e3}`]).catch(() => void 0);
@@ -36426,15 +36850,15 @@ var SystemdNotifier = class {
 
 // apps/body/dist/agent-retirement.js
 async function retireRemovedAgent(runtime, options = {}) {
-  const deletedRoot = resolve25(runtime.supervisorRoot, "beeline", "deleted-runtimes");
-  const target = resolve25(deletedRoot, `${runtime.agent.publicKey}-${Date.now()}`);
+  const deletedRoot = resolve26(runtime.supervisorRoot, "beeline", "deleted-runtimes");
+  const target = resolve26(deletedRoot, `${runtime.agent.publicKey}-${Date.now()}`);
   return relocateAgentRuntime(runtime, target, {
     ...options.run ? { run: options.run } : {}
   });
 }
 async function relocateAgentRuntime(runtime, target, options = {}) {
   const source = runtimeDirectory(runtime.supervisorRoot, runtime.agent.publicKey);
-  const destination = resolve25(target);
+  const destination = resolve26(target);
   if (destination === source || destination.startsWith(`${source}/`)) {
     throw new Error("agent runtime destination must be outside the live runtime");
   }
@@ -36443,13 +36867,13 @@ async function relocateAgentRuntime(runtime, target, options = {}) {
       ...options.run ? { run: options.run } : {}
     });
   }
-  await mkdir16(dirname14(destination), { recursive: true, mode: 448 });
+  await mkdir17(dirname15(destination), { recursive: true, mode: 448 });
   await rename5(source, destination);
   return destination;
 }
 
 // apps/body/dist/start-command.js
-import { basename as basename7, dirname as dirname18 } from "node:path";
+import { basename as basename7, dirname as dirname19 } from "node:path";
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 
 // apps/body/dist/self-update-cli.js
@@ -36460,21 +36884,21 @@ init_self_update_manifest();
 // apps/body/dist/managed-update.js
 init_self_update();
 import { spawn as spawn9 } from "node:child_process";
-import { mkdir as mkdir19, rm as rm7, stat as stat4, writeFile as writeFile13 } from "node:fs/promises";
-import { dirname as dirname17, resolve as resolve28 } from "node:path";
+import { mkdir as mkdir20, rm as rm7, stat as stat4, writeFile as writeFile13 } from "node:fs/promises";
+import { dirname as dirname18, resolve as resolve29 } from "node:path";
 
 // apps/body/dist/update-rollback-alert.js
-import { mkdir as mkdir18, readFile as readFile11, rename as rename7, unlink as unlink4, writeFile as writeFile12 } from "node:fs/promises";
-import { dirname as dirname16, resolve as resolve27 } from "node:path";
+import { mkdir as mkdir19, readFile as readFile12, rename as rename7, unlink as unlink4, writeFile as writeFile12 } from "node:fs/promises";
+import { dirname as dirname17, resolve as resolve28 } from "node:path";
 var REPORT_INTERVAL_MS = 60 * 60 * 1e3;
 var lastLogged = /* @__PURE__ */ new Map();
 function updateRollbackAlertPath(runtimeDir) {
-  return resolve27(runtimeDir, "update-rollback-alert.json");
+  return resolve28(runtimeDir, "update-rollback-alert.json");
 }
 async function writeAlert(runtimeDir, alert) {
   const path = updateRollbackAlertPath(runtimeDir);
   const staged = `${path}.${process.pid}.tmp`;
-  await mkdir18(dirname16(path), { recursive: true });
+  await mkdir19(dirname17(path), { recursive: true });
   await writeFile12(staged, `${JSON.stringify(alert, null, 2)}
 `, { mode: 384 });
   await rename7(staged, path);
@@ -36487,7 +36911,7 @@ async function queueUpdateRollbackAlert(runtimeDir, releaseId, now2 = Date.now()
 }
 async function readUpdateRollbackAlert(runtimeDir) {
   try {
-    const value = JSON.parse(await readFile11(updateRollbackAlertPath(runtimeDir), "utf8"));
+    const value = JSON.parse(await readFile12(updateRollbackAlertPath(runtimeDir), "utf8"));
     if (value.version !== 1 || typeof value.releaseId !== "string")
       return void 0;
     return value;
@@ -36538,13 +36962,13 @@ 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 = resolve28(layout.releasesRoot, ".state", "install.lock");
+  const lock = resolve29(layout.releasesRoot, ".state", "install.lock");
   const deadline = now2() + (options.waitMs ?? 1e4);
-  await mkdir19(dirname17(lock), { recursive: true });
+  await mkdir20(dirname18(lock), { recursive: true });
   for (; ; ) {
     try {
-      await mkdir19(lock);
-      await writeFile13(resolve28(lock, "owner"), `${process.pid}
+      await mkdir20(lock);
+      await writeFile13(resolve29(lock, "owner"), `${process.pid}
 ${now2()}
 `, "utf8");
       break;
@@ -36668,7 +37092,7 @@ var ManagedUpdateHandoff = class _ManagedUpdateHandoff {
       if (!attempt || attempt.releaseId !== desiredRelease || attempt.status !== "pending") {
         const from = await readInstalledBundleIdentity({
           ...this.#layout,
-          libDir: resolve28(this.#layout.releasesRoot, this.#loadedRelease)
+          libDir: resolve29(this.#layout.releasesRoot, this.#loadedRelease)
         }).catch(() => void 0) ?? {};
         const to = await readInstalledBundleIdentity(this.#layout).catch(() => void 0) ?? {};
         const record3 = {
@@ -36955,7 +37379,7 @@ async function proveLoadedReleaseReady(layout, runtimeDir, loadedRelease, option
   });
   if (!accepted)
     return false;
-  await writeFile13(resolve28(runtimeDir, "daemon-ready.json"), `${JSON.stringify({
+  await writeFile13(resolve29(runtimeDir, "daemon-ready.json"), `${JSON.stringify({
     readyAt: (options.now ?? Date.now)(),
     loadedRelease,
     functionalProof: options.functionalProof
@@ -37201,7 +37625,7 @@ async function startStoredRuntime(configPath, opts = {}, dependencyOverrides = {
   return { status: "started", pid };
 }
 function agentStartId(configPath) {
-  return basename7(dirname18(configPath));
+  return basename7(dirname19(configPath));
 }
 async function startRuntime(configPath, spinnerHandle) {
   const report = (text2) => spinnerHandle ? spinnerHandle.message(text2) : console.log(text2);
@@ -37267,7 +37691,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 ${dirname18(path)}\u2026`);
+    spinnerHandle?.start(`Starting ${dirname19(path)}\u2026`);
     try {
       const outcome = await deps.startOne(path, spinnerHandle);
       const report = { id, path, ...outcome };
@@ -37301,9 +37725,9 @@ async function runStartCommand(args, interactiveUi, dependencyOverrides = {}) {
 // apps/body/dist/connect-command.js
 import { spawn as spawn11 } from "node:child_process";
 import { createHash as createHash9, randomUUID as randomUUID6 } from "node:crypto";
-import { chmod as chmod7, mkdir as mkdir20, readFile as readFile12, unlink as unlink5, writeFile as writeFile14 } from "node:fs/promises";
+import { chmod as chmod7, mkdir as mkdir21, readFile as readFile13, unlink as unlink5, writeFile as writeFile14 } from "node:fs/promises";
 import { homedir as homedir13, hostname as hostname2 } from "node:os";
-import { dirname as dirname19, resolve as resolve29 } from "node:path";
+import { dirname as dirname20, resolve as resolve30 } from "node:path";
 import { stdin as stdin3, stdout as stdout4 } from "node:process";
 
 // apps/body/dist/clack-support.js
@@ -37621,6 +38045,9 @@ init_self_update();
 init_self_update_manifest();
 var CONNECT_HARNESSES = AUTO_DETECT_AGENT_KINDS;
 var AGENT_NAME_MAX_LENGTH = 32;
+function isInteractiveConnectTerminal(input = stdin3) {
+  return input.isTTY === true;
+}
 function isReasonableAgentName(value) {
   const normalized = value.trim().replace(/\s+/g, " ");
   return normalized.length > 0 && normalized.length <= AGENT_NAME_MAX_LENGTH && new RegExp("^\\p{L}[\\p{L}\\p{M}'\u2019 -]*$", "u").test(normalized);
@@ -37931,19 +38358,19 @@ function parseConnectSubscriptions(value) {
   ];
 }
 async function readMachineId(env = process.env) {
-  const configDir = resolve29(env.XDG_CONFIG_HOME ?? resolve29(homedir13(), ".config"), "beeline");
-  const machineIdPath = resolve29(configDir, "machine-id");
+  const configDir = resolve30(env.XDG_CONFIG_HOME ?? resolve30(homedir13(), ".config"), "beeline");
+  const machineIdPath = resolve30(configDir, "machine-id");
   let machineId;
   let machineName = hostname2();
   try {
-    const existing = await readFile12(machineIdPath, "utf8");
+    const existing = await readFile13(machineIdPath, "utf8");
     machineId = existing.trim();
     if (!/^[0-9a-f-]{32,}$/.test(machineId))
       throw new Error("invalid persisted machine id");
   } catch {
     machineId = randomUUID6();
     try {
-      await mkdir20(configDir, { recursive: true, mode: 448 });
+      await mkdir21(configDir, { recursive: true, mode: 448 });
       await writeFile14(machineIdPath, `${machineId}
 `, { mode: 384 });
     } catch {
@@ -38005,7 +38432,7 @@ async function installCurrentRelease(fetchImpl) {
   });
   await activateRelease(layout, releaseId);
   return {
-    binary: resolve29(layout.binDir, "beeline"),
+    binary: resolve30(layout.binDir, "beeline"),
     version: published.version ?? releaseId
   };
 }
@@ -38028,7 +38455,7 @@ function providerEnvironment(selection) {
   };
 }
 async function writePrivateJson(path, value) {
-  await mkdir20(dirname19(path), { recursive: true, mode: 448 });
+  await mkdir21(dirname20(path), { recursive: true, mode: 448 });
   await writeFile14(path, `${JSON.stringify(value, null, 2)}
 `, { mode: 384 });
   await chmod7(path, 384);
@@ -38037,8 +38464,8 @@ async function writeProviderEnv(selection, agentPubkey) {
   const values = providerEnvironment(selection);
   if (Object.keys(values).length === 0)
     return void 0;
-  const path = resolve29(defaultSupervisorRoot(process.env), "beeline", "connect", `${agentPubkey}.env`);
-  await mkdir20(dirname19(path), { recursive: true, mode: 448 });
+  const path = resolve30(defaultSupervisorRoot(process.env), "beeline", "connect", `${agentPubkey}.env`);
+  await mkdir21(dirname20(path), { recursive: true, mode: 448 });
   const contents = Object.entries(values).map(([key, value]) => `${key}=${JSON.stringify(value)}`).join("\n");
   await writeFile14(path, `${contents}
 `, { mode: 384 });
@@ -38080,7 +38507,7 @@ async function brassSpinner(message, action, completion) {
   }
 }
 async function runConnectCommand(code, options = {}) {
-  if (!stdin3.isTTY || !stdout4.isTTY) {
+  if (!isInteractiveConnectTerminal()) {
     throw new Error("`usebeeline connect` needs an interactive terminal");
   }
   const restoreRails = paintWizardBrass();
@@ -38107,7 +38534,7 @@ async function runConnectWizard(code, fetchImpl, eventSubscriptions, accessPolic
   await finishConnectedAgentPairing(baseUrl, pairingCode, grant.workspace_joined, eventSubscriptions, fetchImpl);
   const installedRelease = await brassSpinner("Installing the Beeline daemon\u2026", () => installCurrentRelease(fetchImpl), (release) => `Installed Beeline helper ${release.version}`);
   const llmEnvFile = await writeProviderEnv(selection, grant.agent_pubkey);
-  const grantPath = resolve29(defaultSupervisorRoot(process.env), "beeline", "connect", `grant-${process.pid}-${Date.now()}.json`);
+  const grantPath = resolve30(defaultSupervisorRoot(process.env), "beeline", "connect", `grant-${process.pid}-${Date.now()}.json`);
   await writePrivateJson(grantPath, {
     agentSecretKey: grant.agent_secret_key,
     bodySecretKey: grant.body_secret_key,
@@ -38192,18 +38619,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 readFile12(resolve29(path), "utf8"));
+    const grant = JSON.parse(await readFile13(resolve30(path), "utf8"));
     if (!isDevicePairingGrant(grant))
       throw new Error("device connection grant is invalid");
     const connected = await completeDevicePairing(grant);
-    await unlink5(resolve29(path));
-    const providerEnv = grant.llmEnvFile ? await readFile12(grant.llmEnvFile, "utf8").catch(() => "") : "";
+    await unlink5(resolve30(path));
+    const providerEnv = grant.llmEnvFile ? await readFile13(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(dirname19(connected.configPath)),
+        cacheDir: openRouterRoutingCacheDir(dirname20(connected.configPath)),
         ...apiKey ? { apiKey } : {},
         probeTimeoutMs: 1e4
       });
@@ -38221,16 +38648,16 @@ async function runConnectFinishCommand(path) {
 init_self_update();
 
 // apps/body/dist/daemon-failure.js
-import { mkdir as mkdir21, readFile as readFile13, rename as rename8, rm as rm8, writeFile as writeFile15 } from "node:fs/promises";
-import { dirname as dirname20, resolve as resolve30 } from "node:path";
+import { mkdir as mkdir22, readFile as readFile14, rename as rename8, rm as rm8, writeFile as writeFile15 } from "node:fs/promises";
+import { dirname as dirname21, resolve as resolve31 } from "node:path";
 var DAEMON_FAILURE_LIMIT = 3;
 var DAEMON_FAILURE_WINDOW_MS = 5 * 6e4;
 function daemonFailurePath(runtimeDir) {
-  return resolve30(runtimeDir, "daemon-distress.json");
+  return resolve31(runtimeDir, "daemon-distress.json");
 }
 async function readFailureRecord(runtimeDir) {
   try {
-    const value = JSON.parse(await readFile13(daemonFailurePath(runtimeDir), "utf8"));
+    const value = JSON.parse(await readFile14(daemonFailurePath(runtimeDir), "utf8"));
     if (value.version !== 1 || !Array.isArray(value.failures) || value.failures.some((failure2) => typeof failure2 !== "number") || typeof value.lastError !== "string") {
       return void 0;
     }
@@ -38242,7 +38669,7 @@ async function readFailureRecord(runtimeDir) {
 async function writeFailureRecord(runtimeDir, record3) {
   const path = daemonFailurePath(runtimeDir);
   const staged = `${path}.${process.pid}.tmp`;
-  await mkdir21(dirname20(path), { recursive: true, mode: 448 });
+  await mkdir22(dirname21(path), { recursive: true, mode: 448 });
   await writeFile15(staged, `${JSON.stringify(record3, null, 2)}
 `, { mode: 384 });
   await rename8(staged, path);
@@ -38265,9 +38692,9 @@ async function clearDaemonStartFailures(runtimeDir) {
 }
 
 // apps/body/dist/update-functional-probe.js
-import { mkdir as mkdir22, rm as rm9 } from "node:fs/promises";
+import { mkdir as mkdir23, rm as rm9 } from "node:fs/promises";
 import { homedir as homedir14 } from "node:os";
-import { resolve as resolve31 } from "node:path";
+import { resolve as resolve32 } from "node:path";
 var UPDATE_PROBE_SESSION_TIMEOUT_MS = 1e4;
 var UPDATE_PROBE_SESSION_OPEN_TIMEOUT_MS = 2e4;
 var UPDATE_PROBE_TURN_TIMEOUT_MS = 45e3;
@@ -38387,11 +38814,11 @@ async function runUpdateFunctionalProbe(input) {
       modelAnswerReason: `${detail} (the current release has the same host sandbox failure)`
     };
   }
-  const root = input.probeRoot ?? resolve31(input.runtimeDir, "update-functional-probe");
-  const cwd = resolve31(root, "checkout");
-  const homeRoot = resolve31(root, "agent-home");
+  const root = input.probeRoot ?? resolve32(input.runtimeDir, "update-functional-probe");
+  const cwd = resolve32(root, "checkout");
+  const homeRoot = resolve32(root, "agent-home");
   await rm9(root, { recursive: true, force: true });
-  await mkdir22(cwd, { recursive: true, mode: 448 });
+  await mkdir23(cwd, { recursive: true, mode: 448 });
   let client;
   try {
     const agentEnv = {
@@ -38421,7 +38848,7 @@ async function runUpdateFunctionalProbe(input) {
       const { stateDirs, tmpDir } = harnessStateDirsFromEnv(agentEnv);
       const operatorHome = input.config.operatorHome ?? homedir14();
       const homeStateDirs = harnessHomeStateDirs(harnessLabel, agentEnv.HOME ?? operatorHome);
-      await Promise.all(homeStateDirs.map((dir) => mkdir22(dir, { recursive: true })));
+      await Promise.all(homeStateDirs.map((dir) => mkdir23(dir, { recursive: true })));
       spawnCommand = wrapAgentCommand({
         bwrapPath: input.config.bwrapPath,
         spec: {
@@ -38571,7 +38998,7 @@ async function runUpdateFunctionalProbe(input) {
 
 // apps/body/dist/current-release-probe.js
 import { spawn as spawn12 } from "node:child_process";
-import { dirname as dirname21, join as join14 } from "node:path";
+import { dirname as dirname22, join as join14 } from "node:path";
 init_self_update();
 var CURRENT_RELEASE_PROBE_TIMEOUT_MS = 12e4;
 var UPDATE_PROBE_COMMAND = "update-probe";
@@ -38620,7 +39047,7 @@ async function probeReleaseInSubprocess(input) {
     return { kind: "unavailable", reason: `release ${input.releaseId} has no runnable CLI entrypoint` };
   }
   const timeoutMs = input.timeoutMs ?? CURRENT_RELEASE_PROBE_TIMEOUT_MS;
-  return new Promise((resolve35) => {
+  return new Promise((resolve36) => {
     const child = spawn12(input.execPath ?? process.execPath, [entrypoint, UPDATE_PROBE_COMMAND, "--config", input.runtimeConfigPath], { env: input.env ?? process.env, stdio: ["ignore", "pipe", "pipe"] });
     let stdout6 = "";
     let stderr = "";
@@ -38630,7 +39057,7 @@ async function probeReleaseInSubprocess(input) {
         return;
       settled = true;
       clearTimeout(timer);
-      resolve35(outcome);
+      resolve36(outcome);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -38677,7 +39104,7 @@ async function runUpdateProbeCommand(args, options = {}) {
   const runtime = await readRuntimeRecord(configPath);
   const agent = runtimeAgentCommand(runtime);
   const config = loadBodyConfig({
-    workspaceRoot: join14(dirname21(configPath), "workspace"),
+    workspaceRoot: join14(dirname22(configPath), "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env: { ...env, BUZZ_AGENT_BIN: agent.command, BUZZ_DEV_MCP_BIN: runtime.mcpBinary },
     agent
@@ -38695,7 +39122,7 @@ async function runUpdateProbeCommand(args, options = {}) {
   }
   const layout = beelineInstallLayout(env);
   const releaseId = (layout && await activeReleaseId(layout).catch(() => void 0)) ?? "unknown";
-  const runtimeDir = dirname21(configPath);
+  const runtimeDir = dirname22(configPath);
   const outcome = await probeOutcome(() => (options.probe ?? runUpdateFunctionalProbe)({
     config,
     runtimeDir,
@@ -38710,8 +39137,8 @@ async function runUpdateProbeCommand(args, options = {}) {
 }
 
 // apps/body/dist/release-status.js
-import { readFile as readFile14, readdir as readdir6, rename as rename9, writeFile as writeFile16 } from "node:fs/promises";
-import { resolve as resolve32 } from "node:path";
+import { readFile as readFile15, readdir as readdir6, rename as rename9, writeFile as writeFile16 } from "node:fs/promises";
+import { resolve as resolve33 } from "node:path";
 var DAEMON_RELEASE_STATUS_FILE = "release-status.json";
 var RELEASE_VERSION = /^v\d+\.\d+\.\d+$/;
 var SOURCE_SHA = /^[0-9a-f]{7,64}$/;
@@ -38728,7 +39155,7 @@ async function writeDaemonReleaseStatus(runtimeDir, agentPubkey, identity, optio
     pid: options.pid ?? process.pid,
     readyAt: (options.now?.() ?? /* @__PURE__ */ new Date()).toISOString()
   };
-  const target = resolve32(runtimeDir, DAEMON_RELEASE_STATUS_FILE);
+  const target = resolve33(runtimeDir, DAEMON_RELEASE_STATUS_FILE);
   const temporary = `${target}.${status.pid}.tmp`;
   await writeFile16(temporary, `${JSON.stringify(status, null, 2)}
 `, { mode: 384 });
@@ -38738,7 +39165,7 @@ async function writeDaemonReleaseStatus(runtimeDir, agentPubkey, identity, optio
 
 // apps/body/dist/scratch-sweep.js
 import { lstat as lstat5, readdir as readdir7, rmdir, unlink as unlink6 } from "node:fs/promises";
-import { resolve as resolve33 } from "node:path";
+import { resolve as resolve34 } from "node:path";
 var DEFAULT_SCRATCH_TTL_HOURS = 72;
 var NEVER_SWEEP_SUBDIR_NAMES = new Set(HOME_SUBDIRS.filter((name) => name !== "tmp"));
 function scratchTtlMs(env = process.env) {
@@ -38747,7 +39174,7 @@ function scratchTtlMs(env = process.env) {
   return (Number.isFinite(hours) && hours > 0 ? hours : DEFAULT_SCRATCH_TTL_HOURS) * 60 * 60 * 1e3;
 }
 async function discoverAttachScratchRoots(runtimeDir) {
-  const roomsDir = resolve33(runtimeDir, "rooms");
+  const roomsDir = resolve34(runtimeDir, "rooms");
   let entries;
   try {
     entries = await readdir7(roomsDir, { withFileTypes: true });
@@ -38758,7 +39185,7 @@ async function discoverAttachScratchRoots(runtimeDir) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const home = resolve33(roomsDir, entry.name, "agent-home");
+    const home = resolve34(roomsDir, entry.name, "agent-home");
     const stats = await lstat5(home).catch(() => void 0);
     if (stats?.isDirectory())
       roots.push(home);
@@ -38777,7 +39204,7 @@ async function removeStaleFiles(dir, cutoffMs, protectNamesHere) {
   for (const entry of entries) {
     if (protectNamesHere && NEVER_SWEEP_SUBDIR_NAMES.has(entry.name))
       continue;
-    const path = resolve33(dir, entry.name);
+    const path = resolve34(dir, entry.name);
     const stats = await lstat5(path).catch(() => void 0);
     if (!stats || stats.isSymbolicLink())
       continue;
@@ -38865,7 +39292,7 @@ var DaemonExitError = class extends Error {
 };
 async function runStoredDaemon(pathOrPointer) {
   const configPath = await resolveRuntimeConfigPath(pathOrPointer);
-  daemonFailureRuntimeDir = dirname22(configPath);
+  daemonFailureRuntimeDir = dirname23(configPath);
   const accessMigration = await migrateRuntimeRecordAccessPolicy(configPath);
   let runtime = accessMigration.runtime;
   if (!runtime.transport) {
@@ -38884,7 +39311,7 @@ async function runStoredDaemon(pathOrPointer) {
     BUZZ_DEV_MCP_BIN: runtime.mcpBinary
   };
   const config = loadBodyConfig({
-    workspaceRoot: resolve34(dirname22(configPath), "workspace"),
+    workspaceRoot: resolve35(dirname23(configPath), "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env,
     agent
@@ -38919,7 +39346,7 @@ async function runStoredDaemon(pathOrPointer) {
   const stop = () => controller.abort();
   process.once("SIGINT", stop);
   process.once("SIGTERM", stop);
-  const runtimeDir = dirname22(configPath);
+  const runtimeDir = dirname23(configPath);
   const layout = beelineInstallLayout(process.env);
   const notifier = new SystemdNotifier();
   let rollbackAlertDrain;
@@ -39057,6 +39484,7 @@ async function runStoredDaemon(pathOrPointer) {
           agentId: runtime.agent.publicKey,
           log: (message) => console.log(`[body] connector: ${message}`)
         });
+        daemonApi.setConnectorAssignmentListener(() => connectorLoop?.wake());
         connectorLoop.start();
       },
       onProgress: async (status) => {
@@ -39123,7 +39551,7 @@ async function main() {
     const roomId = roomFlag >= 0 ? args[roomFlag + 1] : void 0;
     if (!configPath || !roomId)
       throw new Error("corner-read-token requires --config and --room");
-    const activated = await activateDaemonTransport(resolve34(configPath));
+    const activated = await activateDaemonTransport(resolve35(configPath));
     if (!activated)
       throw new Error("corner-read-token requires monolith transport");
     const credential = await activated.client.execute("getRoomGitHubToken", { roomId });
@@ -39177,14 +39605,14 @@ async function main() {
     }
     if (!configPath && agentPubkey) {
       const configs = await findAgentRuntimeConfigPaths(process.env, process.cwd());
-      configPath = configs.find((candidate) => dirname22(candidate).endsWith(agentPubkey));
+      configPath = configs.find((candidate) => dirname23(candidate).endsWith(agentPubkey));
     }
     if (!configPath && agentPubkey) {
       throw new DaemonExitError(`unknown agent ${agentPubkey}: no durable runtime exists; refusing systemd restart loop`, UNKNOWN_AGENT_EXIT_STATUS);
     }
     if (!configPath)
       throw new Error("daemon requires --config <runtime.json> or --agent <pubkey>");
-    await runStoredDaemon(resolve34(configPath));
+    await runStoredDaemon(resolve35(configPath));
     return;
   }
   if (command === "update") {
@@ -39205,7 +39633,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) => dirname22(candidate).endsWith(agentPubkey));
+    const configPath = configs.find((candidate) => dirname23(candidate).endsWith(agentPubkey));
     if (!configPath)
       throw new Error(`no stored runtime found for agent ${agentPubkey}`);
     const runtime = await readRuntimeRecord(configPath);