usebeeline 0.1.9 → 0.1.10

package/dist/usebeeline.mjs

@@ -212,8 +212,8 @@ async function runSquireBrokerLink(options) {
   const pending = /* @__PURE__ */ new Map();
   const queued = [];
   let resolveDone;
-  const done = new Promise((resolve42) => {
-    resolveDone = resolve42;
+  const done = new Promise((resolve43) => {
+    resolveDone = resolve43;
   });
   const failResponse = (id) => `${JSON.stringify({
     jsonrpc: "2.0",
@@ -14126,7 +14126,7 @@ function configureNetworkFamilyDefaults(network = net) {
 configureNetworkFamilyDefaults();
 
 // apps/body/dist/cli.js
-import { dirname as dirname30, resolve as resolve41 } from "node:path";
+import { dirname as dirname30, resolve as resolve42 } from "node:path";
 import { stdin as stdin4, stdout as stdout5 } from "node:process";
 
 // node_modules/@clack/core/dist/index.mjs
@@ -15566,7 +15566,7 @@ function parseCursorModelsOutput(output) {
   };
 }
 async function enumerateCursorModels(env = process.env) {
-  return new Promise((resolve42) => {
+  return new Promise((resolve43) => {
     const child = spawn2("cursor-agent", ["models"], {
       env,
       stdio: ["ignore", "pipe", "ignore"]
@@ -15580,11 +15580,11 @@ async function enumerateCursorModels(env = process.env) {
     });
     child.on("error", () => {
       clearTimeout(timer);
-      resolve42(void 0);
+      resolve43(void 0);
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve42(code === 0 ? parseCursorModelsOutput(output) : void 0);
+      resolve43(code === 0 ? parseCursorModelsOutput(output) : void 0);
     });
   });
 }
@@ -16011,13 +16011,13 @@ var CursorAcpServer = class {
         consumeLine(line);
     });
     try {
-      const { code, signal } = await new Promise((resolve42) => {
+      const { code, signal } = await new Promise((resolve43) => {
         let settled = false;
         const finish = (exitCode, exitSignal) => {
           if (settled)
             return;
           settled = true;
-          resolve42({ code: exitCode, signal: exitSignal });
+          resolve43({ code: exitCode, signal: exitSignal });
         };
         child.once("error", (error) => {
           spawnError = error instanceof Error ? error.message : String(error);
@@ -16162,10 +16162,10 @@ function releaseSquireConnectSession(log2, owner = "") {
 function squireChromeProfileDir() {
   return process.env.TRUSTY_SQUIRE_PROFILE_DIR ?? squireHostPaths(homedir2()).profileDir;
 }
-var defaultShellRunner = (command, args) => new Promise((resolve42) => {
+var defaultShellRunner = (command, args) => new Promise((resolve43) => {
   execFile(command, [...args], { timeout: 12e4, maxBuffer: 4 * 1024 * 1024, encoding: "utf8" }, (error, stdout6, stderr) => {
     const code = error?.code;
-    resolve42({
+    resolve43({
       code: typeof code === "number" ? code : error ? 1 : 0,
       stdout: String(stdout6 ?? ""),
       stderr: String(stderr ?? "")
@@ -16190,7 +16190,7 @@ function killConnectTree(child) {
   }
   child.kill();
 }
-var defaultStreamedRunner = (command, args, env, owner = "") => new Promise((resolve42) => {
+var defaultStreamedRunner = (command, args, env, owner = "") => new Promise((resolve43) => {
   const child = spawn5(command, args, {
     stdio: ["ignore", "pipe", "pipe"],
     env: env ?? squireConnectProcessEnv(),
@@ -16204,7 +16204,7 @@ var defaultStreamedRunner = (command, args, env, owner = "") => new Promise((res
   const safetyTimer = setTimeout(() => {
     if (!resolved) {
       resolved = true;
-      resolve42({ stdout: stdout6, stderr, pid: child.pid ?? void 0, report, abort: () => {
+      resolve43({ stdout: stdout6, stderr, pid: child.pid ?? void 0, report, abort: () => {
       } });
     }
     killConnectTree(child);
@@ -16239,7 +16239,7 @@ var defaultStreamedRunner = (command, args, env, owner = "") => new Promise((res
   const finish = (result) => {
     if (!resolved) {
       resolved = true;
-      resolve42(result);
+      resolve43(result);
     }
   };
   const settle = (result) => {
@@ -16729,12 +16729,12 @@ var StdioSquireMcpClient = class {
     const child = this.child;
     if (!child)
       return Promise.reject(new Error("Squire MCP session is not running"));
-    return new Promise((resolve42, reject) => {
+    return new Promise((resolve43, 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: resolve42, reject, timer });
+      this.pending.set(id, { resolve: resolve43, reject, timer });
       child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", id, method, params })}
 `);
     });
@@ -16890,9 +16890,9 @@ var SquireTaskRelay = class {
           response.writeHead(400, { "content-type": "application/json" }).end(JSON.stringify({ error: error instanceof Error ? error.message : "Squire relay failed" }));
         }
       });
-      await new Promise((resolve42, reject) => {
+      await new Promise((resolve43, reject) => {
         server.once("error", reject);
-        server.listen(0, "127.0.0.1", resolve42);
+        server.listen(0, "127.0.0.1", resolve43);
       });
       this.server = server;
       const address = server.address();
@@ -17864,11 +17864,11 @@ var RegistryMcpHostBroker = class {
         })();
       });
     });
