@cabane/companion 0.6.202 → 0.6.204

package/dist/runtime.js

@@ -167,25 +167,7 @@ var prepareHookSchema = z.object({
   // Wall-clock cap for the hook. Provisioning is slow (minutes), so the
   // default is generous; a hook that hangs past this is killed and the turn
   // fails with a clear timeout message rather than pinning the companion.
-  timeoutMs: z.number().int().positive().optional(),
-  // Re-invoke the hook when a prepared result already exists, in VALIDATE
-  // mode: the cached result is handed back as `prepared` and stdout is
-  // ignored, so the cwd cannot move. Its only power is to exit non-zero and
-  // fail the turn. The hook resolves once per (conversation, agent), so a
-  // later message asking for a different environment is otherwise silently
-  // ignored; this lets a hook refuse it out loud.
-  //
-  // Default OFF: a hook that provisions unconditionally must not start
-  // running on every turn because the companion upgraded.
-  validateCached: z.boolean().optional(),
-  // Independent operator-owned reporter. Receives sanitized failure metadata
-  // on stdin; never re-enters this hook and cannot change the turn outcome.
-  failureReporter: z.object({
-    command: z.string().min(1),
-    args: z.array(z.string()).optional(),
-    env: z.record(z.string(), z.string()).optional(),
-    timeoutMs: z.number().int().positive().max(3e4).optional()
-  }).strict().optional()
+  timeoutMs: z.number().int().positive().optional()
 }).strict();
 var DEFAULT_TIMEOUT_MS = 10 * 6e4;
 var prepareResultSchema = z.object({
@@ -260,8 +242,7 @@ var companionConfigSchema = z2.object({
   // The DEVICE-LEVEL prepare hook, for every agent assigned here unless its own
   // `agents` row names one. Per-agent hooks alone make the config a second
   // silent roster: an agent nobody listed gets no hook and no error, and starts
-  // in the operator's `$HOME` (an agent woke in `/home/joshed` this way on
-  // 2026-08-17).
+  // in the operator's `$HOME`.
   prepareHook: prepareHookSchema.optional(),
   // `dashboardPort` and `autoOpen` are IGNORED by the CLI (no port, no browser)
   // but stay in the schema so an existing file still parses; the Electron shell
@@ -298,9 +279,10 @@ var companionConfigSchema = z2.object({
   root: z2.string().min(1).refine(isRootPath, { message: "must be an absolute path, or start with ~/" }).optional(),
   // An argv prefix the operator puts in front of every turn's runner: the companion starts
   // `<prefix…> <its own run-turn command…>` instead of the runner bare. What the prefix does
-  // is the operator's (a box of their own making, ENG225); the companion knows nothing of it
+  // is the operator's (a container or VM per turn, say); the companion knows nothing of it
   // beyond handing the runner over, with the turn's inputs in its environment and the
-  // credential and secrets on its stdin (`runner/launch.ts`, `boxed`).
+  // credential and secrets on its stdin (`runner/launch.ts`, `wrapped`). The README lists
+  // what a wrapper can rely on.
   runner: z2.object({
     command: z2.array(z2.string().min(1)).min(1)
   }).strict().optional()
@@ -312,33 +294,38 @@ function workRoot(cfg) {
   if (root.startsWith("~/")) return join4(homedir5(), root.slice(2));
   return root;
 }
-function retiredConfigKeys(raw) {
-  if (!raw || typeof raw !== "object") return [];
-  const obj = raw;
+var RETIRED_ROW_KEYS = ["sandbox"];
+var RETIRED_HOOK_KEYS = ["validateCached", "failureReporter"];
+function isObject(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function splitRetired(raw) {
   const keys = [];
-  if ("runners" in obj) keys.push("runners");
-  const agents = obj.agents;
-  if (agents && typeof agents === "object") {
-    for (const [key, row] of Object.entries(agents)) {
-      if (row && typeof row === "object" && "sandbox" in row) keys.push(`agents.${key}.sandbox`);
+  const without = (obj, names, path) => {
+    const out = {};
+    for (const [k, v] of Object.entries(obj)) {
+      if (names.includes(k)) keys.push(`${path}${k}`);
+      else out[k] = v;
     }
+    return out;
+  };
+  const hook = (row, path) => isObject(row.prepareHook) ? { ...row, prepareHook: without(row.prepareHook, RETIRED_HOOK_KEYS, `${path}prepareHook.`) } : row;
+  const kept = hook(without(raw, ["runners"], ""), "");
+  if (isObject(kept.agents)) {
+    const agents = {};
+    for (const [key, row] of Object.entries(kept.agents)) {
+      const path = `agents.${key}.`;
+      agents[key] = isObject(row) ? hook(without(row, RETIRED_ROW_KEYS, path), path) : row;
+    }
+    kept.agents = agents;
   }
-  return keys;
+  return { keys, kept };
+}
+function retiredConfigKeys(raw) {
+  return isObject(raw) ? splitRetired(raw).keys : [];
 }
 function withoutRetiredKeys(raw) {
-  if (retiredConfigKeys(raw).length === 0) return raw;
-  const { runners: _runners, ...rest } = raw;
-  if (!rest.agents || typeof rest.agents !== "object") return rest;
-  const agents = {};
-  for (const [key, row] of Object.entries(rest.agents)) {
-    if (row && typeof row === "object" && "sandbox" in row) {
-      const { sandbox: _sandbox, ...kept } = row;
-      agents[key] = kept;
-    } else {
-      agents[key] = row;
-    }
-  }
-  return { ...rest, agents };
+  return isObject(raw) ? splitRetired(raw).kept : raw;
 }
 function retiredConfigKeysOnDisk() {
   try {
@@ -1598,7 +1585,7 @@ var emptyHeartbeatStatus = () => ({
 });
 
 // src/supervisor.ts
-import { hostname as hostname2 } from "os";
+import { hostname } from "os";
 
 // packages/agent-runtime/src/failure.ts
 import { z as z4 } from "zod";
@@ -1950,7 +1937,7 @@ var CabaneApi = class {
   //     text use (turnId, seq) within each kind for nonzero seq; tool activity
   //     uses (turnId, toolUseId). Legacy zero/missing seq bypasses row deduplication.
   //     Server fences and the outbox's discard/eviction bounds still apply.
-  async durableCommit(kind, path, body, turnId, seq, signal) {
+  async durableCommit(kind, path, body, turnId, seq, signal, trailPath) {
     try {
       await this.request("POST", path, body, {
         retry: true,
@@ -1961,7 +1948,16 @@ var CabaneApi = class {
       if (!outbox) throw err;
       if (signal?.aborted || isAbortError(err)) throw err;
       if (!isRetryable(err)) throw err;
-      outbox.persist({ enqueuedAt: Date.now(), turnId, seq, method: "POST", path, body, kind });
+      outbox.persist({
+        enqueuedAt: Date.now(),
+        turnId,
+        seq,
+        method: "POST",
+        path,
+        body,
+        kind,
+        ...trailPath ? { trailPath } : {}
+      });
       this.opts.log?.debug(
         { kind, turnId, seq, err: err instanceof Error ? err.message : String(err) },
         "companion: commit queued to outbox after transient failure (will drain when the API returns)"
@@ -1986,6 +1982,29 @@ var CabaneApi = class {
           progressed = true;
         } catch (err) {
           if (err instanceof ApiError && err.status >= 400 && err.status < 500) {
+            if (entry.kind === "message" && entry.trailPath && isAlreadyPublished(err)) {
+              try {
+                await this.request("POST", entry.trailPath, trailOf(entry.body), {
+                  retry: true
+                });
+              } catch (trailErr) {
+                if (!(trailErr instanceof ApiError && trailErr.status >= 400 && trailErr.status < 500)) {
+                  break;
+                }
+                this.opts.log?.warn(
+                  {
+                    kind: entry.kind,
+                    turnId: entry.turnId,
+                    seq: entry.seq,
+                    ...apiErrorLogFields(trailErr)
+                  },
+                  `Cabane rejected a postscript; it could not be filed. ${mayNeedUpdate()}`
+                );
+              }
+              outbox.remove(entry.turnId, entry.seq);
+              progressed = true;
+              continue;
+            }
             if (entry.kind === "active-run" && isTurnEndedRefusal(err)) {
               this.opts.log?.debug(
                 { kind: entry.kind, turnId: entry.turnId, ...apiErrorLogFields(err) },
@@ -2061,6 +2080,19 @@ var CabaneApi = class {
       (e) => e.turnId === turnId && e.kind === "message" && e.body?.kind !== "runtime_notice"
     );
   }
+  // The `seq` of this turn's SELECTED ANSWER still waiting in the outbox — the
+  // `declared` commit the server's `answerArmed` cannot see — or null when none
+  // is queued. A resumed run that re-armed over it would let a newer text
+  // consume the arm first; with the selection queued, the resumed run starts
+  // declared, its texts are trail, and the drain delivers the selection.
+  outboxDeclaredSeqForTurn(turnId) {
+    const outbox = this.opts.outbox;
+    if (!outbox) return null;
+    const queued = outbox.list().find(
+      (e) => e.turnId === turnId && e.kind === "message" && e.body?.declared === true
+    );
+    return queued ? queued.seq : null;
+  }
   // ADOPT a turn context's issuance as the execution source of its work, once,
   // before preparation emits or queues anything, so every row can name a source
   // the server durably recorded and will never reap. Adoption is idempotent, so
@@ -2234,15 +2266,36 @@ var CabaneApi = class {
   // seq also orders speech against the turn's tool/thinking/text trail.
   // Transport/5xx failures get bounded retries and optional outbox delivery;
   // terminal 4xx and cancellation stop delivery rather than proving no commit.
-  postTurnMessage(workspaceId, conversationId, body, signal) {
-    return this.durableCommit(
-      "message",
-      `/api/workspaces/${workspaceId}/conversations/${conversationId}/messages`,
-      body,
-      body.turnId,
-      body.seq ?? 0,
-      signal
-    );
+  //
+  // A turn's answer can be out before a later speech commit arrives — the
+  // declaration published it, or another host's selection drained first — and
+  // the server refuses the commit `409 already_published`. The text is a
+  // postscript then: with `trail` (the committing agent, which names the text
+  // route), it is filed as trail at the same seq, live here and from the outbox
+  // on a drain. Without `trail` (a runtime notice) the refusal is terminal.
+  async postTurnMessage(workspaceId, conversationId, body, signal, trail) {
+    const trailPath = trail ? `/api/workspaces/${workspaceId}/conversations/${conversationId}/participants/agents/${trail.agentId}/text` : void 0;
+    try {
+      await this.durableCommit(
+        "message",
+        `/api/workspaces/${workspaceId}/conversations/${conversationId}/messages`,
+        body,
+        body.turnId,
+        body.seq ?? 0,
+        signal,
+        trailPath
+      );
+    } catch (err) {
+      if (!trailPath || !isAlreadyPublished(err)) throw err;
+      await this.durableCommit(
+        "text",
+        trailPath,
+        trailOf(body),
+        body.turnId,
+        body.seq ?? 0,
+        signal
+      );
+    }
   }
   // Report a tool transition (start/done/error). The server checks span
   // ownership, upserts by (turnId, toolUseId), and publishes agent_activity SSE.
@@ -2288,6 +2341,18 @@ var CabaneApi = class {
     );
   }
 };
+function isAlreadyPublished(err) {
+  return err instanceof ApiError && err.status === 409 && apiErrorCode(err) === "already_published";
+}
+function trailOf(body) {
+  const b = body;
+  return {
+    turnId: b.turnId,
+    text: b.body,
+    ...b.seq !== void 0 ? { seq: b.seq } : {},
+    ...b.executionSourceId !== void 0 ? { executionSourceId: b.executionSourceId } : {}
+  };
+}
 function isRetryable(err) {
   if (err instanceof ApiError) return err.status >= 500;
   if (isAbortError(err)) return false;
@@ -2778,6 +2843,8 @@ var turnOutcomes = ["success", "failure", "cancelled", "skipped"];
 var turnSessionModes = ["fresh", "resumed", "degraded"];
 var turnRuntimeResultKinds = ["success", "error", "no_terminal"];
 var turnFinalSources = [
+  // The agent declared its answer with the `answer` turn act (CT1973).
+  "declared",
   "runtime_text",
   "progress_promotion",
   "host_fallback",
@@ -3063,11 +3130,6 @@ function truncate(s, max) {
   return `${s.slice(0, max)}\u2026[+${s.length - max} chars]`;
 }
 
-// packages/agent-runtime/src/claude-code/index.ts
-import {
-  query as defaultQuery
-} from "@anthropic-ai/claude-agent-sdk";
-
 // packages/agent-runtime/src/turn-control/descriptions.ts
 var MAX_ASK_QUESTION_BYTES = 400;
 var MAX_ASK_HEADLINE_BYTES = 120;
@@ -3078,7 +3140,9 @@ var MAX_ASK_OPTIONS = 4;
 var MAX_WAKE_NOTE_BYTES = 2e3;
 var MAX_WITHDRAW_REASON_BYTES = 400;
 var MAX_SKIP_REASON_BYTES = 500;
+var TURN_CONTROL_MCP_SERVER = "cabane_companion";
 var TURN_CONTROL_TOOLS = [
+  "answer",
   "ask",
   "cancel_wake",
   "skip_turn",
@@ -3086,6 +3150,7 @@ var TURN_CONTROL_TOOLS = [
   "withdraw_ask"
 ];
 var TURN_CONTROL_TOOL_DESCRIPTIONS = {
+  answer: `Call this just before you write your answer: the text you write next is what the conversation keeps as your message. Call it once.`,
   ask: `Ask a person a structured question you need answered to continue, then end your turn; don't wait for the reply. \`targetUserId\` is a person on your roster, by their \`@handle\`; to bring in an agent, name them with \`@handle\` in your reply.
 - Form: one question (\`headline\`, optional \`question\` body, \`options\`) or \`questions\`, 1\u2013${MAX_ASK_ITEMS} \`{ headline, body?, options? }\`; never both. Decisions that arise together go in ONE call, in the order you want them answered. A second \`ask\` is a separate item, never an edit; raise one only for a genuinely new question.
 - \`headline\`: one sentence ending in \`?\`. Body (\`question\` or each item's \`body\`): a sentence or two of framing, not a report; inline Markdown only, no lists or headings. \`options\`: ${MIN_ASK_OPTIONS}\u2013${MAX_ASK_OPTIONS} one-click answers (always for a yes/no go-ahead), each a distinct course of action you can carry out without asking back.
@@ -3100,6 +3165,7 @@ var TURN_CONTROL_TOOL_DESCRIPTIONS = {
   withdraw_ask: `Withdraw an open ask \u2014 yours or anyone's in this conversation \u2014 because the question is moot, was wrong, or has been overtaken. \`reason\` is required and is shown to the person and, if it wasn't your ask, to the agent who asked it. If there is a current question to put in its place, don't call this \u2014 call \`ask\` with \`replaces\` so the two land as one and the person never sees neither or both. Never withdraw to hurry an answer; to act on a deadline, arm a \`wake_me\` and decide then.`
 };
 var TURN_CONTROL_FIELD_DESCRIPTIONS = {
+  answer: {},
   ask: {
     targetUserId: "The person to ask: their `@handle` from your turn context's roster (preferred), or their user id.",
     question: `SINGLE-question form: a short body \u2014 one or two sentences of framing the headline can't hold. NOT a report (up to ${MAX_ASK_QUESTION_BYTES} characters, inline markdown only). Provide EITHER this or \`questions\`, not both. Put the crisp one-sentence question in \`headline\`.`,
@@ -3128,8 +3194,14 @@ var TURN_CONTROL_FIELD_DESCRIPTIONS = {
   }
 };
 
+// packages/agent-runtime/src/claude-code/index.ts
+import {
+  query as defaultQuery
+} from "@anthropic-ai/claude-agent-sdk";
+
 // packages/agent-runtime/src/turn-control/prompt-guidance.ts
 var MEANINGS = {
+  answer: "declare the text you write next as your answer",
   ask: "put a structured question to a person",
   cancel_wake: "cancel your own armed wake in this conversation",
   skip_turn: "end without posting a reply",
@@ -4527,6 +4599,15 @@ function deepestError(node) {
 }
 
 // packages/agent-runtime/src/opencode/loop.ts
+function opencodeMcpServerOf(tool2, servers) {
+  let best = null;
+  for (const server of servers ?? []) {
+    if (tool2.length > server.length + 1 && tool2.startsWith(`${server}_`)) {
+      if (best === null || server.length > best.length) best = server;
+    }
+  }
+  return best;
+}
 async function* decodeOpencodeStream(events, ctx) {
   let held = null;
   const pending = /* @__PURE__ */ new Map();
@@ -4553,12 +4634,14 @@ async function* decodeOpencodeStream(events, ctx) {
         if (sealed) yield sealed;
         const key = part.callID ?? part.id;
         const input = part.state.input;
+        const server = opencodeMcpServerOf(part.tool, ctx.mcpServers);
+        const origin = server ? { mcpServer: server } : {};
         if (!startedTools.has(key)) {
           const name = prettyToolName(part.tool);
           const summary = summarizeToolInput(input);
           pending.set(key, { name, summary, input });
           startedTools.add(key);
-          yield { type: "tool", id: key, name, phase: "start", summary, input };
+          yield { type: "tool", id: key, name, phase: "start", summary, input, ...origin };
         }
         const entry = pending.get(key);
         if (entry && hasToolInput(input)) {
@@ -4578,7 +4661,8 @@ async function* decodeOpencodeStream(events, ctx) {
             phase,
             summary: started?.summary ?? "",
             input: started?.input ?? input,
-            result
+            result,
+            ...origin
           };
         }
       } else {
@@ -4662,7 +4746,6 @@ function parseOpencodeModel(model) {
 
 // packages/agent-runtime/src/opencode/run-spec.ts
 var CABANE_MCP_SERVER2 = "cabane";
-var TURN_CONTROL_MCP_SERVER = "cabane_companion";
 var ACTIVE_CONVERSATION_HEADER2 = "x-cabane-active-conversation";
 function buildRunSpec(req, resumeSessionId) {
   const { config } = req;
@@ -5056,7 +5139,10 @@ function createOpencodeAdapter(deps = {}) {
       }
       yield* decodeOpencodeStream(result.events, {
         signal,
-        sessionId: result.sessionId
+        sessionId: result.sessionId,
+        // The keys the turn's servers were installed under: what the decoder
+        // splits a raw `<server>_<tool>` id on.
+        mcpServers: Object.keys(spec.mcp)
       });
     }
   };
@@ -5192,7 +5278,15 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
     expected: [
       sessionEvent2(NEW_SESSION_ID),
       // start: fires off the first (empty) snapshot — empty input + summary, by design.
-      { type: "tool", id: "call_1", name: "cabane_list", phase: "start", summary: "", input: {} },
+      {
+        type: "tool",
+        id: "call_1",
+        name: "cabane_list",
+        phase: "start",
+        summary: "",
+        input: {},
+        mcpServer: "cabane"
+      },
       // done: carries the full args captured from the later snapshot, and the
       // summary recomputed from them — NOT the first-seen `{}`.
       {
@@ -5202,8 +5296,60 @@ var OPENCODE_CONFORMANCE_FIXTURES = [
         phase: "done",
         summary: "/product/tasks",
         input: { path: "/product/tasks" },
-        result: "CT301.md"
+        result: "CT301.md",
+        mcpServer: "cabane"
+      },
+      { type: "result", ok: true }
+    ]
+  },
+  {
+    // The turn-control server's `answer` (CT1973). opencode names an MCP tool `<server>_<tool>`,
+    // so the installed keys split the raw id: `cabane_companion_answer` is the turn-control
+    // server's, never the workspace server's `companion_answer`. The pump binds on that.
+    name: "turn-control answer is read as the turn-control server\u2019s, not cabane\u2019s",
+    request: makeRequest2({
+      cabane: {
+        mcpUrl: "https://cabane.test/api/mcp",
+        turnControlUrl: "https://cabane.test/api/turn-control",
+        bearer: "tok",
+        activeConversationId: "conv"
+      }
+    }),
+    nativeStream: [
+      textPart("p1", "On it."),
+      toolPart("t1", "cabane_companion_answer", { status: "running", input: {} }, "call_1"),
+      toolPart(
+        "t1",
+        "cabane_companion_answer",
+        { status: "completed", input: {}, output: '{"ok":true,"kind":"answer"}' },
+        "call_1"
+      ),
+      textPart("p2", "The answer."),
+      idle()
+    ],
+    expected: [
+      sessionEvent2(NEW_SESSION_ID),
+      { type: "text", body: "On it.", terminal: false },
+      {
+        type: "tool",
+        id: "call_1",
+        name: "cabane_companion_answer",
+        phase: "start",
+        summary: "",
+        input: {},
+        mcpServer: "cabane_companion"
+      },
+      {
+        type: "tool",
+        id: "call_1",
+        name: "cabane_companion_answer",
+        phase: "done",
+        summary: "",
+        input: {},
+        result: '{"ok":true,"kind":"answer"}',
+        mcpServer: "cabane_companion"
       },
+      { type: "text", body: "The answer.", terminal: true },
       { type: "result", ok: true }
     ]
   },
@@ -5561,6 +5707,7 @@ function readToolItem(item, eventType) {
       name: server && server !== "cabane" ? `${server}.${tool2}` : tool2,
       input: item.arguments,
       status: toStatus(item.status),
+      ...server ? { server } : {},
       ...item.status === "completed" ? { result } : item.status === "failed" ? { result: hasMcpReceipt(result) ? result : readMcpError(item.error) } : {}
     };
   }
@@ -5789,11 +5936,20 @@ async function* decodeCodexStream(events, ctx) {
       if (!tool2) continue;
       yield* flushInterim();
       const name = prettyToolName(tool2.name);
+      const origin = tool2.server ? { mcpServer: tool2.server } : {};
       if (!startedTools.has(tool2.id)) {
         const summary = summarizeToolInput(tool2.input);
         pending.set(tool2.id, { name, summary, input: tool2.input });
         startedTools.add(tool2.id);
-        yield { type: "tool", id: tool2.id, name, phase: "start", summary, input: tool2.input };
+        yield {
+          type: "tool",
+          id: tool2.id,
+          name,
+          phase: "start",
+          summary,
+          input: tool2.input,
+          ...origin
+        };
       }
       const entry = pending.get(tool2.id);
       if (entry && hasToolInput2(tool2.input)) {
@@ -5811,7 +5967,8 @@ async function* decodeCodexStream(events, ctx) {
           phase: tool2.status === "completed" ? "done" : "error",
           summary: started?.summary ?? "",
           input: started?.input ?? tool2.input,
-          result: tool2.result
+          result: tool2.result,
+          ...origin
         };
       }
       continue;
@@ -5902,7 +6059,6 @@ function parseCodexModel(model) {
 
 // packages/agent-runtime/src/codex/run-spec.ts
 var CABANE_MCP_SERVER3 = "cabane";
-var TURN_CONTROL_MCP_SERVER2 = "cabane_companion";
 var ACTIVE_CONVERSATION_HEADER3 = "x-cabane-active-conversation";
 var ENV_ENVELOPE_KEYS = [
   "CABANE_CONVERSATION_ID",
@@ -6031,7 +6187,7 @@ function buildConfig(req) {
     default_tools_approval_mode: "approve"
   };
   if (req.cabane.turnControlUrl) {
-    mcp_servers[TURN_CONTROL_MCP_SERVER2] = {
+    mcp_servers[TURN_CONTROL_MCP_SERVER] = {
       url: req.cabane.turnControlUrl,
       http_headers: {
         Authorization: `Bearer ${req.cabane.bearer}`,
@@ -6209,7 +6365,7 @@ function createCodexAdapter(deps = {}) {
         if (signal.aborted) return;
         if (compactions === null) {
           deps.onWarn?.(
-            "codex adapter: the thread's compaction count could not be read \u2014 re-sending the standing instructions (ENG210)",
+            "codex adapter: the thread's compaction count could not be read \u2014 re-sending the standing instructions",
             { threadId: decision.resume }
           );
         } else if (decision.compactions === compactions) {
@@ -6219,7 +6375,7 @@ function createCodexAdapter(deps = {}) {
           };
         } else if (decision.compactions !== null && compactions > decision.compactions) {
           deps.onWarn?.(
-            "codex adapter: the thread compacted since the last turn \u2014 re-sending the standing instructions (ENG210)",
+            "codex adapter: the thread compacted since the last turn \u2014 re-sending the standing instructions",
             {
               threadId: decision.resume,
               compactions,
@@ -6481,6 +6637,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "t1",
         name: "read",
+        mcpServer: "cabane",
         phase: "start",
         summary: "sleep.md",
         input: { path: "sleep.md" }
@@ -6489,6 +6646,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "t1",
         name: "read",
+        mcpServer: "cabane",
         phase: "done",
         summary: "sleep.md",
         input: { path: "sleep.md" },
@@ -6534,6 +6692,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "query-success",
         name: "query",
+        mcpServer: "cabane",
         phase: "start",
         summary: "",
         input: { op: "files.read", args: { path: "/ABOUT.md" } }
@@ -6542,6 +6701,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "query-success",
         name: "query",
+        mcpServer: "cabane",
         phase: "done",
         summary: "",
         input: { op: "files.read", args: { path: "/ABOUT.md" } },
@@ -6588,6 +6748,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "query-failed",
         name: "query",
+        mcpServer: "cabane",
         phase: "start",
         summary: "",
         input: { op: "files.read", args: { path: "/ABOUT.md" } }
@@ -6596,6 +6757,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "query-failed",
         name: "query",
+        mcpServer: "cabane",
         phase: "error",
         summary: "",
         input: { op: "files.read", args: { path: "/ABOUT.md" } },
@@ -6605,6 +6767,54 @@ var CODEX_CONFORMANCE_FIXTURES = [
       { type: "result", ok: true }
     ]
   },
+  {
+    // The turn-control server's `answer` (CT1973): the tool event carries the server Codex names
+    // beside the tool, which is what the pump binds the declaration to. A non-cabane server keeps
+    // its prefix on the card as before.
+    name: "turn-control answer carries its server",
+    request: makeRequest3(),
+    nativeStream: [
+      threadStarted(NEW_THREAD_ID),
+      agentMessage("m1", "On it."),
+      toolFrame("item.completed", {
+        id: "answer-1",
+        type: "mcp_tool_call",
+        server: "cabane_companion",
+        tool: "answer",
+        arguments: {},
+        status: "completed",
+        result: { content: [{ type: "text", text: '{"ok":true,"kind":"answer"}' }] }
+      }),
+      agentMessage("m2", "The answer."),
+      turnCompleted()
+    ],
+    expected: [
+      startedSession(NEW_THREAD_ID),
+      { type: "text", body: "On it.", terminal: false },
+      {
+        type: "tool",
+        id: "answer-1",
+        name: "cabane_companion.answer",
+        mcpServer: "cabane_companion",
+        phase: "start",
+        summary: "",
+        input: {}
+      },
+      {
+        type: "tool",
+        id: "answer-1",
+        name: "cabane_companion.answer",
+        mcpServer: "cabane_companion",
+        phase: "done",
+        summary: "",
+        input: {},
+        result: [{ type: "text", text: '{"ok":true,"kind":"answer"}' }]
+      },
+      { type: "text", body: "The answer.", terminal: true },
+      closingSession(NEW_THREAD_ID),
+      { type: "result", ok: true }
+    ]
+  },
   {
     // A transport/tool failure with no MCP result payload still uses the real adapter error message,
     // never `undefined`.
@@ -6630,6 +6840,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "mcp-failed",
         name: "other.lookup",
+        mcpServer: "other",
         phase: "start",
         summary: "receipt",
         input: { q: "receipt" }
@@ -6638,6 +6849,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "mcp-failed",
         name: "other.lookup",
+        mcpServer: "other",
         phase: "error",
         summary: "receipt",
         input: { q: "receipt" },
@@ -6674,6 +6886,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "mcp-image",
         name: "other.render",
+        mcpServer: "other",
         phase: "start",
         summary: "",
         input: {}
@@ -6682,6 +6895,7 @@ var CODEX_CONFORMANCE_FIXTURES = [
         type: "tool",
         id: "mcp-image",
         name: "other.render",
+        mcpServer: "other",
         phase: "done",
         summary: "",
         input: {},
@@ -6729,11 +6943,20 @@ var CODEX_CONFORMANCE_FIXTURES = [
     ],
     expected: [
       startedSession(NEW_THREAD_ID),
-      { type: "tool", id: "t1", name: "list", phase: "start", summary: "", input: {} },
       {
         type: "tool",
         id: "t1",
         name: "list",
+        mcpServer: "cabane",
+        phase: "start",
+        summary: "",
+        input: {}
+      },
+      {
+        type: "tool",
+        id: "t1",
+        name: "list",
+        mcpServer: "cabane",
         phase: "done",
         summary: "/product/tasks",
         input: { path: "/product/tasks" },
@@ -7303,8 +7526,6 @@ var ConnectorHealthStore = class {
 
 // src/dispatcher.ts
 import { randomUUID as randomUUID4 } from "crypto";
-import { existsSync as existsSync12, readdirSync as readdirSync2, statSync as statSync4 } from "fs";
-import { join as join21 } from "path";
 
 // src/runner/launch.ts
 import { createInterface } from "readline";
@@ -7554,7 +7775,7 @@ function selfRunnerCommand() {
 function wrappedRunnerCommand(prefix, own) {
   return [...prefix ?? [], ...own];
 }
-var BOXED_ENV_DROPPED = [
+var WRAPPED_ENV_DROPPED = [
   "ANTHROPIC_API_KEY",
   "CLAUDE_CODE_OAUTH_TOKEN",
   "CODEX_API_KEY",
@@ -7563,11 +7784,11 @@ var BOXED_ENV_DROPPED = [
   "DBUS_SESSION_BUS_ADDRESS",
   "XDG_RUNTIME_DIR"
 ];
-function runnerExecEnv(base, boxed) {
+function runnerExecEnv(base, wrapped) {
   const env = {};
   for (const [k, v] of Object.entries(base)) {
     if (v === void 0) continue;
-    if (boxed && BOXED_ENV_DROPPED.includes(k)) continue;
+    if (wrapped && WRAPPED_ENV_DROPPED.includes(k)) continue;
     env[k] = v;
   }
   return env;
@@ -7789,13 +8010,13 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     return { ok: false, durationMs: durationMs2, reason: reason2 };
   }
   try {
-    const boxed = launch.boxed === true;
-    const env = runnerExecEnv(launch.env ?? process.env, boxed);
+    const wrapped = launch.wrapped === true;
+    const env = runnerExecEnv(launch.env ?? process.env, wrapped);
     const grants = minted.deviceGrants.length > 0 ? launch.grants?.(minted.deviceGrants) ?? {} : {};
     const input = {
       baseUrl: opts.baseUrl,
       credential: minted.credential,
-      ...boxed ? { secrets: launch.secrets?.() ?? {} } : {},
+      ...wrapped ? { secrets: launch.secrets?.() ?? {} } : {},
       ...Object.keys(grants).length > 0 ? { grants } : {},
       dispatch: payload,
       turnId,
@@ -7869,7 +8090,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
           locks?.release(lockOwner(event.id));
           return;
         case "process_group":
-          if (!boxed) groups.push(event.pgid);
+          if (!wrapped) groups.push(event.pgid);
           return;
         case "remote_session":
           remote.push({ serverUrl: event.serverUrl, sessionId: event.sessionId });
@@ -7944,7 +8165,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
 
 // src/turn-execution.ts
 import { createHash as createHash2, randomUUID as randomUUID3 } from "crypto";
-import { mkdirSync as mkdirSync9 } from "fs";
+import { existsSync as existsSync12, mkdirSync as mkdirSync9 } from "fs";
 
 // src/grants.ts
 import { existsSync as existsSync9, readFileSync as readFileSync7 } from "fs";
@@ -7998,7 +8219,7 @@ function loadGrantsFile(report) {
   const result = grantsFileSchema.safeParse(parsed);
   if (!result.success) {
     report.unreadable(
-      `${path} must map a secret's variable name to an object of "VARIABLE": "value" pairs (e.g. { "HAS_PROD_ACCESS": { "RENDER_API_KEY": "rnd_\u2026" } }).`
+      `${path} must map a secret's variable name to an object of "VARIABLE": "value" pairs (e.g. { "HAS_STAGING_DB": { "DATABASE_URL": "postgres://\u2026" } }).`
     );
     return {};
   }
@@ -8012,7 +8233,7 @@ import { join as join14 } from "path";
 // src/turn-control-tools.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import { z as z16 } from "zod";
-var COMPANION_LOCAL_MCP_SERVER = "cabane_companion";
+var COMPANION_LOCAL_MCP_SERVER = TURN_CONTROL_MCP_SERVER;
 var COMPANION_LOCAL_TOOL_GLOB = `mcp__${COMPANION_LOCAL_MCP_SERVER}__*`;
 var ASK_TOOL = "ask";
 var ASK_TOOL_NAME = `mcp__${COMPANION_LOCAL_MCP_SERVER}__${ASK_TOOL}`;
@@ -8041,10 +8262,6 @@ import { homedir as homedir7 } from "os";
 import { join as join17 } from "path";
 import { createInterface as createInterface2 } from "readline";
 
-// src/prepare-failure.ts
-import { spawn as spawn3 } from "child_process";
-import { hostname } from "os";
-
 // src/prepared.ts
 import { mkdirSync as mkdirSync7, readFileSync as readFileSync8, rmSync as rmSync5, writeFileSync as writeFileSync5, existsSync as existsSync10 } from "fs";
 import { join as join18 } from "path";
@@ -8120,7 +8337,7 @@ function requiredSecretNames(mcpServers) {
 }
 
 // src/harness-usable.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 
 // src/harness-versions.ts
 var EMPTY = { claudeCode: null, opencode: null, codex: null };
@@ -8223,7 +8440,7 @@ function runBounded(path, args, env) {
     };
     let child;
     try {
-      child = spawn4(path, args, { stdio: ["ignore", "pipe", "pipe"], env });
+      child = spawn3(path, args, { stdio: ["ignore", "pipe", "pipe"], env });
     } catch {
       resolve({ code: null, output: "", error: "spawn" });
       return;
@@ -8390,7 +8607,7 @@ function hostReport() {
 }
 
 // src/providers/local-process.ts
-import { spawn as spawn5 } from "child_process";
+import { spawn as spawn4 } from "child_process";
 import { constants as constants2 } from "os";
 var DEFAULT_KILL_GRACE_MS = 3e4;
 var DEFAULT_REAP_GRACE_MS = 3e3;
@@ -8401,7 +8618,7 @@ function exitCode(code, signal) {
 }
 function createLocalProcessProvider(opts = {}) {
   const killGraceMs = opts.killGraceMs ?? DEFAULT_KILL_GRACE_MS;
-  const spawnFn = opts.spawnFn ?? spawn5;
+  const spawnFn = opts.spawnFn ?? spawn4;
   const reapGraceMs = opts.reapGraceMs ?? DEFAULT_REAP_GRACE_MS;
   const killFn = opts.killFn ?? ((pid, signal) => process.kill(pid, signal));
   const groupAlive = (pgid) => {
@@ -8605,7 +8822,7 @@ function checkReason(check) {
 
 // src/harness-copy.ts
 import { homedir as homedir8 } from "os";
-import { join as join22 } from "path";
+import { join as join21 } from "path";
 var HARNESS_LABELS = {
   "claude-code": "Claude Code",
   codex: "Codex",
@@ -8619,7 +8836,7 @@ function failureText(runtime, reason) {
     case "spawn":
       return `Couldn't check whether ${label} is signed in: Cabane's bundled ${label} wouldn't start. Repair it with  ${repairSteps()}  and try again.${spaced(repairCost())}`;
     case "config":
-      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join22(homedir8(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
+      return `Couldn't check whether ${label} is signed in: its configuration file didn't load${runtime === "codex" ? ` (${tildePath(join21(homedir8(), ".codex", "config.toml"))})` : ""}. Fix it, then try again.`;
     case "unreadable":
       return `Couldn't check whether ${label} is signed in: it answered in a way Cabane couldn't read. Try again, and if it keeps happening, update Cabane.`;
   }
@@ -8878,13 +9095,13 @@ var DispatchClaims = class {
 import {
   existsSync as existsSync14,
   mkdirSync as mkdirSync10,
-  readdirSync as readdirSync3,
+  readdirSync as readdirSync2,
   readFileSync as readFileSync11,
   renameSync as renameSync5,
   rmSync as rmSync7,
   writeFileSync as writeFileSync6
 } from "fs";
-import { join as join23 } from "path";
+import { join as join22 } from "path";
 var MAX_ENTRIES = 2e3;
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
 var Outbox = class {
@@ -8897,10 +9114,10 @@ var Outbox = class {
   // Resolved lazily (per call) so tests that swap HOME between
   // cases route writes at the right tmpdir.
   dir() {
-    return join23(cabaneDir(), "outbox", encodeURIComponent(this.workspaceId));
+    return join22(cabaneDir(), "outbox", encodeURIComponent(this.workspaceId));
   }
   fileFor(turnId, seq) {
-    return join23(this.dir(), `${encodeURIComponent(turnId)}__${seq}.json`);
+    return join22(this.dir(), `${encodeURIComponent(turnId)}__${seq}.json`);
   }
   // Persist a commit for later draining. Atomic (temp file + rename) so a
   // concurrent `list()` never reads a half-written entry, then enforces the
@@ -8935,14 +9152,14 @@ var Outbox = class {
     if (!existsSync14(dir2)) return [];
     let names;
     try {
-      names = readdirSync3(dir2);
+      names = readdirSync2(dir2);
     } catch {
       return [];
     }
     const entries = [];
     for (const name of names) {
       if (!name.endsWith(".json")) continue;
-      const full = join23(dir2, name);
+      const full = join22(dir2, name);
       try {
         const parsed = JSON.parse(readFileSync11(full, "utf8"));
         if (parsed && typeof parsed.turnId === "string" && typeof parsed.seq === "number" && typeof parsed.path === "string") {
@@ -8979,7 +9196,7 @@ var Outbox = class {
   maxSeqForTurn(turnId) {
     const dir2 = this.dir();
     if (!existsSync14(dir2)) return 0;
-    const names = readdirSync3(dir2);
+    const names = readdirSync2(dir2);
     const prefix = `${encodeURIComponent(turnId)}__`;
     let max = 0;
     for (const name of names) {
@@ -9000,7 +9217,7 @@ var Outbox = class {
     const dir2 = this.dir();
     if (!existsSync14(dir2)) return 0;
     try {
-      return readdirSync3(dir2).filter((n) => n.endsWith(".json")).length;
+      return readdirSync2(dir2).filter((n) => n.endsWith(".json")).length;
     } catch {
       return 0;
     }
@@ -9164,9 +9381,9 @@ var SseSubscriber = class {
 };
 
 // src/updater.ts
-import { spawn as spawn6 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 import { copyFileSync as copyFileSync2, existsSync as existsSync16, mkdirSync as mkdirSync14, renameSync as renameSync9, rmSync as rmSync10 } from "fs";
-import { dirname as dirname11, join as join27 } from "path";
+import { dirname as dirname11, join as join26 } from "path";
 
 // src/boot-rule.ts
 import {
@@ -9178,7 +9395,7 @@ import {
   symlinkSync,
   writeFileSync as writeFileSync7
 } from "fs";
-import { dirname as dirname8, join as join24 } from "path";
+import { dirname as dirname8, join as join23 } from "path";
 var UNCONFIRMED_WINDOW_MS = 10 * 6e4;
 var MAX_STAGE_ATTEMPTS = 3;
 function superseded(pending, ...running) {
@@ -9205,32 +9422,32 @@ import {
   lstatSync,
   mkdirSync as mkdirSync12,
   readFileSync as readFileSync13,
-  readdirSync as readdirSync4,
+  readdirSync as readdirSync3,
   realpathSync as realpathSync5,
   renameSync as renameSync7,
   rmSync as rmSync9,
   symlinkSync as symlinkSync2
 } from "fs";
-import { dirname as dirname9, join as join25 } from "path";
+import { dirname as dirname9, join as join24 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 function versionsDir() {
-  return join25(cabaneDir(), "versions");
+  return join24(cabaneDir(), "versions");
 }
 function currentLink() {
-  return join25(cabaneDir(), "current");
+  return join24(cabaneDir(), "current");
 }
 function bootGuardPath() {
-  return join25(cabaneDir(), "boot-guard.mjs");
+  return join24(cabaneDir(), "boot-guard.mjs");
 }
 function versionPackageRoot(version) {
-  return join25(versionsDir(), version, "node_modules", "@cabane", "companion");
+  return join24(versionsDir(), version, "node_modules", "@cabane", "companion");
 }
 function ownPackageRoot(moduleUrl = import.meta.url) {
   return dirname9(dirname9(fileURLToPath5(moduleUrl)));
 }
 function packageVersion(root) {
   try {
-    const pkg2 = JSON.parse(readFileSync13(join25(root, "package.json"), "utf8"));
+    const pkg2 = JSON.parse(readFileSync13(join24(root, "package.json"), "utf8"));
     return typeof pkg2.version === "string" ? pkg2.version : null;
   } catch {
     return null;
@@ -9239,7 +9456,7 @@ function packageVersion(root) {
 function currentRoot() {
   try {
     const root = realpathSync5(currentLink());
-    return existsSync15(join25(root, "dist", "cli.js")) ? root : null;
+    return existsSync15(join24(root, "dist", "cli.js")) ? root : null;
   } catch {
     return null;
   }
@@ -9260,9 +9477,9 @@ function pruneVersions(keep) {
   const dir2 = versionsDir();
   if (!existsSync15(dir2)) return [];
   const removed = [];
-  for (const name of readdirSync4(dir2)) {
+  for (const name of readdirSync3(dir2)) {
     if (keep.includes(name)) continue;
-    rmSync9(join25(dir2, name), { recursive: true, force: true });
+    rmSync9(join24(dir2, name), { recursive: true, force: true });
     removed.push(name);
   }
   return removed;
@@ -9281,7 +9498,7 @@ function compareVersions(a, b) {
 
 // src/update-state.ts
 import { mkdirSync as mkdirSync13, readFileSync as readFileSync14, renameSync as renameSync8, writeFileSync as writeFileSync8 } from "fs";
-import { dirname as dirname10, join as join26 } from "path";
+import { dirname as dirname10, join as join25 } from "path";
 import { z as z18 } from "zod";
 var resultSchema = z18.object({
   kind: z18.enum(["updated", "rolled_back", "failed"]),
@@ -9305,7 +9522,7 @@ var stateSchema = z18.object({
   failed: z18.object({ version: z18.string(), attempts: z18.number().int(), at: z18.string() }).optional()
 });
 function updateStatePath(dir2 = cabaneDir()) {
-  return join26(dir2, "update.json");
+  return join25(dir2, "update.json");
 }
 function readUpdateState(path = updateStatePath()) {
   try {
@@ -9354,7 +9571,7 @@ function rollBack(pending, reason, now = /* @__PURE__ */ new Date()) {
   return updateUpdateState((state) => rolledBackState(state, pending, reason, now));
 }
 function writeBootGuard(root = ownPackageRoot()) {
-  const built = join27(root, "dist", "boot-guard.js");
+  const built = join26(root, "dist", "boot-guard.js");
   if (!existsSync16(built)) return false;
   const target = bootGuardPath();
   mkdirSync14(dirname11(target), { recursive: true });
@@ -9371,7 +9588,7 @@ var runProcess = (command, args, opts = {}) => new Promise((resolve) => {
   let stderr = "";
   let child;
   try {
-    child = spawn6(command, [...args], {
+    child = spawn5(command, [...args], {
       stdio: ["ignore", "pipe", "pipe"],
       env: opts.env ?? process.env
     });
@@ -9394,17 +9611,17 @@ var runProcess = (command, args, opts = {}) => new Promise((resolve) => {
 async function stageVersion(version, harnesses, deps = {}) {
   const run = deps.run ?? runProcess;
   const node = deps.execPath ?? process.execPath;
-  const target = join27(versionsDir(), version);
+  const target = join26(versionsDir(), version);
   const placed = versionPackageRoot(version);
   if (existsSync16(placed)) {
     if (!await verifyInstall(placed, version, harnesses, { run, execPath: node }))
       return { ok: true, root: placed };
   }
-  const npm = join27(dirname11(node), "npm");
+  const npm = join26(dirname11(node), "npm");
   if (!existsSync16(npm))
     return { ok: false, reason: `there is no npm beside Node at ${dirname11(node)}` };
   mkdirSync14(versionsDir(), { recursive: true });
-  const staging = join27(versionsDir(), `.${version}.staging-${process.pid}`);
+  const staging = join26(versionsDir(), `.${version}.staging-${process.pid}`);
   rmSync10(staging, { recursive: true, force: true });
   const installed = await run(
     npm,
@@ -9433,7 +9650,7 @@ async function stageVersion(version, harnesses, deps = {}) {
       return { ok: false, reason: `version ${version} isn't published yet`, unpublished: true };
     return { ok: false, reason: `npm couldn't install it: ${lastLine(installed.stderr)}` };
   }
-  const root = join27(staging, "node_modules", "@cabane", "companion");
+  const root = join26(staging, "node_modules", "@cabane", "companion");
   const verdict = await verifyInstall(root, version, harnesses, { run, execPath: node });
   if (verdict) {
     rmSync10(staging, { recursive: true, force: true });
@@ -9445,7 +9662,7 @@ async function stageVersion(version, harnesses, deps = {}) {
 }
 async function verifyInstall(root, version, harnesses, deps) {
   if (packageVersion(root) !== version) return `the installed package isn't version ${version}`;
-  const answered = await deps.run(deps.execPath, [join27(root, "dist", "bin.js"), "--version"], {
+  const answered = await deps.run(deps.execPath, [join26(root, "dist", "bin.js"), "--version"], {
     timeoutMs: 6e4,
     env: { ...process.env, CABANE_LAUNCH_SELF: "1" }
   });
@@ -9453,7 +9670,7 @@ async function verifyInstall(root, version, harnesses, deps) {
     return `it doesn't start: ${lastLine(answered.stderr) || "no version printed"}`;
   }
   if (harnesses.length === 0) return null;
-  const probed = await deps.run(deps.execPath, [join27(root, "dist", "postinstall.js"), "--json"], {
+  const probed = await deps.run(deps.execPath, [join26(root, "dist", "postinstall.js"), "--json"], {
     timeoutMs: 6e4
   });
   let resolutions = {};
@@ -9870,13 +10087,13 @@ var CompanionSupervisor = class {
     if (this.stopped) return;
     this.log.info(
       { protocolVersion: TURN_PROTOCOL_VERSION, version: COMPANION_VERSION },
-      `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname2()}`
+      `Companion ${COMPANION_VERSION} starting on ${this.config.deviceLabel ?? hostname()}`
     );
     const retired = retiredConfigKeysOnDisk();
     if (retired.length > 0) {
       this.log.warn(
         { keys: retired },
-        `config.json: ${retired.join(", ")} ${retired.length === 1 ? "is" : "are"} no longer read and can be removed. The companion does no sandboxing, and every turn runs in a child process of its own.`
+        `config.json: ${retired.join(", ")} ${retired.length === 1 ? "is" : "are"} no longer read and can be removed.`
       );
     }
     if (this.config.deviceToken) {
@@ -9916,7 +10133,7 @@ var CompanionSupervisor = class {
       log: this.log,
       lastEventId: null,
       onOpen: () => {
-        this.log.info(`Connected to Cabane as ${this.hub.statusJson().device_label ?? hostname2()}`);
+        this.log.info(`Connected to Cabane as ${this.hub.statusJson().device_label ?? hostname()}`);
         this.deviceConnected = true;
         for (const wr of this.workspaces.values()) {
           this.hub.setConnected(wr.workspaceId, true);
@@ -10462,9 +10679,9 @@ var CompanionSupervisor = class {
           this.runnerCommand ?? selfRunnerCommand()
         ),
         ...this.config.runner?.command ? {
-          boxed: true,
+          wrapped: true,
           secrets: () => loadSecretValuesTolerant(
-            (m) => this.log.warn({ err: m }, "Could not read the secrets file for a boxed turn.")
+            (m) => this.log.warn({ err: m }, "Could not read the secrets file for a wrapped turn.")
           )
         } : {},
         // Read per dispatch, for the secret variables its mint named and no others.
@@ -11143,9 +11360,9 @@ async function waitForBoundedHeartbeat(heartbeat) {
 }
 function defaultReexec() {
   clearRuntimeState();
-  void import("child_process").then(({ spawn: spawn7 }) => {
+  void import("child_process").then(({ spawn: spawn6 }) => {
     try {
-      const child = spawn7(process.execPath, process.argv.slice(1), {
+      const child = spawn6(process.execPath, process.argv.slice(1), {
         stdio: "inherit",
         detached: false
       });
@@ -11216,9 +11433,9 @@ function handleUncaught(log, err, origin) {
 
 // src/crash-marker.ts
 import { existsSync as existsSync17, mkdirSync as mkdirSync15, readFileSync as readFileSync15, rmSync as rmSync11, writeFileSync as writeFileSync9 } from "fs";
-import { join as join28 } from "path";
+import { join as join27 } from "path";
 function crashMarkerPath() {
-  return join28(cabaneDir(), "last-error.json");
+  return join27(cabaneDir(), "last-error.json");
 }
 function recordCrash(rec) {
   try {
@@ -11238,7 +11455,7 @@ function clearCrash() {
 // src/stray-companion.ts
 import { spawnSync } from "child_process";
 import { readFileSync as readFileSync16 } from "fs";
-import { join as join29 } from "path";
+import { join as join28 } from "path";
 var COMPANION_ENTRY = /@cabane\/companion\/|cabane-companion|(^|[\s/])cabane\s|\.cabane\/(versions|current|boot-guard)/;
 var START = /\sstart(\s|$)/;
 function companionStarts(psOutput) {
@@ -11255,7 +11472,7 @@ function companionStarts(psOutput) {
 }
 function stateDirOf(env) {
   const home = env.CABANE_COMPANION_HOME || env.HOME;
-  return home ? join29(home, ".cabane") : null;
+  return home ? join28(home, ".cabane") : null;
 }
 function envFromPsE(output, command) {
   const line = output.replace(/\n$/, "");