usebeeline 0.0.117 → 0.0.121

package/dist/usebeeline.mjs

@@ -11300,10 +11300,12 @@ __export(self_update_exports, {
   readInstalledBundleIdentity: () => readInstalledBundleIdentity,
   readUpdateAttempt: () => readUpdateAttempt,
   readUpdateState: () => readUpdateState,
+  releaseIdFromPath: () => releaseIdFromPath,
   repairInstallForwarders: () => repairInstallForwarders,
   replaceUpdateAttempt: () => replaceUpdateAttempt,
   resolveBundleEntrypoint: () => resolveBundleEntrypoint,
   rollbackToPreviousRelease: () => rollbackToPreviousRelease,
+  runningReleaseId: () => runningReleaseId,
   settleUpdateAttemptOnStart: () => settleUpdateAttemptOnStart,
   stageRelease: () => stageRelease,
   updateAttemptPath: () => updateAttemptPath,
@@ -11314,11 +11316,11 @@ __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 { spawn as spawn7 } from "node:child_process";
-import { homedir as homedir10 } from "node:os";
-import { dirname as dirname14, join as join11, resolve as resolve24 } from "node:path";
+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";
 function anchorLayout(rawLibDir) {
-  const libDir = resolve24(rawLibDir);
+  const libDir = resolve26(rawLibDir);
   const segments = libDir.split(/[/\\]/);
   const idx = segments.lastIndexOf(RELEASES_SEGMENT);
   if (idx >= 2 && segments[idx - 1] === "lib") {
@@ -11334,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: resolve24(libDir, "../../bin"),
+    binDir: resolve26(libDir, "../../bin"),
     libDir,
-    releasesRoot: resolve24(libDir, `../${RELEASES_SEGMENT}`)
+    releasesRoot: resolve26(libDir, `../${RELEASES_SEGMENT}`)
   };
 }
 function beelineInstallLayout(env = process.env) {
@@ -11345,9 +11347,32 @@ function beelineInstallLayout(env = process.env) {
     return void 0;
   return anchorLayout(raw);
 }
+function releaseIdFromPath(path) {
+  if (!path?.trim())
+    return void 0;
+  const segments = resolve26(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);
+  for (const raw of [env.BEELINE_LIB_DIR, invocationPath]) {
+    if (!raw?.trim())
+      continue;
+    const resolved = resolve26(raw.trim());
+    if (resolved !== anchor && !resolved.startsWith(`${releasesRoot}/`))
+      continue;
+    const id = releaseIdFromPath(resolved);
+    if (id)
+      return id;
+  }
+  return void 0;
+}
 function defaultBeelineInstallLayout(env = process.env) {
-  const home = env.HOME?.trim() || homedir10();
-  return anchorLayout(resolve24(home, ".local", "lib", "beeline"));
+  const home = env.HOME?.trim() || homedir12();
+  return anchorLayout(resolve26(home, ".local", "lib", "beeline"));
 }
 function discoveredBeelineInstallLayout(env = process.env) {
   const explicitAnchor = env.BEELINE_INSTALL_LIB_DIR?.trim();
@@ -11355,7 +11380,7 @@ function discoveredBeelineInstallLayout(env = process.env) {
     return anchorLayout(explicitAnchor);
   const explicitBinDir = env.BEELINE_INSTALL_DIR?.trim();
   if (explicitBinDir)
-    return anchorLayout(resolve24(dirname14(resolve24(explicitBinDir)), "lib", "beeline"));
+    return anchorLayout(resolve26(dirname15(resolve26(explicitBinDir)), "lib", "beeline"));
   return defaultBeelineInstallLayout(env);
 }
 function hostPlatformKey() {
@@ -11366,7 +11391,7 @@ function hostPlatformKey() {
   return `${os}-${arch}`;
 }
 function bundleJsonCandidates(bundleDir) {
-  return [join11(bundleDir, "lib", "beeline", "bundle.json"), join11(bundleDir, "bundle.json")];
+  return [join13(bundleDir, "lib", "beeline", "bundle.json"), join13(bundleDir, "bundle.json")];
 }
 async function readBundleJson(bundleDir) {
   let raw;
@@ -11390,7 +11415,7 @@ async function readBundleJson(bundleDir) {
   }
 }
 function updateStatePath(layout) {
-  return join11(layout.releasesRoot, ".state", "update-state.json");
+  return join13(layout.releasesRoot, ".state", "update-state.json");
 }
 async function readUpdateState(layout) {
   try {
@@ -11400,7 +11425,7 @@ async function readUpdateState(layout) {
   }
 }
 async function writeUpdateState(layout, state) {
-  await mkdir17(join11(layout.releasesRoot, ".state"), { recursive: true });
+  await mkdir17(join13(layout.releasesRoot, ".state"), { recursive: true });
   await writeFile11(updateStatePath(layout), `${JSON.stringify(state, null, 2)}
 `, "utf8");
 }
@@ -11464,7 +11489,7 @@ async function fetchText(url, fetchImpl) {
 }
 function run(command, args, timeoutMs) {
   return new Promise((resolveRun) => {
-    const child = spawn7(command, args, { stdio: ["ignore", "ignore", "pipe"] });
+    const child = spawn8(command, args, { stdio: ["ignore", "ignore", "pipe"] });
     let stderr = "";
     child.stderr?.setEncoding("utf8");
     child.stderr?.on("data", (chunk) => {
@@ -11482,7 +11507,7 @@ function run(command, args, timeoutMs) {
   });
 }
 function entrypointCandidates(bundleDir) {
-  return [join11(bundleDir, BUNDLE_ENTRYPOINT), join11(bundleDir, "beeline-cli.mjs")];
+  return [join13(bundleDir, BUNDLE_ENTRYPOINT), join13(bundleDir, "beeline-cli.mjs")];
 }
 async function resolveBundleEntrypoint(bundleDir) {
   for (const candidate of entrypointCandidates(bundleDir)) {
@@ -11504,8 +11529,8 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
   const fetchImpl = opts.fetchImpl ?? fetch;
   const log2 = opts.logger ?? ((line) => console.log(`[body] self-update: ${line}`));
   const releaseId = sanitizeReleaseId(published.commit ?? published.version ?? `release-${Date.now()}`);
-  const releaseDir = join11(layout.releasesRoot, releaseId);
-  const okMarker = join11(releaseDir, ".stage-ok");
+  const releaseDir = join13(layout.releasesRoot, releaseId);
+  const okMarker = join13(releaseDir, ".stage-ok");
   let previouslyVerified = false;
   try {
     const recorded = await readFile10(okMarker, "utf8");
@@ -11515,7 +11540,7 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
   } catch {
   }
   await mkdir17(releaseDir, { recursive: true });
-  const tempArchive = join11(layout.releasesRoot, `.download-${releaseId}-${process.pid}.tar.gz`);
+  const tempArchive = join13(layout.releasesRoot, `.download-${releaseId}-${process.pid}.tar.gz`);
   try {
     log2(`downloading ${published.file}`);
     const response = await fetchImpl(archiveUrlFor(manifestUrl, published.file), {
@@ -11537,7 +11562,7 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
     }
     await writeFile11(tempArchive, Buffer.concat(chunks), { mode: 384 });
     const entries = (await new Promise((resolveList, rejectList) => {
-      const child = spawn7("tar", ["-tzf", tempArchive], { stdio: ["ignore", "pipe", "inherit"] });
+      const child = spawn8("tar", ["-tzf", tempArchive], { stdio: ["ignore", "pipe", "inherit"] });
       let out = "";
       child.stdout?.on("data", (chunk) => {
         out += chunk.toString("utf8");
@@ -11555,13 +11580,13 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
       throw new Error(`extracting bundle failed: ${extract2.stderr}`);
     for (const relative3 of requiredBundlePaths()) {
       try {
-        await access(join11(releaseDir, relative3), fsConstants2.F_OK);
+        await access(join13(releaseDir, relative3), fsConstants2.F_OK);
       } catch {
         throw new Error(`staged bundle is missing ${relative3}`);
       }
     }
     if (opts.smokeTestCli !== false) {
-      const probe = await run(process.execPath, [join11(releaseDir, BUNDLE_ENTRYPOINT), "--version"], 6e4);
+      const probe = await run(process.execPath, [join13(releaseDir, BUNDLE_ENTRYPOINT), "--version"], 6e4);
       if (probe.status !== 0) {
         throw new Error(`staged bundle failed its startup smoke test (--version exited ${probe.status})${probe.stderr ? `: ${probe.stderr.trim()}` : ""}`);
       }
@@ -11599,8 +11624,8 @@ async function replaceFile(path, contents, mode) {
   await rename6(temp, path);
 }
 async function activateRelease(layout, releaseId) {
-  const releaseDir = join11(layout.releasesRoot, releaseId);
-  await access(join11(releaseDir, BUNDLE_ENTRYPOINT), fsConstants2.F_OK);
+  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 });
   let previousReleaseId = await activeReleaseId(layout);
@@ -11608,12 +11633,12 @@ async function activateRelease(layout, releaseId) {
   if (kind === "directory") {
     const legacyIdentity = await readBundleJson(layout.libDir);
     const legacyId = sanitizeReleaseId(legacyIdentity?.commit ?? legacyIdentity?.version ?? `legacy-${Date.now()}`);
-    const legacyDir = join11(layout.releasesRoot, legacyId);
+    const legacyDir = join13(layout.releasesRoot, legacyId);
     try {
       await access(legacyDir, fsConstants2.F_OK);
       previousReleaseId = `${legacyId}-${Date.now()}`;
-      await rename6(layout.libDir, join11(layout.releasesRoot, previousReleaseId));
-      await normalizeLegacyBundleShape(join11(layout.releasesRoot, previousReleaseId));
+      await rename6(layout.libDir, join13(layout.releasesRoot, previousReleaseId));
+      await normalizeLegacyBundleShape(join13(layout.releasesRoot, previousReleaseId));
     } catch {
       await rename6(layout.libDir, legacyDir);
       await normalizeLegacyBundleShape(legacyDir);
@@ -11622,18 +11647,18 @@ async function activateRelease(layout, releaseId) {
   }
   const tempLink = `${layout.libDir}.new-${process.pid}`;
   await rm6(tempLink, { force: true });
-  await symlink3(join11("beeline-releases", releaseId), tempLink);
+  await symlink3(join13("beeline-releases", releaseId), tempLink);
   await rename6(tempLink, layout.libDir);
-  await fsyncDir(dirname14(layout.libDir));
+  await fsyncDir(dirname15(layout.libDir));
   await writeBinForwarders(layout, releaseDir);
   return { previousReleaseId };
 }
 async function normalizeLegacyBundleShape(bundleDir) {
-  const innerLib = join11(bundleDir, "lib", "beeline");
+  const innerLib = join13(bundleDir, "lib", "beeline");
   let anyFlat = false;
   for (const name of LEGACY_FLAT_BUNDLE_FILES) {
     try {
-      await access(join11(bundleDir, name), fsConstants2.F_OK);
+      await access(join13(bundleDir, name), fsConstants2.F_OK);
       anyFlat = true;
       break;
     } catch {
@@ -11644,11 +11669,11 @@ async function normalizeLegacyBundleShape(bundleDir) {
   await mkdir17(innerLib, { recursive: true });
   for (const name of LEGACY_FLAT_BUNDLE_FILES) {
     try {
-      await access(join11(innerLib, name), fsConstants2.F_OK);
+      await access(join13(innerLib, name), fsConstants2.F_OK);
       continue;
     } catch {
     }
-    await rename6(join11(bundleDir, name), join11(innerLib, name)).catch(() => void 0);
+    await rename6(join13(bundleDir, name), join13(innerLib, name)).catch(() => void 0);
   }
 }
 async function writeBinForwarders(layout, activeBundleRoot) {
@@ -11657,13 +11682,13 @@ async function writeBinForwarders(layout, activeBundleRoot) {
     ...Object.entries(FORWARDER_ALIASES).map(([alias, tool]) => [alias, tool])
   ];
   for (const [name, tool] of entries) {
-    const target = join11(activeBundleRoot, "bin", tool);
+    const target = join13(activeBundleRoot, "bin", tool);
     try {
       await access(target, fsConstants2.X_OK);
     } catch {
       continue;
     }
-    await replaceFile(join11(layout.binDir, name), forwarderScript(tool), 493);
+    await replaceFile(join13(layout.binDir, name), forwarderScript(tool), 493);
   }
 }
 async function repairInstallForwarders(layout, opts = {}) {
@@ -11672,7 +11697,7 @@ async function repairInstallForwarders(layout, opts = {}) {
   const forwarderHealthy = async (name, tool) => {
     let current;
     try {
-      current = await readFile10(join11(layout.binDir, name), "utf8");
+      current = await readFile10(join13(layout.binDir, name), "utf8");
     } catch {
       current = void 0;
     }
@@ -11691,19 +11716,19 @@ async function repairInstallForwarders(layout, opts = {}) {
   return true;
 }
 async function rollbackToPreviousRelease(layout, previousReleaseId) {
-  const releaseDir = join11(layout.releasesRoot, previousReleaseId);
+  const releaseDir = join13(layout.releasesRoot, previousReleaseId);
   const entrypoint = await resolveBundleEntrypoint(releaseDir);
   if (!entrypoint) {
     throw new Error(`release ${previousReleaseId} has no runnable CLI entrypoint`);
   }
   const tempLink = `${layout.libDir}.rollback-${process.pid}`;
   await rm6(tempLink, { force: true });
-  await symlink3(join11("beeline-releases", previousReleaseId), tempLink);
+  await symlink3(join13("beeline-releases", previousReleaseId), tempLink);
   await rename6(tempLink, layout.libDir);
-  await fsyncDir(dirname14(layout.libDir));
+  await fsyncDir(dirname15(layout.libDir));
 }
 function updateAttemptPath(layout) {
-  return join11(layout.releasesRoot, ".state", "update-attempt.json");
+  return join13(layout.releasesRoot, ".state", "update-attempt.json");
 }
 async function readUpdateAttempt(layout) {
   try {
@@ -11717,7 +11742,7 @@ async function readUpdateAttempt(layout) {
   }
 }
 async function writeUpdateAttempt(layout, record3) {
-  await mkdir17(join11(layout.releasesRoot, ".state"), { recursive: true });
+  await mkdir17(join13(layout.releasesRoot, ".state"), { recursive: true });
   const path = updateAttemptPath(layout);
   const staged = `${path}.${process.pid}.tmp`;
   await writeFile11(staged, `${JSON.stringify(record3, null, 2)}
@@ -11995,7 +12020,7 @@ function configureNetworkFamilyDefaults(network = net) {
 configureNetworkFamilyDefaults();
 
 // apps/body/dist/cli.js
-import { dirname as dirname21, resolve as resolve32 } from "node:path";
+import { dirname as dirname22, resolve as resolve34 } from "node:path";
 import { stdin as stdin4, stdout as stdout5 } from "node:process";
 
 // node_modules/@clack/core/dist/index.mjs
@@ -13444,7 +13469,7 @@ function parseCursorModelsOutput(output) {
   };
 }
 async function enumerateCursorModels(env = process.env) {
-  return new Promise((resolve33) => {
+  return new Promise((resolve35) => {
     const child = spawn("cursor-agent", ["models"], {
       env,
       stdio: ["ignore", "pipe", "ignore"]
@@ -13458,11 +13483,11 @@ async function enumerateCursorModels(env = process.env) {
     });
     child.on("error", () => {
       clearTimeout(timer);
-      resolve33(void 0);
+      resolve35(void 0);
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve33(code === 0 ? parseCursorModelsOutput(output) : void 0);
+      resolve35(code === 0 ? parseCursorModelsOutput(output) : void 0);
     });
   });
 }
@@ -13889,13 +13914,13 @@ var CursorAcpServer = class {
         consumeLine(line);
     });
     try {
-      const { code, signal } = await new Promise((resolve33) => {
+      const { code, signal } = await new Promise((resolve35) => {
         let settled = false;
         const finish = (exitCode, exitSignal) => {
           if (settled)
             return;
           settled = true;
-          resolve33({ code: exitCode, signal: exitSignal });
+          resolve35({ code: exitCode, signal: exitSignal });
         };
         child.once("error", (error) => {
           spawnError = error instanceof Error ? error.message : String(error);
@@ -14574,6 +14599,132 @@ function parseSandboxMaskEnv(env) {
   return entries.length ? entries : void 0;
 }
 
+// apps/body/dist/squire-host.js
+import { spawn as spawn3 } from "node:child_process";
+import { existsSync as existsSync4, lstatSync, mkdirSync } from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+import { homedir as homedir2 } from "node:os";
+import { dirname as dirname3, join as join2, resolve as resolve3 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var SQUIRE_BROKER_UNAVAILABLE = "broker unavailable";
+var TRUSTY_SQUIRE_BROKER_UNIT_NAME = "trusty-squire-broker.service";
+var SQUIRE_FACADE_FLAG = "--squire-facade";
+var SQUIRE_BROKER_FLAG = "--squire-broker";
+var SQUIRE_SERVER_ARGS = ["-y", "@trusty-squire/mcp@latest", "server"];
+function squireHostPaths(home) {
+  const dir = join2(resolve3(home), ".trusty-squire");
+  return {
+    dir,
+    profileDir: join2(dir, "chrome-profile"),
+    configHome: join2(resolve3(home), ".config"),
+    brokerSocket: join2(dir, "broker.sock")
+  };
+}
+function squireHostRewriteEnv(home) {
+  const paths = squireHostPaths(home);
+  return {
+    TRUSTY_SQUIRE_PROFILE_DIR: paths.profileDir,
+    XDG_CONFIG_HOME: paths.configHome,
+    TRUSTY_SQUIRE_BROKER_SOCKET: paths.brokerSocket
+  };
+}
+function ensureSquireHostDir(home) {
+  const paths = squireHostPaths(home);
+  mkdirSync(paths.dir, { recursive: true, mode: 448 });
+  mkdirSync(paths.profileDir, { recursive: true, mode: 448 });
+  return paths;
+}
+function squireHostBindPaths(home, squireRouteGranted) {
+  if (!squireRouteGranted)
+    return [];
+  return [ensureSquireHostDir(home).dir];
+}
+function squireBrokerSocketReady(socketPath) {
+  try {
+    return lstatSync(socketPath).isSocket();
+  } catch {
+    return false;
+  }
+}
+function squireFacadeLaunch(home) {
+  const env = squireHostRewriteEnv(home);
+  const meta = "usebeeline:npm";
+  if (meta.startsWith("beeline:")) {
+    const entry = process.argv[1];
+    if (!entry)
+      throw new Error("Squire fa\xE7ade cannot resolve the Beeline CLI entry");
+    return { command: process.execPath, args: [entry, SQUIRE_FACADE_FLAG], env };
+  }
+  const js = fileURLToPath2(new URL("./squire-facade.js", meta));
+  if (existsSync4(js))
+    return { command: process.execPath, args: [js], env };
+  const ts = fileURLToPath2(new URL("./squire-facade.ts", meta));
+  if (existsSync4(ts)) {
+    const tsx = createRequire2(meta).resolve("tsx");
+    return { command: process.execPath, args: ["--import", tsx, ts], env };
+  }
+  throw new Error("Squire fa\xE7ade entry not found next to the Beeline helper");
+}
+function squireServerCommand(nodeExecPath = process.execPath) {
+  const binDir = dirname3(nodeExecPath);
+  const sibling = join2(binDir, "npx");
+  const args = [...SQUIRE_SERVER_ARGS];
+  if (existsSync4(sibling))
+    return { command: sibling, args, pathPrefix: binDir };
+  return { command: "npx", args, pathPrefix: binDir };
+}
+function trustySquireBrokerUnit() {
+  return `[Unit]
+Description=Trusty Squire host broker
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+WorkingDirectory=%h
+Environment=TRUSTY_SQUIRE_PROFILE_DIR=%h/.trusty-squire/chrome-profile
+Environment=XDG_CONFIG_HOME=%h/.config
+Environment=TRUSTY_SQUIRE_BROKER_SOCKET=%h/.trusty-squire/broker.sock
+ExecStartPre=/bin/mkdir -p %h/.trusty-squire
+ExecStart=%h/.local/bin/beeline ${SQUIRE_BROKER_FLAG}
+Restart=on-failure
+RestartSec=5s
+UMask=0077
+NoNewPrivileges=yes
+
+[Install]
+WantedBy=default.target
+`;
+}
+function spawnSquireServer(env, locateNpx) {
+  const launch = locateNpx ? squireServerCommand() : { command: "npx", args: [...SQUIRE_SERVER_ARGS], pathPrefix: "" };
+  const path = [launch.pathPrefix, env.PATH || "/usr/bin:/bin"].filter(Boolean).join(":");
+  const child = spawn3(launch.command, launch.args, {
+    env: { ...env, PATH: path },
+    stdio: "inherit"
+  });
+  child.on("exit", (code, signal) => {
+    if (signal)
+      process.exit(1);
+    process.exit(code ?? 1);
+  });
+}
+function runSquireBroker(env = process.env) {
+  const home = env.HOME?.trim() || homedir2();
+  const paths = ensureSquireHostDir(home);
+  spawnSquireServer({ ...env, ...squireHostRewriteEnv(home), TRUSTY_SQUIRE_BROKER_SOCKET: paths.brokerSocket }, true);
+}
+function runSquireFacade(env = process.env) {
+  const socket = env.TRUSTY_SQUIRE_BROKER_SOCKET ?? squireHostPaths(env.HOME?.trim() || homedir2()).brokerSocket;
+  if (!squireBrokerSocketReady(socket)) {
+    process.stderr.write(`${SQUIRE_BROKER_UNAVAILABLE}
+`);
+    process.exitCode = 1;
+    return;
+  }
+  spawnSquireServer({ ...env, TRUSTY_SQUIRE_BROKER_SOCKET: socket }, false);
+}
+
 // packages/api-contract/dist/agent-access.js
 var AGENT_ACCESS_POLICIES = ["everyone", "creator", "allowlist"];
 var DEFAULT_AGENT_ACCESS_POLICY = "everyone";
@@ -14590,10 +14741,10 @@ var ACCESS_REFUSAL_WINDOW_MS = 60 * 60 * 1e3;
 // apps/body/dist/model-catalog.js
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve5 } from "node:path";
 
 // apps/body/dist/acp.js
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { EventEmitter } from "node:events";
 
 // apps/body/dist/harness-capabilities.js
@@ -14656,7 +14807,7 @@ var PROFILES = [
     match: /(^|[/\\])pi-acp(\.[a-z]+)?$/i,
     profile: {
       enforcement: "config-isolated",
-      note: "pi-acp ignores session MCP servers, while its own skills/extensions are confined by the Beeline-owned HOME and PI_CODING_AGENT_DIR"
+      note: "pi-acp 0.0.33 still stores session/new mcpServers and never reads them; pi 0.85.1 itself has no MCP client, while optional pi-mcp-adapter reads $PI_CODING_AGENT_DIR/mcp.json and isolated homes exclude the settings.json that would load it"
     }
   },
   {
@@ -14814,6 +14965,11 @@ function agentMessageChunkText(update) {
   return "";
 }
 var CHUNK_CONTINUES_PREVIOUS_WORD = /^[\s'\u2018\u2019\u02bc.,!?;:%)\]}-]/;
+function continuesPreviousWord(current, delta) {
+  if (/\s$/.test(current))
+    return false;
+  return CHUNK_CONTINUES_PREVIOUS_WORD.test(delta);
+}
 var PI_ACP_HARNESS = /(^|[/\\])pi-acp(?:\.[a-z]+)?$/i;
 function isPiAcpHarness(agentLabel) {
   return Boolean(agentLabel && PI_ACP_HARNESS.test(agentLabel));
@@ -14826,17 +14982,12 @@ function agentMessageRuns(updates, agentLabel) {
   let current = "";
   let lastWasText = false;
   for (const u4 of updates) {
-    const isToolCall = u4.update.sessionUpdate === "tool_call";
     const delta = normalizeStreamDelta(agentMessageChunkText(u4.update), agentLabel);
     if (!delta) {
-      if (isToolCall && current) {
-        runs.push(current);
-        current = "";
-      }
       lastWasText = false;
       continue;
     }
-    if (!lastWasText && current && !/\s$/.test(current) && !CHUNK_CONTINUES_PREVIOUS_WORD.test(delta)) {
+    if (!lastWasText && current && !continuesPreviousWord(current, delta)) {
       runs.push(current);
       current = "";
     }
@@ -15041,7 +15192,7 @@ var AcpClient = class extends EventEmitter {
   async start(timeoutMs = 6e4) {
     if (this.alive)
       return;
-    this.child = spawn3(this.agentCommand, this.agentArgs, {
+    this.child = spawn4(this.agentCommand, this.agentArgs, {
       // agentEnv is the child's whole environment: buildAgentEnv's allowlist is
       // a real boundary, not a decorative one layered over a full inherit.
       env: this.inheritProcessEnv ? { ...process.env, ...this.agentEnv } : this.agentEnv,
@@ -15458,7 +15609,7 @@ var AcpClient = class extends EventEmitter {
     const current = this.activeRunIds.get(sessionId);
     if (current)
       return Promise.resolve(current);
-    return new Promise((resolve33, reject) => {
+    return new Promise((resolve35, reject) => {
       const onUpdate = (update) => {
         if (update.sessionId !== sessionId)
           return;
@@ -15466,7 +15617,7 @@ var AcpClient = class extends EventEmitter {
         if (!runId)
           return;
         cleanup();
-        resolve33(runId);
+        resolve35(runId);
       };
       const timer = setTimeout(() => {
         cleanup();
@@ -15550,13 +15701,13 @@ var AcpClient = class extends EventEmitter {
     }
     const id = this.nextId++;
     const payload = { jsonrpc: "2.0", id, method, params };
-    return new Promise((resolve33, reject) => {
+    return new Promise((resolve35, reject) => {
       const timer = setTimeout(() => {
         this.pending.delete(id);
         reject(new AcpRequestTimeoutError(method, timeoutMs, this.stderrTail, Boolean(onStart), detail));
       }, timeoutMs);
       this.pending.set(id, {
-        resolve: resolve33,
+        resolve: resolve35,
         reject,
         timer,
         method,
@@ -15584,8 +15735,8 @@ function isAllowedAgentModelConfigCategory(category) {
 }
 
 // apps/body/dist/model-config.js
-import { lstatSync, readFileSync as readFileSync2 } from "node:fs";
-import { basename as basename3, resolve as resolve3 } from "node:path";
+import { lstatSync as lstatSync2, readFileSync as readFileSync2 } from "node:fs";
+import { basename as basename3, resolve as resolve4 } from "node:path";
 var GROK_SESSION_MODEL_AXIS_ID = "beeline:grok-session-model";
 var GROK_LAUNCH_EFFORT_AXIS_ID = "beeline:grok-launch-reasoning-effort";
 function isGrokAgentCommand(agent) {
@@ -15754,13 +15905,13 @@ function credentialedProviders(env) {
   return held;
 }
 function credentialedPiCustomProviders(env) {
-  const agentDir = env.PI_CODING_AGENT_DIR?.trim() ? resolve3(env.PI_CODING_AGENT_DIR) : env.HOME?.trim() ? resolve3(env.HOME, ".pi/agent") : void 0;
+  const agentDir = env.PI_CODING_AGENT_DIR?.trim() ? resolve4(env.PI_CODING_AGENT_DIR) : env.HOME?.trim() ? resolve4(env.HOME, ".pi/agent") : void 0;
   const held = /* @__PURE__ */ new Set();
   if (!agentDir)
     return held;
-  const path = resolve3(agentDir, "models.json");
+  const path = resolve4(agentDir, "models.json");
   try {
-    const stats = lstatSync(path);
+    const stats = lstatSync2(path);
     if (!stats.isFile() || stats.isSymbolicLink() || stats.nlink !== 1 || stats.size > 1048576) {
       return held;
     }
@@ -15906,7 +16057,7 @@ function modelCatalogProbeEnvironment(agent, agentEnv, scratchCwd) {
     return agentEnv;
   return {
     ...agentEnv,
-    GOOSE_PATH_ROOT: resolve4(scratchCwd, "goose")
+    GOOSE_PATH_ROOT: resolve5(scratchCwd, "goose")
   };
 }
 function filterAgentModelCatalog(agent, raw, agentEnv) {
@@ -15916,7 +16067,7 @@ function filterAgentModelCatalog(agent, raw, agentEnv) {
 async function withAgentModelCatalog(agent, agentEnv, selection, inspect, limits = {}) {
   const deadline = limits.timeoutMs === void 0 ? void 0 : Date.now() + limits.timeoutMs;
   const remaining = () => deadline === void 0 ? void 0 : Math.max(1, deadline - Date.now());
-  const scratchCwd = await mkdtemp(resolve4(tmpdir(), "beeline-pair-model-check-"));
+  const scratchCwd = await mkdtemp(resolve5(tmpdir(), "beeline-pair-model-check-"));
   const probeEnv = modelCatalogProbeEnvironment(agent, agentEnv, scratchCwd);
   const client = new AcpClient({
     agentCommand: agent.command,
@@ -16016,7 +16167,7 @@ async function applyRuntimeModelPreflight(config, agent, selection, validate = v
 // apps/body/dist/model-catalog-sync.js
 import { createHash } from "node:crypto";
 import { readFile, writeFile as writeFile2 } from "node:fs/promises";
-import { resolve as resolve5 } from "node:path";
+import { resolve as resolve6 } from "node:path";
 var MODEL_CATALOG_PROBE_TIMEOUT_MS = 3e4;
 var MODEL_CATALOG_HASH_FILE = "model-catalog.sha256";
 function modelCatalogHash(options, selection, startupUnavailable) {
@@ -16041,7 +16192,7 @@ async function withTimeout(work, timeoutMs, what) {
 async function syncAgentModelCatalog(input) {
   const log2 = input.log ?? ((line) => console.log(line));
   const fetchCatalog = input.fetchCatalog ?? fetchAgentModelCatalog;
-  const hashPath = resolve5(input.runtimeDir, MODEL_CATALOG_HASH_FILE);
+  const hashPath = resolve6(input.runtimeDir, MODEL_CATALOG_HASH_FILE);
   try {
     const configuration = await input.api.execute("getAgentConfiguration", {
       agentId: input.agentId
@@ -16075,8 +16226,8 @@ async function syncAgentModelCatalog(input) {
 }
 
 // apps/body/dist/connector-google.js
-import { mkdirSync, readFileSync as readFileSync4, writeFileSync } from "node:fs";
-import { dirname as dirname4, join as join3 } from "node:path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync } from "node:fs";
+import { dirname as dirname5, join as join4 } from "node:path";
 
 // apps/body/dist/google-workspace-client.js
 function credentialsTokenSource(credentials) {
@@ -16451,11 +16602,11 @@ function googleWorkspaceClient(tokenSource, transport = defaultGoogleApiTranspor
 }
 
 // apps/body/dist/connector-squire.js
-import { execFile, spawn as spawn4 } from "node:child_process";
+import { execFile, spawn as spawn5 } from "node:child_process";
 import { createHash as createHash2 } from "node:crypto";
-import { lstatSync as lstatSync2, readFileSync as readFileSync3, realpathSync, rmSync } from "node:fs";
-import { homedir as homedir2, hostname, tmpdir as tmpdir2 } from "node:os";
-import { basename as basename4, dirname as dirname3, join as join2, resolve as resolve6 } from "node:path";
+import { lstatSync as lstatSync3, readFileSync as readFileSync3, 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";
 var SQUIRE_MCP_NAME = "@trusty-squire/mcp";
 var SQUIRE_CONNECT_PACKAGE = `${SQUIRE_MCP_NAME}@latest`;
 var activeConnectSession;
@@ -16485,17 +16636,17 @@ function releaseSquireConnectSession(log2) {
   }
 }
 function squireChromeProfileDir() {
-  return process.env.TRUSTY_SQUIRE_PROFILE_DIR ?? join2(homedir2(), ".trusty-squire", "chrome-profile");
+  return process.env.TRUSTY_SQUIRE_PROFILE_DIR ?? squireHostPaths(homedir3()).profileDir;
 }
 function squireProfilePathIdentity(profileDir) {
-  const absolute = resolve6(profileDir);
+  const absolute = resolve7(profileDir);
   const suffix = [];
   let candidate = absolute;
   for (; ; ) {
     try {
-      return join2(realpathSync.native(candidate), ...suffix.reverse());
+      return join3(realpathSync.native(candidate), ...suffix.reverse());
     } catch {
-      const parent = dirname3(candidate);
+      const parent = dirname4(candidate);
       if (parent === candidate)
         return absolute;
       suffix.push(basename4(candidate));
@@ -16505,7 +16656,7 @@ function squireProfilePathIdentity(profileDir) {
 }
 function squireProfileLockPath(profileDir = squireChromeProfileDir(), lockRoot = tmpdir2()) {
   const digest = createHash2("sha256").update(squireProfilePathIdentity(profileDir)).digest("hex").slice(0, 24);
-  return join2(lockRoot, `trusty-squire-profile-${digest}.lock`);
+  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) {
@@ -16537,7 +16688,7 @@ function lockOwnerIsAlive(owner) {
 }
 function readLockFileOwner(lockPath) {
   try {
-    const target = lstatSync2(lockPath).isDirectory() ? join2(lockPath, "owner.json") : lockPath;
+    const target = lstatSync3(lockPath).isDirectory() ? join3(lockPath, "owner.json") : lockPath;
     const parsed = JSON.parse(readFileSync3(target, "utf8"));
     if (typeof parsed.host !== "string" || typeof parsed.pid !== "number")
       return void 0;
@@ -16576,10 +16727,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((resolve33) => {
+var defaultShellRunner = (command, args) => new Promise((resolve35) => {
   execFile(command, [...args], { timeout: 12e4, maxBuffer: 4 * 1024 * 1024, encoding: "utf8" }, (error, stdout6, stderr) => {
     const code = error?.code;
-    resolve33({
+    resolve35({
       code: typeof code === "number" ? code : error ? 1 : 0,
       stdout: String(stdout6 ?? ""),
       stderr: String(stderr ?? "")
@@ -16589,6 +16740,7 @@ var defaultShellRunner = (command, args) => new Promise((resolve33) => {
 function squireConnectProcessEnv(profileDir = squireChromeProfileDir()) {
   return {
     ...process.env,
+    ...squireHostRewriteEnv(homedir3()),
     TRUSTY_SQUIRE_PROFILE_DIR: profileDir
   };
 }
@@ -16603,8 +16755,8 @@ function killConnectTree(child) {
   }
   child.kill();
 }
-var defaultStreamedRunner = (command, args, env) => new Promise((resolve33) => {
-  const child = spawn4(command, args, {
+var defaultStreamedRunner = (command, args, env) => new Promise((resolve35) => {
+  const child = spawn5(command, args, {
     stdio: ["ignore", "pipe", "pipe"],
     env: env ?? squireConnectProcessEnv(),
     detached: true
@@ -16615,7 +16767,7 @@ var defaultStreamedRunner = (command, args, env) => new Promise((resolve33) => {
   const safetyTimer = setTimeout(() => {
     if (!resolved) {
       resolved = true;
-      resolve33({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
+      resolve35({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
       } });
     }
     killConnectTree(child);
@@ -16633,18 +16785,22 @@ var defaultStreamedRunner = (command, args, env) => new Promise((resolve33) => {
   const finish = (result) => {
     if (!resolved) {
       resolved = true;
-      clearTimeout(safetyTimer);
-      resolve33(result);
+      resolve35(result);
     }
   };
+  const settle = (result) => {
+    clearTimeout(safetyTimer);
+    finish(result);
+  };
   const checkOutput = () => {
-    const combined = `${stdout6}
-${stderr}`;
-    const signIn = parseConnectOutput(combined);
+    const signIn = parseConnectOutput(stdout6) ?? parseConnectOutput(stderr);
     if (signIn) {
       finish({ stdout: stdout6, stderr, signIn, abort });
     }
   };
+  const finalSignIn = () => parseConnectOutput(`${stdout6}
+`) ?? parseConnectOutput(`${stderr}
+`);
   child.stdout?.on("data", (chunk) => {
     stdout6 += String(chunk);
     checkOutput();
@@ -16654,11 +16810,17 @@ ${stderr}`;
     checkOutput();
   });
   child.on("close", () => {
-    finish({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
-    } });
+    settle({
+      stdout: stdout6,
+      stderr,
+      pid: child.pid ?? void 0,
+      signIn: finalSignIn(),
+      abort: () => {
+      }
+    });
   });
   child.on("error", () => {
-    finish({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
+    settle({ stdout: stdout6, stderr, pid: child.pid ?? void 0, signIn: void 0, abort: () => {
     } });
   });
 });
@@ -16667,17 +16829,84 @@ var step = (label, status, reason) => ({
   status,
   ...reason ? { reason } : {}
 });
-function parseConnectOutput(output) {
-  const url = output.match(/https:\/\/[^\s"'<>]+/)?.[0];
-  if (!url)
-    return void 0;
-  if (/oauth|authorize/i.test(url) || /oauth/i.test(output)) {
-    return { method: "oauth", url };
+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 isForeignUrl(url) {
+  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";
+  } catch {
+    return true;
+  }
+}
+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;
+    }
   }
-  if (/novnc|vnc\.html|remote|stream/i.test(url) || /novnc|remote login|vnc/i.test(output)) {
-    return { method: "streamed-page", url };
+  if (carry !== void 0)
+    lines.push(carry);
+  return lines;
+}
+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);
   }
-  return { method: "streamed-page", url };
+  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 };
+  }
+  return void 0;
+}
+function parseConnectAlreadyConnected(output) {
+  return /Already connected \(/i.test(output) && /config refreshed/i.test(output);
+}
+function withoutForceReloginHint(output) {
+  return output.split("\n").filter((line) => !/--force-relogin/.test(line)).join("\n").trim();
 }
 async function installedSquireVersion(run2, spec = SQUIRE_CONNECT_PACKAGE, preferOnline = false) {
   const probe = await run2("npx", [
@@ -16760,15 +16989,11 @@ async function installSquire(options) {
   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",
-    "--force-relogin=google",
-    "--target=codex",
-    "--skip-browser"
-  ], squireConnectProcessEnv(profileDir));
-  if (!install.signIn) {
-    const stderr = install.stderr.trim();
+  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)) {
@@ -16786,7 +17011,7 @@ async function installSquire(options) {
   const signIn = install.signIn;
   const signedInAs = parseSignedInAs(`${install.stdout}
 ${install.stderr}`);
-  push(step("waiting for sign-in", "done"));
+  push(step("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));
@@ -16799,10 +17024,18 @@ ${install.stderr}`);
     };
   }
   push(step("paired to workspace", "done"));
+  if (signIn) {
+    return {
+      status: "installing",
+      steps,
+      signIn,
+      ...version ? { squireVersion: version } : {},
+      ...signedInAs ? { signedInAs } : {}
+    };
+  }
   return {
     status: "connected",
     steps,
-    signIn,
     ...version ? { squireVersion: version } : {},
     ...signedInAs ? { signedInAs } : {}
   };
@@ -16829,6 +17062,15 @@ function stringList(value) {
 function numberOrNull(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
+function epochSeconds(value) {
+  const numeric = numberOrNull(value);
+  if (numeric !== null)
+    return numeric;
+  if (typeof value !== "string")
+    return null;
+  const parsed = Date.parse(value);
+  return Number.isNaN(parsed) ? null : Math.floor(parsed / 1e3);
+}
 function vaultConnectionMeta(raw) {
   const record3 = asRecord2(raw);
   const reference = String(record3.reference ?? record3.id ?? "");
@@ -16838,7 +17080,7 @@ function vaultConnectionMeta(raw) {
     label: String(record3.label ?? record3.service ?? reference),
     fieldNames: stringList(record3.field_names ?? record3.fieldNames),
     allowedHosts: stringList(record3.allowed_hosts ?? record3.allowedHosts ?? record3.login_hosts),
-    createdAt: numberOrNull(record3.created_at ?? record3.createdAt) ?? 0,
+    createdAt: epochSeconds(record3.created_at ?? record3.createdAt) ?? 0,
     stale: record3.stale === true,
     state: record3.state === "error" ? "error" : "active"
   };
@@ -16933,7 +17175,7 @@ async function readGoogleCredentialsFromVault(mcp) {
   };
 }
 function manualGoogleCredentialsSearchPaths(home) {
-  return [join3(home, "google-credentials.json")];
+  return [join4(home, "google-credentials.json")];
 }
 function loadManualGoogleCredentials(home, env = process.env) {
   if (env.BEELINE_GOOGLE_ACCESS_TOKEN) {
@@ -16966,7 +17208,7 @@ function loadManualGoogleCredentials(home, env = process.env) {
 }
 function persistManualGoogleCredentials(home, credentials) {
   const path = manualGoogleCredentialsSearchPaths(home)[0];
-  mkdirSync(dirname4(path), { recursive: true, mode: 448 });
+  mkdirSync2(dirname5(path), { recursive: true, mode: 448 });
   writeFileSync(path, `${JSON.stringify({
     accessToken: credentials.accessToken,
     ...credentials.refreshToken ? { refreshToken: credentials.refreshToken } : {},
@@ -17044,10 +17286,10 @@ function describe(error) {
 }
 
 // apps/body/dist/squire-mcp-client.js
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn6 } from "node:child_process";
+import { homedir as homedir4 } from "node:os";
 var INITIALIZE_TIMEOUT_MS = 3e4;
 var CALL_TIMEOUT_MS = 12e4;
-var SQUIRE_MCP_SERVER_ARGS = ["-y", "@trusty-squire/mcp@latest", "server"];
 var StdioSquireMcpClient = class {
   options;
   child;
@@ -17101,7 +17343,8 @@ var StdioSquireMcpClient = class {
     return this.initialized;
   }
   initialize() {
-    const child = (this.options.spawn ?? spawn5)(this.options.command ?? "npx", [...this.options.args ?? [...SQUIRE_MCP_SERVER_ARGS]], { env: this.options.env ?? squireConnectProcessEnv() });
+    const launch = squireFacadeLaunch(homedir4());
+    const child = (this.options.spawn ?? spawn6)(this.options.command ?? launch.command, [...this.options.args ?? launch.args], { env: this.options.env ?? { ...squireConnectProcessEnv(), ...launch.env } });
     this.child = child;
     this.buffer = "";
     child.stdout.setEncoding("utf8");
@@ -17135,12 +17378,12 @@ var StdioSquireMcpClient = class {
     const child = this.child;
     if (!child)
       return Promise.reject(new Error("Squire MCP session is not running"));
-    return new Promise((resolve33, reject) => {
+    return new Promise((resolve35, 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: resolve33, reject, timer });
+      this.pending.set(id, { resolve: resolve35, reject, timer });
       child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
 `);
     });
@@ -17184,6 +17427,7 @@ function defaultSquireMcpClient() {
 
 // apps/body/dist/connector-assignments.js
 var CONNECTOR_POLL_INTERVAL_MS = 1e4;
+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;
   api;
@@ -17356,6 +17600,25 @@ var ConnectorAssignmentLoop = class {
   }
   /** Install Trusty Squire, reporting every step as it settles. */
   async runInstall(connectorId) {
+    const claim = squireConnectSession();
+    const spent = claim ? Date.now() - claim.claimedAt >= CONNECT_TIMEOUT_MS : false;
+    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`);
+        return;
+      }
+      this.log("trusty-squire re-pair requested; superseding the connect holding the browser");
+    } else if (spent && (await this.connectorRow(connectorId))?.signIn) {
+      releaseSquireConnectSession((message) => this.log(`[trusty-squire] ${message}`));
+      await this.api.execute("postConnectorStatus", {
+        agentId: this.agentId,
+        connectorId,
+        steps: [{ label: "waiting for sign-in", status: "failed", reason: CEREMONY_EXPIRED }],
+        signIn: null,
+        errorMessage: CEREMONY_EXPIRED
+      });
+      return;
+    }
     const report = async (steps) => {
       try {
         await this.api.execute("postConnectorStatus", { agentId: this.agentId, connectorId, steps });
@@ -17374,6 +17637,7 @@ var ConnectorAssignmentLoop = class {
         agentId: this.agentId,
         connectorId,
         steps: result.steps,
+        signIn: null,
         errorMessage: result.errorMessage
       });
       return;
@@ -17383,8 +17647,7 @@ var ConnectorAssignmentLoop = class {
         agentId: this.agentId,
         connectorId,
         ...result.squireVersion ? { squireVersion: result.squireVersion } : {},
-        ...result.signedInAs ? { signedInAs: result.signedInAs } : {},
-        ...result.signIn ? { signIn: result.signIn } : {}
+        ...result.signedInAs ? { signedInAs: result.signedInAs } : {}
       });
       await this.reportVault(connectorId);
       return;
@@ -17393,11 +17656,37 @@ var ConnectorAssignmentLoop = class {
       agentId: this.agentId,
       connectorId,
       steps: result.steps,
+      signIn: result.signIn ?? null,
       ...result.squireVersion ? { squireVersion: result.squireVersion } : {},
-      ...result.signedInAs ? { signedInAs: result.signedInAs } : {},
-      ...result.signIn ? { signIn: result.signIn } : {}
+      ...result.signedInAs ? { signedInAs: result.signedInAs } : {}
     });
   }
+  /** This connector's own row, or undefined when the server cannot answer. */
+  async connectorRow(connectorId) {
+    try {
+      const status = await this.api.execute("getConnectorStatus", {
+        agentId: this.agentId,
+        connectorId
+      });
+      return status.connectorId === connectorId ? status : void 0;
+    } catch (error) {
+      this.log(`connector status unavailable: ${describe2(error)}`);
+      return void 0;
+    }
+  }
+  /**
+   * True when a human asked for this connector again while a connect of ours
+   * still holds the browser. `pairConnector` re-arms the row to its default
+   * all-pending steps, so a row whose every step is still pending is a fresh
+   * request; the row carrying the ceremony this helper published has settled
+   * ones. An unreadable row is not evidence of a retry.
+   */
+  async rearmedByHuman(connectorId) {
+    const status = await this.connectorRow(connectorId);
+    if (!status)
+      return false;
+    return status.steps.length > 0 && status.steps.every((step3) => step3.status === "pending");
+  }
   /** One vault report covers every live trusty-squire connector on this helper. */
   async runSync() {
     await this.reportVault();
@@ -17439,6 +17728,22 @@ function isAgentCommand(value) {
 }
 
 // packages/api-contract/dist/artifacts.js
+var ARTIFACT_EXTENSIONS_BY_MIME = {
+  "text/html": [".html", ".htm"],
+  "image/svg+xml": [".svg"],
+  "application/pdf": [".pdf"],
+  "text/markdown": [".md"],
+  "image/png": [".png"],
+  "image/jpeg": [".jpg", ".jpeg"],
+  "image/gif": [".gif"],
+  "image/webp": [".webp"],
+  "text/plain": [".txt", ".log"],
+  "application/json": [".json"],
+  "text/csv": [".csv"],
+  "application/zip": [".zip"],
+  "application/octet-stream": []
+};
+var ARTIFACT_MIME_BY_EXTENSION = Object.fromEntries(Object.entries(ARTIFACT_EXTENSIONS_BY_MIME).flatMap(([mime, extensions]) => extensions.map((extension2) => [extension2, mime])));
 var ARTIFACT_MAXIMUM_BYTES = 25 * 1024 * 1024;
 
 // packages/api-contract/dist/system-events.js
@@ -17526,7 +17831,7 @@ function classifyTurnSilence(reason, reasonKind) {
   if (/command protocol/i.test(text2) || /refusing intake/i.test(text2) || /helper is out of date/i.test(text2)) {
     return { kind: "helper-out-of-date" };
   }
-  if (/working copy/i.test(text2) || /could not (?:clone|fetch|checkout)/i.test(text2) || /repository not found/i.test(text2) || /could not resolve host/i.test(text2) || /failed to start corner/i.test(text2) || /unable to access/i.test(text2) || /\bgit clone\b/i.test(text2) || /repository state is not verified/i.test(text2) || /incomplete repository binding/i.test(text2) || /no authoritative objective fact/i.test(text2)) {
+  if (/working copy/i.test(text2) || /could not (?:clone|fetch|checkout)/i.test(text2) || /repository not found/i.test(text2) || /could not resolve host/i.test(text2) || /failed to start corner/i.test(text2) || /unable to access/i.test(text2) || /\bgit clone\b/i.test(text2) || /repository state is not verified/i.test(text2) || /incomplete repository binding/i.test(text2) || /no authoritative objective fact/i.test(text2) || /profile_busy/i.test(text2) || /broker unavailable/i.test(text2)) {
     return { kind: "workspace-failure", repo: repoFromReason(text2) };
   }
   if (/helper isn't running/i.test(text2) || /helper is offline/i.test(text2)) {
@@ -17547,7 +17852,7 @@ function hiccupBackoffMs(attempt) {
 }
 
 // apps/body/dist/daemon-api-client.js
-import { resolve as resolve8 } from "node:path";
+import { resolve as resolve9 } from "node:path";
 import { randomUUID as randomUUID2 } from "node:crypto";
 
 // node_modules/ws/wrapper.mjs
@@ -17566,9 +17871,9 @@ import { randomBytes as randomBytes5 } from "node:crypto";
 import { execFile as execFile2 } from "node:child_process";
 import { closeSync, openSync, readFileSync as readFileSync5 } from "node:fs";
 import { mkdir as mkdir2, readFile as readFile2, readdir, rename as rename2, stat, unlink as unlink2, writeFile as writeFile3 } from "node:fs/promises";
-import { homedir as homedir3 } from "node:os";
-import { dirname as dirname5, resolve as resolve7 } from "node:path";
-import { spawn as spawn6 } from "node:child_process";
+import { homedir as homedir5 } from "node:os";
+import { dirname as dirname6, resolve as resolve8 } from "node:path";
+import { spawn as spawn7 } from "node:child_process";
 import { promisify } from "node:util";
 
 // node_modules/@noble/hashes/_u64.js
@@ -21955,7 +22260,7 @@ function alphabet(letters) {
   };
 }
 // @__NO_SIDE_EFFECTS__
-function join4(separator = "") {
+function join5(separator = "") {
   astr("join", separator);
   return {
     encode: (from) => {
@@ -22085,8 +22390,8 @@ var base64 = hasBase64Builtin ? {
   decode(s) {
     return decodeBase64Builtin(s, false);
   }
-} : /* @__PURE__ */ chain(/* @__PURE__ */ radix2(6), /* @__PURE__ */ alphabet("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), /* @__PURE__ */ padding(6), /* @__PURE__ */ join4(""));
-var BECH_ALPHABET = /* @__PURE__ */ chain(/* @__PURE__ */ alphabet("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), /* @__PURE__ */ join4(""));
+} : /* @__PURE__ */ chain(/* @__PURE__ */ radix2(6), /* @__PURE__ */ alphabet("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"), /* @__PURE__ */ padding(6), /* @__PURE__ */ join5(""));
+var BECH_ALPHABET = /* @__PURE__ */ chain(/* @__PURE__ */ alphabet("qpzry9x8gf2tvdw0s3jn54khce6mua7l"), /* @__PURE__ */ join5(""));
 var POLYMOD_GENERATORS = [996825010, 642813549, 513874426, 1027748829, 705979059];
 function bech32Polymod(pre) {
   const b = pre >> 25;
@@ -26104,15 +26409,15 @@ var DEFAULT_AGENT_IDENTITY_NAME = "beeline-agent";
 var DEFAULT_BODY_IDENTITY_NAME = "beeline-body";
 var DEFAULT_DAEMON_MONOLITH_BASE_URL = "https://server.usebeeline.app";
 function defaultSupervisorRoot(env = process.env) {
-  return resolve7(env.XDG_STATE_HOME ?? resolve7(homedir3(), ".local", "state"));
+  return resolve8(env.XDG_STATE_HOME ?? resolve8(homedir5(), ".local", "state"));
 }
 function runtimeDirectory(supervisorRoot, publicKey) {
   if (!/^[0-9a-f]{64}$/i.test(publicKey))
     throw new Error("invalid agent public key");
-  return resolve7(supervisorRoot, "beeline", "agents", publicKey.toLowerCase());
+  return resolve8(supervisorRoot, "beeline", "agents", publicKey.toLowerCase());
 }
 function runtimeConfigPath(supervisorRoot, publicKey) {
-  return resolve7(runtimeDirectory(supervisorRoot, publicKey), "runtime.json");
+  return resolve8(runtimeDirectory(supervisorRoot, publicKey), "runtime.json");
 }
 function identityFromKey(value, name) {
   const secretKey = value ? value.startsWith("nsec1") ? decodeNsec(value) : Uint8Array.from(Buffer.from(value, "hex")) : randomBytes5(32);
@@ -26148,7 +26453,7 @@ function runtimeAgentCommand(runtime, env = process.env) {
 }
 async function writeRuntimeRecord(runtime) {
   const path = runtimeConfigPath(runtime.supervisorRoot, runtime.agent.publicKey);
-  await mkdir2(dirname5(path), { recursive: true, mode: 448 });
+  await mkdir2(dirname6(path), { recursive: true, mode: 448 });
   const staged = `${path}.${process.pid}.tmp`;
   await writeFile3(staged, `${JSON.stringify(runtime, null, 2)}
 `, { mode: 384 });
@@ -26174,7 +26479,7 @@ async function migrateRuntimeRecordAccessPolicy(path) {
   return { runtime, migrated: true };
 }
 async function stageMonolithAgentRuntime(input) {
-  const supervisorRoot = input.supervisorRoot ? resolve7(input.supervisorRoot) : defaultSupervisorRoot();
+  const supervisorRoot = input.supervisorRoot ? resolve8(input.supervisorRoot) : defaultSupervisorRoot();
   const configPath = runtimeConfigPath(supervisorRoot, input.agentIdentity.publicKey);
   const configuredBaseUrl = input.monolithBaseUrl ?? DEFAULT_DAEMON_MONOLITH_BASE_URL;
   const baseUrl = new URL(configuredBaseUrl).origin;
@@ -26219,9 +26524,9 @@ async function stageMonolithAgentRuntime(input) {
   return { runtime, configPath };
 }
 async function runtimePaths(root) {
-  const agents = resolve7(root, "beeline", "agents");
+  const agents = resolve8(root, "beeline", "agents");
   const entries = await readdir(agents, { withFileTypes: true }).catch(() => []);
-  return entries.filter((entry) => entry.isDirectory()).map((entry) => resolve7(agents, entry.name, "runtime.json"));
+  return entries.filter((entry) => entry.isDirectory()).map((entry) => resolve8(agents, entry.name, "runtime.json"));
 }
 async function findAgentRuntimeConfigPaths(env = process.env, _cwd = process.cwd()) {
   return runtimePaths(defaultSupervisorRoot(env));
@@ -26230,13 +26535,13 @@ async function findRuntimeConfigPaths(cwd = process.cwd(), env = process.env) {
   return findAgentRuntimeConfigPaths(env, cwd);
 }
 async function resolveRuntimeConfigPath(path) {
-  return resolve7(path);
+  return resolve8(path);
 }
 async function selectRuntimeConfigPaths(options) {
   const hostScope = true;
   const configs = await options.findHostRuntimes(options.cwd);
   const requestedPubkey = options.requestedPubkey;
-  const paths = requestedPubkey ? configs.filter((path) => dirname5(path).endsWith(requestedPubkey)) : [...new Set(configs)];
+  const paths = requestedPubkey ? configs.filter((path) => dirname6(path).endsWith(requestedPubkey)) : [...new Set(configs)];
   if (!paths.length)
     throw new Error(options.noRuntimeMessage(hostScope));
   if (options.requestedPubkey && paths.length > 1)
@@ -26244,10 +26549,10 @@ async function selectRuntimeConfigPaths(options) {
   return { paths, hostScope };
 }
 function daemonPidPath(configPath) {
-  return resolve7(dirname5(configPath), "daemon.pid");
+  return resolve8(dirname6(configPath), "daemon.pid");
 }
 function daemonBirthPath(configPath) {
-  return resolve7(dirname5(configPath), "daemon.birth");
+  return resolve8(dirname6(configPath), "daemon.birth");
 }
 function processBirthIdentity(pid) {
   try {
@@ -26259,7 +26564,7 @@ function processBirthIdentity(pid) {
   }
 }
 async function writeDaemonPidRecord(configPath, pid) {
-  const directory = dirname5(configPath);
+  const directory = dirname6(configPath);
   await mkdir2(directory, { recursive: true, mode: 448 });
   await writeFile3(daemonPidPath(configPath), `${pid}
 `, { mode: 384 });
@@ -26283,11 +26588,11 @@ async function daemonIsThisRuntime(pid, configPath) {
   try {
     const argv = (await readFile2(`/proc/${pid}/cmdline`, "utf8")).split("\0").filter(Boolean);
     const flag = argv.lastIndexOf("--config");
-    return flag > 0 && argv[flag - 1] === "daemon" && resolve7(argv[flag + 1]) === resolve7(configPath);
+    return flag > 0 && argv[flag - 1] === "daemon" && resolve8(argv[flag + 1]) === resolve8(configPath);
   } catch {
     try {
       const { stdout: stdout6 } = await execFileAsync("ps", ["-p", String(pid), "-o", "command="]);
-      return stdout6.includes(" daemon ") && stdout6.includes(resolve7(configPath));
+      return stdout6.includes(" daemon ") && stdout6.includes(resolve8(configPath));
     } catch {
       return false;
     }
@@ -26340,14 +26645,14 @@ async function stopRuntimeDaemon(path, opts = {}) {
   throw new Error(`agent daemon ${pid} did not stop after ${timeout}ms`);
 }
 async function launchRuntimeDaemon(configPath, opts = {}) {
-  const directory = dirname5(configPath);
+  const directory = dirname6(configPath);
   await mkdir2(directory, { recursive: true, mode: 448 });
   const foreground = opts.foreground === true;
-  const output = foreground ? "inherit" : openSync(resolve7(directory, "daemon.log"), "a", 384);
+  const output = foreground ? "inherit" : openSync(resolve8(directory, "daemon.log"), "a", 384);
   const entrypoint = opts.entrypoint ?? process.argv[1];
   if (!entrypoint)
     throw new Error("cannot resolve daemon CLI entrypoint");
-  const child = spawn6(process.execPath, [...opts.execArgv ?? [], entrypoint, "daemon", "--config", resolve7(configPath)], {
+  const child = spawn7(process.execPath, [...opts.execArgv ?? [], entrypoint, "daemon", "--config", resolve8(configPath)], {
     cwd: directory,
     env: opts.env ?? process.env,
     detached: !foreground,
@@ -26609,8 +26914,8 @@ var DaemonApiClient = class {
 };
 async function activateDaemonTransport(path, fetchImpl = fetch) {
   const runtime = await readRuntimeRecord(path);
-  const expectedPath = resolve8(runtimeDirectory(runtime.supervisorRoot, runtime.agent.publicKey), "runtime.json");
-  if (resolve8(path) !== expectedPath) {
+  const expectedPath = resolve9(runtimeDirectory(runtime.supervisorRoot, runtime.agent.publicKey), "runtime.json");
+  if (resolve9(path) !== expectedPath) {
     throw new Error(`refusing daemon token exchange outside canonical runtime path: ${path}`);
   }
   const transport = runtime.transport;
@@ -26651,9 +26956,9 @@ async function activateDaemonTransport(path, fetchImpl = fetch) {
 // apps/body/dist/room-runtime.js
 import { execFile as execFile6 } from "node:child_process";
 import { createHash as createHash7 } from "node:crypto";
-import { existsSync as existsSync5, mkdirSync as mkdirSync2 } from "node:fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3 } from "node:fs";
 import { mkdir as mkdir14, rm as rm5 } from "node:fs/promises";
-import { dirname as dirname11, resolve as resolve21 } from "node:path";
+import { dirname as dirname12, resolve as resolve23 } from "node:path";
 import { promisify as promisify4 } from "node:util";
 
 // apps/body/dist/grant-runner.js
@@ -26661,10 +26966,10 @@ import { execFile as execFile3 } from "node:child_process";
 import { createHash as createHash3, randomBytes as randomBytes6 } from "node:crypto";
 import { readFile as readFile4 } from "node:fs/promises";
 import { createServer } from "node:http";
-import { dirname as dirname7, resolve as resolve11 } from "node:path";
+import { dirname as dirname8, resolve as resolve12 } from "node:path";
 
 // packages/api-contract/dist/agent-grants.js
-var AGENT_GRANT_KINDS = ["path", "host", "secret", "device", "budget", "command"];
+var AGENT_GRANT_KINDS = ["path", "host", "secret", "device", "budget", "command", "mcp"];
 var SHELL_METACHARACTERS = /[;&|<>$`\\'"(){}\n\r\t*?[\]~#!]/;
 var SECRET_NAME = /^[A-Z][A-Z0-9_]{0,63}$/;
 function parseCommandGrantTarget(target) {
@@ -26884,9 +27189,9 @@ function surfaceAllows(surface, capability) {
 
 // apps/body/dist/bwrap-sandbox.js
 import { spawnSync } from "node:child_process";
-import { lstatSync as lstatSync3 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { isAbsolute as isAbsolute2, relative, resolve as resolve9 } from "node:path";
+import { lstatSync as lstatSync4 } from "node:fs";
+import { homedir as homedir6 } from "node:os";
+import { isAbsolute as isAbsolute2, relative, resolve as resolve10 } from "node:path";
 var DEFAULT_SANDBOX_POLICY = "bwrap";
 function isSandboxPolicy(value) {
   return value === "bwrap" || value === "off";
@@ -26922,35 +27227,34 @@ var HARNESS_HOME_STATE_DIRS = [
     dirs: [".cursor"]
   }
 ];
-function harnessHomeStateDirs(agentCommand, home = homedir4()) {
+function harnessHomeStateDirs(agentCommand, home = homedir6()) {
   if (!agentCommand)
     return [];
   for (const { match, dirs } of HARNESS_HOME_STATE_DIRS) {
     if (match.test(agentCommand))
-      return dirs.map((dir) => resolve9(home, dir));
+      return dirs.map((dir) => resolve10(home, dir));
   }
   return [];
 }
 var KNOWN_CREDENTIAL_MASK_PATHS = [
   ".config/gh",
-  ".config/trusty-squire",
   ".ssh",
   ".netrc",
   ".git-credentials",
   ".secrets.env"
 ];
-function credentialMaskPaths(extraPaths, home = homedir4(), stat5 = (path) => {
+function credentialMaskPaths(extraPaths, home = homedir6(), stat5 = (path) => {
   try {
-    const info = lstatSync3(path);
+    const info = lstatSync4(path);
     return { isDirectory: info.isDirectory() };
   } catch {
     return void 0;
   }
 }, requiredPaths = []) {
-  const required = new Set(requiredPaths.map((path) => resolve9(path)));
+  const required = new Set(requiredPaths.map((path) => resolve10(path)));
   const candidates = [
-    ...KNOWN_CREDENTIAL_MASK_PATHS.map((entry) => resolve9(home, entry)),
-    ...(extraPaths ?? []).map((entry) => resolve9(entry))
+    ...KNOWN_CREDENTIAL_MASK_PATHS.map((entry) => resolve10(home, entry)),
+    ...(extraPaths ?? []).map((entry) => resolve10(entry))
   ];
   const seen = /* @__PURE__ */ new Set();
   const masks = [];
@@ -26977,7 +27281,7 @@ function normalize(paths) {
   for (const path of paths) {
     if (!path)
       continue;
-    seen.add(resolve9(path));
+    seen.add(resolve10(path));
   }
   return Array.from(seen).sort();
 }
@@ -27015,7 +27319,7 @@ function sandboxMountPlan(spec) {
     writable,
     quotaTmpfs: spec.workbench ? [
       {
-        target: resolve9(spec.workbench.dir),
+        target: resolve10(spec.workbench.dir),
         maxBytes: spec.workbench.maxBytes,
         maxInodes: spec.workbench.maxInodes,
         blockGit: true
@@ -27070,7 +27374,7 @@ function buildBwrapArgv(input) {
   for (const binding of quotaTmpfs) {
     args.push("--dir", binding.target, "--size", String(binding.maxBytes), "--tmpfs", binding.target);
     if (binding.blockGit)
-      args.push("--ro-bind", "/dev/null", resolve9(binding.target, ".git"));
+      args.push("--ro-bind", "/dev/null", resolve10(binding.target, ".git"));
   }
   args.push("--chdir", input.cwd);
   args.push("--die-with-parent");
@@ -27130,14 +27434,14 @@ function detectBwrapSandbox(options = {}) {
   }
   return {
     path: bwrapPath,
-    advisory: `harness OS sandbox ENABLED via ${bwrapPath}: every ACP child gets a read-only filesystem plus a private /tmp and PID namespace, writable only in its own harness state; ambient credential stores (~/.config/gh, ~/.config/trusty-squire, ~/.ssh, ~/.netrc, ~/.git-credentials) are masked absent; a repository corner adds its worktree and git dir, then receives its linked repository's GitHub App credential. Hygiene boundary, not confinement \u2014 it shapes where sessions write files and does not restrict other access this account has (e.g. sockets, container runtimes, secrets not on the mask list)`
+    advisory: `harness OS sandbox ENABLED via ${bwrapPath}: every ACP child gets a read-only filesystem plus a private /tmp and PID namespace, writable only in its own harness state; ambient credential stores (~/.config/gh, ~/.ssh, ~/.netrc, ~/.git-credentials) are masked absent; a repository corner adds its worktree and git dir, then receives its linked repository's GitHub App credential. Hygiene boundary, not confinement \u2014 it shapes where sessions write files and does not restrict other access this account has (e.g. sockets, container runtimes, secrets not on the mask list)`
   };
 }
 
 // apps/body/dist/provider-key-store.js
 import { chmod as chmod2, mkdir as mkdir3, readFile as readFile3, writeFile as writeFile4 } from "node:fs/promises";
-import { homedir as homedir5 } from "node:os";
-import { dirname as dirname6, resolve as resolve10 } from "node:path";
+import { homedir as homedir7 } from "node:os";
+import { dirname as dirname7, resolve as resolve11 } from "node:path";
 var PROVIDER_KEY_ENV_VARS = {
   openrouter: "OPENROUTER_API_KEY",
   openai: "OPENAI_API_KEY",
@@ -27147,8 +27451,8 @@ var PROVIDER_KEY_ENV_VARS = {
 };
 var GOOGLE_ENV_ALIAS = "GEMINI_API_KEY";
 function providerKeyStorePath(env = process.env) {
-  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve10(homedir5(), ".config");
-  return resolve10(configRoot, "beeline", "providers.json");
+  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve11(homedir7(), ".config");
+  return resolve11(configRoot, "beeline", "providers.json");
 }
 async function readProviderKeyStore(env = process.env) {
   const path = providerKeyStorePath(env);
@@ -27171,7 +27475,7 @@ async function readSavedProviderKey(provider, env = process.env) {
 async function saveProviderKey(provider, key, env = process.env) {
   const path = providerKeyStorePath(env);
   const store = { ...await readProviderKeyStore(env), [provider]: key };
-  await mkdir3(dirname6(path), { recursive: true, mode: 448 });
+  await mkdir3(dirname7(path), { recursive: true, mode: 448 });
   await writeFile4(path, `${JSON.stringify(store, null, 2)}
 `, { mode: 384 });
   await chmod2(path, 384);
@@ -27208,7 +27512,7 @@ function operatorSecretResolver(env = process.env) {
       if (saved)
         return saved;
     }
-    const raw = await readFile4(resolve11(dirname7(providerKeyStorePath(env)), "secrets.json"), "utf8").catch(() => void 0);
+    const raw = await readFile4(resolve12(dirname8(providerKeyStorePath(env)), "secrets.json"), "utf8").catch(() => void 0);
     if (!raw)
       return void 0;
     try {
@@ -27320,9 +27624,9 @@ var GrantCommandRunner = class {
       ...Object.fromEntries(secrets)
     };
     const cap = this.options.outputCapBytes ?? GRANT_COMMAND_OUTPUT_CAP_BYTES;
-    const spawn12 = surfaceAllows(policy.surface, "run-host-command") ? { command: argv[0], args: argv.slice(1) } : roomSandboxCommand(policy, room.cwd, argv);
+    const spawn13 = surfaceAllows(policy.surface, "run-host-command") ? { command: argv[0], args: argv.slice(1) } : roomSandboxCommand(policy, room.cwd, argv);
     const outcome = await new Promise((resolveRun) => {
-      const child = execFile3(spawn12.command, spawn12.args, {
+      const child = execFile3(spawn13.command, spawn13.args, {
         cwd: room.cwd,
         env,
         timeout: this.options.timeoutMs ?? GRANT_COMMAND_TIMEOUT_MS,
@@ -27410,8 +27714,8 @@ function scriptCandidates(cwd, scratch, argv) {
   if (!argument)
     return [];
   const paths = [
-    resolve11(cwd, argument.path),
-    ...scratch ? [resolve11(scratch, argument.path)] : []
+    resolve12(cwd, argument.path),
+    ...scratch ? [resolve12(scratch, argument.path)] : []
   ];
   return [...new Set(paths)];
 }
@@ -27614,17 +27918,17 @@ function captureConnectionUsage(recorder, turn, calls) {
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { mkdir as mkdir4, writeFile as writeFile5 } from "node:fs/promises";
 import { tmpdir as tmpdir3 } from "node:os";
-import { dirname as dirname8, join as join5 } from "node:path";
+import { dirname as dirname9, join as join6 } from "node:path";
 var CommandExecutionContext = class {
   generationId = randomUUID3();
   path;
   current;
   constructor(root) {
-    this.path = join5(root ?? tmpdir3(), `beeline-command-${this.generationId}.json`);
+    this.path = join6(root ?? tmpdir3(), `beeline-command-${this.generationId}.json`);
   }
   async enter(command) {
     this.current = command;
-    await mkdir4(dirname8(this.path), { recursive: true });
+    await mkdir4(dirname9(this.path), { recursive: true });
     await writeFile5(this.path, JSON.stringify({
       roomId: command.roomId,
       requestId: command.turnRequestId,
@@ -27746,13 +28050,13 @@ async function runServerCommandIntake(options) {
         }
       }
       options.onPoll?.();
-      const reconcile = await new Promise((resolve33) => {
+      const reconcile = await new Promise((resolve35) => {
         const done = (needed) => {
           if (timer)
             clearTimeout(timer);
           signal?.removeEventListener("abort", aborted);
           wake = void 0;
-          resolve33(needed);
+          resolve35(needed);
         };
         const aborted = () => done(false);
         wake = done;
@@ -27780,13 +28084,13 @@ async function runServerCommandIntake(options) {
 import { execFile as execFile5 } from "node:child_process";
 import { createHash as createHash6 } from "node:crypto";
 import { mkdir as mkdir13 } from "node:fs/promises";
-import { homedir as homedir8 } from "node:os";
-import { join as join10 } from "node:path";
+import { homedir as homedir10 } from "node:os";
+import { join as join12 } from "node:path";
 import { promisify as promisify3 } from "node:util";
 
 // apps/body/dist/agent-home.js
-var import_yaml = __toESM(require_dist(), 1);
-import { existsSync as existsSync4, readFileSync as readFileSync7 } from "node:fs";
+var import_yaml2 = __toESM(require_dist(), 1);
+import { existsSync as existsSync5, readFileSync as readFileSync7 } from "node:fs";
 
 // node_modules/smol-toml/dist/date.js
 var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
@@ -28433,15 +28737,164 @@ function parse5(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
   return res;
 }
 
+// node_modules/smol-toml/dist/stringify.js
+var BARE_KEY = /^[a-z0-9-_]+$/i;
+function extendedTypeOf(obj) {
+  let type = typeof obj;
+  if (type === "object") {
+    if (Array.isArray(obj))
+      return "array";
+    if (typeof obj?.getUTCDate === "function" && obj instanceof Date)
+      return "date";
+    if (globalThis.Temporal && // check for the 'since' property as an early bailout that avoids running all 5 instanceof checks
+    typeof obj?.since === "function" && (obj instanceof Temporal.Instant || obj instanceof Temporal.PlainDate || obj instanceof Temporal.PlainDateTime || obj instanceof Temporal.PlainTime || obj instanceof Temporal.ZonedDateTime)) {
+      return "temporal";
+    }
+  }
+  return type;
+}
+function isArrayOfTables(obj) {
+  for (let i3 = 0; i3 < obj.length; i3++) {
+    if (extendedTypeOf(obj[i3]) !== "object")
+      return false;
+  }
+  return obj.length != 0;
+}
+function formatString(s) {
+  return JSON.stringify(s).replace(/\x7f/g, "\\u007f");
+}
+function stringifyTemporal(temporal) {
+  return temporal.toString({
+    calendarName: "never",
+    timeZoneName: "never"
+  });
+}
+function stringifyValue(val, type, depth, numberAsFloat) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
+  switch (type) {
+    // @ts-expect-error -- intentional fallthrough case
+    case "number":
+      if (isNaN(val))
+        return "nan";
+      if (val === Infinity)
+        return "inf";
+      if (val === -Infinity)
+        return "-inf";
+      if (Number.isInteger(val) && (numberAsFloat || !Number.isSafeInteger(val)))
+        return val.toFixed(1);
+    case "bigint":
+    case "boolean":
+      return val.toString();
+    case "string":
+      return formatString(val);
+    case "date":
+      if (isNaN(val.getTime()))
+        throw new TypeError("cannot serialize invalid date");
+      return val.toISOString();
+    case "object":
+      return stringifyInlineTable(val, depth, numberAsFloat);
+    case "array":
+      return stringifyArray(val, depth, numberAsFloat);
+    case "temporal":
+      return stringifyTemporal(val);
+  }
+}
+function stringifyInlineTable(obj, depth, numberAsFloat) {
+  let keys = Object.keys(obj);
+  if (keys.length === 0)
+    return "{}";
+  let res = "{ ";
+  for (let i3 = 0; i3 < keys.length; i3++) {
+    let k = keys[i3];
+    if (i3)
+      res += ", ";
+    res += BARE_KEY.test(k) ? k : formatString(k);
+    res += " = ";
+    res += stringifyValue(obj[k], extendedTypeOf(obj[k]), depth - 1, numberAsFloat);
+  }
+  return res + " }";
+}
+function stringifyArray(array, depth, numberAsFloat) {
+  if (array.length === 0)
+    return "[]";
+  let res = "[ ";
+  for (let i3 = 0; i3 < array.length; i3++) {
+    if (i3)
+      res += ", ";
+    if (array[i3] === null || array[i3] === void 0) {
+      throw new TypeError("arrays cannot contain null or undefined values");
+    }
+    res += stringifyValue(array[i3], extendedTypeOf(array[i3]), depth - 1, numberAsFloat);
+  }
+  return res + " ]";
+}
+function stringifyArrayTable(array, key, depth, numberAsFloat) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
+  let res = "";
+  for (let i3 = 0; i3 < array.length; i3++) {
+    res += `${res && "\n"}[[${key}]]
+`;
+    res += stringifyTable(0, array[i3], key, depth, numberAsFloat);
+  }
+  return res;
+}
+function stringifyTable(tableKey, obj, prefix, depth, numberAsFloat) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
+  let preamble = "";
+  let tables = "";
+  let keys = Object.keys(obj);
+  for (let i3 = 0; i3 < keys.length; i3++) {
+    let k = keys[i3];
+    if (obj[k] !== null && obj[k] !== void 0) {
+      let type = extendedTypeOf(obj[k]);
+      if (type === "symbol" || type === "function") {
+        throw new TypeError(`cannot serialize values of type '${type}'`);
+      }
+      let key = BARE_KEY.test(k) ? k : formatString(k);
+      if (type === "array" && isArrayOfTables(obj[k])) {
+        tables += (tables && "\n") + stringifyArrayTable(obj[k], prefix ? `${prefix}.${key}` : key, depth - 1, numberAsFloat);
+      } else if (type === "object") {
+        let tblKey = prefix ? `${prefix}.${key}` : key;
+        tables += (tables && "\n") + stringifyTable(tblKey, obj[k], tblKey, depth - 1, numberAsFloat);
+      } else {
+        preamble += key;
+        preamble += " = ";
+        preamble += stringifyValue(obj[k], type, depth, numberAsFloat);
+        preamble += "\n";
+      }
+    }
+  }
+  if (tableKey && (preamble || !tables))
+    preamble = preamble ? `[${tableKey}]
+${preamble}` : `[${tableKey}]`;
+  return preamble && tables ? `${preamble}
+${tables}` : preamble || tables;
+}
+function stringify(obj, { maxDepth = 1e3, numbersAsFloat = false } = {}) {
+  if (extendedTypeOf(obj) !== "object") {
+    throw new TypeError("stringify can only be called with an object");
+  }
+  let str = stringifyTable(0, obj, "", maxDepth, numbersAsFloat);
+  if (str[str.length - 1] !== "\n")
+    return str + "\n";
+  return str;
+}
+
 // apps/body/dist/agent-home.js
 import { createHash as createHash4, randomUUID as randomUUID4 } from "node:crypto";
 import { chmod as chmod3, copyFile, lstat as lstat2, mkdir as mkdir6, readFile as readFile6, readdir as readdir2, realpath, rename as rename3, rm as rm2, symlink, unlink as unlink3, writeFile as writeFile7 } from "node:fs/promises";
-import { homedir as homedir6 } from "node:os";
-import { basename as basename5, dirname as dirname9, join as join6, relative as relative2, resolve as resolve14, sep } from "node:path";
+import { homedir as homedir8 } from "node:os";
+import { basename as basename5, dirname as dirname10, join as join8, relative as relative2, resolve as resolve16, sep } from "node:path";
 
 // apps/body/dist/beeline-skill.js
 import { readFileSync as readFileSync6 } from "node:fs";
-import { resolve as resolve12 } from "node:path";
+import { resolve as resolve13 } from "node:path";
 
 // packages/api-contract/dist/workbench.js
 var CONNECTABLE_CONNECTOR_KINDS = [
@@ -28456,6 +28909,13 @@ var CONNECTABLE_CONNECTOR_KINDS = [
 var CONNECTOR_OFFER_WINDOW_MS = 2 * 6e4;
 var OFFERABLE_CONNECTOR_KINDS = CONNECTABLE_CONNECTOR_KINDS.filter((kind) => kind !== "wallet");
 
+// packages/api-contract/dist/phone-guards.js
+var CLOSED_VIEWER = {
+  identity: { pubkey: "0".repeat(64), kind: "human", name: "" },
+  role: "member",
+  permissions: { send: false, manage: false }
+};
+
 // packages/api-contract/dist/agent-pairing-code.js
 var CURRENT_AGENT_PAIRING_CODE = /^[0-9A-F]{8}-[0-9A-F]{8}$/;
 var LEGACY_AGENT_PAIRING_CODE = /^BUZZ-(?:[0-9A-F]{8}-[0-9A-F]{8}|[A-HJ-NP-Z2-9]{4}-[A-HJ-NP-Z2-9]{4})$/;
@@ -28529,7 +28989,7 @@ function runningBeelineReleaseId(env = process.env, read = (path) => readFileSyn
     const lib = env.BEELINE_LIB_DIR;
     if (!lib)
       return "source";
-    const manifest = JSON.parse(read(resolve12(lib, "bundle.json")));
+    const manifest = JSON.parse(read(resolve13(lib, "bundle.json")));
     return [manifest.version, manifest.commit].filter(Boolean).join("-") || "source";
   } catch {
     return "source";
@@ -28751,9 +29211,213 @@ var SQUIRE_GOVERNED_TOOLS = [
 ];
 var SQUIRE_GOVERNED_TOOL_SET = new Set(SQUIRE_GOVERNED_TOOLS);
 
+// apps/body/dist/mcp-route-class.js
+var CODE_OWNED_HOST_MCP_NAMES = ["squire"];
+var MCP_ROUTE_CLASS_KEY = "beeline_route";
+var MCP_ROUTE_HOST = "host";
+function isCodeOwnedHostMcpName(name) {
+  return CODE_OWNED_HOST_MCP_NAMES.includes(name.trim().toLowerCase());
+}
+function classifyImportedMcpServer(input) {
+  const name = input.name.trim();
+  if (isCodeOwnedHostMcpName(name))
+    return "host";
+  const command = input.command ?? mcpLaunchCommand(input.declaration);
+  const args = input.args ?? mcpLaunchArgs(input.declaration);
+  if (command && isTrustySquireMcpLaunch(command, args))
+    return "host";
+  if (operatorMarkedHost(input.declaration))
+    return "host";
+  return "local";
+}
+function hostMcpIdentityPrefixes(name) {
+  const lower = name.trim().toLowerCase();
+  const normalized = lower.replace(/[^a-z0-9]+/g, "_");
+  return [
+    `mcp__${lower}__`,
+    `mcp__${normalized}__`,
+    `mcp.${lower}.`,
+    `${lower}.`,
+    `${lower}/`,
+    `${lower}__`
+  ];
+}
+function isHostMcpIdentity(candidate, hostNames = CODE_OWNED_HOST_MCP_NAMES) {
+  const lowered = candidate.trim().toLowerCase();
+  if (!lowered)
+    return false;
+  return hostNames.some((name) => {
+    const n3 = name.trim().toLowerCase();
+    if (!n3)
+      return false;
+    if (lowered === n3)
+      return true;
+    return hostMcpIdentityPrefixes(n3).some((prefix) => lowered.startsWith(prefix));
+  });
+}
+function operatorMarkedHost(declaration) {
+  return declaration?.[MCP_ROUTE_CLASS_KEY] === MCP_ROUTE_HOST;
+}
+function mcpLaunchCommand(declaration) {
+  if (!declaration)
+    return void 0;
+  return stringField(declaration.command) ?? stringField(declaration.cmd);
+}
+function mcpLaunchArgs(declaration) {
+  return stringArray(declaration?.args);
+}
+function stringField(value) {
+  return typeof value === "string" && value.trim() ? value : void 0;
+}
+function stringArray(value) {
+  return Array.isArray(value) && value.every((entry) => typeof entry === "string") ? value : [];
+}
+
+// apps/body/dist/host-mcp-route.js
+import { join as join7, resolve as resolve14 } from "node:path";
+var import_yaml = __toESM(require_dist(), 1);
+function grantedMcpServerNames(grants) {
+  const names = /* @__PURE__ */ new Set();
+  for (const grant of grants ?? []) {
+    if (grant.kind !== "mcp")
+      continue;
+    const name = grant.target.trim();
+    if (name)
+      names.add(name);
+  }
+  return [...names];
+}
+function ungatedHostServers(hostServers, granted) {
+  const allowed = new Set(granted);
+  return hostServers.filter((name) => !allowed.has(name));
+}
+function grantedHostRoutesFromList(result) {
+  if (!result || typeof result !== "object" || !("grants" in result))
+    return [];
+  const grants = result.grants;
+  if (!Array.isArray(grants))
+    return [];
+  return grantedMcpServerNames(grants.flatMap((entry) => {
+    if (!entry || typeof entry !== "object")
+      return [];
+    const row = entry;
+    return typeof row.kind === "string" && typeof row.target === "string" ? [{ kind: row.kind, target: row.target }] : [];
+  }));
+}
+function recordValue(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function stringArray2(value) {
+  return Array.isArray(value) && value.every((entry) => typeof entry === "string") ? value : [];
+}
+function isSquireDeclaration(name, declaration) {
+  if (isCodeOwnedHostMcpName(name))
+    return true;
+  const command = typeof declaration.command === "string" && declaration.command || typeof declaration.cmd === "string" && declaration.cmd || "";
+  return Boolean(command) && isTrustySquireMcpLaunch(command, stringArray2(declaration.args));
+}
+function grantedSquireHostRoute(granted, declarations = {}) {
+  return granted.some((name) => {
+    if (isCodeOwnedHostMcpName(name))
+      return true;
+    const declaration = declarations[name];
+    return Boolean(declaration && isSquireDeclaration(name, declaration));
+  });
+}
+function hostRouteEnv(hostHome) {
+  return { XDG_CONFIG_HOME: join7(resolve14(hostHome), ".config") };
+}
+function rewriteHostMcpDeclaration(name, declaration, hostHome) {
+  const next = { ...declaration };
+  delete next[MCP_ROUTE_CLASS_KEY];
+  const launch = isSquireDeclaration(name, declaration) ? squireFacadeLaunch(hostHome) : void 0;
+  const routeEnv = launch?.env ?? hostRouteEnv(hostHome);
+  const gooseShape = "cmd" in declaration && !("command" in declaration);
+  if (launch) {
+    if (gooseShape)
+      next.cmd = launch.command;
+    else
+      next.command = launch.command;
+    next.args = launch.args;
+  }
+  if (gooseShape)
+    next.envs = { ...recordValue(declaration.envs), ...routeEnv };
+  else
+    next.env = { ...recordValue(declaration.env), ...routeEnv };
+  return next;
+}
+function rewriteGrantedHostRoutes(declarations, granted, hostHome) {
+  const allowed = new Set(granted);
+  const rewritten = {};
+  for (const [name, declaration] of Object.entries(declarations)) {
+    if (!allowed.has(name))
+      continue;
+    if (classifyImportedMcpServer({ name, declaration }) !== "host")
+      continue;
+    rewritten[name] = rewriteHostMcpDeclaration(name, declaration, hostHome);
+  }
+  for (const name of granted) {
+    if (rewritten[name] || !isCodeOwnedHostMcpName(name))
+      continue;
+    rewritten[name] = rewriteHostMcpDeclaration(name, {}, hostHome);
+  }
+  return rewritten;
+}
+function grantedHostRouteWires(granted, hostHome, declarations = {}) {
+  const routes = rewriteGrantedHostRoutes(declarations, granted, hostHome);
+  return Object.entries(routes).flatMap(([name, declaration]) => {
+    const command = typeof declaration.command === "string" && declaration.command || typeof declaration.cmd === "string" && declaration.cmd || "";
+    if (!command)
+      return [];
+    const envRecord = recordValue(declaration.env) ?? recordValue(declaration.envs) ?? {};
+    const env = Object.entries(envRecord).flatMap(([envName, value]) => typeof value === "string" ? [{ name: envName, value }] : []);
+    return [
+      {
+        name,
+        command,
+        args: stringArray2(declaration.args),
+        ...env.length ? { env } : {}
+      }
+    ];
+  });
+}
+function mergeTomlHostRoutes(existing, routes) {
+  if (Object.keys(routes).length === 0)
+    return existing;
+  const added = stringify({ mcp_servers: routes });
+  const chunk = added.endsWith("\n") ? added : `${added}
+`;
+  if (!existing?.trim())
+    return chunk;
+  const body = existing.endsWith("\n") ? existing : `${existing}
+`;
+  return `${body}
+${chunk}`;
+}
+function mergeJsonHostRoutes(existing, routes) {
+  if (Object.keys(routes).length === 0)
+    return existing;
+  return { ...existing ?? {}, ...routes };
+}
+function mergeGooseHostRoutes(existing, routes) {
+  if (Object.keys(routes).length === 0)
+    return existing;
+  let parsed = {};
+  if (existing?.trim()) {
+    try {
+      parsed = (0, import_yaml.parse)(existing);
+    } catch {
+      parsed = {};
+    }
+  }
+  const document = recordValue(parsed) ?? {};
+  const extensions = { ...recordValue(document.extensions), ...routes };
+  return (0, import_yaml.stringify)({ ...document, extensions });
+}
+
 // apps/body/dist/openrouter-routing.js
 import { mkdir as mkdir5, readFile as readFile5, writeFile as writeFile6 } from "node:fs/promises";
-import { resolve as resolve13 } from "node:path";
+import { resolve as resolve15 } from "node:path";
 var OPENROUTER_ENDPOINTS_BASE_URL = "https://openrouter.ai/api/v1/models";
 var OPENROUTER_COMPLETIONS_URL = "https://openrouter.ai/api/v1/chat/completions";
 var OPENROUTER_ROUTING_CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
@@ -28855,10 +29519,10 @@ function openRouterRoutingFor(providers, allowFallbacks = true) {
   };
 }
 function openRouterRoutingCacheDir(runtimeDir) {
-  return resolve13(runtimeDir, "openrouter-routing");
+  return resolve15(runtimeDir, "openrouter-routing");
 }
 function cachePath(cacheDir, model) {
-  return resolve13(cacheDir, `${model.replace(/[^A-Za-z0-9._-]+/g, "_")}.json`);
+  return resolve15(cacheDir, `${model.replace(/[^A-Za-z0-9._-]+/g, "_")}.json`);
 }
 async function readCache(cacheDir, model) {
   try {
@@ -28889,7 +29553,7 @@ async function writeCache(cacheDir, value) {
   });
 }
 function probeCachePath(cacheDir, model) {
-  return resolve13(cacheDir, `${model.replace(/[^A-Za-z0-9._-]+/g, "_")}.probe.json`);
+  return resolve15(cacheDir, `${model.replace(/[^A-Za-z0-9._-]+/g, "_")}.probe.json`);
 }
 async function readProbeCache(cacheDir, model) {
   try {
@@ -29369,6 +30033,10 @@ var PI_CUSTOM_MODEL_CONFIG = {
   source: ".pi/agent/models.json",
   target: "models.json"
 };
+var PI_MCP_CONFIG = {
+  source: ".pi/agent/mcp.json",
+  target: "mcp.json"
+};
 var CODEX_ROOM_AGENT_LOCKDOWN_TOML = "[agents]\nenabled = false\n";
 var CODEX_ROOM_WEB_SEARCH_TOML = "[features]\nstandalone_web_search = true\n";
 var HOME_SUBDIRS = [
@@ -29384,8 +30052,8 @@ var HOME_SUBDIRS = [
   "tmp"
 ];
 async function prepareRoomAgentHome(input) {
-  const root = resolve14(input.root);
-  const operatorHome = input.operatorHome ?? homedir6();
+  const root = resolve16(input.root);
+  const operatorHome = input.operatorHome ?? homedir8();
   try {
     await mkdir6(root, { recursive: true, mode: 448 });
     const rootStats = await lstat2(root);
@@ -29393,7 +30061,7 @@ async function prepareRoomAgentHome(input) {
       throw new AgentHomeSecurityError(`agent home root is not an ordinary directory: ${root}`);
     }
     for (const subdir of HOME_SUBDIRS) {
-      const path = resolve14(root, subdir);
+      const path = resolve16(root, subdir);
       await mkdir6(path, { recursive: true, mode: 448 });
       await assertRealContainedDirectory(path, root);
     }
@@ -29404,15 +30072,15 @@ async function prepareRoomAgentHome(input) {
     return {};
   }
   for (const credential of SHARED_CREDENTIALS) {
-    const source = resolve14(operatorHome, credential.source);
-    const target = resolve14(root, credential.dir, credential.target);
-    if (!existsSync4(source) || existsSync4(target))
+    const source = resolve16(operatorHome, credential.source);
+    const target = resolve16(root, credential.dir, credential.target);
+    if (!existsSync5(source) || existsSync5(target))
       continue;
-    await mkdir6(dirname9(target), { recursive: true, mode: 448 }).catch(() => void 0);
+    await mkdir6(dirname10(target), { recursive: true, mode: 448 }).catch(() => void 0);
     await symlink(source, target).catch(() => void 0);
   }
   const prior = agentHomeProvisionQueues.get(root) ?? Promise.resolve();
-  const provision = prior.catch(() => void 0).then(() => provisionAgentSkillsAndMcp(root, operatorHome, input.skillReleaseId ?? runningBeelineReleaseId(), input.failClosed ?? false, input.sharedSkills ?? [], agentSkillDir(input.agentKind), input.openRouterRouting, input.isReviewer ?? false));
+  const provision = prior.catch(() => void 0).then(() => provisionAgentSkillsAndMcp(root, operatorHome, input.skillReleaseId ?? runningBeelineReleaseId(), input.failClosed ?? false, input.sharedSkills ?? [], agentSkillDir(input.agentKind), input.openRouterRouting, input.isReviewer ?? false, input.grantedHostRoutes ?? [], input.agentKind));
   agentHomeProvisionQueues.set(root, provision);
   try {
     await provision;
@@ -29422,19 +30090,19 @@ async function prepareRoomAgentHome(input) {
   }
   return roomAgentHomeEnv(root);
 }
-async function provisionAgentSkillsAndMcp(root, operatorHome, skillReleaseId, failClosed, sharedSkills, skillDir, openRouterRouting, isReviewer) {
+async function provisionAgentSkillsAndMcp(root, operatorHome, skillReleaseId, failClosed, sharedSkills, skillDir, openRouterRouting, isReviewer, grantedHostRoutes, agentKind) {
   const managedSkills = [
     { name: USING_BEELINE_SKILL_NAME, content: usingBeelineSkillMarkdown(skillReleaseId) },
     { name: BEELINE_TRIAGE_SKILL_NAME, content: beelineTriageSkillMarkdown(skillReleaseId) },
     ...isReviewer ? [{ name: BEELINE_REVIEW_SKILL_NAME, content: beelineReviewSkillMarkdown(skillReleaseId) }] : []
   ];
   const shared = await resolveSharedSkillSources(operatorHome, sharedSkills);
-  await provisionManagedSkillsDir(resolve14(root, skillDir, "skills"), managedSkills, shared, sharedSkills.length === 0);
+  await provisionManagedSkillsDir(resolve16(root, skillDir, "skills"), managedSkills, shared, sharedSkills.length === 0);
   for (const config of HARNESS_MCP_CONFIGS) {
     try {
-      const source = resolve14(operatorHome, config.toml);
-      const target = resolve14(root, config.dir, "config.toml");
-      const mcpSection = existsSync4(source) ? filteredHarnessMcpToml(readFileSync7(source, "utf8")) : void 0;
+      const source = resolve16(operatorHome, config.toml);
+      const target = resolve16(root, config.dir, "config.toml");
+      const mcpSection = existsSync5(source) ? localHarnessMcpToml(readFileSync7(source, "utf8")) : void 0;
       const section = config.dir === "codex" ? [CODEX_ROOM_AGENT_LOCKDOWN_TOML, CODEX_ROOM_WEB_SEARCH_TOML, mcpSection].filter(Boolean).join("\n") : mcpSection;
       if (!section) {
         await unlink3(target).catch(() => void 0);
@@ -29448,13 +30116,14 @@ async function provisionAgentSkillsAndMcp(root, operatorHome, skillReleaseId, fa
     }
   }
   try {
-    const gooseConfigDir = resolve14(root, "goose", "config");
+    const gooseConfigDir = resolve16(root, "goose", "config");
     await mkdir6(gooseConfigDir, { recursive: true, mode: 448 });
     for (const name of GOOSE_SHARED_CONFIG_FILES) {
-      const source = resolve14(operatorHome, ".config", "goose", name);
-      const target = resolve14(gooseConfigDir, name);
-      if (existsSync4(source)) {
-        await writeIsolatedHarnessFile(target, readFileSync7(source, "utf8"));
+      const source = resolve16(operatorHome, ".config", "goose", name);
+      const target = resolve16(gooseConfigDir, name);
+      if (existsSync5(source)) {
+        const body = readFileSync7(source, "utf8");
+        await writeIsolatedHarnessFile(target, name === "config.yaml" ? localGooseConfig(body) : body);
       } else {
         await unlink3(target).catch(() => void 0);
       }
@@ -29465,9 +30134,9 @@ async function provisionAgentSkillsAndMcp(root, operatorHome, skillReleaseId, fa
     console.warn("[body] operator Goose configuration passthrough failed:", error);
   }
   try {
-    const claudeJson = resolve14(operatorHome, ".claude.json");
-    const claudeTarget = resolve14(root, "claude", ".claude.json");
-    const mcpServers = existsSync4(claudeJson) ? readClaudeUserScopeMcpServers(claudeJson) : void 0;
+    const claudeJson = resolve16(operatorHome, ".claude.json");
+    const claudeTarget = resolve16(root, "claude", ".claude.json");
+    const mcpServers = existsSync5(claudeJson) ? readClaudeUserScopeMcpServers(claudeJson) : void 0;
     if (mcpServers && Object.keys(mcpServers).length > 0) {
       await writeIsolatedHarnessFile(claudeTarget, `${JSON.stringify({ mcpServers }, null, 2)}
 `);
@@ -29479,20 +30148,100 @@ async function provisionAgentSkillsAndMcp(root, operatorHome, skillReleaseId, fa
       throw error;
     console.warn("[body] operator MCP passthrough failed for claude:", error);
   }
+  try {
+    const piJson = resolve16(operatorHome, PI_MCP_CONFIG.source);
+    const piTarget = resolve16(root, "pi", PI_MCP_CONFIG.target);
+    const mcpServers = existsSync5(piJson) ? localMcpServers(recordValue2(readJsonObject(piJson)?.mcpServers) ?? {}) : void 0;
+    if (mcpServers && Object.keys(mcpServers).length > 0) {
+      await writeIsolatedHarnessFile(piTarget, `${JSON.stringify({ mcpServers }, null, 2)}
+`);
+    } else {
+      await unlink3(piTarget).catch(() => void 0);
+    }
+  } catch (error) {
+    if (failClosed)
+      throw error;
+    console.warn("[body] operator MCP passthrough failed for pi:", error);
+  }
   try {
     const settings2 = { permissions: { allow: ["WebSearch", "WebFetch"] } };
-    await writeIsolatedHarnessFile(resolve14(root, "claude", "settings.json"), `${JSON.stringify(settings2, null, 2)}
+    await writeIsolatedHarnessFile(resolve16(root, "claude", "settings.json"), `${JSON.stringify(settings2, null, 2)}
 `);
   } catch (error) {
     if (failClosed)
       throw error;
     console.warn("[body] claude web-search settings provisioning failed:", error);
   }
+  await applyGrantedHostRoutes(root, operatorHome, grantedHostRoutes, agentKind, failClosed);
   await provisionPiCustomModelConfig(root, operatorHome, failClosed, openRouterRouting);
 }
+function appliesToHarness(selected, harness) {
+  return !selected || selected === harness;
+}
+async function applyGrantedHostRoutes(root, operatorHome, granted, agentKind, failClosed) {
+  if (granted.length === 0)
+    return;
+  try {
+    if (grantedSquireHostRoute(granted, hostImportedMcpDeclarations({ operatorHome, agentKind })))
+      ensureSquireHostDir(operatorHome);
+    const routesFor = (kind) => rewriteGrantedHostRoutes(hostImportedMcpDeclarations({ operatorHome, agentKind: kind }), granted, operatorHome);
+    for (const config of HARNESS_MCP_CONFIGS) {
+      if (!appliesToHarness(agentKind, config.dir))
+        continue;
+      const routes = routesFor(config.dir);
+      if (Object.keys(routes).length === 0)
+        continue;
+      const target = resolve16(root, config.dir, "config.toml");
+      const existing = existsSync5(target) ? readFileSync7(target, "utf8") : void 0;
+      const merged = mergeTomlHostRoutes(existing, routes);
+      if (merged)
+        await writeIsolatedHarnessFile(target, merged);
+    }
+    if (appliesToHarness(agentKind, "goose")) {
+      const routes = routesFor("goose");
+      if (Object.keys(routes).length > 0) {
+        const gooseConfigDir = resolve16(root, "goose", "config");
+        await mkdir6(gooseConfigDir, { recursive: true, mode: 448 });
+        const target = resolve16(gooseConfigDir, "config.yaml");
+        const existing = existsSync5(target) ? readFileSync7(target, "utf8") : void 0;
+        const merged = mergeGooseHostRoutes(existing, routes);
+        if (merged)
+          await writeIsolatedHarnessFile(target, merged);
+      }
+    }
+    if (appliesToHarness(agentKind, "claude")) {
+      const routes = routesFor("claude");
+      if (Object.keys(routes).length > 0) {
+        const target = resolve16(root, "claude", ".claude.json");
+        const parsed = existsSync5(target) ? readJsonObject(target) : void 0;
+        const merged = mergeJsonHostRoutes(recordValue2(parsed?.mcpServers), routes);
+        if (merged && Object.keys(merged).length > 0) {
+          await writeIsolatedHarnessFile(target, `${JSON.stringify({ mcpServers: merged }, null, 2)}
+`);
+        }
+      }
+    }
+    if (appliesToHarness(agentKind, "pi")) {
+      const routes = routesFor("pi");
+      if (Object.keys(routes).length > 0) {
+        const target = resolve16(root, "pi", PI_MCP_CONFIG.target);
+        const parsed = existsSync5(target) ? readJsonObject(target) : void 0;
+        const merged = mergeJsonHostRoutes(recordValue2(parsed?.mcpServers), routes);
+        if (merged && Object.keys(merged).length > 0) {
+          await writeIsolatedHarnessFile(target, `${JSON.stringify({ mcpServers: merged }, null, 2)}
+`);
+        }
+      }
+    }
+  } catch (error) {
+    if (failClosed)
+      throw error;
+    console.warn("[body] granted host MCP route passthrough failed:", error);
+  }
+}
 async function provisionPiCustomModelConfig(root, operatorHome, failClosed, openRouterRouting) {
-  const source = resolve14(operatorHome, PI_CUSTOM_MODEL_CONFIG.source);
-  const target = resolve14(root, "pi", PI_CUSTOM_MODEL_CONFIG.target);
+  const source = resolve16(operatorHome, PI_CUSTOM_MODEL_CONFIG.source);
+  const target = resolve16(root, "pi", PI_CUSTOM_MODEL_CONFIG.target);
   let decision2;
   if (openRouterRouting) {
     decision2 = await resolveOpenRouterRouting(openRouterRouting);
@@ -29538,110 +30287,204 @@ async function provisionPiCustomModelConfig(root, operatorHome, failClosed, open
 function readClaudeUserScopeMcpServers(path) {
   try {
     const parsed = JSON.parse(readFileSync7(path, "utf8"));
-    if (parsed && typeof parsed.mcpServers === "object" && parsed.mcpServers !== null) {
-      return Object.fromEntries(Object.entries(parsed.mcpServers).filter(([name, value]) => {
-        if (name === "squire")
-          return false;
-        const server = value;
-        if (!server || typeof server.command !== "string")
-          return true;
-        const args = Array.isArray(server.args) && server.args.every((arg) => typeof arg === "string") ? server.args : [];
-        return !isTrustySquireMcpLaunch(server.command, args);
-      }));
-    }
+    const servers = recordValue2(parsed.mcpServers);
+    if (servers)
+      return localMcpServers(servers);
   } catch {
   }
   return void 0;
 }
-function filteredHarnessMcpToml(source) {
-  const excluded = tomlChildTableNames(source, ["mcp_servers"]).filter((name) => {
-    const section = extractTomlSections(source, ["mcp_servers", name]);
-    return name === "squire" || Boolean(section && isTrustySquireMcpLaunch(section));
-  });
-  return extractTomlSections(source, ["mcp_servers"], excluded);
+function localHarnessMcpToml(source) {
+  let servers;
+  try {
+    servers = recordValue2(parse5(source).mcp_servers);
+  } catch {
+    return void 0;
+  }
+  if (!servers)
+    return void 0;
+  const hostNames = hostMcpServerNames(servers);
+  const childTables = tomlChildTableNames(source, ["mcp_servers"]);
+  if (hostNames.every((name) => childTables.includes(name))) {
+    return extractTomlSections(source, ["mcp_servers"], hostNames);
+  }
+  const bareLocal = Object.fromEntries(Object.entries(servers).filter(([name]) => !childTables.includes(name) && !hostNames.includes(name)));
+  const sections = [
+    Object.keys(bareLocal).length > 0 ? stringify({ mcp_servers: bareLocal }) : void 0,
+    ...childTables.filter((name) => !hostNames.includes(name)).map((name) => extractTomlSections(source, ["mcp_servers", name]))
+  ].filter((section) => section !== void 0).map((section) => section.endsWith("\n") ? section : `${section}
+`);
+  return sections.length > 0 ? sections.join("\n") : void 0;
+}
+function localGooseConfig(source) {
+  let parsed;
+  try {
+    parsed = (0, import_yaml2.parse)(source);
+  } catch {
+    return source;
+  }
+  const document = recordValue2(parsed);
+  const extensions = recordValue2(document?.extensions);
+  if (!document || !extensions)
+    return source;
+  const local = localMcpServers(extensions);
+  if (Object.keys(local).length === Object.keys(extensions).length)
+    return source;
+  return (0, import_yaml2.stringify)({ ...document, extensions: local });
+}
+function isHostMcpDeclaration(name, value) {
+  return classifyImportedMcpServer({ name, declaration: recordValue2(value) ?? {} }) === "host";
+}
+function hostMcpServerNames(servers) {
+  return Object.entries(servers).filter(([name, value]) => isHostMcpDeclaration(name, value)).map(([name]) => name);
+}
+function localMcpServers(servers) {
+  return Object.fromEntries(Object.entries(servers).filter(([name, value]) => !isHostMcpDeclaration(name, value)));
+}
+function recordValue2(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
 function mountedImportedMcpServerNames(input = {}) {
   const names = /* @__PURE__ */ new Set();
   if (input.preparedEnv) {
     const env = input.preparedEnv;
-    const home = env.HOME ?? input.operatorHome ?? homedir6();
+    const home = env.HOME ?? input.operatorHome ?? homedir8();
     const kind = input.agentKind;
     if (!kind || kind === "codex") {
-      addTomlMcpNames(names, resolve14(env.CODEX_HOME ?? resolve14(home, ".codex"), "config.toml"), "all");
+      addTomlMcpNames(names, resolve16(env.CODEX_HOME ?? resolve16(home, ".codex"), "config.toml"));
     }
     if (!kind || kind === "grok") {
-      addTomlMcpNames(names, resolve14(env.GROK_HOME ?? resolve14(home, ".grok"), "config.toml"), "all");
+      addTomlMcpNames(names, resolve16(env.GROK_HOME ?? resolve16(home, ".grok"), "config.toml"));
     }
     if (!kind || kind === "claude") {
-      addClaudeMcpNames(names, resolve14(env.CLAUDE_CONFIG_DIR ?? home, ".claude.json"), "all");
+      addClaudeMcpNames(names, resolve16(env.CLAUDE_CONFIG_DIR ?? home, ".claude.json"));
     }
     if (!kind || kind === "goose") {
-      addGooseExtensionNames(names, env.GOOSE_PATH_ROOT ? resolve14(env.GOOSE_PATH_ROOT, "config/config.yaml") : resolve14(home, ".config/goose/config.yaml"));
+      addGooseExtensionNames(names, env.GOOSE_PATH_ROOT ? resolve16(env.GOOSE_PATH_ROOT, "config/config.yaml") : resolve16(home, ".config/goose/config.yaml"));
+    }
+    if (!kind || kind === "pi") {
+      addClaudeMcpNames(names, resolve16(env.PI_CODING_AGENT_DIR ?? resolve16(home, ".pi/agent"), PI_MCP_CONFIG.target));
     }
   } else {
-    collectImportedMcpNames(input.operatorHome ?? homedir6(), names, input.agentKind);
+    collectImportedMcpNames(input.operatorHome ?? homedir8(), names, input.agentKind);
   }
   return [...names].sort((left, right) => left.localeCompare(right));
 }
+function hostImportedMcpDeclarations(input = {}) {
+  const operatorHome = input.operatorHome ?? homedir8();
+  const kind = input.agentKind;
+  const declarations = {};
+  const add = (servers) => {
+    if (!servers)
+      return;
+    for (const [name, value] of Object.entries(servers)) {
+      if (isHostMcpDeclaration(name, value))
+        declarations[name] = recordValue2(value) ?? {};
+    }
+  };
+  if (!kind || kind === "codex")
+    add(readTomlMcpServers(resolve16(operatorHome, ".codex/config.toml")));
+  if (!kind || kind === "grok")
+    add(readTomlMcpServers(resolve16(operatorHome, ".grok/config.toml")));
+  if (!kind || kind === "claude") {
+    add(recordValue2(readJsonObject(resolve16(operatorHome, ".claude.json"))?.mcpServers));
+  }
+  if (!kind || kind === "goose") {
+    add(readGooseExtensions(resolve16(operatorHome, ".config/goose/config.yaml")));
+  }
+  if (!kind || kind === "pi") {
+    add(recordValue2(readJsonObject(resolve16(operatorHome, PI_MCP_CONFIG.source))?.mcpServers));
+  }
+  return declarations;
+}
+function hostImportedMcpServerNames(input = {}) {
+  return Object.keys(hostImportedMcpDeclarations(input)).sort((left, right) => left.localeCompare(right));
+}
+function grantedSquireHostBindPaths(input) {
+  const operatorHome = input.operatorHome ?? homedir8();
+  const granted = input.grantedHostRoutes ?? [];
+  if (granted.length === 0)
+    return [];
+  return squireHostBindPaths(operatorHome, grantedSquireHostRoute(granted, hostImportedMcpDeclarations({ operatorHome, agentKind: input.agentKind })));
+}
+function expectedMountedImportedMcpServerNames(input) {
+  const local = mountedImportedMcpServerNames({
+    operatorHome: input.operatorHome,
+    agentKind: input.agentKind
+  });
+  const allowed = new Set(input.grantedHostRoutes ?? []);
+  const grantedHost = hostImportedMcpServerNames({
+    operatorHome: input.operatorHome,
+    agentKind: input.agentKind
+  }).filter((name) => allowed.has(name));
+  for (const name of allowed) {
+    if (isCodeOwnedHostMcpName(name))
+      grantedHost.push(name);
+  }
+  return [.../* @__PURE__ */ new Set([...local, ...grantedHost])].sort((left, right) => left.localeCompare(right));
+}
 function collectImportedMcpNames(operatorHome, names, kind) {
   if (!kind || kind === "codex") {
-    addTomlMcpNames(names, resolve14(operatorHome, ".codex/config.toml"), "imported");
+    addLocalMcpNames(names, readTomlMcpServers(resolve16(operatorHome, ".codex/config.toml")));
   }
   if (!kind || kind === "grok") {
-    addTomlMcpNames(names, resolve14(operatorHome, ".grok/config.toml"), "imported");
+    addLocalMcpNames(names, readTomlMcpServers(resolve16(operatorHome, ".grok/config.toml")));
   }
   if (!kind || kind === "claude") {
-    addClaudeMcpNames(names, resolve14(operatorHome, ".claude.json"), "imported");
+    addLocalMcpNames(names, recordValue2(readJsonObject(resolve16(operatorHome, ".claude.json"))?.mcpServers));
   }
   if (!kind || kind === "goose") {
-    addGooseExtensionNames(names, resolve14(operatorHome, ".config/goose/config.yaml"));
+    addLocalMcpNames(names, readGooseExtensions(resolve16(operatorHome, ".config/goose/config.yaml")));
   }
+  if (!kind || kind === "pi") {
+    addLocalMcpNames(names, recordValue2(readJsonObject(resolve16(operatorHome, PI_MCP_CONFIG.source))?.mcpServers));
+  }
+}
+function addLocalMcpNames(names, servers) {
+  if (!servers)
+    return;
+  for (const name of Object.keys(localMcpServers(servers)))
+    names.add(name);
+}
+function addTomlMcpNames(names, path) {
+  addMcpNamesFromMap(names, readTomlMcpServers(path));
 }
-function addTomlMcpNames(names, path, mode) {
+function addClaudeMcpNames(names, path) {
+  addMcpNamesFromMap(names, recordValue2(readJsonObject(path)?.mcpServers));
+}
+function readTomlMcpServers(path) {
   const source = readExistingText(path);
   if (source === void 0)
-    return;
-  const mountedSource = mode === "imported" ? filteredHarnessMcpToml(source) : source;
-  if (!mountedSource)
-    return;
-  let servers;
+    return void 0;
   try {
-    servers = parse5(mountedSource).mcp_servers;
+    return recordValue2(parse5(source).mcp_servers);
   } catch {
-    return;
+    return void 0;
   }
-  if (!servers || typeof servers !== "object" || Array.isArray(servers))
-    return;
-  for (const name of Object.keys(servers))
-    names.add(name);
 }
-function addClaudeMcpNames(names, path, mode) {
-  const servers = mode === "imported" ? readClaudeUserScopeMcpServers(path) : readJsonObject(path)?.mcpServers;
-  if (!servers || typeof servers !== "object" || Array.isArray(servers))
-    return;
-  for (const name of Object.keys(servers))
-    names.add(name);
-}
-function addGooseExtensionNames(names, path) {
+function readGooseExtensions(path) {
   const source = readExistingText(path);
   if (source === void 0)
-    return;
+    return void 0;
   let parsed;
   try {
-    parsed = (0, import_yaml.parse)(source);
+    parsed = (0, import_yaml2.parse)(source);
   } catch {
-    return;
+    return void 0;
   }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
-    return;
-  const extensions = parsed.extensions;
-  if (!extensions || typeof extensions !== "object" || Array.isArray(extensions))
+  return recordValue2(recordValue2(parsed)?.extensions);
+}
+function addMcpNamesFromMap(names, servers) {
+  if (!servers)
     return;
-  for (const name of Object.keys(extensions))
+  for (const name of Object.keys(servers))
     names.add(name);
 }
+function addGooseExtensionNames(names, path) {
+  addMcpNamesFromMap(names, readGooseExtensions(path));
+}
 function readExistingText(path) {
-  if (!existsSync4(path))
+  if (!existsSync5(path))
     return void 0;
   try {
     return readFileSync7(path, "utf8");
@@ -29661,21 +30504,21 @@ function readJsonObject(path) {
   }
 }
 async function provisionManagedSkillsDir(target, managedSkills, sharedSkills, optionalShares) {
-  const parent = dirname9(target);
-  await assertRealContainedDirectory(parent, dirname9(parent));
+  const parent = dirname10(target);
+  await assertRealContainedDirectory(parent, dirname10(parent));
   const plan = await planManagedSkills(managedSkills, sharedSkills, optionalShares);
   if (await materializedSkillManifest(target) === plan.manifest)
     return;
-  const staged = resolve14(parent, `.skills.${process.pid}.${randomUUID4()}.tmp`);
+  const staged = resolve16(parent, `.skills.${process.pid}.${randomUUID4()}.tmp`);
   await mkdir6(staged, { mode: 448 });
   try {
     for (const entry of plan.entries) {
       if (entry.kind === "managed") {
-        const skillDir = resolve14(staged, entry.name);
+        const skillDir = resolve16(staged, entry.name);
         await mkdir6(skillDir, { recursive: true });
-        await writeIsolatedHarnessFile(resolve14(skillDir, "SKILL.md"), entry.content);
+        await writeIsolatedHarnessFile(resolve16(skillDir, "SKILL.md"), entry.content);
       } else {
-        await copySafeSkillTree(entry.source, resolve14(staged, entry.name), entry.source);
+        await copySafeSkillTree(entry.source, resolve16(staged, entry.name), entry.source);
       }
     }
     const existing = await lstat2(target).catch(() => void 0);
@@ -29702,8 +30545,8 @@ async function planManagedSkills(managedSkills, sharedSkills, optionalShares) {
     try {
       const tree = [];
       await walkSafeSkillTree(shared.source, shared.source, {
-        directory: async (rel) => void tree.push(`d ${join6(shared.name, rel)}`),
-        file: async (rel, realPath) => void tree.push(`f ${join6(shared.name, rel)} ${sha2563(await readFile6(realPath))}`)
+        directory: async (rel) => void tree.push(`d ${join8(shared.name, rel)}`),
+        file: async (rel, realPath) => void tree.push(`f ${join8(shared.name, rel)} ${sha2563(await readFile6(realPath))}`)
       });
       entries.push({ kind: "shared", name: shared.name, source: shared.source });
       lines.push(...tree);
@@ -29722,8 +30565,8 @@ async function materializedSkillManifest(target) {
   const lines = [];
   const visit = async (directory, prefix) => {
     for (const entry of await readdir2(directory)) {
-      const path = resolve14(directory, entry);
-      const rel = prefix ? join6(prefix, entry) : entry;
+      const path = resolve16(directory, entry);
+      const rel = prefix ? join8(prefix, entry) : entry;
       const entryStats = await lstat2(path);
       if (entryStats.isSymbolicLink())
         return false;
@@ -29757,14 +30600,14 @@ async function resolveSharedSkillSources(operatorHome, names) {
   const resolved = [];
   const skipped = [];
   for (const relativeRoot of OPERATOR_SKILL_SOURCE_DIRS) {
-    const sourceRoot = resolve14(operatorHome, relativeRoot);
+    const sourceRoot = resolve16(operatorHome, relativeRoot);
     const rootStats = await lstat2(sourceRoot).catch(() => void 0);
     if (!rootStats?.isDirectory() || rootStats.isSymbolicLink())
       continue;
     for (const entry of await readdir2(sourceRoot)) {
       if (!isSharedSkillName(entry) || seen.has(entry))
         continue;
-      const candidate = resolve14(sourceRoot, entry);
+      const candidate = resolve16(sourceRoot, entry);
       try {
         const candidateStats = await lstat2(candidate);
         if (candidateStats.isSymbolicLink()) {
@@ -29780,7 +30623,7 @@ async function resolveSharedSkillSources(operatorHome, names) {
           continue;
         }
         assertContained(sourceRoot, candidate);
-        const skillMd = resolve14(candidate, "SKILL.md");
+        const skillMd = resolve16(candidate, "SKILL.md");
         const skillStats = await lstat2(skillMd).catch((error) => {
           if (isMissingPathError(error)) {
             skipped.push({ path: candidate, reason: "missing SKILL.md" });
@@ -29832,8 +30675,8 @@ async function resolveExplicitSkillSources(operatorHome, names) {
   for (const name of unique) {
     const matches = [];
     for (const relativeRoot of OPERATOR_SKILL_SOURCE_DIRS) {
-      const sourceRoot = resolve14(operatorHome, relativeRoot);
-      const candidate = resolve14(sourceRoot, name);
+      const sourceRoot = resolve16(operatorHome, relativeRoot);
+      const candidate = resolve16(sourceRoot, name);
       const rootStats = await lstat2(sourceRoot).catch(() => void 0);
       const candidateStats = await lstat2(candidate).catch(() => void 0);
       if (!candidateStats)
@@ -29850,7 +30693,7 @@ async function resolveExplicitSkillSources(operatorHome, names) {
     if (matches.length !== 1) {
       throw new Error(matches.length === 0 ? `shared skill is unavailable: ${name}` : `shared skill source is ambiguous: ${name}`);
     }
-    const skillMd = resolve14(matches[0], "SKILL.md");
+    const skillMd = resolve16(matches[0], "SKILL.md");
     const skillStats = await lstat2(skillMd).catch(() => void 0);
     if (!skillStats?.isFile() || skillStats.isSymbolicLink() || skillStats.nlink !== 1) {
       throw new Error(`shared skill requires an ordinary SKILL.md: ${name}`);
@@ -29861,7 +30704,7 @@ async function resolveExplicitSkillSources(operatorHome, names) {
 }
 function assertContained(root, candidate) {
   const rel = relative2(root, candidate);
-  if (rel === ".." || rel.startsWith(`..${sep}`) || resolve14(root, rel) !== resolve14(candidate)) {
+  if (rel === ".." || rel.startsWith(`..${sep}`) || resolve16(root, rel) !== resolve16(candidate)) {
     throw new Error(`path escapes the agent skill boundary: ${candidate}`);
   }
 }
@@ -29876,7 +30719,7 @@ var BLOCKED_SHARED_FILENAMES = /^(?:\.env(?:\..*)?|auth\.json|\.credentials\.jso
 async function walkSafeSkillTree(source, sourceRoot, visitor, rel = "") {
   assertContained(sourceRoot, source);
   const resolvedSource = await realpath(source);
-  if (resolvedSource !== resolve14(source)) {
+  if (resolvedSource !== resolve16(source)) {
     throw new Error(`shared skill path resolves through a link: ${source}`);
   }
   assertContained(sourceRoot, resolvedSource);
@@ -29891,7 +30734,7 @@ async function walkSafeSkillTree(source, sourceRoot, visitor, rel = "") {
     for (const entry of await readdir2(resolvedSource)) {
       if (entry === "." || entry === "..")
         throw new Error("invalid shared skill entry");
-      await walkSafeSkillTree(resolve14(source, entry), sourceRoot, visitor, rel ? join6(rel, entry) : entry);
+      await walkSafeSkillTree(resolve16(source, entry), sourceRoot, visitor, rel ? join8(rel, entry) : entry);
     }
     return;
   }
@@ -29903,22 +30746,22 @@ async function walkSafeSkillTree(source, sourceRoot, visitor, rel = "") {
 async function copySafeSkillTree(source, target, sourceRoot) {
   await walkSafeSkillTree(source, sourceRoot, {
     directory: async (rel) => {
-      await mkdir6(resolve14(target, rel), { mode: 448 });
+      await mkdir6(resolve16(target, rel), { mode: 448 });
     },
     file: async (rel, realPath) => {
-      const destination = resolve14(target, rel);
+      const destination = resolve16(target, rel);
       await copyFile(realPath, destination);
       await chmod3(destination, 384);
     }
   });
 }
 async function writeIsolatedHarnessFile(path, content) {
-  const parent = dirname9(path);
+  const parent = dirname10(path);
   const parentStats = await lstat2(parent);
   if (!parentStats.isDirectory() || parentStats.isSymbolicLink()) {
     throw new Error(`isolated harness parent is not a real directory: ${parent}`);
   }
-  const temporary = resolve14(parent, `.${basename5(path)}.${process.pid}.${randomUUID4()}.tmp`);
+  const temporary = resolve16(parent, `.${basename5(path)}.${process.pid}.${randomUUID4()}.tmp`);
   try {
     await writeFile7(temporary, content, { mode: 384, flag: "wx" });
     await chmod3(temporary, 384);
@@ -29928,18 +30771,18 @@ async function writeIsolatedHarnessFile(path, content) {
   }
 }
 function roomAgentHomeEnv(root) {
-  const resolved = resolve14(root);
+  const resolved = resolve16(root);
   return {
-    HOME: resolve14(resolved, "user"),
-    CLAUDE_CONFIG_DIR: resolve14(resolved, "claude"),
-    CODEX_HOME: resolve14(resolved, "codex"),
-    GOOSE_PATH_ROOT: resolve14(resolved, "goose"),
-    GROK_HOME: resolve14(resolved, "grok"),
-    CURSOR_HOME: resolve14(resolved, "cursor"),
-    PI_CODING_AGENT_DIR: resolve14(resolved, "pi"),
-    XDG_STATE_HOME: resolve14(resolved, "state"),
-    XDG_CACHE_HOME: resolve14(resolved, "cache"),
-    TMPDIR: resolve14(resolved, "tmp")
+    HOME: resolve16(resolved, "user"),
+    CLAUDE_CONFIG_DIR: resolve16(resolved, "claude"),
+    CODEX_HOME: resolve16(resolved, "codex"),
+    GOOSE_PATH_ROOT: resolve16(resolved, "goose"),
+    GROK_HOME: resolve16(resolved, "grok"),
+    CURSOR_HOME: resolve16(resolved, "cursor"),
+    PI_CODING_AGENT_DIR: resolve16(resolved, "pi"),
+    XDG_STATE_HOME: resolve16(resolved, "state"),
+    XDG_CACHE_HOME: resolve16(resolved, "cache"),
+    TMPDIR: resolve16(resolved, "tmp")
   };
 }
 var HARNESS_STATE_ENV_VARS = [
@@ -29958,15 +30801,15 @@ function harnessStateDirsFromEnv(env) {
   for (const name of HARNESS_STATE_ENV_VARS) {
     const value = env[name];
     if (value)
-      stateDirs.push(resolve14(value));
+      stateDirs.push(resolve16(value));
   }
   const tmp = env.TMPDIR;
-  return { stateDirs, ...tmp ? { tmpDir: resolve14(tmp) } : {} };
+  return { stateDirs, ...tmp ? { tmpDir: resolve16(tmp) } : {} };
 }
 
 // apps/body/dist/attachment-delivery.js
 import { mkdir as mkdir7, writeFile as writeFile8 } from "node:fs/promises";
-import { basename as basename6, extname, join as join7 } from "node:path";
+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`;
@@ -30026,7 +30869,7 @@ async function deliverAttachments(attachments, dir, fetchImpl = fetch) {
         return { attachment, reason: EXPIRED_REASON };
       if (!fetched.ok)
         throw new Error(`HTTP ${fetched.status}`);
-      const path = join7(dir, safeFileName(attachment, index, taken));
+      const path = join9(dir, safeFileName(attachment, index, taken));
       await writeFile8(path, fetched.bytes);
       const bytes = fetched.bytes;
       const mimeType = attachment.mimeType ?? fetched.mimeType;
@@ -30215,6 +31058,12 @@ function durableReplyText(agentText) {
 var AgentTurnStream = class {
   options;
   latest = "";
+  /**
+   * The assistant run currently accumulating — what `finalAgentMessageText`
+   * would return if the prompt ended here. The join above is the draft lane's
+   * material; this is the only part of the stream an ending may commit.
+   */
+  latestRun = "";
   /**
    * The newest snapshot not yet handed to a write. A draft is a picture of the
    * whole answer so far, so an older snapshot that never reached the wire is
@@ -30238,10 +31087,14 @@ var AgentTurnStream = class {
   /**
    * The ACP delta hook: hand it straight to `sessionPrompt`. `full` is every
    * assistant run so far joined — not the final answer — so it is only ever
-   * shown provisionally.
+   * shown provisionally. A caller that cannot name the current run leaves
+   * `lastRunText` empty rather than letting the join stand in for it: an
+   * unknown last run is not an answer, and an ending that reads one must
+   * settle through whatever else it has.
    */
-  onChunk = (_delta, full) => {
+  onChunk = (_delta, full, currentRun) => {
     this.latest = full;
+    this.latestRun = currentRun ?? "";
     const text2 = sanitizeAgentReply(full);
     if (!text2 || this.closed)
       return;
@@ -30278,9 +31131,19 @@ var AgentTurnStream = class {
   get streamedText() {
     return this.latest;
   }
+  /**
+   * The LAST assistant run alone — the same text `PromptResult.agentText`
+   * carries when the prompt returns, available to an ending the prompt never
+   * reached. An earlier run is progress narration around tool work and is not
+   * this turn's answer, however the turn ends.
+   */
+  get lastRunText() {
+    return this.latestRun;
+  }
   /** Forget the previous run's stream text; a re-pinned retry starts clean. */
   beginRun() {
     this.latest = "";
+    this.latestRun = "";
     this.pending = void 0;
   }
   /**
@@ -30427,7 +31290,7 @@ function mountedMcpSet(servers) {
 
 // apps/body/dist/pi-mcp-bridge.js
 import { mkdir as mkdir8 } from "node:fs/promises";
-import { resolve as resolve15 } from "node:path";
+import { resolve as resolve17 } from "node:path";
 var PI_MCP_BRIDGE_FILENAME = "beeline-mcp-bridge.js";
 function isPiAcpCommand(agentCommand) {
   return Boolean(agentCommand && /(^|[/\\])pi-acp(\.[a-z]+)?$/i.test(agentCommand));
@@ -30447,8 +31310,8 @@ async function installPiMcpBridge(input) {
     return void 0;
   if (!input.piHome || !input.servers.length)
     return void 0;
-  const directory = resolve15(input.piHome, "extensions");
-  const path = resolve15(directory, PI_MCP_BRIDGE_FILENAME);
+  const directory = resolve17(input.piHome, "extensions");
+  const path = resolve17(directory, PI_MCP_BRIDGE_FILENAME);
   try {
     await mkdir8(directory, { recursive: true, mode: 448 });
     await writeIsolatedHarnessFile(path, piMcpBridgeSource(input.servers));
@@ -30460,7 +31323,8 @@ async function installPiMcpBridge(input) {
 }
 var BRIDGE_PREAMBLE = `// Generated by Beeline for one Room session. Do not edit: it is rewritten on
 // every activation. It republishes this session's MCP servers as pi tools,
-// because pi has no MCP client of its own (apps/body/src/pi-mcp-bridge.ts).
+// because pi 0.85.1 has no MCP client of its own and pi-acp 0.0.33 still
+// drops session/new mcpServers (apps/body/src/pi-mcp-bridge.ts).
 import { spawn } from 'node:child_process';
 
 `;
@@ -30648,7 +31512,7 @@ async function contains(git, head, ancestor) {
 }
 
 // apps/body/dist/room-session.js
-import { resolve as resolve16 } from "node:path";
+import { resolve as resolve18 } from "node:path";
 
 // apps/body/dist/read-only-policy.js
 var READ_ONLY_MCP_SERVER_NAME = "beeline-readonly-mcp";
@@ -30794,22 +31658,14 @@ var AGENT_SURFACE_TOOL_NAMES = [
   "write_scratch_file",
   "fetch_image"
 ];
-var SQUIRE_TITLE_PREFIXES = [
-  "mcp__squire__",
-  "mcp.squire.",
-  "squire.",
-  "squire/",
-  // grok's qualified `<server>__<tool>` spelling, inside `use_tool` or as the
-  // relabelled title.
-  "squire__"
-];
-function isSquireMcpPermissionRequest(request) {
+function isHostMcpPermissionRequest(request, hostServers = CODE_OWNED_HOST_MCP_NAMES) {
   const rawInput = request.toolCall?.rawInput;
   if (rawInput && typeof rawInput === "object" && !Array.isArray(rawInput)) {
-    if (rawInput.server === "squire")
+    const server = rawInput.server;
+    if (typeof server === "string" && isHostMcpIdentity(server, hostServers))
       return true;
   }
-  return toolIdentityCandidates(request.toolCall).some((candidate) => SQUIRE_TITLE_PREFIXES.some((prefix) => candidate.toLowerCase().startsWith(prefix)));
+  return toolIdentityCandidates(request.toolCall).some((candidate) => isHostMcpIdentity(candidate, hostServers));
 }
 function isBeelineAgentMcpPermissionRequest(request) {
   const toolCall = request.toolCall;
@@ -31115,14 +31971,14 @@ function readOnlyMcpServer(config, cwd, agentMemoryDir) {
     command: config.readonlyMcpCommand,
     args: [...config.readonlyMcpArgs ?? []],
     env: [
-      { name: "BEELINE_READONLY_ROOT", value: resolve16(cwd) },
+      { name: "BEELINE_READONLY_ROOT", value: resolve18(cwd) },
       ...config.agentHomeRoot ? [
         {
           name: "BEELINE_READONLY_AGENT_SKILLS_ROOT",
-          value: resolve16(config.agentHomeRoot, skillDir, "skills")
+          value: resolve18(config.agentHomeRoot, skillDir, "skills")
         }
       ] : [],
-      ...agentMemoryDir ? [{ name: "BEELINE_READONLY_AGENT_MEMORY_ROOT", value: resolve16(agentMemoryDir) }] : []
+      ...agentMemoryDir ? [{ name: "BEELINE_READONLY_AGENT_MEMORY_ROOT", value: resolve18(agentMemoryDir) }] : []
     ]
   };
 }
@@ -31142,7 +31998,7 @@ function youtubeMcpServer(config, accessToken) {
 
 // apps/body/dist/pi-turn-record.js
 import { readdir as readdir3, readFile as readFile7 } from "node:fs/promises";
-import { resolve as resolve17 } from "node:path";
+import { resolve as resolve19 } from "node:path";
 function summarizeProviderError(errorMessage2) {
   const trimmed = errorMessage2.trim();
   const statusMatch = /^(\d{3}):\s*([\s\S]*)$/.exec(trimmed);
@@ -31163,7 +32019,7 @@ function summarizeProviderError(errorMessage2) {
 }
 async function sessionFileFromMap(home, sessionId) {
   try {
-    const raw = await readFile7(resolve17(home, ".pi", "pi-acp", "session-map.json"), "utf8");
+    const raw = await readFile7(resolve19(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;
@@ -31172,7 +32028,7 @@ async function sessionFileFromMap(home, sessionId) {
   }
 }
 async function sessionFileFromLayout(piDir, sessionId) {
-  const sessionsRoot = resolve17(piDir, "sessions");
+  const sessionsRoot = resolve19(piDir, "sessions");
   const suffix = `_${sessionId}.jsonl`;
   let projects;
   try {
@@ -31181,7 +32037,7 @@ async function sessionFileFromLayout(piDir, sessionId) {
     return void 0;
   }
   for (const project of projects) {
-    const dir = resolve17(sessionsRoot, project);
+    const dir = resolve19(sessionsRoot, project);
     let files;
     try {
       files = await readdir3(dir);
@@ -31190,7 +32046,7 @@ async function sessionFileFromLayout(piDir, sessionId) {
     }
     const match = files.find((file) => file.endsWith(suffix));
     if (match)
-      return resolve17(dir, match);
+      return resolve19(dir, match);
   }
   return void 0;
 }
@@ -31365,7 +32221,7 @@ 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 resolve18 } from "node:path";
+import { resolve as resolve20 } 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. */
@@ -31595,7 +32451,7 @@ function formatTurnTraceLine(record3) {
   return [head, ...record3.attempts.map((attempt) => formatTurnAttempt(attempt))].join("\n  ");
 }
 function turnTraceDirectory(runtimeDir) {
-  return resolve18(runtimeDir, "turn-traces");
+  return resolve20(runtimeDir, "turn-traces");
 }
 var TURN_TRACE_RETENTION_DAYS = 7;
 function traceFileName(date) {
@@ -31612,7 +32468,7 @@ var TurnTraceFile = class {
     this.options = options;
   }
   path(now2 = (this.options.clock ?? (() => /* @__PURE__ */ new Date()))()) {
-    return resolve18(this.directory, traceFileName(now2));
+    return resolve20(this.directory, traceFileName(now2));
   }
   write(record3) {
     this.tail = this.tail.catch(() => void 0).then(async () => {
@@ -31636,15 +32492,15 @@ 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(resolve18(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(resolve20(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 resolve19 } from "node:path";
+import { delimiter as delimiter2, resolve as resolve21 } from "node:path";
 async function installCornerGitHubWrappers(input) {
-  const bin = resolve19(input.root, "beeline-github-bin");
+  const bin = resolve21(input.root, "beeline-github-bin");
   await mkdir10(bin, { recursive: true, mode: 448 });
   const common = {
     node: process.execPath,
@@ -31654,13 +32510,13 @@ async function installCornerGitHubWrappers(input) {
     featureBranch: input.featureBranch,
     targetBranch: input.targetBranch
   };
-  await writeLauncher(resolve19(bin, "git"), {
+  await writeLauncher(resolve21(bin, "git"), {
     ...common,
     command: input.gitBinary,
     launcher: "git"
   });
   if (input.ghBinary)
-    await writeLauncher(resolve19(bin, "gh"), {
+    await writeLauncher(resolve21(bin, "gh"), {
       ...common,
       command: input.ghBinary,
       launcher: "gh"
@@ -31798,22 +32654,22 @@ process.exit(result.status ?? 1);
 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 dirname10, join as join8, resolve as resolve20 } from "node:path";
+import { dirname as dirname11, join as join10, resolve as resolve22 } 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 resolve20(supervisorRoot, "beeline", "npm-cache");
+  return resolve22(supervisorRoot, "beeline", "npm-cache");
 }
 function warmNodeModulesStoreDir(supervisorRoot) {
-  return resolve20(supervisorRoot, "beeline", "node-modules");
+  return resolve22(supervisorRoot, "beeline", "node-modules");
 }
 function isPlanRefusal(value) {
   return "failure" in value;
 }
 async function readWarmPlan(worktreePath) {
-  const lockfile = await readFile8(resolve20(worktreePath, "package-lock.json")).catch(() => void 0);
+  const lockfile = await readFile8(resolve22(worktreePath, "package-lock.json")).catch(() => void 0);
   if (!lockfile)
     return { failure: "no-lockfile" };
   const packages = parseLockfilePackages(lockfile);
@@ -31852,11 +32708,11 @@ async function seedWarmNodeModules(input) {
     return { reason: plan.failure, ...plan.detail ? { detail: plan.detail } : {} };
   }
   for (const tree of plan.trees) {
-    if (await pathExists(resolve20(input.worktreePath, tree))) {
+    if (await pathExists(resolve22(input.worktreePath, tree))) {
       return { reason: "present", key: plan.key };
     }
   }
-  const entry = resolve20(input.storeRoot, plan.key);
+  const entry = resolve22(input.storeRoot, plan.key);
   if (!await isDirectory(entry))
     return { reason: "cold", key: plan.key };
   const [storeDevice, checkoutDevice] = await Promise.all([
@@ -31866,19 +32722,19 @@ async function seedWarmNodeModules(input) {
   if (storeDevice === void 0 || storeDevice !== checkoutDevice) {
     return { reason: "cross-device", key: plan.key };
   }
-  const staging = resolve20(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
+  const staging = resolve22(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(resolve20(entry, tree), resolve20(staging, tree), seedFile);
+      await cloneTree(resolve22(entry, tree), resolve22(staging, tree), seedFile);
     }
     for (const tree of plan.trees) {
-      const target = resolve20(input.worktreePath, tree);
-      await mkdir11(dirname10(target), { recursive: true });
-      await rename4(resolve20(staging, tree), target);
+      const target = resolve22(input.worktreePath, tree);
+      await mkdir11(dirname11(target), { recursive: true });
+      await rename4(resolve22(staging, tree), target);
       placed.push(target);
     }
     return { reason: "seeded", key: plan.key };
@@ -31896,11 +32752,11 @@ async function harvestWarmNodeModules(input) {
   if (isPlanRefusal(plan)) {
     return { reason: plan.failure, ...plan.detail ? { detail: plan.detail } : {} };
   }
-  const entry = resolve20(input.storeRoot, plan.key);
+  const entry = resolve22(input.storeRoot, plan.key);
   if (await pathExists(entry))
     return { reason: "already-warm", key: plan.key };
   for (const tree of plan.trees) {
-    if (!await isDirectory(resolve20(input.worktreePath, tree))) {
+    if (!await isDirectory(resolve22(input.worktreePath, tree))) {
       return { reason: "no-node-modules", key: plan.key, detail: tree };
     }
   }
@@ -31912,12 +32768,12 @@ async function harvestWarmNodeModules(input) {
       detail: `${missing.length} absent, e.g. ${missing.slice(0, 3).join(", ")}`
     };
   }
-  const staging = resolve20(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
+  const staging = resolve22(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID5()}`);
   try {
     await mkdir11(input.storeRoot, { recursive: true, mode: 493 });
     await sweepStaleStaging(input.storeRoot, (input.now ?? Date.now)());
     for (const tree of plan.trees) {
-      await cloneTree(resolve20(input.worktreePath, tree), resolve20(staging, tree), harvestFile);
+      await cloneTree(resolve22(input.worktreePath, tree), resolve22(staging, tree), harvestFile);
     }
     await input.onCopied?.();
     if (!await stagedTreeIsPublishable(input.worktreePath, staging, plan.key)) {
@@ -31938,18 +32794,18 @@ async function stagedTreeIsPublishable(worktreePath, staging, key) {
   const settled = await readWarmPlan(worktreePath);
   if (isPlanRefusal(settled) || settled.key !== key)
     return false;
-  const hidden = join8("node_modules", ".package-lock.json");
+  const hidden = join10("node_modules", ".package-lock.json");
   const [copied, current] = await Promise.all([
-    readFile8(resolve20(staging, hidden)).catch(() => void 0),
-    readFile8(resolve20(worktreePath, hidden)).catch(() => void 0)
+    readFile8(resolve22(staging, hidden)).catch(() => void 0),
+    readFile8(resolve22(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(resolve20(worktreePath, "package-lock.json")).catch(() => void 0));
-  const installed = parseLockfilePackages(await readFile8(resolve20(treeRoot, "node_modules", ".package-lock.json")).catch(() => void 0));
+  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));
   if (!wanted)
     return ["package-lock.json is unreadable"];
   if (!installed)
@@ -31969,14 +32825,14 @@ async function missingInstalledPackages(worktreePath, treeRoot = worktreePath) {
       required.push(path);
   }
   await mapWithLimit(required, INTEGRITY_READ_CONCURRENCY, async (path) => {
-    if (!(path in installed) || !await isInstalledPackage(resolve20(treeRoot, path))) {
+    if (!(path in installed) || !await isInstalledPackage(resolve22(treeRoot, path))) {
       missing.push(path);
     }
   });
   return missing.sort();
 }
 async function isInstalledPackage(path) {
-  return stat2(join8(path, "package.json")).then((info) => info.isFile(), () => false);
+  return stat2(join10(path, "package.json")).then((info) => info.isFile(), () => false);
 }
 var INTEGRITY_READ_CONCURRENCY = 64;
 async function mapWithLimit(values, limit, visit) {
@@ -32010,8 +32866,8 @@ function isContainedTreePath(value) {
 async function cloneTree(source, target, file, topLevel = true) {
   await mkdir11(target, { recursive: true, mode: 493 });
   for (const entry of await readdir5(source, { withFileTypes: true })) {
-    const from = join8(source, entry.name);
-    const to = join8(target, entry.name);
+    const from = join10(source, entry.name);
+    const to = join10(target, entry.name);
     if (entry.isSymbolicLink()) {
       await symlink2(await readlink(from), to);
       continue;
@@ -32041,13 +32897,13 @@ async function pruneWarmStore(storeRoot, keep) {
   const names = (await readdir5(storeRoot).catch(() => [])).filter((name) => !name.startsWith(STAGING_PREFIX));
   const entries = [];
   for (const name of names) {
-    const info = await lstat3(join8(storeRoot, name)).catch(() => void 0);
+    const info = await lstat3(join10(storeRoot, name)).catch(() => void 0);
     if (info?.isDirectory())
       entries.push({ name, usedAt: info.mtimeMs });
   }
   const dropped = entries.sort((a2, b) => b.usedAt - a2.usedAt || a2.name.localeCompare(b.name)).slice(keep);
   for (const entry of dropped) {
-    await rm4(join8(storeRoot, entry.name), { recursive: true, force: true }).catch(() => void 0);
+    await rm4(join10(storeRoot, entry.name), { recursive: true, force: true }).catch(() => void 0);
   }
   return dropped.map((entry) => entry.name);
 }
@@ -32056,7 +32912,7 @@ async function sweepStaleStaging(storeRoot, now2) {
   for (const name of entries) {
     if (!name.startsWith(STAGING_PREFIX))
       continue;
-    const path = join8(storeRoot, name);
+    const path = join10(storeRoot, name);
     const info = await lstat3(path).catch(() => void 0);
     if (!info || now2 - info.mtimeMs < STAGING_SWEEP_MS)
       continue;
@@ -32078,8 +32934,8 @@ function describe3(error) {
 
 // apps/body/dist/monolith-room-turn.js
 import { mkdir as mkdir12 } from "node:fs/promises";
-import { homedir as homedir7 } from "node:os";
-import { join as join9 } from "node:path";
+import { homedir as homedir9 } from "node:os";
+import { join as join11 } from "node:path";
 
 // packages/api-contract/dist/scheduled-prompts.js
 var SCHEDULE_SCHEDULER_NAME = "Beeline Scheduler";
@@ -32087,8 +32943,8 @@ var SCHEDULE_RAN_VERB = "ran a schedule for";
 
 // apps/body/dist/monolith-room-turn.js
 var ROOM_PROMPT_INACTIVITY_TIMEOUT_MS = 18e4;
-function isRoomMcpPermissionRequest(request, mountedServers = ROOM_MOUNTED_MCP_SERVERS) {
-  if (isSquireMcpPermissionRequest(request))
+function isRoomMcpPermissionRequest(request, mountedServers = ROOM_MOUNTED_MCP_SERVERS, hostServers = CODE_OWNED_HOST_MCP_NAMES) {
+  if (isHostMcpPermissionRequest(request, hostServers))
     return false;
   return isMountedMcpToolPermissionRequest(request, mountedServers);
 }
@@ -32229,7 +33085,7 @@ var MonolithRoomTurnLoop = class {
       ...this.options.config.bwrapPath ? { bwrapPath: this.options.config.bwrapPath } : {},
       ...this.sessionScratchDir ? { scratch: this.sessionScratchDir } : {},
       ...this.sessionStateDirs.length ? { harnessStateDirs: this.sessionStateDirs } : {},
-      maskPaths: credentialMaskPaths(this.options.config.sandboxMaskPaths, this.options.config.operatorHome ?? homedir7())
+      maskPaths: credentialMaskPaths(this.options.config.sandboxMaskPaths, this.options.config.operatorHome ?? homedir9())
     };
   }
   /**
@@ -32296,7 +33152,7 @@ var MonolithRoomTurnLoop = class {
     const cached = this.deliveredAttachments.get(item.id);
     if (cached)
       return cached;
-    const delivered = await deliverAttachments(item.attachments, join9(this.attachmentDir, item.id.replace(/[^\w-]/g, "_")), this.options.fetchImpl);
+    const delivered = await deliverAttachments(item.attachments, join11(this.attachmentDir, item.id.replace(/[^\w-]/g, "_")), this.options.fetchImpl);
     this.deliveredAttachments.set(item.id, withoutImageData(delivered));
     return delivered;
   }
@@ -32329,12 +33185,13 @@ var MonolithRoomTurnLoop = class {
     return await this.currentSessionFingerprint() === this.sessionFingerprint;
   }
   async currentSessionFingerprint() {
-    const [configuration, roster] = await Promise.all([
+    const [configuration, roster, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.roomId
       }),
-      this.roster()
+      this.roster(),
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     return sessionConfigFingerprint({
@@ -32342,9 +33199,22 @@ var MonolithRoomTurnLoop = class {
       effort: configuration.effort ?? this.options.config.modelSelection?.effort,
       soul: configuration.soul ?? self?.soul,
       agentName: self?.name ?? this.agent.name,
-      mcpServers: this.mountedMcpServers()
+      mcpServers: expectedMountedImportedMcpServerNames({
+        operatorHome: this.options.config.operatorHome,
+        agentKind: this.options.config.agentKind,
+        grantedHostRoutes
+      })
     });
   }
+  async grantedHostRoutes() {
+    try {
+      return grantedHostRoutesFromList(await this.options.api.execute("listAgentGrants", {
+        agentId: this.agent.publicKey
+      }));
+    } catch {
+      return [];
+    }
+  }
   mountedMcpServers(preparedEnv) {
     return mountedImportedMcpServerNames({
       operatorHome: this.options.config.operatorHome,
@@ -32356,13 +33226,14 @@ var MonolithRoomTurnLoop = class {
     if (this.client?.isAlive && this.sessionId)
       return this.sessionId;
     trace?.noteActivation("cold");
-    const [configuration, roster, repositoryState] = await Promise.all([
+    const [configuration, roster, repositoryState, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.roomId
       }),
       this.roster(),
-      this.repositoryState()
+      this.repositoryState(),
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     const directMessage = Array.isArray(repositoryState.directParticipants) && repositoryState.directParticipants.length === 2;
@@ -32370,10 +33241,12 @@ var MonolithRoomTurnLoop = class {
     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;
+    const operatorHome = this.options.config.operatorHome ?? homedir9();
     const homeOverlay = this.options.config.agentHomeRoot ? await prepareRoomAgentHome({
       root: this.options.config.agentHomeRoot,
       sharedSkills: this.options.config.sharedSkills ?? [],
       isReviewer: isConfiguredReviewer(self?.handle, configuration.reviewerHandle),
+      grantedHostRoutes,
       ...this.options.config.agentKind ? { agentKind: this.options.config.agentKind } : {},
       ...this.options.config.operatorHome ? { operatorHome: this.options.config.operatorHome } : {},
       ...openRouterRoutingInput(this.options.config, selection, this.options.fetchImpl, {
@@ -32396,7 +33269,11 @@ var MonolithRoomTurnLoop = class {
       effort: configuration.effort ?? this.options.config.modelSelection?.effort,
       soul: configuration.soul ?? self?.soul,
       agentName: self?.name ?? this.agent.name,
-      mcpServers: this.mountedMcpServers(agentEnv)
+      mcpServers: expectedMountedImportedMcpServerNames({
+        operatorHome: this.options.config.operatorHome,
+        agentKind: this.options.config.agentKind,
+        grantedHostRoutes
+      })
     });
     this.agentEnv = agentEnv;
     const agentArgs = agentArgsWithModelSelection({
@@ -32404,9 +33281,8 @@ var MonolithRoomTurnLoop = class {
       command,
       args: this.options.config.agentArgs ?? []
     }, selection);
-    const operatorHome = this.options.config.operatorHome ?? homedir7();
     const { stateDirs, tmpDir } = harnessStateDirsFromEnv(agentEnv);
-    this.attachmentDir = tmpDir ? join9(tmpDir, "beeline-attachments") : void 0;
+    this.attachmentDir = tmpDir ? join11(tmpDir, "beeline-attachments") : void 0;
     this.sessionScratchDir = tmpDir;
     this.sessionStateDirs = stateDirs;
     const homeStateDirs = harnessHomeStateDirs(harnessLabel, agentEnv.HOME ?? operatorHome);
@@ -32422,7 +33298,14 @@ var MonolithRoomTurnLoop = class {
         harnessStateDirs: stateDirs,
         harnessHomeStateDirs: homeStateDirs,
         ...tmpDir ? { tmpDir } : {},
-        ...attachScratchRoot ? { additionalWritablePaths: [attachScratchRoot] } : {},
+        additionalWritablePaths: [
+          ...attachScratchRoot ? [attachScratchRoot] : [],
+          ...grantedSquireHostBindPaths({
+            operatorHome,
+            agentKind: this.options.config.agentKind,
+            grantedHostRoutes
+          })
+        ],
         maskPaths: credentialMaskPaths(this.options.config.sandboxMaskPaths, operatorHome)
       },
       command,
@@ -32447,12 +33330,24 @@ var MonolithRoomTurnLoop = class {
     const youtube = youtubeMcpServer(this.options.config, this.options.youtubeAccessToken);
     if (youtube)
       servers.push(youtube);
+    const grantedRouteServers = grantedHostRouteWires(grantedHostRoutes, operatorHome, hostImportedMcpDeclarations({
+      operatorHome,
+      agentKind: this.options.config.agentKind
+    }));
     await installPiMcpBridge({
       agentCommand: harnessLabel,
       piHome: agentEnv.PI_CODING_AGENT_DIR,
-      servers
+      servers: [...servers, ...grantedRouteServers]
     });
-    const mountedServers = servers.map((server) => server.name);
+    const mountedServers = [
+      ...servers.map((server) => server.name),
+      ...grantedRouteServers.map((server) => server.name),
+      ...this.mountedMcpServers(agentEnv)
+    ];
+    const hostServers = ungatedHostServers(hostImportedMcpServerNames({
+      operatorHome: this.options.config.operatorHome,
+      agentKind: this.options.config.agentKind
+    }), grantedHostRoutes);
     const clientOptions = {
       agentCommand: spawnCommand.command,
       agentArgs: spawnCommand.args,
@@ -32463,7 +33358,7 @@ 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)
+      permissionAllowlist: (request) => isRoomMcpPermissionRequest(request, mountedServers, hostServers)
     };
     this.client = (this.options.createAcpClient ?? ((value) => new AcpClient(value)))(clientOptions);
     await this.client.start();
@@ -32688,9 +33583,9 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
               try {
                 stream.beginRun();
                 trace.promptSent();
-                result2 = await this.client.sessionPrompt(this.sessionId, nextPrompt, ROOM_PROMPT_INACTIVITY_TIMEOUT_MS, (delta, full) => {
+                result2 = await this.client.sessionPrompt(this.sessionId, nextPrompt, ROOM_PROMPT_INACTIVITY_TIMEOUT_MS, (delta, full, currentRun) => {
                   trace.firstModelOutput();
-                  stream.onChunk(delta, full);
+                  stream.onChunk(delta, full, currentRun);
                 }, void 0, (calls) => {
                   trace.toolCalls(calls);
                   if (openedACorner(openCornerToolCall(calls)))
@@ -32723,8 +33618,8 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
           trace.promptSettled();
           let openCornerCall = openCornerToolCall(result.toolCalls);
           let cornerOpened = openedACorner(openCornerCall);
-          let explained = cornerOpened ? void 0 : await this.explainEmpty(result);
-          if (explained && shouldRetryEmptyTurn(explained)) {
+          let explained = await this.explainEmpty(result);
+          if (!cornerOpened && explained && shouldRetryEmptyTurn(explained)) {
             const silent = this.servingProviders();
             const next = await this.repinNextProvider(trace, explained.reason);
             if (next) {
@@ -32733,7 +33628,7 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
               trace.promptSettled();
               openCornerCall = openCornerToolCall(result.toolCalls);
               cornerOpened = openedACorner(openCornerCall);
-              explained = cornerOpened ? void 0 : await this.explainEmpty(result);
+              explained = await this.explainEmpty(result);
             }
           }
           if (active.cancelled) {
@@ -32760,15 +33655,14 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
           }
           stream.close();
           let reply = durableReplyText(result.agentText);
-          if (!reply && explained) {
-            reply = explained.recoveredText ? durableReplyText(explained.recoveredText) : "";
-            if (!reply) {
-              throw new Error(turnFailureReasonWithProvider(explained.reason, this.servingProviders()));
-            }
-            console.warn(`[thin-core] monolith Room ${this.options.roomId} turn ${item.id}: ${explained.reason}`);
+          if (!reply && explained?.recoveredText) {
+            reply = durableReplyText(explained.recoveredText);
+          }
+          if (!reply && explained && !cornerOpened) {
+            throw new Error(turnFailureReasonWithProvider(explained.reason, this.servingProviders()));
           }
-          if (cornerOpened) {
-            reply = "";
+          if (reply && explained) {
+            console.warn(`[thin-core] monolith Room ${this.options.roomId} turn ${item.id}: ${explained.reason}`);
           }
           await trace.measure("publish", () => stream.settle(reply, reply ? {
             triggerMessageId: item.id
@@ -32792,9 +33686,14 @@ ${JSON.stringify((corners.corners ?? []).filter((corner) => !corner.archived))}`
       if (liveCornerOpened && error instanceof AcpRequestTimeoutError && error.inactivity && error.method === "session/prompt") {
         console.log(`[thin-core] monolith Room ${this.options.roomId} turn ${item.id}: inactivity timeout after opening a corner; the work continues in the corner`);
         this.options.onCornerOpened?.();
-        await liveStream?.retract().catch((retractError) => {
-          console.error(`[thin-core] monolith Room ${this.options.roomId} draft retract failed:`, retractError);
-        });
+        const lastRun = liveStream?.lastRunText ?? "";
+        const streamed = isPureRetryNarration(lastRun) ? "" : durableReplyText(lastRun);
+        if (liveStream) {
+          await liveStream.settle(streamed, streamed ? { triggerMessageId: item.id } : {}).catch((settleError) => {
+            console.error(`[thin-core] monolith Room ${this.options.roomId} draft settle failed:`, settleError);
+          });
+          await liveStream.retract();
+        }
         await api.execute("postAgentTurnReceipt", {
           agentId: this.agent.publicKey,
           roomId: this.options.roomId,
@@ -32880,7 +33779,7 @@ var TOOL_OUTPUT_MAX_BYTES = 3200;
 var TOOL_PATH_LIMIT = 12;
 function cornerMergeInstruction(yoloMode, reviewerHandle) {
   if (reviewerHandle)
-    return `Commit, push, open the PR, and reply with the URL; do not merge until @${reviewerHandle} tags you with approval, then call pr_checks_status and merge with gh pr merge --squash --match-head-commit <sha> only if the complete gate passes.`;
+    return `Commit, push, open the PR, and reply with the URL; do not merge until @${reviewerHandle} has reviewed \u2014 you are woken when that review ends, whether or not it tags you \u2014 then call pr_checks_status and merge with gh pr merge --squash --match-head-commit <sha> only if the complete gate passes.`;
   return yoloMode ? "Yolo is on: when the gate passes, merge this pull request with gh." : "Yolo is off: never merge; wait for a human owner to turn yolo on or merge the pull request themselves.";
 }
 function cornerReviewerInstruction(input) {
@@ -33203,12 +34102,13 @@ var MonolithCornerTurnLoop = class {
     return await this.currentSessionFingerprint() === this.sessionFingerprint;
   }
   async currentSessionFingerprint() {
-    const [configuration, roster] = await Promise.all([
+    const [configuration, roster, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.cornerId
       }),
-      this.roster()
+      this.roster(),
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     return sessionConfigFingerprint({
@@ -33217,27 +34117,34 @@ var MonolithCornerTurnLoop = class {
       soul: configuration.soul ?? self?.soul,
       agentName: self?.name ?? this.agent.name,
       yoloMode: configuration.yoloMode,
-      mcpServers: this.mountedMcpServers(),
+      mcpServers: expectedMountedImportedMcpServerNames({
+        operatorHome: this.options.config.operatorHome,
+        agentKind: this.options.config.agentKind,
+        grantedHostRoutes
+      }),
       reviewerHandle: configuration.reviewerHandle
     });
   }
-  mountedMcpServers(preparedEnv) {
-    return mountedImportedMcpServerNames({
-      operatorHome: this.options.config.operatorHome,
-      agentKind: this.options.config.agentKind,
-      preparedEnv
-    });
+  async grantedHostRoutes() {
+    try {
+      return grantedHostRoutesFromList(await this.options.api.execute("listAgentGrants", {
+        agentId: this.agent.publicKey
+      }));
+    } catch {
+      return [];
+    }
   }
   async activate(trace) {
     if (this.client?.isAlive && this.sessionId)
       return this.sessionId;
     trace?.noteActivation("cold");
-    const [configuration, roster] = await Promise.all([
+    const [configuration, roster, grantedHostRoutes] = await Promise.all([
       this.options.api.execute("getAgentConfiguration", {
         agentId: this.agent.publicKey,
         roomId: this.options.cornerId
       }),
-      this.roster()
+      this.roster(),
+      this.grantedHostRoutes()
     ]);
     const self = roster.members.find((member) => member.identityId === this.agent.publicKey);
     this.yoloMode = configuration.yoloMode;
@@ -33268,6 +34175,7 @@ var MonolithCornerTurnLoop = class {
       root: this.options.config.agentHomeRoot,
       sharedSkills: this.options.config.sharedSkills ?? [],
       isReviewer: isConfiguredReviewer(self?.handle, configuration.reviewerHandle),
+      grantedHostRoutes,
       ...this.options.config.agentKind ? { agentKind: this.options.config.agentKind } : {},
       ...this.options.config.operatorHome ? { operatorHome: this.options.config.operatorHome } : {},
       ...openRouterRoutingInput(this.options.config, selection, this.options.fetchImpl, {
@@ -33309,13 +34217,18 @@ var MonolithCornerTurnLoop = class {
       ...githubEnv,
       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: this.mountedMcpServers(agentEnv),
+      mcpServers: expectedMountedImportedMcpServerNames({
+        operatorHome: this.options.config.operatorHome,
+        agentKind: this.options.config.agentKind,
+        grantedHostRoutes
+      }),
       reviewerHandle: configuration.reviewerHandle
     });
     this.agentEnv = agentEnv;
@@ -33324,9 +34237,8 @@ var MonolithCornerTurnLoop = class {
       command,
       args: this.options.config.agentArgs ?? []
     }, selection);
-    const operatorHome = this.options.config.operatorHome ?? homedir8();
     const { stateDirs, tmpDir } = harnessStateDirsFromEnv(agentEnv);
-    this.attachmentDir = tmpDir ? join10(tmpDir, "beeline-attachments") : void 0;
+    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 })));
@@ -33349,7 +34261,12 @@ var MonolithCornerTurnLoop = class {
           // The shared npm cache. npm writes to its cache on every install,
           // and this one is deliberately outside the per-corner home so the
           // download is paid once per host rather than once per corner.
-          npmCacheDir
+          npmCacheDir,
+          ...grantedSquireHostBindPaths({
+            operatorHome,
+            agentKind: this.options.config.agentKind,
+            grantedHostRoutes
+          })
         ],
         maskPaths: credentialMaskPaths(this.options.config.sandboxMaskPaths, operatorHome)
       },
@@ -33403,10 +34320,14 @@ var MonolithCornerTurnLoop = class {
     const youtube = youtubeMcpServer(this.options.config, this.options.youtubeAccessToken);
     if (youtube)
       servers.push(youtube);
+    const grantedRouteServers = grantedHostRouteWires(grantedHostRoutes, operatorHome, hostImportedMcpDeclarations({
+      operatorHome,
+      agentKind: this.options.config.agentKind
+    }));
     await installPiMcpBridge({
       agentCommand: harnessLabel,
       piHome: agentEnv.PI_CODING_AGENT_DIR,
-      servers
+      servers: [...servers, ...grantedRouteServers]
     });
     const persona = configuration.soul ?? self?.soul;
     const identityInstructions = `Your Beeline identity is ${self?.name ?? this.agent.name}.`;
@@ -33431,11 +34352,15 @@ var MonolithCornerTurnLoop = class {
             selfReviewerInstruction ?? cornerMergeInstruction(configuration.yoloMode, configuration.reviewerHandle)
           ],
           "Do not tag the user when a corner turn finishes: the server posts the merge summary card and its push already cover completion. Tag a human only mid-turn, and only when you need a decision or input.",
-          "Never restate server check or merge notes. On a checks turn, say nothing unless you merge or push a fix, then use one short line. When asked whether the reviewer was woken, call pr_checks_status and report reviewerWake; do not invent a cause. Never merge while approvalPending is true. When approval is pending, wait for the reviewer to tag you. Never merge another pull request. Never create a schedule to poll pr_checks_status or the merge gate: the green transition wakes the reviewer and the reviewer's approval tag wakes you, and tagging any agent other than the configured reviewer cannot clear the gate. If a schedule wakes you in this corner anyway, follow the same rule as a checks turn: say nothing unless you merge, push a fix, or report a genuinely new blocker."
+          "Never restate server check or merge notes. On a checks turn, say nothing unless you merge or push a fix, then use one short line. When asked whether the reviewer was woken, call pr_checks_status and report reviewerWake; do not invent a cause. Never merge while approvalPending is true. When approval is pending, wait to be woken. Never merge another pull request. Never create a schedule to poll pr_checks_status or the merge gate: the green transition wakes the reviewer and the end of that review wakes you, tag or no tag, and tagging any agent other than the configured reviewer cannot clear the gate. If a schedule wakes you in this corner anyway, follow the same rule as a checks turn: say nothing unless you merge, push a fix, or report a genuinely new blocker."
         ] : [
-          "This is a chat-only corner with no repository or GitHub workflow.",
+          "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, push, open a pull request, or wait for GitHub checks."
+          "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.`
         ]
       ].filter(Boolean).join("\n\n")
     });
@@ -33554,7 +34479,7 @@ var MonolithCornerTurnLoop = class {
           const [conversation, roster, delivered] = await trace.measure("context-fetch", () => Promise.all([
             api.execute("getRoomConversation", { roomId: cornerId, limit: 200 }),
             this.roster(),
-            this.attachmentDir && attachments.length ? deliverAttachments(attachments, join10(this.attachmentDir, requestId.replace(/[^\w-]/g, "_")), this.options.fetchImpl) : Promise.resolve([])
+            this.attachmentDir && attachments.length ? deliverAttachments(attachments, join12(this.attachmentDir, requestId.replace(/[^\w-]/g, "_")), this.options.fetchImpl) : Promise.resolve([])
           ]));
           const names = new Map(roster.members.map((member) => [member.identityId, member.name]));
           const requestedBy = requester && !requester.name && names.get(requester.pubkey) ? { ...requester, name: names.get(requester.pubkey) } : requester;
@@ -33686,7 +34611,7 @@ ${trigger}`,
                   completedNarrationRuns.push(currentNarrationRun);
                 currentNarrationRun = currentRun;
               }
-              stream.onChunk(delta, full);
+              stream.onChunk(delta, full, currentRun);
             }, void 0, (calls) => {
               trace.toolCalls(calls);
               publishToolCalls(calls, true);
@@ -34336,12 +35261,12 @@ 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 = resolve21(input.supervisorRoot, "beeline", "repositories", `${repositoryHash}.git`);
-  const path = resolve21(input.supervisorRoot, "beeline", "corners", input.cornerId);
-  await mkdir14(dirname11(gitCommonDir), { recursive: true, mode: 448 });
-  await mkdir14(dirname11(path), { recursive: true, mode: 448 });
+  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 authEnv = githubGitEnv(input.token);
-  if (!existsSync5(resolve21(gitCommonDir, "HEAD"))) {
+  if (!existsSync6(resolve23(gitCommonDir, "HEAD"))) {
     await execFileAsync4("git", ["clone", "--bare", remote, gitCommonDir], {
       env: authEnv,
       maxBuffer: 4 * 1024 * 1024
@@ -34360,7 +35285,7 @@ async function materializeCornerWorktree(input) {
     "origin",
     `+refs/heads/${input.featureBranch}:refs/remotes/origin/${input.featureBranch}`
   ], { env: authEnv, maxBuffer: 4 * 1024 * 1024 }).then(() => true, () => false);
-  if (!existsSync5(resolve21(path, ".git"))) {
+  if (!existsSync6(resolve23(path, ".git"))) {
     await rm5(path, { recursive: true, force: true });
     await execFileAsync4("git", [
       `--git-dir=${gitCommonDir}`,
@@ -34411,7 +35336,7 @@ async function materializeCornerWorktree(input) {
     `${input.committer.publicKey.slice(0, 16)}@users.noreply.github.com`
   ]);
   const top = await execFileAsync4("git", ["-C", path, "rev-parse", "--show-toplevel"]);
-  if (resolve21(top.stdout.trim()) !== resolve21(path)) {
+  if (resolve23(top.stdout.trim()) !== resolve23(path)) {
     throw new Error(`corner worktree escaped its isolated root: ${top.stdout.trim()}`);
   }
   return { path, gitCommonDir };
@@ -34432,7 +35357,7 @@ async function mapWithConcurrency(values, limit, visit) {
 async function removeCornerWorktreeAndBranches(worktree) {
   const localRef = `refs/heads/${worktree.branch}`;
   const remoteRef = `refs/heads/${worktree.branch}`;
-  const worktreeExists = existsSync5(worktree.path);
+  const worktreeExists = existsSync6(worktree.path);
   const localExists = await gitRefExists(worktree.gitCommonDir, localRef);
   if (worktreeExists) {
     const checkedOut = await execFileAsync4("git", [
@@ -34477,8 +35402,8 @@ async function removeCornerWorktreeAndBranches(worktree) {
 }
 var execFileAsync4 = promisify4(execFile6);
 async function removeCornerScratchWorkspace(input) {
-  const expected = resolve21(input.roomRoot, "scratch");
-  if (resolve21(input.scratchPath) !== expected) {
+  const expected = resolve23(input.roomRoot, "scratch");
+  if (resolve23(input.scratchPath) !== expected) {
     throw new Error(`refusing to remove scratch outside corner ${input.cornerId}`);
   }
   await rm5(expected, { recursive: true, force: true });
@@ -34699,17 +35624,17 @@ var RoomRuntimeCoordinator = class {
     return this.runtime.rooms.find((room) => room.channelId === roomId);
   }
   roomRoot(roomId) {
-    return this.roomRecord(roomId)?.root ?? resolve21(dirname11(this.configPath), "rooms", roomId);
+    return this.roomRecord(roomId)?.root ?? resolve23(dirname12(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 = resolve21(workspaceRoot, "agent-home");
-    if (!required && flag !== "1" && !existsSync5(home) && existsSync5(workspaceRoot))
+    const home = resolve23(workspaceRoot, "agent-home");
+    if (!required && flag !== "1" && !existsSync6(home) && existsSync6(workspaceRoot))
       return void 0;
     try {
-      mkdirSync2(home, { recursive: true, mode: 448 });
+      mkdirSync3(home, { recursive: true, mode: 448 });
       return home;
     } catch (error) {
       console.error(`[thin-core] per-room agent home unavailable at ${home}:`, error);
@@ -34721,10 +35646,10 @@ var RoomRuntimeCoordinator = class {
     return {
       ...this.baseConfig,
       workspaceRoot,
-      agentPrivateRoot: resolve21(workspaceRoot, "agent-private"),
-      agentMemoryRoot: resolve21(dirname11(this.configPath), "memory"),
-      openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname11(this.configPath)),
-      turnTraceDir: turnTraceDirectory(dirname11(this.configPath)),
+      agentPrivateRoot: resolve23(workspaceRoot, "agent-private"),
+      agentMemoryRoot: resolve23(dirname12(this.configPath), "memory"),
+      openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname12(this.configPath)),
+      turnTraceDir: turnTraceDirectory(dirname12(this.configPath)),
       ...agentHomeRoot ? { agentHomeRoot } : {}
     };
   }
@@ -34802,11 +35727,11 @@ 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 = resolve21(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
-    await mkdir14(dirname11(path), { recursive: true, mode: 448 });
+    const path = resolve23(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
+    await mkdir14(dirname12(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 (!existsSync5(resolve21(path, ".git"))) {
+    if (!existsSync6(resolve23(path, ".git"))) {
       await execFileAsync4("git", ["clone", "--no-checkout", remote, path], {
         env,
         maxBuffer: 4 * 1024 * 1024
@@ -34855,7 +35780,7 @@ var RoomRuntimeCoordinator = class {
       const objective = (restore.objective ?? "").trim();
       if (!objective)
         throw new Error("corner has no authoritative objective fact");
-      const repositoryBacked = repository.resolution === "repository";
+      const repositoryBacked = repository.resolution === "repository" && restore.lane !== "no_code";
       const targetBranch = repositoryBacked ? repository.targetBranch || "main" : void 0;
       const featureBranch = repositoryBacked ? restore.featureBranch ?? `feature/corner-${corner.cornerId.replaceAll("-", "").slice(0, 12)}` : void 0;
       const granted = repositoryBacked ? await this.options.daemonApi.execute("getRoomGitHubToken", {
@@ -34868,7 +35793,7 @@ var RoomRuntimeCoordinator = class {
         featureBranch,
         token: granted.token
       }) : void 0;
-      const workspacePath = worktree?.path ?? resolve21(this.roomRoot(corner.cornerId), "scratch");
+      const workspacePath = worktree?.path ?? resolve23(this.roomRoot(corner.cornerId), "scratch");
       if (!worktree)
         await mkdir14(workspacePath, { recursive: true, mode: 448 });
       const isOpener = !corner.openedBy || corner.openedBy === this.agent.publicKey;
@@ -34894,6 +35819,7 @@ var RoomRuntimeCoordinator = class {
         ...corner.openedBy ? { openedBy: corner.openedBy } : {},
         objective,
         worktreePath: workspacePath,
+        ...restore.requesterHandle ? { requesterHandle: restore.requesterHandle } : {},
         ...worktree ? {
           repository: {
             featureBranch,
@@ -34946,7 +35872,7 @@ var RoomRuntimeCoordinator = class {
       });
       this.standingCornerStartFaults.delete(corner.cornerId);
       this.reportedCornerStartFailures.delete(corner.cornerId);
-      console.log(worktree ? `[thin-core] serving corner ${corner.cornerId} on ${featureBranch} at ${workspacePath}` : `[thin-core] serving chat-only corner ${corner.cornerId} at ${workspacePath}`);
+      console.log(worktree ? `[thin-core] serving corner ${corner.cornerId} on ${featureBranch} at ${workspacePath}` : `[thin-core] serving no-code corner ${corner.cornerId} at ${workspacePath}`);
     } catch (error) {
       console.error(`[thin-core] failed to start corner ${corner.cornerId}:`, error);
       const reported = await this.reportCornerStartFailure(corner.cornerId, error);
@@ -35260,13 +36186,13 @@ var ThinDaemonCore = class {
 
 // apps/body/dist/agent-retirement.js
 import { mkdir as mkdir16, rename as rename5 } from "node:fs/promises";
-import { dirname as dirname13, resolve as resolve23 } from "node:path";
+import { dirname as dirname14, resolve as resolve25 } 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 { homedir as homedir9 } from "node:os";
-import { dirname as dirname12, resolve as resolve22 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { dirname as dirname13, resolve as resolve24 } from "node:path";
 import { setTimeout as sleep } from "node:timers/promises";
 import { promisify as promisify5 } from "node:util";
 var execFileAsync5 = promisify5(execFile7);
@@ -35288,6 +36214,7 @@ StartLimitBurst=10
 Type=notify
 NotifyAccess=all
 Environment=BEELINE_MANAGED_BY_SYSTEMD=1
+Environment=PATH=%h/.local/bin:/usr/local/bin:/usr/bin:/bin
 ExecStart=%h/.local/bin/beeline daemon --agent %i
 Restart=always
 RestartSec=5s
@@ -35308,10 +36235,10 @@ WantedBy=default.target
 `;
 }
 function isCanonicalInstalledLauncher(env = process.env, invocationPath = process.argv[1]) {
-  const home = env.HOME?.trim() || homedir9();
-  const expectedLibDir = resolve22(home, ".local", "lib", "beeline");
+  const home = env.HOME?.trim() || homedir11();
+  const expectedLibDir = resolve24(home, ".local", "lib", "beeline");
   const expectedPrefix = `${expectedLibDir}/`;
-  return resolve22(env.BEELINE_LIB_DIR?.trim() || "/") === expectedLibDir && Boolean(invocationPath) && resolve22(invocationPath).startsWith(expectedPrefix);
+  return resolve24(env.BEELINE_LIB_DIR?.trim() || "/") === expectedLibDir && Boolean(invocationPath) && resolve24(invocationPath).startsWith(expectedPrefix);
 }
 function assertCanonicalInstalledLauncher(env, invocationPath) {
   if (isCanonicalInstalledLauncher(env, invocationPath))
@@ -35319,8 +36246,28 @@ 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() || resolve22(homedir9(), ".config");
-  return resolve22(configRoot, "systemd", "user", SYSTEMD_UNIT_NAME);
+  const configRoot = env.XDG_CONFIG_HOME?.trim() || resolve24(homedir11(), ".config");
+  return resolve24(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);
+}
+async function installTrustySquireBrokerService(options = {}) {
+  const env = options.env ?? process.env;
+  assertCanonicalInstalledLauncher(env, options.invocationPath);
+  const home = env.HOME?.trim() || homedir11();
+  ensureSquireHostDir(home);
+  const path = systemdBrokerUnitPath(env);
+  const content = trustySquireBrokerUnit();
+  const existing = await readFile9(path, "utf8").catch(() => "");
+  if (existing !== content) {
+    await mkdir15(dirname13(path), { recursive: true, mode: 448 });
+    await writeFile10(path, content, { mode: 384 });
+  }
+  const run2 = options.run ?? runSystemctl;
+  await run2(["daemon-reload"]);
+  await run2(["enable", "--now", TRUSTY_SQUIRE_BROKER_UNIT_NAME]);
 }
 var AGENT_SERVICE = /^beeline-agent@([0-9a-f]{64})\.service$/i;
 var runSystemctl = async (args) => {
@@ -35339,7 +36286,7 @@ async function installAgentService(publicKey, options = {}) {
   const content = agentServiceUnit();
   const existing = await readFile9(path, "utf8").catch(() => "");
   if (existing !== content) {
-    await mkdir15(dirname12(path), { recursive: true, mode: 448 });
+    await mkdir15(dirname13(path), { recursive: true, mode: 448 });
     await writeFile10(path, content, { mode: 384 });
   }
   const run2 = options.run ?? runSystemctl;
@@ -35479,15 +36426,15 @@ var SystemdNotifier = class {
 
 // apps/body/dist/agent-retirement.js
 async function retireRemovedAgent(runtime, options = {}) {
-  const deletedRoot = resolve23(runtime.supervisorRoot, "beeline", "deleted-runtimes");
-  const target = resolve23(deletedRoot, `${runtime.agent.publicKey}-${Date.now()}`);
+  const deletedRoot = resolve25(runtime.supervisorRoot, "beeline", "deleted-runtimes");
+  const target = resolve25(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 = resolve23(target);
+  const destination = resolve25(target);
   if (destination === source || destination.startsWith(`${source}/`)) {
     throw new Error("agent runtime destination must be outside the live runtime");
   }
@@ -35496,13 +36443,13 @@ async function relocateAgentRuntime(runtime, target, options = {}) {
       ...options.run ? { run: options.run } : {}
     });
   }
-  await mkdir16(dirname13(destination), { recursive: true, mode: 448 });
+  await mkdir16(dirname14(destination), { recursive: true, mode: 448 });
   await rename5(source, destination);
   return destination;
 }
 
 // apps/body/dist/start-command.js
-import { basename as basename7, dirname as dirname17 } from "node:path";
+import { basename as basename7, dirname as dirname18 } from "node:path";
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 
 // apps/body/dist/self-update-cli.js
@@ -35512,22 +36459,22 @@ init_self_update_manifest();
 
 // apps/body/dist/managed-update.js
 init_self_update();
-import { spawn as spawn8 } from "node:child_process";
+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 dirname16, resolve as resolve26 } from "node:path";
+import { dirname as dirname17, resolve as resolve28 } 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 dirname15, resolve as resolve25 } from "node:path";
+import { dirname as dirname16, resolve as resolve27 } from "node:path";
 var REPORT_INTERVAL_MS = 60 * 60 * 1e3;
 var lastLogged = /* @__PURE__ */ new Map();
 function updateRollbackAlertPath(runtimeDir) {
-  return resolve25(runtimeDir, "update-rollback-alert.json");
+  return resolve27(runtimeDir, "update-rollback-alert.json");
 }
 async function writeAlert(runtimeDir, alert) {
   const path = updateRollbackAlertPath(runtimeDir);
   const staged = `${path}.${process.pid}.tmp`;
-  await mkdir18(dirname15(path), { recursive: true });
+  await mkdir18(dirname16(path), { recursive: true });
   await writeFile12(staged, `${JSON.stringify(alert, null, 2)}
 `, { mode: 384 });
   await rename7(staged, path);
@@ -35591,13 +36538,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 = resolve26(layout.releasesRoot, ".state", "install.lock");
+  const lock = resolve28(layout.releasesRoot, ".state", "install.lock");
   const deadline = now2() + (options.waitMs ?? 1e4);
-  await mkdir19(dirname16(lock), { recursive: true });
+  await mkdir19(dirname17(lock), { recursive: true });
   for (; ; ) {
     try {
       await mkdir19(lock);
-      await writeFile13(resolve26(lock, "owner"), `${process.pid}
+      await writeFile13(resolve28(lock, "owner"), `${process.pid}
 ${now2()}
 `, "utf8");
       break;
@@ -35645,10 +36592,11 @@ var ManagedUpdateHandoff = class _ManagedUpdateHandoff {
     this.#nextUpdateCheckAt = this.#now() + numberEnv(this.#env, "BEELINE_UPDATE_INITIAL_DELAY_MS", DEFAULT_UPDATE_INITIAL_DELAY_MS);
   }
   static async create(layout, runtimeDir, now2 = Date.now, options = {}) {
+    const env = options.env ?? process.env;
     return new _ManagedUpdateHandoff({
       layout,
       runtimeDir,
-      loadedRelease: await activeReleaseId(layout),
+      loadedRelease: runningReleaseId(layout, env) ?? await activeReleaseId(layout),
       now: now2,
       ...options
     });
@@ -35720,7 +36668,7 @@ var ManagedUpdateHandoff = class _ManagedUpdateHandoff {
       if (!attempt || attempt.releaseId !== desiredRelease || attempt.status !== "pending") {
         const from = await readInstalledBundleIdentity({
           ...this.#layout,
-          libDir: resolve26(this.#layout.releasesRoot, this.#loadedRelease)
+          libDir: resolve28(this.#layout.releasesRoot, this.#loadedRelease)
         }).catch(() => void 0) ?? {};
         const to = await readInstalledBundleIdentity(this.#layout).catch(() => void 0) ?? {};
         const record3 = {
@@ -35926,7 +36874,7 @@ async function runManagedUpdateWorkerProcess() {
   if (!entrypoint)
     throw new Error("cannot resolve the current Beeline entrypoint");
   await new Promise((resolveWorker, rejectWorker) => {
-    const child = spawn8(process.execPath, [entrypoint, "managed-update-worker"], {
+    const child = spawn9(process.execPath, [entrypoint, "managed-update-worker"], {
       detached: true,
       env: { ...process.env, BEELINE_INTERNAL_UPDATE_WORKER: "1" },
       stdio: ["ignore", "pipe", "pipe"]
@@ -36007,7 +36955,7 @@ async function proveLoadedReleaseReady(layout, runtimeDir, loadedRelease, option
   });
   if (!accepted)
     return false;
-  await writeFile13(resolve26(runtimeDir, "daemon-ready.json"), `${JSON.stringify({
+  await writeFile13(resolve28(runtimeDir, "daemon-ready.json"), `${JSON.stringify({
     readyAt: (options.now ?? Date.now)(),
     loadedRelease,
     functionalProof: options.functionalProof
@@ -36253,7 +37201,7 @@ async function startStoredRuntime(configPath, opts = {}, dependencyOverrides = {
   return { status: "started", pid };
 }
 function agentStartId(configPath) {
-  return basename7(dirname17(configPath));
+  return basename7(dirname18(configPath));
 }
 async function startRuntime(configPath, spinnerHandle) {
   const report = (text2) => spinnerHandle ? spinnerHandle.message(text2) : console.log(text2);
@@ -36261,6 +37209,11 @@ async function startRuntime(configPath, spinnerHandle) {
   const selectedAgent = runtimeAgentCommand(runtime);
   report(`[body] agent ${runtime.agent.publicKey} binary: ${formatAgentCommand(selectedAgent)}`);
   if (process.platform === "linux" && process.env.BEELINE_SYSTEMD_USER !== "0") {
+    try {
+      await installTrustySquireBrokerService();
+    } catch (error) {
+      report(`[beeline] trusty-squire host broker not installed: ${error instanceof Error ? error.message : String(error)}`);
+    }
     const existingPid = await runtimeDaemonPid(configPath);
     if (existingPid) {
       report(`[beeline] agent already running (pid ${existingPid})`);
@@ -36314,7 +37267,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 ${dirname17(path)}\u2026`);
+    spinnerHandle?.start(`Starting ${dirname18(path)}\u2026`);
     try {
       const outcome = await deps.startOne(path, spinnerHandle);
       const report = { id, path, ...outcome };
@@ -36346,11 +37299,11 @@ async function runStartCommand(args, interactiveUi, dependencyOverrides = {}) {
 }
 
 // apps/body/dist/connect-command.js
-import { spawn as spawn10 } from "node:child_process";
+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 { homedir as homedir11, hostname as hostname2 } from "node:os";
-import { dirname as dirname18, resolve as resolve27 } from "node:path";
+import { homedir as homedir13, hostname as hostname2 } from "node:os";
+import { dirname as dirname19, resolve as resolve29 } from "node:path";
 import { stdin as stdin3, stdout as stdout4 } from "node:process";
 
 // apps/body/dist/clack-support.js
@@ -36434,7 +37387,7 @@ async function verifyProviderKey(input) {
 }
 
 // apps/body/dist/pair-agent-selection.js
-import { spawn as spawn9 } from "node:child_process";
+import { spawn as spawn10 } from "node:child_process";
 import { stdin as stdin2, stdout as stdout3 } from "node:process";
 var NO_AGENT_MESSAGE = `No supported ACP-capable coding agent was detected.
 Install one of these supported agents:
@@ -36463,7 +37416,7 @@ async function clackSelectAgent(candidates) {
 }
 async function installAdapter(install, opts) {
   await new Promise((resolveInstall, rejectInstall) => {
-    const child = spawn9(install.command, install.args, {
+    const child = spawn10(install.command, install.args, {
       cwd: opts.cwd,
       env: opts.env ?? process.env,
       stdio: "inherit"
@@ -36646,7 +37599,17 @@ async function pairDevice(grant, options = {}) {
     throw new Error("monolith daemon transport activation failed");
   let pid;
   try {
-    pid = await (options.launch ?? (async (configPath, publicKey) => process.platform === "linux" && process.env.BEELINE_SYSTEMD_USER !== "0" ? installAgentService(publicKey) : launchRuntimeDaemon(configPath)))(staged.configPath, agentIdentity.publicKey);
+    pid = await (options.launch ?? (async (configPath, publicKey) => {
+      if (process.platform === "linux" && process.env.BEELINE_SYSTEMD_USER !== "0") {
+        try {
+          await installTrustySquireBrokerService();
+        } catch (error) {
+          console.warn(`[beeline] trusty-squire host broker not installed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return installAgentService(publicKey);
+      }
+      return launchRuntimeDaemon(configPath);
+    }))(staged.configPath, agentIdentity.publicKey);
   } catch (error) {
     throw new Error(`agent ${agentIdentity.publicKey} is connected, but its daemon did not start: ${error instanceof Error ? error.message : String(error)}. Run \`beeline start --agent ${agentIdentity.publicKey}\`.`, { cause: error });
   }
@@ -36968,8 +37931,8 @@ function parseConnectSubscriptions(value) {
   ];
 }
 async function readMachineId(env = process.env) {
-  const configDir = resolve27(env.XDG_CONFIG_HOME ?? resolve27(homedir11(), ".config"), "beeline");
-  const machineIdPath = resolve27(configDir, "machine-id");
+  const configDir = resolve29(env.XDG_CONFIG_HOME ?? resolve29(homedir13(), ".config"), "beeline");
+  const machineIdPath = resolve29(configDir, "machine-id");
   let machineId;
   let machineName = hostname2();
   try {
@@ -37042,7 +38005,7 @@ async function installCurrentRelease(fetchImpl) {
   });
   await activateRelease(layout, releaseId);
   return {
-    binary: resolve27(layout.binDir, "beeline"),
+    binary: resolve29(layout.binDir, "beeline"),
     version: published.version ?? releaseId
   };
 }
@@ -37065,7 +38028,7 @@ function providerEnvironment(selection) {
   };
 }
 async function writePrivateJson(path, value) {
-  await mkdir20(dirname18(path), { recursive: true, mode: 448 });
+  await mkdir20(dirname19(path), { recursive: true, mode: 448 });
   await writeFile14(path, `${JSON.stringify(value, null, 2)}
 `, { mode: 384 });
   await chmod7(path, 384);
@@ -37074,8 +38037,8 @@ async function writeProviderEnv(selection, agentPubkey) {
   const values = providerEnvironment(selection);
   if (Object.keys(values).length === 0)
     return void 0;
-  const path = resolve27(defaultSupervisorRoot(process.env), "beeline", "connect", `${agentPubkey}.env`);
-  await mkdir20(dirname18(path), { recursive: true, mode: 448 });
+  const path = resolve29(defaultSupervisorRoot(process.env), "beeline", "connect", `${agentPubkey}.env`);
+  await mkdir20(dirname19(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 });
@@ -37084,7 +38047,7 @@ async function writeProviderEnv(selection, agentPubkey) {
 }
 async function runInstalledFinish(binary, grantPath) {
   await new Promise((resolveRun, rejectRun) => {
-    const child = spawn10(binary, ["connect-finish", grantPath], {
+    const child = spawn11(binary, ["connect-finish", grantPath], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     let diagnostic = "";
@@ -37144,7 +38107,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 = resolve27(defaultSupervisorRoot(process.env), "beeline", "connect", `grant-${process.pid}-${Date.now()}.json`);
+  const grantPath = resolve29(defaultSupervisorRoot(process.env), "beeline", "connect", `grant-${process.pid}-${Date.now()}.json`);
   await writePrivateJson(grantPath, {
     agentSecretKey: grant.agent_secret_key,
     bodySecretKey: grant.body_secret_key,
@@ -37229,18 +38192,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(resolve27(path), "utf8"));
+    const grant = JSON.parse(await readFile12(resolve29(path), "utf8"));
     if (!isDevicePairingGrant(grant))
       throw new Error("device connection grant is invalid");
     const connected = await completeDevicePairing(grant);
-    await unlink5(resolve27(path));
+    await unlink5(resolve29(path));
     const providerEnv = grant.llmEnvFile ? await readFile12(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(dirname18(connected.configPath)),
+        cacheDir: openRouterRoutingCacheDir(dirname19(connected.configPath)),
         ...apiKey ? { apiKey } : {},
         probeTimeoutMs: 1e4
       });
@@ -37259,11 +38222,11 @@ 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 dirname19, resolve as resolve28 } from "node:path";
+import { dirname as dirname20, resolve as resolve30 } from "node:path";
 var DAEMON_FAILURE_LIMIT = 3;
 var DAEMON_FAILURE_WINDOW_MS = 5 * 6e4;
 function daemonFailurePath(runtimeDir) {
-  return resolve28(runtimeDir, "daemon-distress.json");
+  return resolve30(runtimeDir, "daemon-distress.json");
 }
 async function readFailureRecord(runtimeDir) {
   try {
@@ -37279,7 +38242,7 @@ async function readFailureRecord(runtimeDir) {
 async function writeFailureRecord(runtimeDir, record3) {
   const path = daemonFailurePath(runtimeDir);
   const staged = `${path}.${process.pid}.tmp`;
-  await mkdir21(dirname19(path), { recursive: true, mode: 448 });
+  await mkdir21(dirname20(path), { recursive: true, mode: 448 });
   await writeFile15(staged, `${JSON.stringify(record3, null, 2)}
 `, { mode: 384 });
   await rename8(staged, path);
@@ -37303,8 +38266,8 @@ async function clearDaemonStartFailures(runtimeDir) {
 
 // apps/body/dist/update-functional-probe.js
 import { mkdir as mkdir22, rm as rm9 } from "node:fs/promises";
-import { homedir as homedir12 } from "node:os";
-import { resolve as resolve29 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { resolve as resolve31 } 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;
@@ -37424,9 +38387,9 @@ async function runUpdateFunctionalProbe(input) {
       modelAnswerReason: `${detail} (the current release has the same host sandbox failure)`
     };
   }
-  const root = input.probeRoot ?? resolve29(input.runtimeDir, "update-functional-probe");
-  const cwd = resolve29(root, "checkout");
-  const homeRoot = resolve29(root, "agent-home");
+  const root = input.probeRoot ?? resolve31(input.runtimeDir, "update-functional-probe");
+  const cwd = resolve31(root, "checkout");
+  const homeRoot = resolve31(root, "agent-home");
   await rm9(root, { recursive: true, force: true });
   await mkdir22(cwd, { recursive: true, mode: 448 });
   let client;
@@ -37435,7 +38398,7 @@ async function runUpdateFunctionalProbe(input) {
       ...input.config.agentEnv,
       ...await prepareRoomAgentHome({
         root: homeRoot,
-        operatorHome: input.config.operatorHome ?? homedir12(),
+        operatorHome: input.config.operatorHome ?? homedir14(),
         sharedSkills: input.config.sharedSkills ?? [],
         ...input.config.agentKind ? { agentKind: input.config.agentKind } : {},
         skillReleaseId: input.releaseId,
@@ -37456,7 +38419,7 @@ async function runUpdateFunctionalProbe(input) {
     let turnCompleted = true;
     if (input.config.bwrapPath) {
       const { stateDirs, tmpDir } = harnessStateDirsFromEnv(agentEnv);
-      const operatorHome = input.config.operatorHome ?? homedir12();
+      const operatorHome = input.config.operatorHome ?? homedir14();
       const homeStateDirs = harnessHomeStateDirs(harnessLabel, agentEnv.HOME ?? operatorHome);
       await Promise.all(homeStateDirs.map((dir) => mkdir22(dir, { recursive: true })));
       spawnCommand = wrapAgentCommand({
@@ -37607,8 +38570,8 @@ async function runUpdateFunctionalProbe(input) {
 }
 
 // apps/body/dist/current-release-probe.js
-import { spawn as spawn11 } from "node:child_process";
-import { dirname as dirname20, join as join12 } from "node:path";
+import { spawn as spawn12 } from "node:child_process";
+import { dirname as dirname21, join as join14 } from "node:path";
 init_self_update();
 var CURRENT_RELEASE_PROBE_TIMEOUT_MS = 12e4;
 var UPDATE_PROBE_COMMAND = "update-probe";
@@ -37651,14 +38614,14 @@ function outcomeFromReport(report) {
   }
 }
 async function probeReleaseInSubprocess(input) {
-  const bundleDir = join12(input.layout.releasesRoot, input.releaseId);
+  const bundleDir = join14(input.layout.releasesRoot, input.releaseId);
   const entrypoint = await resolveBundleEntrypoint(bundleDir);
   if (!entrypoint) {
     return { kind: "unavailable", reason: `release ${input.releaseId} has no runnable CLI entrypoint` };
   }
   const timeoutMs = input.timeoutMs ?? CURRENT_RELEASE_PROBE_TIMEOUT_MS;
-  return new Promise((resolve33) => {
-    const child = spawn11(input.execPath ?? process.execPath, [entrypoint, UPDATE_PROBE_COMMAND, "--config", input.runtimeConfigPath], { env: input.env ?? process.env, stdio: ["ignore", "pipe", "pipe"] });
+  return new Promise((resolve35) => {
+    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 = "";
     let settled = false;
@@ -37667,7 +38630,7 @@ async function probeReleaseInSubprocess(input) {
         return;
       settled = true;
       clearTimeout(timer);
-      resolve33(outcome);
+      resolve35(outcome);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -37714,7 +38677,7 @@ async function runUpdateProbeCommand(args, options = {}) {
   const runtime = await readRuntimeRecord(configPath);
   const agent = runtimeAgentCommand(runtime);
   const config = loadBodyConfig({
-    workspaceRoot: join12(dirname20(configPath), "workspace"),
+    workspaceRoot: join14(dirname21(configPath), "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env: { ...env, BUZZ_AGENT_BIN: agent.command, BUZZ_DEV_MCP_BIN: runtime.mcpBinary },
     agent
@@ -37732,7 +38695,7 @@ async function runUpdateProbeCommand(args, options = {}) {
   }
   const layout = beelineInstallLayout(env);
   const releaseId = (layout && await activeReleaseId(layout).catch(() => void 0)) ?? "unknown";
-  const runtimeDir = dirname20(configPath);
+  const runtimeDir = dirname21(configPath);
   const outcome = await probeOutcome(() => (options.probe ?? runUpdateFunctionalProbe)({
     config,
     runtimeDir,
@@ -37740,7 +38703,7 @@ async function runUpdateProbeCommand(args, options = {}) {
     sandboxRequired: runtime.sandbox !== "off",
     sandboxUnavailableDetail: sandbox.advisory,
     // The successor's probe still holds `<runtimeDir>/update-functional-probe`.
-    probeRoot: join12(runtimeDir, "current-release-probe")
+    probeRoot: join14(runtimeDir, "current-release-probe")
   }));
   const report = outcome.kind === "served" ? { probe: "served" } : outcome.kind === "refused" ? { probe: "refused", status: outcome.status, reason: outcome.reason } : outcome.kind === "sandbox-unavailable" ? { probe: "sandbox-unavailable", reason: outcome.reason } : { probe: "failed", reason: outcome.reason };
   write(JSON.stringify(report));
@@ -37748,7 +38711,7 @@ 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 resolve30 } from "node:path";
+import { resolve as resolve32 } 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}$/;
@@ -37765,7 +38728,7 @@ async function writeDaemonReleaseStatus(runtimeDir, agentPubkey, identity, optio
     pid: options.pid ?? process.pid,
     readyAt: (options.now?.() ?? /* @__PURE__ */ new Date()).toISOString()
   };
-  const target = resolve30(runtimeDir, DAEMON_RELEASE_STATUS_FILE);
+  const target = resolve32(runtimeDir, DAEMON_RELEASE_STATUS_FILE);
   const temporary = `${target}.${status.pid}.tmp`;
   await writeFile16(temporary, `${JSON.stringify(status, null, 2)}
 `, { mode: 384 });
@@ -37775,7 +38738,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 resolve31 } from "node:path";
+import { resolve as resolve33 } 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) {
@@ -37784,7 +38747,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 = resolve31(runtimeDir, "rooms");
+  const roomsDir = resolve33(runtimeDir, "rooms");
   let entries;
   try {
     entries = await readdir7(roomsDir, { withFileTypes: true });
@@ -37795,7 +38758,7 @@ async function discoverAttachScratchRoots(runtimeDir) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const home = resolve31(roomsDir, entry.name, "agent-home");
+    const home = resolve33(roomsDir, entry.name, "agent-home");
     const stats = await lstat5(home).catch(() => void 0);
     if (stats?.isDirectory())
       roots.push(home);
@@ -37814,7 +38777,7 @@ async function removeStaleFiles(dir, cutoffMs, protectNamesHere) {
   for (const entry of entries) {
     if (protectNamesHere && NEVER_SWEEP_SUBDIR_NAMES.has(entry.name))
       continue;
-    const path = resolve31(dir, entry.name);
+    const path = resolve33(dir, entry.name);
     const stats = await lstat5(path).catch(() => void 0);
     if (!stats || stats.isSymbolicLink())
       continue;
@@ -37902,7 +38865,7 @@ var DaemonExitError = class extends Error {
 };
 async function runStoredDaemon(pathOrPointer) {
   const configPath = await resolveRuntimeConfigPath(pathOrPointer);
-  daemonFailureRuntimeDir = dirname21(configPath);
+  daemonFailureRuntimeDir = dirname22(configPath);
   const accessMigration = await migrateRuntimeRecordAccessPolicy(configPath);
   let runtime = accessMigration.runtime;
   if (!runtime.transport) {
@@ -37921,7 +38884,7 @@ async function runStoredDaemon(pathOrPointer) {
     BUZZ_DEV_MCP_BIN: runtime.mcpBinary
   };
   const config = loadBodyConfig({
-    workspaceRoot: resolve32(dirname21(configPath), "workspace"),
+    workspaceRoot: resolve34(dirname22(configPath), "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env,
     agent
@@ -37956,7 +38919,7 @@ async function runStoredDaemon(pathOrPointer) {
   const stop = () => controller.abort();
   process.once("SIGINT", stop);
   process.once("SIGTERM", stop);
-  const runtimeDir = dirname21(configPath);
+  const runtimeDir = dirname22(configPath);
   const layout = beelineInstallLayout(process.env);
   const notifier = new SystemdNotifier();
   let rollbackAlertDrain;
@@ -38136,6 +39099,14 @@ async function main() {
     await runCursorAcpStdioServer();
     return;
   }
+  if (command === SQUIRE_FACADE_FLAG) {
+    runSquireFacade();
+    return;
+  }
+  if (command === SQUIRE_BROKER_FLAG) {
+    runSquireBroker();
+    return;
+  }
   if (command === "--help" || command === "-h")
     usage(0);
   if (command === "managed-update-worker") {
@@ -38152,7 +39123,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(resolve32(configPath));
+    const activated = await activateDaemonTransport(resolve34(configPath));
     if (!activated)
       throw new Error("corner-read-token requires monolith transport");
     const credential = await activated.client.execute("getRoomGitHubToken", { roomId });
@@ -38206,14 +39177,14 @@ async function main() {
     }
     if (!configPath && agentPubkey) {
       const configs = await findAgentRuntimeConfigPaths(process.env, process.cwd());
-      configPath = configs.find((candidate) => dirname21(candidate).endsWith(agentPubkey));
+      configPath = configs.find((candidate) => dirname22(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(resolve32(configPath));
+    await runStoredDaemon(resolve34(configPath));
     return;
   }
   if (command === "update") {
@@ -38234,7 +39205,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) => dirname21(candidate).endsWith(agentPubkey));
+    const configPath = configs.find((candidate) => dirname22(candidate).endsWith(agentPubkey));
     if (!configPath)
       throw new Error(`no stored runtime found for agent ${agentPubkey}`);
     const runtime = await readRuntimeRecord(configPath);