-    await new Promise((resolve42, reject) => {
+    await new Promise((resolve43, reject) => {
       this.server.once("error", reject);
       this.server.listen(this.socketPath, () => {
         this.server.off("error", reject);
-        resolve42();
+        resolve43();
       });
     });
     chmodSync(this.socketPath, 384);
@@ -17877,12 +17877,12 @@ var RegistryMcpHostBroker = class {
     const server = this.server;
     this.server = void 0;
     if (server)
-      await new Promise((resolve42) => server.close(() => resolve42()));
+      await new Promise((resolve43) => server.close(() => resolve43()));
     rmSync(this.socketPath, { force: true });
   }
 };
 async function brokerRequest(socketPath, request) {
-  return new Promise((resolve42, reject) => {
+  return new Promise((resolve43, reject) => {
     const socket = createConnection3(socketPath);
     let output = "";
     socket.setEncoding("utf8");
@@ -17899,7 +17899,7 @@ async function brokerRequest(socketPath, request) {
           throw new Error(parsed.error);
         if (!Array.isArray(parsed.messages) || !parsed.messages.every((entry) => typeof entry === "string"))
           throw new Error("Registry MCP broker returned an invalid response");
-        resolve42(parsed.messages);
+        resolve43(parsed.messages);
       } catch (error) {
         reject(error);
       }
@@ -28531,13 +28531,13 @@ var RoomSupervisor = class {
    */
   retryDelay(failures, signal, since = this.#wakes) {
     const delay = this.delaysMs[failures - 1];
-    return new Promise((resolve42) => {
+    return new Promise((resolve43) => {
       let timer;
       const done = () => {
         clearTimeout(timer);
         this.#parked.delete(done);
         signal?.removeEventListener("abort", done);
-        resolve42();
+        resolve43();
       };
       this.#parked.add(done);
       signal?.addEventListener("abort", done, { once: true });
@@ -28729,12 +28729,12 @@ async function retryBeforeReady(work, options) {
           if (wait2 <= 0)
             break;
           await options.extendStartTimeout(wait2 + 15e3);
-          await new Promise((resolve42) => {
+          await new Promise((resolve43) => {
             const timer = setTimeout(done, wait2);
             function done() {
               clearTimeout(timer);
               options.signal?.removeEventListener("abort", done);
-              resolve42();
+              resolve43();
             }
             wake = done;
             options.signal?.addEventListener("abort", done, { once: true });
@@ -29195,9 +29195,26 @@ var AcpRequestTimeoutError = class extends Error {
     this.name = "AcpRequestTimeoutError";
   }
 };
-function isSilentPromptTimeout(error) {
-  return error instanceof AcpRequestTimeoutError && error.inactivity && error.method === "session/prompt";
-}
+var TURN_BACKSTOP_MS = 30 * 6e4;
+var AcpTurnBackstopError = class extends Error {
+  timeoutMs;
+  lastActivity;
+  cause = "turn_backstop";
+  constructor(timeoutMs, lastActivity, stderrTail = "", detail = "") {
+    const meaningful = flattenHarnessCause(stderrTail);
+    super(`turn_backstop: no ACP traffic for ${timeoutMs / 6e4} minutes; last activity: ${lastActivity}${detail ? ` (${detail})` : ""}${meaningful ? `; harness stderr: ${meaningful}` : ""}`);
+    this.timeoutMs = timeoutMs;
+    this.lastActivity = lastActivity;
+    this.name = "AcpTurnBackstopError";
+  }
+};
+var AcpRuntimeExitedError = class extends Error {
+  cause = "runtime_exited";
+  constructor(detail) {
+    super(`runtime_exited: ${detail}`);
+    this.name = "AcpRuntimeExitedError";
+  }
+};
 function killChildProcessGroup(child, signal) {
   if (!child.pid)
     return;
@@ -29521,16 +29538,26 @@ var AcpClient = class extends EventEmitter {
     });
     this.child.stdout.setEncoding("utf8");
     this.child.stdout.on("data", (chunk) => this.onData(chunk));
+    const child = this.child;
+    const pipeClosed = (pipe) => {
+      setTimeout(() => {
+        if (this.child === child && this.alive) {
+          const stderr = flattenHarnessCause(this.stderrTail);
+          this.failRuntime(`ACP agent ${this.agentLabel} ${pipe} pipe closed${stderr ? `: ${stderr}` : ""}`);
+        }
+      }, 25);
+    };
+    this.child.stdout.on("end", () => pipeClosed("stdout"));
+    this.child.stdout.on("close", () => pipeClosed("stdout"));
+    this.child.stdout.on("error", (error) => this.failRuntime(`stdout: ${error.message}`));
+    this.child.stdin.on("close", () => pipeClosed("stdin"));
+    this.child.stdin.on("error", (error) => this.failRuntime(`stdin: ${error.message}`));
     this.child.on("exit", (code, signal) => {
-      void this.handleChildExit(code, signal);
+      if (this.child === child)
+        void this.handleChildExit(code, signal);
     });
     this.child.on("error", (err) => {
-      this.alive = false;
-      for (const [, p] of this.pending) {
-        clearTimeout(p.timer);
-        p.reject(err);
-      }
-      this.pending.clear();
+      this.failRuntime(`ACP agent ${this.agentLabel}: ${err.message}`);
       if (this.listenerCount("error") > 0)
         this.emit("error", err);
     });
@@ -29556,13 +29583,28 @@ var AcpClient = class extends EventEmitter {
    */
   async handleChildExit(code, signal) {
     this.alive = false;
-    const oomKilled = signal === "SIGKILL" && !this.stopping && await this.oomKills.consume().catch(() => false);
+    for (const p of this.pending.values())
+      this.clearTimer(p);
+    let oomKilled = false;
+    if (signal === "SIGKILL" && !this.stopping) {
+      let diagnosticTimer;
+      try {
+        oomKilled = await Promise.race([
+          this.oomKills.consume().catch(() => false),
+          new Promise((resolve43) => {
+            diagnosticTimer = setTimeout(() => resolve43(false), 100);
+          })
+        ]);
+      } finally {
+        clearTimeout(diagnosticTimer);
+      }
+    }
     const exitText = oomKilled ? `ACP agent ${this.agentLabel} was killed by the kernel OOM killer (signal=SIGKILL)` : `ACP agent ${this.agentLabel} exited code=${code} signal=${signal}`;
     const meaningful = flattenHarnessCause(this.stderrTail);
     const stderrSuffix = meaningful ? `: ${meaningful}` : "";
     for (const [, p] of this.pending) {
       this.clearTimer(p);
-      p.reject(new Error(`${exitText}${stderrSuffix}`));
+      p.reject(new AcpRuntimeExitedError(`${exitText}${stderrSuffix}`));
     }
     this.pending.clear();
     this.activeRunIds.clear();
@@ -29571,9 +29613,15 @@ var AcpClient = class extends EventEmitter {
     this.sessionCommands.clear();
     this.emit("exit", { code, signal });
   }
+  failRuntime(detail) {
+    this.alive = false;
+    for (const p of this.pending.values()) {
+      this.clearTimer(p);
+      p.reject(new AcpRuntimeExitedError(detail));
+    }
+    this.pending.clear();
+  }
   async stop() {
-    if (!this.alive)
-      return;
     const child = this.child;
     if (!child)
       return;
@@ -29705,10 +29753,10 @@ var AcpClient = class extends EventEmitter {
   }
   /**
    * Run one prompt turn. `timeoutMs` is an idle window, not a hard cap on
-   * turn length: every `session/update` for this session (message chunk,
-   * tool call, or otherwise) re-arms it, so an actively-working agent can
-   * run indefinitely while a genuinely wedged one (zero activity for
-   * `timeoutMs`) still gets cancelled. `onChunk` is the ACP-boundary
+   * turn length: every inbound ACP message for this session re-arms it.
+   * Open tool calls suspend the backstop until completion. A silent session
+   * with no open tool is cancelled without stopping the runtime.
+   * `onChunk` is the ACP-boundary
    * streaming hook: called for every incremental `agent_message_chunk`
    * delta as it arrives, so a caller can project live text without waiting
    * for the turn to finish. A harness that only emits a final message
@@ -29723,18 +29771,15 @@ var AcpClient = class extends EventEmitter {
   get lastPromptBytes() {
     return this.lastPromptByteCount;
   }
-  async sessionPrompt(sessionId, text2, timeoutMs = 12e4, onChunk, onActivity, onToolCalls) {
+  async sessionPrompt(sessionId, text2, timeoutMs = TURN_BACKSTOP_MS, onChunk, onActivity, onToolCalls) {
     this.lastPromptByteCount = typeof text2 === "string" ? Buffer.byteLength(text2, "utf8") : void 0;
     const updates = [];
     let promptRunId;
-    let requestId;
     const onUpdate = (u4) => {
       if (u4.sessionId !== sessionId)
         return;
       updates.push(u4);
       promptRunId ??= this.activeRunIdFromUpdate(u4.update);
-      if (requestId !== void 0)
-        this.resetPendingIdleTimeout(requestId);
       onActivity?.(agentStreamSnapshot(updates, this.agentLabel));
       onToolCalls?.(toolCallEntries(updates));
       if (onChunk) {
@@ -29751,9 +29796,7 @@ var AcpClient = class extends EventEmitter {
       const result = await this.request("session/prompt", {
         sessionId,
         prompt: typeof text2 === "string" ? [{ type: "text", text: text2 }] : [...text2]
-      }, timeoutMs, (id) => {
-        requestId = id;
-      }, promptPayloadNote(text2));
+      }, timeoutMs, true, promptPayloadNote(text2));
       const agentText = finalAgentMessageText(updates, this.agentLabel);
       const toolCalls = toolCallEntries(updates);
       return {
@@ -29836,22 +29879,22 @@ var AcpClient = class extends EventEmitter {
     }
   }
   /**
-   * Re-arm a pending request's idle timer from its full `idleTimeoutMs`,
-   * called on every ACP activity signal for that request (streamed text
-   * delta, session/update, tool call). A request only times out after this
-   * much wall-clock time with zero activity, not after a fixed deadline —
-   * so an actively-working turn can run indefinitely while a genuinely
-   * wedged one still gets caught.
+   * A tool owns its deadline. Silence while it is open is never a turn failure.
+   * After the last tool closes, start a full backstop window for this session.
    */
   resetPendingIdleTimeout(id) {
     const p = this.pending.get(id);
     if (!p || p.idleTimeoutMs === void 0)
       return;
     this.clearTimer(p);
-    const { idleTimeoutMs, method, reject, detail } = p;
+    if (p.openToolCalls?.size)
+      return;
+    const { idleTimeoutMs, reject, detail, sessionId, lastActivity } = p;
     p.timer = setTimeout(() => {
       this.pending.delete(id);
-      reject(new AcpRequestTimeoutError(method ?? "request", idleTimeoutMs, this.stderrTail, true, detail ?? ""));
+      if (sessionId)
+        this.sessionCancel(sessionId);
+      reject(new AcpTurnBackstopError(idleTimeoutMs, lastActivity ?? "session/prompt", this.stderrTail, detail));
     }, idleTimeoutMs);
   }
   onData(chunk) {
@@ -29874,6 +29917,25 @@ var AcpClient = class extends EventEmitter {
   handleMessage(msg) {
     const id = msg.id;
     const method = msg.method;
+    const params = msg.params;
+    const response = !method && id !== void 0 ? this.pending.get(Number(id)) : void 0;
+    const sessionId = params?.sessionId ?? response?.sessionId;
+    if (sessionId) {
+      for (const [requestId, pending] of this.pending) {
+        if (pending.method !== "session/prompt" || pending.sessionId !== sessionId)
+          continue;
+        const update = params?.update;
+        pending.lastActivity = typeof update?.sessionUpdate === "string" ? update.sessionUpdate : method ?? `response:${response?.method ?? "request"}`;
+        if (typeof update?.toolCallId === "string" && (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update")) {
+          if (update.status === "pending" || update.status === "in_progress") {
+            pending.openToolCalls?.add(update.toolCallId);
+          } else if (update.status === "completed" || update.status === "failed") {
+            pending.openToolCalls?.delete(update.toolCallId);
+          }
+        }
+        this.resetPendingIdleTimeout(requestId);
+      }
+    }
     if (id !== void 0 && !method) {
       const n3 = Number(id);
       const p = this.pending.get(n3);
@@ -29901,19 +29963,19 @@ var AcpClient = class extends EventEmitter {
       return;
     }
     if (method === "session/update") {
-      const params = msg.params;
-      if (params?.sessionId && params.update) {
-        if (params.update.sessionUpdate === "available_commands_update") {
-          const commands = parseAvailableCommands(params.update.availableCommands);
-          this.sessionCommands.set(params.sessionId, commands);
+      const params2 = msg.params;
+      if (params2?.sessionId && params2.update) {
+        if (params2.update.sessionUpdate === "available_commands_update") {
+          const commands = parseAvailableCommands(params2.update.availableCommands);
+          this.sessionCommands.set(params2.sessionId, commands);
           this.commandsHandler?.(commands);
-          this.emit("commands", { sessionId: params.sessionId, commands });
+          this.emit("commands", { sessionId: params2.sessionId, commands });
         }
-        const toolCallId = params.update.toolCallId;
-        const sessionUpdate = params.update.sessionUpdate;
+        const toolCallId = params2.update.toolCallId;
+        const sessionUpdate = params2.update.sessionUpdate;
         if (typeof toolCallId === "string" && (sessionUpdate === "tool_call" || sessionUpdate === "tool_call_update")) {
-          const metadataKey = `${params.sessionId}\0${toolCallId}`;
-          const status = params.update.status;
+          const metadataKey = `${params2.sessionId}\0${toolCallId}`;
+          const status = params2.update.status;
           if (status === "completed" || status === "failed") {
             this.toolCallMetadata.delete(metadataKey);
           } else {
@@ -29921,25 +29983,25 @@ var AcpClient = class extends EventEmitter {
             this.toolCallMetadata.set(metadataKey, {
               ...existing,
               toolCallId,
-              ...typeof params.update.title === "string" ? { title: params.update.title } : {},
-              ...typeof params.update.kind === "string" ? { kind: params.update.kind } : {},
-              ..."rawInput" in params.update ? { rawInput: params.update.rawInput } : {},
+              ...typeof params2.update.title === "string" ? { title: params2.update.title } : {},
+              ...typeof params2.update.kind === "string" ? { kind: params2.update.kind } : {},
+              ..."rawInput" in params2.update ? { rawInput: params2.update.rawInput } : {},
               // `content`/`locations` carry the touched file paths for adapters
               // whose permission request omits them (codex-acp's file-change
               // request has no rawInput at all) — the corner worktree guard in
               // `session-sandbox.ts` reads them.
-              ..."content" in params.update ? { content: params.update.content } : {},
-              ..."locations" in params.update ? { locations: params.update.locations } : {}
+              ..."content" in params2.update ? { content: params2.update.content } : {},
+              ..."locations" in params2.update ? { locations: params2.update.locations } : {}
             });
           }
         }
         const u4 = {
-          sessionId: params.sessionId,
-          update: params.update
+          sessionId: params2.sessionId,
+          update: params2.update
         };
-        const activeRunId = this.activeRunIdFromUpdate(params.update);
+        const activeRunId = this.activeRunIdFromUpdate(params2.update);
         if (activeRunId)
-          this.activeRunIds.set(params.sessionId, activeRunId);
+          this.activeRunIds.set(params2.sessionId, activeRunId);
         this.emit("session/update", u4);
       }
       return;
@@ -29954,7 +30016,7 @@ var AcpClient = class extends EventEmitter {
     const current = this.activeRunIds.get(sessionId);
     if (current)
       return Promise.resolve(current);
-    return new Promise((resolve42, reject) => {
+    return new Promise((resolve43, reject) => {
       const onUpdate = (update) => {
         if (update.sessionId !== sessionId)
           return;
@@ -29962,7 +30024,7 @@ var AcpClient = class extends EventEmitter {
         if (!runId)
           return;
         cleanup();
-        resolve42(runId);
+        resolve43(runId);
       };
       const timer = setTimeout(() => {
         cleanup();
@@ -30034,32 +30096,30 @@ var AcpClient = class extends EventEmitter {
       result: { outcome: { outcome: "cancelled" } }
     });
   }
-  /**
-   * `onStart`, when given, receives the assigned request id synchronously
-   * and marks the request as idle-resettable at `timeoutMs`: callers can
-   * then call `resetPendingIdleTimeout(id)` on activity to defer the
-   * timeout instead of it firing at a fixed deadline.
-   */
-  request(method, params, timeoutMs = 6e4, onStart, detail = "") {
+  /** Prompt backstops reset on session traffic; other requests use a fixed deadline. */
+  request(method, params, timeoutMs = 6e4, backstop = false, detail = "") {
     if (!this.child || !this.alive) {
       return Promise.reject(new Error("AcpClient not started"));
     }
     const id = this.nextId++;
     const payload = { jsonrpc: "2.0", id, method, params };
-    return new Promise((resolve42, reject) => {
-      const timer = setTimeout(() => {
+    return new Promise((resolve43, reject) => {
+      const timer = backstop ? void 0 : setTimeout(() => {
         this.pending.delete(id);
-        reject(new AcpRequestTimeoutError(method, timeoutMs, this.stderrTail, Boolean(onStart), detail));
+        reject(new AcpRequestTimeoutError(method, timeoutMs, this.stderrTail, false, detail));
       }, timeoutMs);
+      const sessionId = params?.sessionId;
       this.pending.set(id, {
-        resolve: resolve42,
+        resolve: resolve43,
         reject,
         timer,
         method,
+        ...sessionId ? { sessionId } : {},
         ...detail ? { detail } : {},
-        ...onStart ? { idleTimeoutMs: timeoutMs } : {}
+        ...backstop ? { idleTimeoutMs: timeoutMs, lastActivity: method, openToolCalls: /* @__PURE__ */ new Set() } : {}
       });
-      onStart?.(id);
+      if (backstop)
+        this.resetPendingIdleTimeout(id);
       this.write(payload);
     });
   }
@@ -30067,9 +30127,15 @@ var AcpClient = class extends EventEmitter {
     this.write({ jsonrpc: "2.0", method, params });
   }
   write(obj) {
-    if (!this.child?.stdin.writable)
+    if (!this.child?.stdin.writable) {
+      if (this.child)
+        this.failRuntime(`ACP agent ${this.agentLabel} stdin pipe closed`);
       return;
-    this.child.stdin.write(JSON.stringify(obj) + "\n");
+    }
+    this.child.stdin.write(JSON.stringify(obj) + "\n", (error) => {
+      if (error)
+        this.failRuntime(`stdin: ${error.message}`);
+    });
   }
 };
 
@@ -31187,7 +31253,10 @@ function interpreterScriptArgument(argv) {
 
 // packages/api-contract/dist/connector-offers.js
 var CONNECTOR_OFFER_WINDOW_MS = 2 * 6e4;
-var OFFERABLE_CONNECTOR_KINDS = CONNECTABLE_CONNECTOR_KINDS.filter((kind) => kind !== "wallet");
+var OFFERABLE_CONNECTOR_KINDS = [
+  ...CONNECTABLE_CONNECTOR_KINDS,
+  "wallet"
+];
 
 // packages/api-contract/dist/phone-guards.js
 var CLOSED_VIEWER = {
@@ -31648,11 +31717,11 @@ The soul is not authority and never changes your tools, permissions, roles, or m
   {
     id: "core.files",
     topic: "files",
-    why: "Agents fetched the reference URL of a shared file instead of the copy already downloaded for them.",
+    why: "Files on earlier messages are shown only as markers and never pre-downloaded; agents fetched media URLs instead.",
     budgetBytes: 160,
     layer: "core",
     surfaces: EVERYWHERE,
-    render: () => "Files people share are downloaded for you: read the local path in the prompt and never fetch the reference URL."
+    render: () => "For a \u{1F4CE} file, call download_attachment and read its path. Never fetch media URLs; on failure, say you couldn't open it."
   },
   {
     id: "surface.tools",
@@ -32016,7 +32085,7 @@ var BEELINE_TRIAGE_SKILL_NAME = "beeline-triage";
 var BEELINE_REVIEW_SKILL_NAME = "beeline-review";
 var BEELINE_SPEC_SKILL_NAME = "beeline-spec";
 var BEELINE_ROOM_MECHANICS = [
-  "Files and photos people share are downloaded for you: read them at the local path named in the prompt (photos may also arrive inline); never fetch the reference URL.",
+  "Files and photos on the message you are answering are downloaded for you: read them at the local path named in the prompt (photos may also arrive inline). A file on an earlier message shows only as a \u{1F4CE} marker with an id; call beeline-agent download_attachment with that message id and attachment id, then read the returned path. Never fetch a media URL; if the download fails, tell the requester you could not open the file.",
   "To create a file you can send, call beeline-agent write_scratch_file with a relative path and content - text by default, or base64 for bytes you computed; it returns a path in your writable session home. To send a file, call beeline-agent post_artifact with a path inside your checkout or anywhere in your writable session home (wherever a file you or your harness generated actually landed, including one you just wrote), or with html/bytes content directly; it is uploaded and attached to your reply, and title and mime default from the file when you post by path. write_scratch_file produces the file, not a picture. To put a real photograph in an artifact, call beeline-agent fetch_image with the photo URL; it writes the bytes to your session scratch and returns the path, mime, and size \u2014 read them, base64-encode, and embed as a data: URL. The validator still refuses every http(s) image reference, and drawing an SVG stand-in is not a photograph.",
   "To run something later or repeatedly, call beeline-agent create_schedule (interval in minutes or a 5-field cron, optional maxRuns); list_schedules / update_schedule / delete_schedule manage them, including schedules other agents created for themselves.",
   `To react to a message in this Room, call beeline-agent react_to_message with its message id and one supported emoji (${MESSAGE_REACTION_EMOJIS.join(" ")}).`,
@@ -32135,6 +32204,15 @@ The record informs the verdict but never replaces approve_merge or pr_checks_sta
 - Record every command and exit code.
 - A review with no executed command is invalid and must FAIL.
 
+### Design rules
+
+When the diff touches UI and the repository has a DESIGN.md, check every changed style against its rules: colours from theme tokens only, the type roles, the spacing scale, the allowed radii, elevation, the shared components, and touch targets.
+
+- Run the repository's design lints. In Beeline, from \`apps/mobile\`: \`npx vitest run sources/buzz/calm-lint sources/buzz/design-lint\`.
+- FAIL when a design baseline count grows, or when an allowlist entry is added without naming the design decision behind it.
+- Require a screenshot or rendered proof of every visual change in each theme the app ships (in Beeline, Obsidian and Bone).
+- A design-rule violation is an engineering finding and blocks PASS.
+
 ## 4. Adversarial pass
 
 - For every changed function, name one concrete input or sequence that breaks it.
@@ -33409,6 +33487,14 @@ async function provisionAgentSkillsAndMcp(root, operatorHome, skillReleaseId, fa
   }
   await applyGrantedHostRoutes(root, operatorHome, grantedHostRoutes, agentKind, failClosed, resourceAuthFile, extraHostRoutes, squireScope);
   await provisionPiCustomModelConfig(root, operatorHome, failClosed, openRouterRouting);
+  if (appliesToHarness(agentKind, "pi")) {
+    const settings2 = {
+      httpIdleTimeoutMs: 3e5,
+      retry: { enabled: true, maxRetries: 3, baseDelayMs: 2e3 }
+    };
+    await writeIsolatedHarnessFile(resolve15(root, "pi", "settings.json"), `${JSON.stringify(settings2, null, 2)}
+`);
+  }
 }
 function appliesToHarness(selected, harness) {
   return !selected || selected === harness;
@@ -34390,7 +34476,7 @@ function clearInstallFailure(stateDir) {
   } catch {
   }
 }
-var runSandboxInstallCommand = (command, args) => new Promise((resolve42) => {
+var runSandboxInstallCommand = (command, args) => new Promise((resolve43) => {
   execFile6(command, [...args], {
     timeout: INSTALL_TIMEOUT_MS,
     maxBuffer: INSTALL_OUTPUT_LIMIT * 2,
@@ -34400,7 +34486,7 @@ var runSandboxInstallCommand = (command, args) => new Promise((resolve42) => {
   }, (error, stdout6, stderr) => {
     const code = error && "code" in error && typeof error.code === "number" ? error.code : error ? null : 0;
     const output = [stdout6, stderr].join("").trim();
-    resolve42({ code, output: output || (error ? error.message : "") });
+    resolve43({ code, output: output || (error ? error.message : "") });
   });
 });
 function lastLine(output, fallback) {
@@ -35073,6 +35159,7 @@ var UPDATE_PROBE_TURN_TIMEOUT_MS = 45e3;
 var UPDATE_PROBE_RETRY_DELAY_MS = 2e3;
 var ACP_ERROR_CODE = /\bACP error (-\d+):/;
 var ACP_PROMPT_INACTIVITY = /\bACP session\/prompt timed out after \d+ms of inactivity\b/;
+var ACP_TURN_BACKSTOP = /\bturn_backstop: no ACP traffic for [\d.]+ minutes; last activity:/;
 function isServerInternalCode(code) {
   return code === -32603 || code <= -32e3 && code >= -32099;
 }
@@ -35080,8 +35167,9 @@ function classifyAcpTurnFailure(error) {
   const message = error instanceof Error ? error.message : typeof error === "string" ? error : void 0;
   if (!message)
     return void 0;
-  if (ACP_PROMPT_INACTIVITY.test(message))
+  if (ACP_TURN_BACKSTOP.test(message) || ACP_PROMPT_INACTIVITY.test(message)) {
     return { kind: "prompt-inactivity" };
+  }
   const code = Number(ACP_ERROR_CODE.exec(message)?.[1]);
   if (Number.isFinite(code) && isServerInternalCode(code))
     return { kind: "server-internal", code };
@@ -35136,7 +35224,7 @@ function describeCurrentReleaseOutcome(outcome) {
 async function retryWhileAdapterReinstalls(run2, options = {}) {
   const attempts = options.attempts ?? 12;
   const delayMs = options.delayMs ?? 5e3;
-  const sleep4 = options.sleep ?? ((ms) => new Promise((resolve42) => setTimeout(resolve42, ms)));
+  const sleep4 = options.sleep ?? ((ms) => new Promise((resolve43) => setTimeout(resolve43, ms)));
   for (let attempt = 1; ; attempt += 1) {
     try {
       return await run2();
@@ -37809,7 +37897,7 @@ async function probeReleaseInSubprocess(input) {
     return { kind: "unavailable", reason: `release ${input.releaseId} has no runnable CLI entrypoint` };
   }
   const timeoutMs = input.timeoutMs ?? CURRENT_RELEASE_PROBE_TIMEOUT_MS;
-  return new Promise((resolve42) => {
+  return new Promise((resolve43) => {
     const child = spawn13(input.execPath ?? process.execPath, [entrypoint, UPDATE_PROBE_COMMAND, "--config", input.runtimeConfigPath], { env: input.env ?? process.env, stdio: ["ignore", "pipe", "pipe"] });
     let stdout6 = "";
     let stderr = "";
@@ -37819,7 +37907,7 @@ async function probeReleaseInSubprocess(input) {
         return;
       settled = true;
       clearTimeout(timer);
-      resolve42(outcome);
+      resolve43(outcome);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -37904,7 +37992,7 @@ import { dirname as dirname29 } from "node:path";
 
 // apps/body/dist/agent-runtime.js
 import { homedir as homedir18 } from "node:os";
-import { dirname as dirname28, join as join19, resolve as resolve40 } from "node:path";
+import { dirname as dirname28, join as join19, resolve as resolve41 } from "node:path";
 
 // apps/body/dist/model-availability.js
 var SECRET_VALUE = /(?:token|key|secret|password)=?[^\s,;]*/gi;
@@ -38038,10 +38126,10 @@ var LOGIN_URL = /https:\/\/login\.tailscale\.com\/[A-Za-z0-9_/-]+/u;
 function clipped(value) {
   return value.length <= OUTPUT_LIMIT ? value : value.slice(value.length - OUTPUT_LIMIT);
 }
-var runTailscaleCommand = (command, args) => new Promise((resolve42) => {
+var runTailscaleCommand = (command, args) => new Promise((resolve43) => {
   execFile7(command, [...args], { timeout: COMMAND_TIMEOUT_MS, maxBuffer: OUTPUT_LIMIT * 2 }, (error, stdout6, stderr) => {
     const code = error && "code" in error && typeof error.code === "number" ? error.code : error ? null : 0;
-    resolve42({ code, stdout: clipped(stdout6), stderr: clipped(stderr) });
+    resolve43({ code, stdout: clipped(stdout6), stderr: clipped(stderr) });
   });
 });
 function loginUrlFrom(status, output) {
@@ -38605,7 +38693,7 @@ import { execFile as execFile13 } from "node:child_process";
 import { createHash as createHash13 } from "node:crypto";
 import { existsSync as existsSync8, mkdirSync as mkdirSync3 } from "node:fs";
 import { mkdir as mkdir26, readdir as readdir9, realpath as realpath2, rm as rm14 } from "node:fs/promises";
-import { dirname as dirname26, relative as relative3, resolve as resolve35, sep as sep2 } from "node:path";
+import { dirname as dirname26, relative as relative3, resolve as resolve36, sep as sep2 } from "node:path";
 import { promisify as promisify8 } from "node:util";
 
 // apps/body/dist/grant-runner.js
@@ -39066,8 +39154,30 @@ function captureConnectionUsage(recorder, turn, calls) {
   }
 }
 
-// apps/body/dist/turn-usage.js
+// apps/body/dist/model-context-window.js
 import { readFile as readFile21 } from "node:fs/promises";
+import { join as join13 } from "node:path";
+async function modelContextWindowTokens(model, piHome) {
+  if (!model || !piHome)
+    return void 0;
+  try {
+    const catalog = JSON.parse(await readFile21(join13(piHome, "models.json"), "utf8"));
+    const parts = model.split("/");
+    const preferredProvider = parts.length > 2 ? parts.shift() : void 0;
+    const modelId = parts.join("/");
+    const providers = preferredProvider ? [catalog.providers?.[preferredProvider]].filter(Boolean) : Object.values(catalog.providers ?? {});
+    for (const provider of providers) {
+      const window = provider?.models?.find((entry) => entry.id === modelId)?.contextWindow;
+      if (window && Number.isFinite(window) && window > 0)
+        return Math.floor(window);
+    }
+  } catch {
+  }
+  return void 0;
+}
+
+// apps/body/dist/turn-usage.js
+import { readFile as readFile22 } from "node:fs/promises";
 function tokenCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
 }
@@ -39079,61 +39189,77 @@ function promptTokens(usage2) {
   const cacheWrite = tokenCount(usage2.cacheWrite) ?? tokenCount(usage2.cache_write) ?? 0;
   return input + cacheRead + cacheWrite;
 }
-async function readHarnessTurnUsage(input) {
+async function readUsageCalls(input, latestTurn) {
   const file = await piSessionFilePath(input.agentEnv, input.sessionId);
   if (!file)
+    return latestTurn ? void 0 : [];
+  const raw = await readFile22(file, "utf8").catch(() => void 0);
+  if (raw === void 0)
     return void 0;
-  let raw;
-  try {
-    raw = await readFile21(file, "utf8");
-  } catch {
-    return void 0;
-  }
-  let latest;
+  const calls = [];
   for (const line of raw.split(/\r?\n/)) {
-    if (!line.trim())
-      continue;
     let entry;
     try {
       entry = JSON.parse(line);
     } catch {
       continue;
     }
-    if (entry.type !== "message" || !entry.message)
+    if (!entry || entry.type !== "message" || !entry.message)
       continue;
-    if (entry.message.role === "user") {
-      latest = void 0;
-      continue;
-    }
+    if (entry.message.role === "user" && latestTurn)
+      calls.length = 0;
     if (entry.message.role !== "assistant")
       continue;
     const usage2 = entry.message.usage;
-    if (!usage2 || typeof usage2 !== "object" || Array.isArray(usage2))
-      continue;
-    const tokens = promptTokens(usage2);
-    if (tokens === void 0)
-      continue;
+    const tokens = usage2 && typeof usage2 === "object" && !Array.isArray(usage2) ? promptTokens(usage2) : void 0;
     const model = entry.message.model;
-    latest = {
-      inputTokens: tokens,
+    calls.push({
+      ...tokens !== void 0 ? { inputTokens: tokens } : {},
       ...typeof model === "string" && model ? { model } : {}
-    };
+    });
   }
-  return latest;
+  return calls;
+}
+function summarize(calls) {
+  if (!calls.length)
+    return void 0;
+  const measured = calls.filter((call) => call.inputTokens !== void 0);
+  return {
+    ...calls[calls.length - 1],
+    ...measured.length ? { totalInputTokens: measured.reduce((sum, call) => sum + call.inputTokens, 0) } : {},
+    modelCalls: measured.length,
+    modelCallsWithoutUsage: calls.length - measured.length
+  };
 }
+var TurnUsageAccumulator = class {
+  calls = [];
+  async measure(input, run2) {
+    const before = await readUsageCalls(input, false);
+    try {
+      return await run2();
+    } finally {
+      const after = await readUsageCalls(input, false);
+      if (before && after)
+        this.calls.push(...after.slice(before.length));
+    }
+  }
+  get usage() {
+    return summarize(this.calls);
+  }
+};
 
 // apps/body/dist/server-command-intake.js
 import { randomUUID as randomUUID10 } from "node:crypto";
 import { mkdir as mkdir17, writeFile as writeFile16 } from "node:fs/promises";
 import { writeFileSync as writeFileSync4 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
-import { dirname as dirname21, join as join13 } from "node:path";
+import { dirname as dirname21, join as join14 } from "node:path";
 var CommandExecutionContext = class {
   generationId = randomUUID10();
   path;
   current;
   constructor(root) {
-    this.path = join13(root ?? tmpdir4(), `beeline-command-${this.generationId}.json`);
+    this.path = join14(root ?? tmpdir4(), `beeline-command-${this.generationId}.json`);
   }
   async enter(command) {
     this.current = command;
@@ -39281,11 +39407,11 @@ async function runServerCommandIntake(options) {
               if (attempt === 3)
                 throw error;
               const waitMs = Math.max(250 * 2 ** attempt, error instanceof DaemonApiError ? error.retryAfterMs ?? 0 : 0);
-              await new Promise((resolve42) => {
+              await new Promise((resolve43) => {
                 const done = () => {
                   clearTimeout(timer);
                   signal?.removeEventListener("abort", done);
-                  resolve42();
+                  resolve43();
                 };
                 const timer = setTimeout(done, waitMs);
                 signal?.addEventListener("abort", done, { once: true });
@@ -39376,11 +39502,11 @@ async function runServerCommandIntake(options) {
         }
       }
       options.onPoll?.();
-      const reconcile = await new Promise((resolve42) => {
+      const reconcile = await new Promise((resolve43) => {
         const done = (needed) => {
           signal?.removeEventListener("abort", aborted);
           wake = void 0;
-          resolve42(needed);
+          resolve43(needed);
         };
         const aborted = () => done(false);
         wake = done;
@@ -39422,9 +39548,9 @@ async function runServerCommandIntake(options) {
 // apps/body/dist/monolith-corner-turn.js
 import { execFile as execFile12 } from "node:child_process";
 import { createHash as createHash12 } from "node:crypto";
-import { mkdir as mkdir25, readFile as readFile26, writeFile as writeFile20 } from "node:fs/promises";
+import { mkdir as mkdir25, readFile as readFile27, writeFile as writeFile20 } from "node:fs/promises";
 import { homedir as homedir17, hostname as hostname3 } from "node:os";
-import { dirname as dirname25, join as join18, resolve as resolve34 } from "node:path";
+import { dirname as dirname25, join as join18, resolve as resolve35 } from "node:path";
 import { promisify as promisify7 } from "node:util";
 
 // apps/body/dist/agent-command-catalog.js
@@ -39443,7 +39569,7 @@ function agentCommandCatalogPublisher(input) {
 
 // apps/body/dist/attachment-delivery.js
 import { mkdir as mkdir18, writeFile as writeFile17 } from "node:fs/promises";
-import { basename as basename8, extname, join as join14 } from "node:path";
+import { basename as basename8, extname, join as join15 } from "node:path";
 var MAX_ATTACHMENT_BYTES = 25 * 1024 * 1024;
 var EXPIRED_REASON = "expired: these attachment bytes are past their retention window";
 var FETCH_TIMEOUT_MS = 3e4;
@@ -39493,6 +39619,10 @@ async function fetchBoundedBytes(url, fetchImpl = fetch) {
   return { status: response.status, ok: true, bytes, mimeType };
 }
 var MAX_INLINE_IMAGE_BYTES = 5 * 1024 * 1024;
+function safeAttachmentNames(attachments) {
+  const taken = /* @__PURE__ */ new Set();
+  return attachments.map((attachment, index) => safeFileName(attachment, index, taken));
+}
 function safeFileName(attachment, index, taken) {
   const raw = basename8(attachment.name ?? "").replace(/[^\w.-]+/g, "_").replace(/^\.+/, "");
   let name = raw || `attachment-${index + 1}`;
@@ -39506,8 +39636,7 @@ function safeFileName(attachment, index, taken) {
 async function deliverAttachments(attachments, dir, fetchImpl = fetch, cached = []) {
   if (!attachments.length)
     return [];
-  const taken = /* @__PURE__ */ new Set();
-  const names = attachments.map((attachment, index) => safeFileName(attachment, index, taken));
+  const names = safeAttachmentNames(attachments);
   return Promise.all(attachments.map(async (attachment, index) => {
     const tooLarge = (bytes) => ({
       attachment,
@@ -39540,7 +39669,7 @@ async function deliverAttachments(attachments, dir, fetchImpl = fetch, cached =
         return { attachment, reason: EXPIRED_REASON };
       if (!fetched.ok)
         throw new Error(`HTTP ${fetched.status}`);
-      const path = join14(dir, names[index]);
+      const path = join15(dir, names[index]);
       await writeFile17(path, fetched.bytes);
       const bytes = fetched.bytes;
       const mimeType = attachment.mimeType ?? fetched.mimeType;
@@ -39564,6 +39693,24 @@ async function deliverAttachments(attachments, dir, fetchImpl = fetch, cached =
     }
   }));
 }
+var MEDIA_ID = /\/v1\/media\/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:[?#]|$)/i;
+function attachmentId(attachment) {
+  return MEDIA_ID.exec(attachment.url)?.[1]?.toLowerCase();
+}
+function readableSize(bytes) {
+  if (bytes < 1024)
+    return `${bytes} B`;
+  if (bytes < 1024 * 1024)
+    return `${Math.round(bytes / 1024)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+function attachmentMarkerLines(attachments) {
+  return attachments.map((attachment) => {
+    const metadata = [attachment.mimeType, attachment.size ? readableSize(attachment.size) : ""].filter(Boolean).join(", ");
+    const id = attachmentId(attachment);
+    return `\u{1F4CE} ${attachment.name ?? "attachment"}${metadata ? ` (${metadata})` : ""} ${id ? `id=${id}` : "id unavailable"}${attachment.expired ? " (expired)" : ""}`;
+  });
+}
 function withoutImageData(delivered) {
   return delivered.map(({ image: _image, ...rest }) => rest);
 }
@@ -40034,7 +40181,7 @@ function mountedMcpSet(servers) {
 
 // apps/body/dist/pi-mcp-bridge.js
 import { execFile as execFile9 } from "node:child_process";
-import { mkdtemp as mkdtemp2, mkdir as mkdir19, readFile as readFile22, rm as rm11, unlink as unlink8 } from "node:fs/promises";
+import { mkdtemp as mkdtemp2, mkdir as mkdir19, readFile as readFile23, rm as rm11, unlink as unlink8 } from "node:fs/promises";
 import { tmpdir as tmpdir5 } from "node:os";
 import { resolve as resolve28 } from "node:path";
 import { promisify as promisify5 } from "node:util";
@@ -40066,7 +40213,7 @@ async function piHasNativeMcp(command) {
 }
 async function isolatedPiConfig(piHome) {
   try {
-    const parsed = JSON.parse(await readFile22(resolve28(piHome, "mcp.json"), "utf8"));
+    const parsed = JSON.parse(await readFile23(resolve28(piHome, "mcp.json"), "utf8"));
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
   } catch (error) {
     if (error.code !== "ENOENT")
@@ -40345,20 +40492,22 @@ export default async function (pi) {
 
 // apps/body/dist/corner-branch-sync.js
 import { execFile as execFile10 } from "node:child_process";
+import { access as access2, readFile as readFile24 } from "node:fs/promises";
+import { resolve as resolve29 } from "node:path";
 var CORNER_GIT_SYNC_TIMEOUT_MS = 12e4;
 var CORNER_GIT_SYNC_KILL_GRACE_MS = 1e3;
 var CornerGitSyncInterruptedError = class extends Error {
 };
 async function syncCornerBranch(input) {
-  const git = async (args) => {
+  const git = async (args, cleanup = false) => {
     const controller = new AbortController();
-    const signal = input.signal ? AbortSignal.any([input.signal, controller.signal]) : controller.signal;
+    const signal = input.signal && !cleanup ? AbortSignal.any([input.signal, controller.signal]) : controller.signal;
     const timer = setTimeout(() => controller.abort(), CORNER_GIT_SYNC_TIMEOUT_MS);
     const interrupted = () => new CornerGitSyncInterruptedError(`corner git sync ${args[0]} ${controller.signal.aborted ? `timed out after ${CORNER_GIT_SYNC_TIMEOUT_MS}ms` : "stopped"}`);
     try {
       if (signal.aborted)
         throw interrupted();
-      return await new Promise((resolve42, reject) => {
+      return await new Promise((resolve43, reject) => {
         let killTimer;
         let stdout6 = "";
         let failure = null;
@@ -40372,35 +40521,41 @@ async function syncCornerBranch(input) {
         });
         const abort = () => {
           if (!child) {
-            cleanup();
+            cleanup2();
             reject(interrupted());
           } else {
             killTimer = setTimeout(() => child.kill("SIGKILL"), CORNER_GIT_SYNC_KILL_GRACE_MS);
           }
         };
         signal.addEventListener("abort", abort, { once: true });
-        const cleanup = () => {
+        const cleanup2 = () => {
           signal.removeEventListener("abort", abort);
           if (killTimer)
             clearTimeout(killTimer);
         };
         if (child)
           child.once("close", () => {
-            cleanup();
+            cleanup2();
             if (signal.aborted)
               reject(interrupted());
             else if (failure)
               reject(failure);
             else
-              resolve42(stdout6);
+              resolve43(stdout6);
           });
         else
-          input.git(args).then(resolve42, reject).finally(cleanup);
+          input.git(args).then(resolve43, reject).finally(cleanup2);
       });
     } finally {
       clearTimeout(timer);
     }
   };
+  const marker = await readFile24(resolve29(input.worktreePath, ".git"), "utf8").catch(() => "");
+  const gitDir = resolve29(input.worktreePath, marker.startsWith("gitdir: ") ? marker.slice(8).trim() : ".git");
+  for (const directory of ["rebase-merge", "rebase-apply"]) {
+    if (await access2(resolve29(gitDir, directory)).then(() => true, () => false))
+      await git(["rebase", "--abort"], true);
+  }
   const remoteRef = `refs/remotes/origin/${input.featureBranch}`;
   const fetched = await git([
     "fetch",
@@ -40427,12 +40582,12 @@ async function syncCornerBranch(input) {
     await git(behind ? ["merge", "--ff-only", remote] : ["rebase", remote]);
     return behind ? "fast-forwarded" : "rebased";
   } catch (error) {
-    if (error instanceof CornerGitSyncInterruptedError)
-      throw error;
-    await git(["rebase", "--abort"]).catch((error2) => {
+    await git(["rebase", "--abort"], true).catch((error2) => {
       if (error2 instanceof CornerGitSyncInterruptedError)
         throw error2;
     });
+    if (error instanceof CornerGitSyncInterruptedError)
+      throw error;
     await git(["reset", "--hard", remote]);
     return "realigned";
   }
@@ -40446,7 +40601,7 @@ async function contains(git, head, ancestor) {
 }
 
 // apps/body/dist/room-session.js
-import { resolve as resolve29 } from "node:path";
+import { resolve as resolve30 } from "node:path";
 
 // apps/body/dist/read-only-policy.js
 var READ_ONLY_MCP_SERVER_NAME = "beeline-readonly-mcp";
@@ -40681,21 +40836,21 @@ function readOnlyMcpServer(config, cwd, agentMemoryDir) {
     command: config.readonlyMcpCommand,
     args: [...config.readonlyMcpArgs ?? []],
     env: [
-      { name: "BEELINE_READONLY_ROOT", value: resolve29(cwd) },
+      { name: "BEELINE_READONLY_ROOT", value: resolve30(cwd) },
       ...config.agentHomeRoot ? [
         {
           name: "BEELINE_READONLY_AGENT_SKILLS_ROOT",
-          value: resolve29(config.agentHomeRoot, skillDir, "skills")
+          value: resolve30(config.agentHomeRoot, skillDir, "skills")
         }
       ] : [],
-      ...agentMemoryDir ? [{ name: "BEELINE_READONLY_AGENT_MEMORY_ROOT", value: resolve29(agentMemoryDir) }] : []
+      ...agentMemoryDir ? [{ name: "BEELINE_READONLY_AGENT_MEMORY_ROOT", value: resolve30(agentMemoryDir) }] : []
     ]
   };
 }
 
 // apps/body/dist/institutional-context.js
 import { performance as performance2 } from "node:perf_hooks";
-var INSTITUTIONAL_CONTEXT_TIMEOUT_MS = 200;
+var INSTITUTIONAL_CONTEXT_TIMEOUT_MS = 500;
 var INSTITUTIONAL_MEMORY_LIVE_FLAG = "BEELINE_INSTITUTIONAL_MEMORY_ENABLED";
 function institutionalMemoryFlagEnabled(env, flag) {
   return env[flag] !== "false";
@@ -40742,15 +40897,15 @@ async function awaitInstitutionalContext(fetch2, log2 = console.warn, budgetMs =
 
 // apps/body/dist/codegraph.js
 import { execFile as execFile11 } from "node:child_process";
-import { access as access2, appendFile, mkdir as mkdir20, readFile as readFile23 } from "node:fs/promises";
-import { dirname as dirname22, isAbsolute as isAbsolute3, resolve as resolve30 } from "node:path";
+import { access as access3, appendFile, mkdir as mkdir20, readFile as readFile25 } from "node:fs/promises";
+import { dirname as dirname22, isAbsolute as isAbsolute3, resolve as resolve31 } from "node:path";
 import { promisify as promisify6 } from "node:util";
 var execFileAsync6 = promisify6(execFile11);
 var CODEGRAPH_MCP_SERVER_NAME = "codegraph";
 var CODEGRAPH_INDEX_PATH = ".codegraph/codegraph.db";
 var CODEGRAPH_PREPARE_TIMEOUT_MS = 12e4;
 function codegraphIndexDirectory(cwd) {
-  return resolve30(cwd, dirname22(CODEGRAPH_INDEX_PATH));
+  return resolve31(cwd, dirname22(CODEGRAPH_INDEX_PATH));
 }
 function codegraphMcpServer(config, cwd, options) {
   if (!config.codegraphCommand)
@@ -40758,7 +40913,7 @@ function codegraphMcpServer(config, cwd, options) {
   return {
     name: CODEGRAPH_MCP_SERVER_NAME,
     command: config.codegraphCommand,
-    args: ["serve", "--mcp", "--path", resolve30(cwd), ...options.readonly ? ["--no-watch"] : []],
+    args: ["serve", "--mcp", "--path", resolve31(cwd), ...options.readonly ? ["--no-watch"] : []],
     env: [
       { name: "CODEGRAPH_TELEMETRY", value: "0" },
       // One MCP child per harness session is easier to contain than a daemon
@@ -40776,7 +40931,7 @@ async function isGitWorktree(cwd) {
       cwd,
       timeout: 1e4
     });
-    return resolve30(stdout6.trim()) === resolve30(cwd);
+    return resolve31(stdout6.trim()) === resolve31(cwd);
   } catch {
     return false;
   }
@@ -40790,9 +40945,9 @@ async function excludeIndexFromGitStatus(cwd) {
     const gitPath = stdout6.trim();
     if (!gitPath)
       return;
-    const path = isAbsolute3(gitPath) ? gitPath : resolve30(cwd, gitPath);
+    const path = isAbsolute3(gitPath) ? gitPath : resolve31(cwd, gitPath);
     await mkdir20(dirname22(path), { recursive: true });
-    const existing = await readFile23(path, "utf8").catch(() => "");
+    const existing = await readFile25(path, "utf8").catch(() => "");
     if (existing.split("\n").includes(".codegraph/"))
       return;
     await appendFile(path, `${existing && !existing.endsWith("\n") ? "\n" : ""}.codegraph/
@@ -40805,8 +40960,8 @@ async function prepareCodegraphIndex(config, cwd) {
   if (!command || !await isGitWorktree(cwd))
     return false;
   await excludeIndexFromGitStatus(cwd);
-  const indexPath = resolve30(cwd, CODEGRAPH_INDEX_PATH);
-  const indexed = await access2(indexPath).then(() => true, () => false);
+  const indexPath = resolve31(cwd, CODEGRAPH_INDEX_PATH);
+  const indexed = await access3(indexPath).then(() => true, () => false);
   const args = indexed ? ["sync", "--quiet", cwd] : ["init", "--yes", cwd];
   try {
     await execFileAsync6(command, args, {
@@ -40831,31 +40986,9 @@ import { dirname as dirname23, join as join16 } from "node:path";
 var SCHEDULE_SCHEDULER_NAME = "Beeline Scheduler";
 var SCHEDULE_RAN_VERB = "ran a schedule for";
 
-// apps/body/dist/model-context-window.js
-import { readFile as readFile24 } from "node:fs/promises";
-import { join as join15 } from "node:path";
-async function modelContextWindowTokens(model, piHome) {
-  if (!model || !piHome)
-    return void 0;
-  try {
-    const catalog = JSON.parse(await readFile24(join15(piHome, "models.json"), "utf8"));
-    const parts = model.split("/");
-    const preferredProvider = parts.length > 2 ? parts.shift() : void 0;
-    const modelId = parts.join("/");
-    const providers = preferredProvider ? [catalog.providers?.[preferredProvider]].filter(Boolean) : Object.values(catalog.providers ?? {});
-    for (const provider of providers) {
-      const window = provider?.models?.find((entry) => entry.id === modelId)?.contextWindow;
-      if (window && Number.isFinite(window) && window > 0)
-        return Math.floor(window);
-    }
-  } catch {
-  }
-  return void 0;
-}
-
 // apps/body/dist/turn-trace.js
 import { appendFile as appendFile2, mkdir as mkdir21, readdir as readdir7, rm as rm12 } from "node:fs/promises";
-import { resolve as resolve31 } from "node:path";
+import { resolve as resolve32 } from "node:path";
 import { performance as performance3 } from "node:perf_hooks";
 var TURN_PHASES = [
   /** Enqueued on `SessionScheduler` until this turn holds a slot. A capacity wait lives here. */
@@ -40891,6 +41024,7 @@ var TurnTrace = class {
   atAdmission;
   finished = false;
   promptSections;
+  promptWindow;
   searchMemoryCalls;
   searchMemoryMisses;
   /** Every distinct tool call id this turn has seen, across retries. */
@@ -40972,6 +41106,10 @@ var TurnTrace = class {
   notePromptSections(report) {
     this.promptSections = Object.fromEntries(report.map((entry) => [entry.id, entry.bytes]));
   }
+  /** Assembled text only; the harness's tool schema is outside this measurement. */
+  notePromptWindow(prompt, modelContextTokens) {
+    this.promptWindow = modelContextTokens === void 0 ? void 0 : { promptBytes: Buffer.byteLength(prompt), modelContextTokens };
+  }
   /** The prompt left for the harness. Idempotent: a steer resume is the same attempt. */
   promptSent() {
     this.current.promptSentAt ??= this.now();
@@ -41081,6 +41219,7 @@ var TurnTrace = class {
         ...this.atAdmission ? { atAdmission: this.atAdmission } : {}
       },
       ...this.promptSections ? { promptSections: this.promptSections } : {},
+      ...this.promptWindow ? { promptWindow: this.promptWindow } : {},
       ...this.searchMemoryCalls !== void 0 ? { searchMemoryCalls: this.searchMemoryCalls, searchMemoryMisses: this.searchMemoryMisses ?? 0 } : {}
     };
   }
@@ -41135,7 +41274,7 @@ function formatTurnTraceLine(record5) {
   return [head, ...record5.attempts.map((attempt) => formatTurnAttempt(attempt))].join("\n  ");
 }
 function turnTraceDirectory(runtimeDir) {
-  return resolve31(runtimeDir, "turn-traces");
+  return resolve32(runtimeDir, "turn-traces");
 }
 var TURN_TRACE_RETENTION_DAYS = 7;
 function traceFileName(date) {
@@ -41152,7 +41291,7 @@ var TurnTraceFile = class {
     this.options = options;
   }
   path(now2 = (this.options.clock ?? (() => /* @__PURE__ */ new Date()))()) {
-    return resolve31(this.directory, traceFileName(now2));
+    return resolve32(this.directory, traceFileName(now2));
   }
   write(record5) {
     this.tail = this.tail.catch(() => void 0).then(async () => {
@@ -41176,7 +41315,7 @@ var TurnTraceFile = class {
     this.prunedDay = day;
     const cutoff = traceFileName(new Date(now2.getTime() - TURN_TRACE_RETENTION_DAYS * 864e5));
     const names = await readdir7(this.directory).catch(() => []);
-    await Promise.all(names.filter((name) => /^turns-\d{4}-\d{2}-\d{2}\.jsonl$/.test(name) && name < cutoff).map((name) => rm12(resolve31(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) => rm12(resolve32(this.directory, name), { force: true })));
   }
 };
 
@@ -41224,7 +41363,7 @@ var WarmTranscript = class {
 };
 
 // apps/body/dist/monolith-room-turn.js
-var ROOM_PROMPT_INACTIVITY_TIMEOUT_MS = 18e4;
+var ROOM_PROMPT_BACKSTOP_MS = TURN_BACKSTOP_MS;
 function isRoomMcpPermissionRequest(request, mountedServers = ROOM_MOUNTED_MCP_SERVERS, hostServers = CODE_OWNED_HOST_MCP_NAMES) {
   if (isHostMcpPermissionRequest(request, hostServers))
     return false;
@@ -41344,6 +41483,7 @@ var MonolithRoomTurnLoop = class {
    * and the terminal receipt is posted on a path that may run after it.
    */
   turnMetrics = {};
+  turnUsage = new TurnUsageAccumulator();
   /** OpenRouter providers this activation pinned, in order (C92). */
   pinnedProviders = [];
   /** The one provider re-pinned after an empty completion, until the session ends. */
@@ -41523,10 +41663,10 @@ var MonolithRoomTurnLoop = class {
    * Missing numbers are omitted rather than zeroed.
    */
   async captureTurnMetrics() {
-    const usage2 = this.sessionId ? await readHarnessTurnUsage({ agentEnv: this.agentEnv, sessionId: this.sessionId }) : void 0;
+    const { model: _model, ...usage2 } = this.turnUsage.usage ?? {};
     const promptBytes = this.client?.lastPromptBytes;
     return {
-      ...usage2 ? { inputTokens: usage2.inputTokens } : {},
+      ...usage2,
       ...promptBytes ? { promptBytes } : {}
     };
   }
@@ -42013,6 +42153,7 @@ var MonolithRoomTurnLoop = class {
     const api = this.options.api;
     this.busy = true;
     this.turnMetrics = {};
+    this.turnUsage = new TurnUsageAccumulator();
     const trace = this.beginTurnTrace(item.id);
     const institutionalContextFetch = startInstitutionalContextFetch(api, this.options.roomId);
     let statsStartedAt = 0;
@@ -42033,8 +42174,8 @@ var MonolithRoomTurnLoop = class {
         let timer;
         const stats = statsPromise && remaining > 0 ? await Promise.race([
           statsPromise,
-          new Promise((resolve42) => {
-            timer = setTimeout(() => resolve42(void 0), remaining);
+          new Promise((resolve43) => {
+            timer = setTimeout(() => resolve43(void 0), remaining);
           })
         ]).finally(() => {
           if (timer)
@@ -42095,7 +42236,7 @@ var MonolithRoomTurnLoop = class {
           const transcriptRows = conversation.items.filter((message) => message.type === "message" && message.id !== item.id && !active.steers.some((steerItem) => steerItem.id === message.id)).slice(-80).map((message) => ({
             id: message.id,
             authorId: message.authorId,
-            line: roomMessagePrompt(names.get(message.authorId) ?? message.authorId.slice(0, 12), message.body, message.attachments, this.deliveredAttachments.get(message.id), this.acceptsImages(), message.id)
+            line: transcriptMessagePrompt(names.get(message.authorId) ?? message.authorId.slice(0, 12), message.body, message.attachments, message.id)
           }));
           const command = this.commandContext.current;
           const grantDecision = command?.action === "resume";
@@ -42133,6 +42274,7 @@ var MonolithRoomTurnLoop = class {
               }
             });
             trace.notePromptSections(assembled.report);
+            trace.notePromptWindow(assembled.text, this.modelContextTokens);
             this.commandContext.notePromptSections([
               ...this.sessionPromptSectionIds,
               ...assembled.report.map((section) => section.id)
@@ -42156,14 +42298,14 @@ var MonolithRoomTurnLoop = class {
               try {
                 stream.beginRun();
                 trace.promptSent();
-                result2 = await this.client.sessionPrompt(this.sessionId, nextPrompt, ROOM_PROMPT_INACTIVITY_TIMEOUT_MS, (delta, full, currentRun) => {
+                result2 = await this.turnUsage.measure({ agentEnv: this.agentEnv, sessionId: this.sessionId }, () => this.client.sessionPrompt(this.sessionId, nextPrompt, ROOM_PROMPT_BACKSTOP_MS, (delta, full, currentRun) => {
                   trace.firstModelOutput();
                   stream.onChunk(delta, full, currentRun);
                 }, void 0, (calls) => {
                   trace.toolCalls(calls);
                   if (openedACorner(openCornerToolCall(calls)))
                     liveCornerOpened = true;
-                });
+                }));
               } catch (error) {
                 promptError = error;
               }
@@ -42306,8 +42448,8 @@ var MonolithRoomTurnLoop = class {
         void finishTrace("cancelled").catch(() => void 0);
         return;
       }
-      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`);
+      if (liveCornerOpened && error instanceof AcpTurnBackstopError) {
+        console.log(`[thin-core] monolith Room ${this.options.roomId} turn ${item.id}: turn_backstop after opening a corner; the work continues in the corner`);
         this.options.onCornerOpened?.();
         const lastRun = liveStream?.lastRunText ?? "";
         const streamed = isPureRetryNarration(lastRun) ? "" : durableReplyText(lastRun);
@@ -42330,8 +42472,6 @@ var MonolithRoomTurnLoop = class {
         void finishTrace("complete").catch(() => void 0);
         return;
       }
-      if (isSilentPromptTimeout(error))
-        await this.discardSession().catch(() => void 0);
       await liveStream?.retract().catch((retractError) => {
         console.error(`[thin-core] monolith Room ${this.options.roomId} draft retract failed:`, retractError);
       });
@@ -42422,6 +42562,13 @@ function openCornerToolCall(calls) {
 function openedACorner(call) {
   return !!call && isCompletedToolCall(call);
 }
+function transcriptMessagePrompt(author, body, attachments, messageId) {
+  return [
+    `[message id: ${messageId}]`,
+    `${author}: ${body.trim() || "(shared attachments)"}`,
+    ...attachmentMarkerLines(attachments)
+  ].join("\n");
+}
 function roomMessagePrompt(author, body, attachments, delivered, harnessAcceptsImages = true, messageId) {
   const message = body.trim() || "(shared attachments)";
   const rendered = author ? `${author}: ${message}` : message;
@@ -42434,9 +42581,9 @@ function roomMessagePrompt(author, body, attachments, delivered, harnessAcceptsI
 
 // apps/body/dist/corner-github-auth.js
 import { chmod as chmod9, mkdir as mkdir23, writeFile as writeFile19 } from "node:fs/promises";
-import { delimiter as delimiter2, resolve as resolve32 } from "node:path";
+import { delimiter as delimiter2, resolve as resolve33 } from "node:path";
 async function installCornerGitHubWrappers(input) {
-  const bin = resolve32(input.root, "beeline-github-bin");
+  const bin = resolve33(input.root, "beeline-github-bin");
   await mkdir23(bin, { recursive: true, mode: 448 });
   const common = {
     node: process.execPath,
@@ -42446,13 +42593,13 @@ async function installCornerGitHubWrappers(input) {
     featureBranch: input.featureBranch,
     targetBranch: input.targetBranch
   };
-  await writeLauncher(resolve32(bin, "git"), {
+  await writeLauncher(resolve33(bin, "git"), {
     ...common,
     command: input.gitBinary,
     launcher: "git"
   });
   if (input.ghBinary)
-    await writeLauncher(resolve32(bin, "gh"), {
+    await writeLauncher(resolve33(bin, "gh"), {
       ...common,
       command: input.ghBinary,
       launcher: "gh"
@@ -42591,29 +42738,29 @@ process.exit(result.status ?? 1);
 // apps/body/dist/warm-node-modules.js
 import { createHash as createHash11, randomUUID as randomUUID11 } from "node:crypto";
 import { constants as fsConstants3 } from "node:fs";
-import { chmod as chmod10, copyFile as copyFile2, link, lstat as lstat4, mkdir as mkdir24, readdir as readdir8, readFile as readFile25, readlink as readlink2, rename as rename9, rm as rm13, stat as stat8, symlink as symlink3, utimes } from "node:fs/promises";
-import { dirname as dirname24, join as join17, resolve as resolve33 } from "node:path";
+import { chmod as chmod10, copyFile as copyFile2, link, lstat as lstat4, mkdir as mkdir24, readdir as readdir8, readFile as readFile26, readlink as readlink2, rename as rename9, rm as rm13, stat as stat8, symlink as symlink3, utimes } from "node:fs/promises";
+import { dirname as dirname24, join as join17, resolve as resolve34 } 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 resolve33(supervisorRoot, "beeline", "npm-cache");
+  return resolve34(supervisorRoot, "beeline", "npm-cache");
 }
 function sharedPnpmStoreDir(supervisorRoot) {
-  return resolve33(supervisorRoot, "beeline", "pnpm-store");
+  return resolve34(supervisorRoot, "beeline", "pnpm-store");
 }
 function sharedCargoTargetDir(supervisorRoot) {
-  return resolve33(supervisorRoot, "beeline", "cargo-target");
+  return resolve34(supervisorRoot, "beeline", "cargo-target");
 }
 function warmNodeModulesStoreDir(supervisorRoot) {
-  return resolve33(supervisorRoot, "beeline", "node-modules");
+  return resolve34(supervisorRoot, "beeline", "node-modules");
 }
 function isPlanRefusal(value) {
   return "failure" in value;
 }
 async function readWarmPlan(worktreePath) {
-  const lockfile = await readFile25(resolve33(worktreePath, "package-lock.json")).catch(() => void 0);
+  const lockfile = await readFile26(resolve34(worktreePath, "package-lock.json")).catch(() => void 0);
   if (!lockfile)
     return { failure: "no-lockfile" };
   const packages = parseLockfilePackages(lockfile);
@@ -42652,11 +42799,11 @@ async function seedWarmNodeModules(input) {
     return { reason: plan.failure, ...plan.detail ? { detail: plan.detail } : {} };
   }
   for (const tree of plan.trees) {
-    if (await pathExists(resolve33(input.worktreePath, tree))) {
+    if (await pathExists(resolve34(input.worktreePath, tree))) {
       return { reason: "present", key: plan.key };
     }
   }
-  const entry = resolve33(input.storeRoot, plan.key);
+  const entry = resolve34(input.storeRoot, plan.key);
   if (!await isDirectory(entry))
     return { reason: "cold", key: plan.key };
   const [storeDevice, checkoutDevice] = await Promise.all([
@@ -42666,19 +42813,19 @@ async function seedWarmNodeModules(input) {
   if (storeDevice === void 0 || storeDevice !== checkoutDevice) {
     return { reason: "cross-device", key: plan.key };
   }
-  const staging = resolve33(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID11()}`);
+  const staging = resolve34(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID11()}`);
   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(resolve33(entry, tree), resolve33(staging, tree), seedFile);
+      await cloneTree(resolve34(entry, tree), resolve34(staging, tree), seedFile);
     }
     for (const tree of plan.trees) {
-      const target = resolve33(input.worktreePath, tree);
+      const target = resolve34(input.worktreePath, tree);
       await mkdir24(dirname24(target), { recursive: true });
-      await rename9(resolve33(staging, tree), target);
+      await rename9(resolve34(staging, tree), target);
       placed.push(target);
     }
     return { reason: "seeded", key: plan.key };
@@ -42696,11 +42843,11 @@ async function harvestWarmNodeModules(input) {
   if (isPlanRefusal(plan)) {
     return { reason: plan.failure, ...plan.detail ? { detail: plan.detail } : {} };
   }
-  const entry = resolve33(input.storeRoot, plan.key);
+  const entry = resolve34(input.storeRoot, plan.key);
   if (await pathExists(entry))
     return { reason: "already-warm", key: plan.key };
   for (const tree of plan.trees) {
-    if (!await isDirectory(resolve33(input.worktreePath, tree))) {
+    if (!await isDirectory(resolve34(input.worktreePath, tree))) {
       return { reason: "no-node-modules", key: plan.key, detail: tree };
     }
   }
@@ -42712,12 +42859,12 @@ async function harvestWarmNodeModules(input) {
       detail: `${missing.length} absent, e.g. ${missing.slice(0, 3).join(", ")}`
     };
   }
-  const staging = resolve33(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID11()}`);
+  const staging = resolve34(input.storeRoot, `${STAGING_PREFIX}${process.pid}.${randomUUID11()}`);
   try {
     await mkdir24(input.storeRoot, { recursive: true, mode: 493 });
     await sweepStaleStaging(input.storeRoot, (input.now ?? Date.now)());
     for (const tree of plan.trees) {
-      await cloneTree(resolve33(input.worktreePath, tree), resolve33(staging, tree), harvestFile);
+      await cloneTree(resolve34(input.worktreePath, tree), resolve34(staging, tree), harvestFile);
     }
     await input.onCopied?.();
     if (!await stagedTreeIsPublishable(input.worktreePath, staging, plan.key)) {
@@ -42740,16 +42887,16 @@ async function stagedTreeIsPublishable(worktreePath, staging, key) {
     return false;
   const hidden = join17("node_modules", ".package-lock.json");
   const [copied, current] = await Promise.all([
-    readFile25(resolve33(staging, hidden)).catch(() => void 0),
-    readFile25(resolve33(worktreePath, hidden)).catch(() => void 0)
+    readFile26(resolve34(staging, hidden)).catch(() => void 0),
+    readFile26(resolve34(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 readFile25(resolve33(worktreePath, "package-lock.json")).catch(() => void 0));
-  const installed = parseLockfilePackages(await readFile25(resolve33(treeRoot, "node_modules", ".package-lock.json")).catch(() => void 0));
+  const wanted = parseLockfilePackages(await readFile26(resolve34(worktreePath, "package-lock.json")).catch(() => void 0));
+  const installed = parseLockfilePackages(await readFile26(resolve34(treeRoot, "node_modules", ".package-lock.json")).catch(() => void 0));
   if (!wanted)
     return ["package-lock.json is unreadable"];
   if (!installed)
@@ -42769,7 +42916,7 @@ async function missingInstalledPackages(worktreePath, treeRoot = worktreePath) {
       required.push(path);
   }
   await mapWithLimit(required, INTEGRITY_READ_CONCURRENCY, async (path) => {
-    if (!(path in installed) || !await isInstalledPackage(resolve33(treeRoot, path))) {
+    if (!(path in installed) || !await isInstalledPackage(resolve34(treeRoot, path))) {
       missing.push(path);
     }
   });
@@ -43119,6 +43266,8 @@ var MonolithCornerTurnLoop = class {
    * and the terminal receipt is posted on a path that may run after it.
    */
   turnMetrics = {};
+  turnUsage = new TurnUsageAccumulator();
+  modelContextTokens;
   /** OpenRouter providers this activation pinned, in order (C92). */
   pinnedProviders = [];
   /** Whether the pinned model takes images; `undefined` when the pin did not say. */
@@ -43266,10 +43415,10 @@ var MonolithCornerTurnLoop = class {
    * Missing numbers are omitted rather than zeroed.
    */
   async captureTurnMetrics() {
-    const usage2 = this.sessionId ? await readHarnessTurnUsage({ agentEnv: this.agentEnv, sessionId: this.sessionId }) : void 0;
+    const { model: _model, ...usage2 } = this.turnUsage.usage ?? {};
     const promptBytes = this.client?.lastPromptBytes;
     return {
-      ...usage2 ? { inputTokens: usage2.inputTokens } : {},
+      ...usage2,
       ...promptBytes ? { promptBytes } : {}
     };
   }
@@ -43466,6 +43615,7 @@ var MonolithCornerTurnLoop = class {
       CARGO_TARGET_DIR: cargoTargetDir
     };
     this.agentEnv = agentEnv;
+    this.modelContextTokens = await modelContextWindowTokens(selection.model, agentEnv.PI_CODING_AGENT_DIR);
     const agentArgs = agentArgsWithModelSelection({
       kind: this.options.config.agentKind,
       command,
@@ -43693,7 +43843,7 @@ var MonolithCornerTurnLoop = class {
           briefRevision: restore.brief?.revision
         }),
         ...this.options.config.agentHomeRoot && this.options.config.agentKind && !AGENT_SKILL_DIRS.includes(this.options.config.agentKind) ? [
-          `This harness has no verified native skill discovery. Read the release-managed review procedure at ${resolve34(this.options.config.agentHomeRoot, "codex", "skills", "beeline-review", "SKILL.md")} before the verdict.`
+          `This harness has no verified native skill discovery. Read the release-managed review procedure at ${resolve35(this.options.config.agentHomeRoot, "codex", "skills", "beeline-review", "SKILL.md")} before the verdict.`
         ] : []
       ].join("\n");
     } catch {
@@ -43825,8 +43975,8 @@ var MonolithCornerTurnLoop = class {
         let timer;
         const stats = statsPromise && remaining > 0 ? await Promise.race([
           statsPromise,
-          new Promise((resolve42) => {
-            timer = setTimeout(() => resolve42(void 0), remaining);
+          new Promise((resolve43) => {
+            timer = setTimeout(() => resolve43(void 0), remaining);
           })
         ]).finally(() => {
           if (timer)
@@ -43856,6 +44006,7 @@ var MonolithCornerTurnLoop = class {
             throw new Error("corner turn stopped for daemon handoff");
           this.busy = true;
           this.turnMetrics = {};
+          this.turnUsage = new TurnUsageAccumulator();
           await this.syncBranch();
           const [conversation, roster, restored, activeReviewerInstruction, institutionalContext, memberCorners] = await trace.measure("context-fetch", () => Promise.all([
             api.execute("getRoomConversation", {
@@ -43883,7 +44034,7 @@ var MonolithCornerTurnLoop = class {
           const delivered = this.attachmentDir && allAttachments.length ? await deliverAttachments(allAttachments, join18(this.attachmentDir, requestId.replace(/[^\w-]/g, "_")), this.options.fetchImpl) : [];
           const briefFileLines = await Promise.all((restored.brief?.attachments ?? []).map(async (file, index) => {
             const entry = delivered.find((item) => item.attachment === briefAttachments[index]);
-            const verified = entry?.path && createHash12("sha256").update(await readFile26(entry.path)).digest("hex") === file.sha256;
+            const verified = entry?.path && createHash12("sha256").update(await readFile27(entry.path)).digest("hex") === file.sha256;
             return `- ${file.title} (${file.purpose}; ${file.required ? "required" : "optional"}; sha256 ${file.sha256}): ${verified ? entry.path : "UNAVAILABLE OR CONTENT MISMATCH"}`;
           }));
           const missingRequiredBriefFile = (restored.brief?.attachments ?? []).some((file, index) => file.required && briefFileLines[index]?.includes("UNAVAILABLE OR CONTENT MISMATCH"));
@@ -43891,18 +44042,20 @@ var MonolithCornerTurnLoop = class {
           const requestedBy = requester && !requester.name && names.get(requester.pubkey) ? { ...requester, name: names.get(requester.pubkey) } : requester;
           if (requestedBy)
             this.currentTurn = { requestId, requester: requestedBy };
-          const transcriptRows = conversation.items.filter((message) => message.id !== requestId && message.id !== sourceMessageId && message.body.trim()).slice(-120).map((message) => ({
+          const transcriptRows = conversation.items.filter((message) => message.id !== requestId && message.id !== sourceMessageId && (message.body.trim() || message.attachments?.length)).slice(-120).map((message) => ({
             id: message.id,
             authorId: message.authorId,
             line: [
               ...message.type === "message" ? [`[message id: ${message.id}]`] : [],
-              `${names.get(message.authorId) ?? "Beeline"} [${message.type}]: ${message.body}`
+              `${names.get(message.authorId) ?? "Beeline"} [${message.type}]: ${message.body.trim() ? message.body : "(shared attachments)"}`,
+              ...attachmentMarkerLines(message.attachments ?? [])
             ].join("\n")
           }));
           const buildPrompt = () => {
             const transcript = this.warmTranscript.select(this.sessionId, transcriptRows, this.agent.publicKey);
             const assembled = assembleTurnPrompt({
               surface: this.sessionSurface,
+              modelContextTokens: this.modelContextTokens,
               sessionPrefix: this.turnSessionPrefix,
               objective: this.options.objective,
               ...restored.titleGenerated && restored.title ? { generatedTitle: restored.title } : {},
@@ -43928,6 +44081,7 @@ var MonolithCornerTurnLoop = class {
               }
             });
             trace.notePromptSections(assembled.report);
+            trace.notePromptWindow(assembled.text, this.modelContextTokens);
             this.commandContext.notePromptSections([
               ...this.sessionPromptSectionIds,
               ...assembled.report.map((section) => section.id)
@@ -44042,7 +44196,7 @@ var MonolithCornerTurnLoop = class {
             narrationRunBoundary = 0;
             currentNarrationRun = "";
             trace.promptSent();
-            return this.client.sessionPrompt(this.sessionId, promptWithImages(prompt, attachmentImageBlocks(delivered, this.acceptsImages())), ROOM_PROMPT_INACTIVITY_TIMEOUT_MS, (delta, full, currentRun, runs) => {
+            return this.turnUsage.measure({ agentEnv: this.agentEnv, sessionId: this.sessionId }, () => this.client.sessionPrompt(this.sessionId, promptWithImages(prompt, attachmentImageBlocks(delivered, this.acceptsImages())), ROOM_PROMPT_BACKSTOP_MS, (delta, full, currentRun, runs) => {
               trace.firstModelOutput();
               if (runs) {
                 completedNarrationRuns = runs.slice(narrationRunBoundary);
@@ -44059,7 +44213,7 @@ var MonolithCornerTurnLoop = class {
               trace.toolCalls(calls);
               publishToolCalls(calls, true);
               publishToolCalls(calls, false, lastNarratedToolCall);
-            });
+            }));
           };
           let loginRetryUsed = false;
           const runPrompt = async (prompt = buildPrompt()) => {
@@ -44205,7 +44359,7 @@ ${deviceGrantResumePrompt(grantedDevice, result.agentText)}`);
           await trace.measure("publish", () => stream.settle(repeatedNarration ? "" : durableReply, durableReply && !repeatedNarration ? {
             ...requestedById ? { triggerMessageId: requestId } : {}
           } : {}));
-        }, { priority: "interactive", roomKey: cornerId });
+        }, { priority: "interactive", roomKey: this.options.parentRoomId });
       }, (error) => console.error(`[thin-core] corner ${cornerId} receipt heartbeat failed:`, error));
       if (laneUpgraded) {
         void finishTrace("complete").catch(() => void 0);
@@ -44235,8 +44389,6 @@ ${deviceGrantResumePrompt(grantedDevice, result.agentText)}`);
         void finishTrace("complete").catch(() => void 0);
         return;
       }
-      if (isSilentPromptTimeout(error))
-        await this.discardSession().catch(() => void 0);
       const reason = distillTurnFailureReason(error);
       startTraceStats();
       await api.execute("postAgentTurnReceipt", {
@@ -44312,7 +44464,7 @@ ${deviceGrantResumePrompt(grantedDevice, result.agentText)}`);
       } catch (error) {
         if (attempt === 2)
           throw error;
-        await new Promise((resolve42) => setTimeout(resolve42, 250 * (attempt + 1)));
+        await new Promise((resolve43) => setTimeout(resolve43, 250 * (attempt + 1)));
       }
     }
     if (!token)
@@ -44924,7 +45076,7 @@ function cornerStartConfigKey(repository, objective) {
 function cornerRepositoryCacheDir(supervisorRoot, remote) {
   const normalizedRemote = roomCheckoutRemote(remote);
   const repositoryHash = createHash13("sha256").update(normalizedRemote).digest("hex").slice(0, 24);
-  return resolve35(supervisorRoot, "beeline", "repositories", `${repositoryHash}.git`);
+  return resolve36(supervisorRoot, "beeline", "repositories", `${repositoryHash}.git`);
 }
 function isStandingCornerStartFault(error) {
   const text2 = error instanceof Error ? error.message : String(error);
@@ -44933,11 +45085,11 @@ function isStandingCornerStartFault(error) {
 async function materializeCornerWorktree(input) {
   const remote = roomCheckoutRemote(input.remote);
   const gitCommonDir = cornerRepositoryCacheDir(input.supervisorRoot, remote);
-  const path = resolve35(input.supervisorRoot, "beeline", "corners", input.cornerId);
+  const path = resolve36(input.supervisorRoot, "beeline", "corners", input.cornerId);
   await mkdir26(dirname26(gitCommonDir), { recursive: true, mode: 448 });
   await mkdir26(dirname26(path), { recursive: true, mode: 448 });
   const authEnv = githubGitEnv(input.token);
-  if (!existsSync8(resolve35(gitCommonDir, "HEAD"))) {
+  if (!existsSync8(resolve36(gitCommonDir, "HEAD"))) {
     await execFileAsync8("git", ["clone", "--bare", remote, gitCommonDir], {
       env: authEnv,
       maxBuffer: 4 * 1024 * 1024
@@ -44960,7 +45112,7 @@ async function materializeCornerWorktree(input) {
       return false;
     throw error;
   });
-  if (!existsSync8(resolve35(path, ".git"))) {
+  if (!existsSync8(resolve36(path, ".git"))) {
     await rm14(path, { recursive: true, force: true });
     await execFileAsync8("git", [
       `--git-dir=${gitCommonDir}`,
@@ -45026,9 +45178,9 @@ async function mapWithConcurrency(values, limit, visit) {
   }));
 }
 async function discoverCornerWorktree(supervisorRoot, cornerId) {
-  const cornersRoot = resolve35(supervisorRoot, "beeline", "corners");
-  const path = resolve35(cornersRoot, cornerId);
-  if (dirname26(path) !== cornersRoot || !existsSync8(resolve35(path, ".git")))
+  const cornersRoot = resolve36(supervisorRoot, "beeline", "corners");
+  const path = resolve36(cornersRoot, cornerId);
+  if (dirname26(path) !== cornersRoot || !existsSync8(resolve36(path, ".git")))
     return void 0;
   const [canonicalRoot, canonicalPath] = await Promise.all([
     realpath2(cornersRoot),
@@ -45040,8 +45192,8 @@ async function discoverCornerWorktree(supervisorRoot, cornerId) {
   const common = await execFileAsync8("git", ["-C", path, "rev-parse", "--git-common-dir"]).catch(() => void 0);
   if (!common)
     return void 0;
-  const gitCommonDir = resolve35(path, common.stdout.trim());
-  const repositoriesRoot = resolve35(supervisorRoot, "beeline", "repositories");
+  const gitCommonDir = resolve36(path, common.stdout.trim());
+  const repositoriesRoot = resolve36(supervisorRoot, "beeline", "repositories");
   const commonRelative = relative3(repositoriesRoot, gitCommonDir);
   if (!commonRelative || commonRelative === ".." || commonRelative.startsWith(`..${sep2}`) || commonRelative.startsWith(sep2)) {
     throw new Error(`refusing corner ${cornerId} with git directory outside repository cache`);
@@ -45049,7 +45201,7 @@ async function discoverCornerWorktree(supervisorRoot, cornerId) {
   return { path, gitCommonDir };
 }
 async function localCornerWorktreeIds(supervisorRoot) {
-  const root = resolve35(supervisorRoot, "beeline", "corners");
+  const root = resolve36(supervisorRoot, "beeline", "corners");
   const entries = await readdir9(root, { withFileTypes: true }).catch((error) => {
     if (error.code === "ENOENT")
       return [];
@@ -45139,8 +45291,8 @@ async function originContains(gitCommonDir, head) {
 }
 var execFileAsync8 = promisify8(execFile13);
 async function removeCornerScratchWorkspace(input) {
-  const expected = resolve35(input.roomRoot, "scratch");
-  if (resolve35(input.scratchPath) !== expected) {
+  const expected = resolve36(input.roomRoot, "scratch");
+  if (resolve36(input.scratchPath) !== expected) {
     throw new Error(`refusing to remove scratch outside corner ${input.cornerId}`);
   }
   await rm14(expected, { recursive: true, force: true });
@@ -45252,7 +45404,7 @@ var RoomRuntimeCoordinator = class {
       ...fixedWorkspaceCeiling ? { maxLiveSessions: Number(fixedWorkspaceCeiling) } : {},
       perRoomLiveSessions: resolvePerRoomLiveSessions(process.env),
       workspaceFloor: Number(process.env.BUZZY_BODY_MAX_SESSIONS_FLOOR ?? String(DEFAULT_WORKSPACE_LIVE_SESSIONS_FLOOR)),
-      activeRoomCount: () => this.running.size,
+      activeRoomCount: () => this.activeRoomCount(),
       idleMs: resolveSessionIdleMs(process.env),
       maxWarmSessions: resolveMaxWarmSessions(process.env),
       reserveInteractiveSlot: true
@@ -45282,7 +45434,7 @@ var RoomRuntimeCoordinator = class {
     this.discoveryWakeListener?.();
   }
   activeRoomCount() {
-    return this.running.size;
+    return new Set([...this.running.keys()].map((id) => this.monolithCornerParents.get(id) ?? id)).size;
   }
   surfaceHealthSnapshot() {
     return this.surfaceHealth.snapshot();
@@ -45589,13 +45741,13 @@ var RoomRuntimeCoordinator = class {
     return this.runtime.rooms.find((room) => room.channelId === roomId);
   }
   roomRoot(roomId) {
-    return this.roomRecord(roomId)?.root ?? resolve35(dirname26(this.configPath), "rooms", roomId);
+    return this.roomRecord(roomId)?.root ?? resolve36(dirname26(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 = resolve35(workspaceRoot, "agent-home");
+    const home = resolve36(workspaceRoot, "agent-home");
     if (!required && flag !== "1" && !existsSync8(home) && existsSync8(workspaceRoot))
       return void 0;
     try {
@@ -45611,8 +45763,8 @@ var RoomRuntimeCoordinator = class {
     return {
       ...this.baseConfig,
       workspaceRoot,
-      agentPrivateRoot: resolve35(workspaceRoot, "agent-private"),
-      agentMemoryRoot: resolve35(dirname26(this.configPath), "memory"),
+      agentPrivateRoot: resolve36(workspaceRoot, "agent-private"),
+      agentMemoryRoot: resolve36(dirname26(this.configPath), "memory"),
       openRouterRoutingCacheDir: openRouterRoutingCacheDir(dirname26(this.configPath)),
       turnTraceDir: turnTraceDirectory(dirname26(this.configPath)),
       ...agentHomeRoot ? { agentHomeRoot } : {}
@@ -45695,11 +45847,11 @@ var RoomRuntimeCoordinator = class {
     const remote = roomCheckoutRemote(repository.remote);
     const targetBranch = repository.targetBranch || "main";
     const checkoutId = createHash13("sha256").update(`${roomId}\0${remote}\0${targetBranch}`).digest("hex").slice(0, 24);
-    const path = resolve35(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
+    const path = resolve36(this.runtime.supervisorRoot, "beeline", "room-checkouts", checkoutId);
     await mkdir26(dirname26(path), { recursive: true, mode: 448 });
     const token = remote.startsWith("https://github.com/") ? await this.parentRepositoryToken(roomId) : void 0;
     const env = token ? githubGitEnv(token.token) : process.env;
-    if (!existsSync8(resolve35(path, ".git"))) {
+    if (!existsSync8(resolve36(path, ".git"))) {
       await execFileAsync8("git", ["clone", "--no-checkout", remote, path], {
         env,
         maxBuffer: 4 * 1024 * 1024
@@ -45776,7 +45928,7 @@ var RoomRuntimeCoordinator = class {
       if (!objective)
         throw new Error("corner has no authoritative objective fact");
       const repositoryBacked = repository.resolution === "repository" && restore.lane !== "no_code";
-      const scratchPath = resolve35(this.roomRoot(corner.cornerId), "scratch");
+      const scratchPath = resolve36(this.roomRoot(corner.cornerId), "scratch");
       if (repositoryBacked && existsSync8(scratchPath) && !restore.featureBranch)
         throw new Error("promoted corner has no server-assigned feature branch");
       const targetBranch = repositoryBacked ? repository.targetBranch || "main" : void 0;
@@ -45791,7 +45943,7 @@ var RoomRuntimeCoordinator = class {
       }) : void 0;
       if (worktree && existsSync8(scratchPath))
         await this.reapCornerScratch({ path: scratchPath, cornerId: corner.cornerId });
-      const workspacePath = worktree?.path ?? resolve35(this.roomRoot(corner.cornerId), "scratch");
+      const workspacePath = worktree?.path ?? resolve36(this.roomRoot(corner.cornerId), "scratch");
       if (!worktree)
         await mkdir26(workspacePath, { recursive: true, mode: 448 });
       if (worktree && shouldPostInitialCornerWorkingState(restore)) {
@@ -46114,7 +46266,7 @@ var RoomRuntimeCoordinator = class {
           throw new Error(`archived corner ${corner.cornerId} has no authoritative repository`);
         }
         const expectedCommonDir = cornerRepositoryCacheDir(this.runtime.supervisorRoot, repository.remote);
-        if (resolve35(discovered.gitCommonDir) !== expectedCommonDir) {
+        if (resolve36(discovered.gitCommonDir) !== expectedCommonDir) {
           throw new Error(`archived corner ${corner.cornerId} repository cache does not match`);
         }
         if (!restore.featureBranch) {
@@ -46465,10 +46617,10 @@ var ThinDaemonCore = class {
 
 // apps/body/dist/force-update-journal.js
 import { mkdirSync as mkdirSync4, readFileSync as readFileSync9, renameSync, writeFileSync as writeFileSync5 } from "node:fs";
-import { resolve as resolve36 } from "node:path";
+import { resolve as resolve37 } from "node:path";
 var NAME = "force-update-interruptions.json";
 function pathFor(runtimeDir) {
-  return resolve36(runtimeDir, NAME);
+  return resolve37(runtimeDir, NAME);
 }
 function read(runtimeDir) {
   try {
@@ -46546,17 +46698,17 @@ function staleGeneration(error) {
 init_launchd();
 init_systemd();
 import { mkdir as mkdir27, rename as rename10 } from "node:fs/promises";
-import { dirname as dirname27, resolve as resolve37 } from "node:path";
+import { dirname as dirname27, resolve as resolve38 } from "node:path";
 async function retireRemovedAgent(runtime, options = {}) {
-  const deletedRoot = resolve37(runtime.supervisorRoot, "beeline", "deleted-runtimes");
-  const target = resolve37(deletedRoot, `${runtime.agent.publicKey}-${Date.now()}`);
+  const deletedRoot = resolve38(runtime.supervisorRoot, "beeline", "deleted-runtimes");
+  const target = resolve38(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 = resolve37(target);
+  const destination = resolve38(target);
   if (destination === source || destination.startsWith(`${source}/`)) {
     throw new Error("agent runtime destination must be outside the live runtime");
   }
@@ -46579,8 +46731,8 @@ init_self_update();
 init_systemd();
 
 // apps/body/dist/release-status.js
-import { readFile as readFile27, readdir as readdir10, rename as rename11, writeFile as writeFile21 } from "node:fs/promises";
-import { resolve as resolve38 } from "node:path";
+import { readFile as readFile28, readdir as readdir10, rename as rename11, writeFile as writeFile21 } from "node:fs/promises";
+import { resolve as resolve39 } 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}$/;
@@ -46597,7 +46749,7 @@ async function writeDaemonReleaseStatus(runtimeDir, agentPubkey, identity, optio
     pid: options.pid ?? process.pid,
     readyAt: (options.now?.() ?? /* @__PURE__ */ new Date()).toISOString()
   };
-  const target = resolve38(runtimeDir, DAEMON_RELEASE_STATUS_FILE);
+  const target = resolve39(runtimeDir, DAEMON_RELEASE_STATUS_FILE);
   const temporary = `${target}.${status.pid}.tmp`;
   await writeFile21(temporary, `${JSON.stringify(status, null, 2)}
 `, { mode: 384 });
@@ -46607,7 +46759,7 @@ async function writeDaemonReleaseStatus(runtimeDir, agentPubkey, identity, optio
 
 // apps/body/dist/scratch-sweep.js
 import { lstat as lstat5, readdir as readdir11, rmdir as rmdir2, unlink as unlink9 } from "node:fs/promises";
-import { resolve as resolve39 } from "node:path";
+import { resolve as resolve40 } 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) {
@@ -46616,7 +46768,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 = resolve39(runtimeDir, "rooms");
+  const roomsDir = resolve40(runtimeDir, "rooms");
   let entries;
   try {
     entries = await readdir11(roomsDir, { withFileTypes: true });
@@ -46627,7 +46779,7 @@ async function discoverAttachScratchRoots(runtimeDir) {
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const home = resolve39(roomsDir, entry.name, "agent-home");
+    const home = resolve40(roomsDir, entry.name, "agent-home");
     const stats = await lstat5(home).catch(() => void 0);
     if (stats?.isDirectory())
       roots.push(home);
@@ -46646,7 +46798,7 @@ async function removeStaleFiles(dir, cutoffMs, protectNamesHere) {
   for (const entry of entries) {
     if (protectNamesHere && NEVER_SWEEP_SUBDIR_NAMES.has(entry.name))
       continue;
-    const path = resolve39(dir, entry.name);
+    const path = resolve40(dir, entry.name);
     const stats = await lstat5(path).catch(() => void 0);
     if (!stats || stats.isSymbolicLink())
       continue;
@@ -46731,7 +46883,7 @@ async function runAgentRuntime(configPath, host, signal) {
     BUZZ_DEV_MCP_BIN: runtime.mcpBinary
   };
   const config = loadBodyConfig({
-    workspaceRoot: resolve40(runtimeDir, "workspace"),
+    workspaceRoot: resolve41(runtimeDir, "workspace"),
     llmEnvFile: runtime.llmEnvFile,
     env,
     agent
@@ -47591,7 +47743,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(resolve41(configPath));
+    const activated = await activateDaemonTransport(resolve42(configPath));
     if (!activated)
       throw new Error("corner-read-token requires monolith transport");
     const credential = await activated.client.execute("getRoomGitHubToken", { roomId });
@@ -47646,7 +47798,7 @@ async function main() {
     }
     if (!configPath && !args.includes("--machine"))
       throw new Error("daemon requires --machine, or --config <runtime.json> for one agent");
-    const { reason, lifecycle } = await runMachineHelper(configPath ? { configPaths: [resolve41(configPath)] } : {});
+    const { reason, lifecycle } = await runMachineHelper(configPath ? { configPaths: [resolve42(configPath)] } : {});
     daemonLifecycle = lifecycle;
     lifecycle.exit(reason);
     return;