@cabane/companion 0.6.234 → 0.6.236

package/dist/cli.js

@@ -3205,9 +3205,11 @@ function envResolvedFrom(server, secretEnv) {
   if (!server.env && Object.keys(resolved).length === 0) return void 0;
   return { ...server.env, ...resolved };
 }
+var TURN_TOKEN_ENV;
 var init_mcp_secret_env = __esm({
   "packages/agent-runtime/src/mcp-secret-env.ts"() {
     "use strict";
+    TURN_TOKEN_ENV = "CABANE_TURN_TOKEN";
   }
 });
 
@@ -3357,7 +3359,7 @@ function buildClaudeCodeOptions(req, augment) {
       type: "http",
       url: req.cabane.mcpUrl,
       headers: {
-        Authorization: `Bearer ${req.cabane.bearer}`,
+        Authorization: `\${${TURN_TOKEN_ENV}}`,
         [ACTIVE_CONVERSATION_HEADER]: req.cabane.activeConversationId
       },
       // Claude Code 2.1.x defers every MCP tool behind tool-search by default;
@@ -3416,10 +3418,15 @@ function buildClaudeCodeOptions(req, augment) {
     //
     // `secretEnv` — the values the MCP headers above reference — joins here and only here: it is
     // this child's environment, not the host's.
+    //
+    // The turn token goes after everything a room secret, a hook or the inherited environment can
+    // supply: this spread order is the only thing that stops a variable of the same name from
+    // displacing the turn's own credential.
     env: {
       ...process.env,
       ...req.local.env,
       ...req.local.secretEnv,
+      [TURN_TOKEN_ENV]: `Bearer ${req.cabane.bearer}`,
       CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1"
     },
     ...resume ? { resume } : {}
@@ -5249,12 +5256,16 @@ function codexSecretEnv(req) {
   const env = { ...req.local.secretEnv };
   for (const server of Object.values(req.local.mcpServers ?? {})) {
     if ("url" in server) continue;
-    for (const [variable, envName] of Object.entries(server.envFromEnv ?? {})) {
+    for (const [variable, envName] of forwardedEnvVars(server.envFromEnv)) {
       const value = req.local.secretEnv?.[envName];
       if (value !== void 0) env[variable] = value;
     }
   }
-  return Object.keys(env).length > 0 ? env : null;
+  env[TURN_TOKEN_ENV] = `Bearer ${req.cabane.bearer}`;
+  return env;
+}
+function forwardedEnvVars(envFromEnv) {
+  return Object.entries(envFromEnv ?? {}).filter(([variable]) => variable !== TURN_TOKEN_ENV);
 }
 function buildInput(req, segments, preamble, resumed) {
   const userText = req.content.filter((b) => b.type === "text").map((b) => b.text).join("\n\n");
@@ -5296,7 +5307,7 @@ function buildConfig(req) {
         default_tools_approval_mode: "approve"
       };
     } else if ("command" in server) {
-      const forwarded = Object.keys(server.envFromEnv ?? {}).sort();
+      const forwarded = forwardedEnvVars(server.envFromEnv).map(([variable]) => variable).sort();
       mcp_servers[name] = {
         command: server.command,
         ...server.args ? { args: server.args } : {},
@@ -5324,19 +5335,15 @@ function buildConfig(req) {
   }
   mcp_servers[CABANE_MCP_SERVER3] = {
     url: req.cabane.mcpUrl,
-    http_headers: {
-      Authorization: `Bearer ${req.cabane.bearer}`,
-      [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId
-    },
+    http_headers: { [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId },
+    env_http_headers: { Authorization: TURN_TOKEN_ENV },
     default_tools_approval_mode: "approve"
   };
   if (req.cabane.turnControlUrl) {
     mcp_servers[TURN_CONTROL_MCP_SERVER] = {
       url: req.cabane.turnControlUrl,
-      http_headers: {
-        Authorization: `Bearer ${req.cabane.bearer}`,
-        [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId
-      },
+      http_headers: { [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId },
+      env_http_headers: { Authorization: TURN_TOKEN_ENV },
       default_tools_approval_mode: "approve"
     };
   }
@@ -5361,6 +5368,7 @@ var CABANE_MCP_SERVER3, ACTIVE_CONVERSATION_HEADER3, ENV_ENVELOPE_KEYS, CORE_REP
 var init_run_spec2 = __esm({
   "packages/agent-runtime/src/codex/run-spec.ts"() {
     "use strict";
+    init_mcp_secret_env();
     init_descriptions();
     init_standing();
     init_policy3();
@@ -5476,7 +5484,7 @@ function createSdkCodexTransport(opts = {}) {
         // path (the CLI splits on `.` and ignores TOML quoting), so it must ride inside an inline-table
         // value, which the SDK's flattener can't produce. See `config-overrides.ts`.
         configOverrides: buildConfigOverrides(spec.config),
-        ...spec.secretEnv ? { env: codexProcessEnv(spec.secretEnv) } : {}
+        env: codexProcessEnv(spec.secretEnv)
       };
       const codex = new Codex(codexOptions);
       const threadOptions = buildSdkThreadOptions(spec);

package/dist/runtime.js

@@ -3134,6 +3134,7 @@ var CLAUDE_CODE_ADDENDUM = [
 ].join("\n");
 
 // packages/agent-runtime/src/mcp-secret-env.ts
+var TURN_TOKEN_ENV = "CABANE_TURN_TOKEN";
 function headersAsEnvReferences(server) {
   const refs = Object.entries(server.headersFromEnv ?? {}).map(
     ([header, envName]) => [header, `\${${envName}}`]
@@ -3298,7 +3299,7 @@ function buildClaudeCodeOptions(req, augment) {
       type: "http",
       url: req.cabane.mcpUrl,
       headers: {
-        Authorization: `Bearer ${req.cabane.bearer}`,
+        Authorization: `\${${TURN_TOKEN_ENV}}`,
         [ACTIVE_CONVERSATION_HEADER]: req.cabane.activeConversationId
       },
       // Claude Code 2.1.x defers every MCP tool behind tool-search by default;
@@ -3357,10 +3358,15 @@ function buildClaudeCodeOptions(req, augment) {
     //
     // `secretEnv` — the values the MCP headers above reference — joins here and only here: it is
     // this child's environment, not the host's.
+    //
+    // The turn token goes after everything a room secret, a hook or the inherited environment can
+    // supply: this spread order is the only thing that stops a variable of the same name from
+    // displacing the turn's own credential.
     env: {
       ...process.env,
       ...req.local.env,
       ...req.local.secretEnv,
+      [TURN_TOKEN_ENV]: `Bearer ${req.cabane.bearer}`,
       CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1"
     },
     ...resume ? { resume } : {}
@@ -4991,12 +4997,16 @@ function codexSecretEnv(req) {
   const env = { ...req.local.secretEnv };
   for (const server of Object.values(req.local.mcpServers ?? {})) {
     if ("url" in server) continue;
-    for (const [variable, envName] of Object.entries(server.envFromEnv ?? {})) {
+    for (const [variable, envName] of forwardedEnvVars(server.envFromEnv)) {
       const value = req.local.secretEnv?.[envName];
       if (value !== void 0) env[variable] = value;
     }
   }
-  return Object.keys(env).length > 0 ? env : null;
+  env[TURN_TOKEN_ENV] = `Bearer ${req.cabane.bearer}`;
+  return env;
+}
+function forwardedEnvVars(envFromEnv) {
+  return Object.entries(envFromEnv ?? {}).filter(([variable]) => variable !== TURN_TOKEN_ENV);
 }
 var CORE_REPLACES = "Your standing instructions changed since an earlier copy in this conversation, or that copy may have been compacted away. This copy replaces every earlier one: where they differ, this one holds, and anything an earlier copy said that this one does not no longer applies.";
 var CONVERSATION_REPLACES = "This conversation's standing context \u2014 its charters, skill indexes and roster \u2014 changed since an earlier copy in this conversation, or that copy may have been compacted away. This copy replaces every earlier one, including charters and skills an earlier turn carried in its own text: where they differ, this one holds, and anything an earlier copy said that this one does not no longer applies.";
@@ -5040,7 +5050,7 @@ function buildConfig(req) {
         default_tools_approval_mode: "approve"
       };
     } else if ("command" in server) {
-      const forwarded = Object.keys(server.envFromEnv ?? {}).sort();
+      const forwarded = forwardedEnvVars(server.envFromEnv).map(([variable]) => variable).sort();
       mcp_servers[name] = {
         command: server.command,
         ...server.args ? { args: server.args } : {},
@@ -5068,19 +5078,15 @@ function buildConfig(req) {
   }
   mcp_servers[CABANE_MCP_SERVER3] = {
     url: req.cabane.mcpUrl,
-    http_headers: {
-      Authorization: `Bearer ${req.cabane.bearer}`,
-      [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId
-    },
+    http_headers: { [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId },
+    env_http_headers: { Authorization: TURN_TOKEN_ENV },
     default_tools_approval_mode: "approve"
   };
   if (req.cabane.turnControlUrl) {
     mcp_servers[TURN_CONTROL_MCP_SERVER] = {
       url: req.cabane.turnControlUrl,
-      http_headers: {
-        Authorization: `Bearer ${req.cabane.bearer}`,
-        [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId
-      },
+      http_headers: { [ACTIVE_CONVERSATION_HEADER3]: req.cabane.activeConversationId },
+      env_http_headers: { Authorization: TURN_TOKEN_ENV },
       default_tools_approval_mode: "approve"
     };
   }
@@ -5196,7 +5202,7 @@ function createSdkCodexTransport(opts = {}) {
         // path (the CLI splits on `.` and ignores TOML quoting), so it must ride inside an inline-table
         // value, which the SDK's flattener can't produce. See `config-overrides.ts`.
         configOverrides: buildConfigOverrides(spec.config),
-        ...spec.secretEnv ? { env: codexProcessEnv(spec.secretEnv) } : {}
+        env: codexProcessEnv(spec.secretEnv)
       };
       const codex = new Codex(codexOptions);
       const threadOptions = buildSdkThreadOptions(spec);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.234",
+  "version": "0.6.236",
   "type": "module",
   "description": "The Cabane Companion (headless): connect an agent on your machine to your Cabane workspace as a responder — drive work against your own codebase, files, and MCP servers without putting any of it in Cabane.",
   "license": "UNLICENSED",
@@ -38,7 +38,7 @@
     "prepublishOnly": "pnpm build"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.319",
+    "@anthropic-ai/claude-agent-sdk": "0.3.322",
     "@clack/prompts": "1.8.1",
     "@openai/codex-sdk": "0.167.0",
     "commander": "12.1.0",