@cabane/companion 0.6.152 → 0.6.153

package/dist/cli.js

@@ -1892,7 +1892,8 @@ var init_turn_request = __esm({
         type: z8.literal("stdio").optional(),
         command: z8.string(),
         args: z8.array(z8.string()).optional(),
-        env: z8.record(z8.string(), z8.string()).optional()
+        env: z8.record(z8.string(), z8.string()).optional(),
+        envFromEnv: z8.record(z8.string(), z8.string()).optional()
       }),
       z8.object({
         type: z8.literal("http"),
@@ -2439,6 +2440,22 @@ function headersResolvedFrom(server, secretEnv) {
   if (!server.headers && Object.keys(resolved).length === 0) return void 0;
   return { ...server.headers, ...resolved };
 }
+function envAsEnvReferences(server) {
+  const refs = Object.entries(server.envFromEnv ?? {}).map(
+    ([variable, envName]) => [variable, `\${${envName}}`]
+  );
+  if (!server.env && refs.length === 0) return void 0;
+  return { ...server.env, ...Object.fromEntries(refs) };
+}
+function envResolvedFrom(server, secretEnv) {
+  const resolved = {};
+  for (const [variable, envName] of Object.entries(server.envFromEnv ?? {})) {
+    const value = secretEnv?.[envName];
+    if (value !== void 0) resolved[variable] = value;
+  }
+  if (!server.env && Object.keys(resolved).length === 0) return void 0;
+  return { ...server.env, ...resolved };
+}
 var init_mcp_secret_env = __esm({
   "packages/agent-runtime/src/mcp-secret-env.ts"() {
     "use strict";
@@ -2600,7 +2617,9 @@ function buildClaudeCodeOptions(req, augment) {
       const headers = headersAsEnvReferences(server);
       userServers[name] = { ...rest, ...headers ? { headers } : {} };
     } else {
-      userServers[name] = server;
+      const { envFromEnv: _refs, env: _env, ...rest } = server;
+      const env = envAsEnvReferences(server);
+      userServers[name] = { ...rest, ...env ? { env } : {} };
     }
   }
   const mcpServers = {
@@ -4106,8 +4125,10 @@ function buildRunSpec(req, resumeSessionId) {
     sendClientMessageId: resumeSessionId == null,
     ...dialect.agent ? { agent: dialect.agent } : {},
     mcp: buildMcp(req),
+    // Every server this turn installs with a credential resolved into it: a remote one's
+    // `headersFromEnv`, a stdio one's `envFromEnv`. None may take an operator-configured name.
     credentialServers: Object.entries(req.local.mcpServers ?? {}).filter(
-      ([, server]) => "url" in server && Object.keys(server.headersFromEnv ?? {}).length > 0
+      ([, server]) => "url" in server ? Object.keys(server.headersFromEnv ?? {}).length > 0 : Object.keys(server.envFromEnv ?? {}).length > 0
     ).map(([name]) => name)
   };
 }
@@ -4136,10 +4157,11 @@ function buildMcp(req) {
       };
     } else if ("command" in server) {
       const command = [server.command, ...server.args ?? []];
+      const environment = envResolvedFrom(server, req.local.secretEnv);
       mcp[name] = {
         type: "local",
         command,
-        ...server.env ? { environment: server.env } : {},
+        ...environment ? { environment } : {},
         enabled: true
       };
     }
@@ -5426,9 +5448,20 @@ function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromp
     promptRidesInput,
     promptFingerprint,
     config: buildConfig(req, baseInstructionsFile),
-    secretEnv: req.local.secretEnv && Object.keys(req.local.secretEnv).length > 0 ? req.local.secretEnv : null
+    secretEnv: codexSecretEnv(req)
   };
 }
+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 ?? {})) {
+      const value = req.local.secretEnv?.[envName];
+      if (value !== void 0) env[variable] = value;
+    }
+  }
+  return Object.keys(env).length > 0 ? env : null;
+}
 function buildInput(req, promptRidesInput) {
   const userText = req.content.filter((b) => b.type === "text").map((b) => b.text).join("\n\n");
   const body = userText.trim().length > 0 ? userText : req.prompt;
@@ -5457,10 +5490,12 @@ function buildConfig(req, baseInstructionsFile) {
         default_tools_approval_mode: "approve"
       };
     } else if ("command" in server) {
+      const forwarded = Object.keys(server.envFromEnv ?? {}).sort();
       mcp_servers[name] = {
         command: server.command,
         ...server.args ? { args: server.args } : {},
         ...server.env ? { env: server.env } : {},
+        ...forwarded.length > 0 ? { env_vars: forwarded } : {},
         default_tools_approval_mode: "approve"
       };
     }
@@ -7417,7 +7452,10 @@ var init_run_config = __esm({
       type: z15.literal("stdio").optional(),
       command: z15.string().min(1),
       args: z15.array(z15.string()).optional(),
-      env: z15.record(z15.string(), z15.string()).optional()
+      env: z15.record(z15.string(), z15.string()).optional(),
+      // Variable → the name of a `secretEnv` entry holding its value. Set by the server on a
+      // room's shared browser, whose connect URL is a credential.
+      envFromEnv: z15.record(z15.string(), z15.string()).optional()
     });
     mcpHttpServerSchema = z15.object({
       type: z15.literal("http"),

package/dist/runtime.js

@@ -3355,7 +3355,8 @@ var resolvedMcpServerSchema = z8.union([
     type: z8.literal("stdio").optional(),
     command: z8.string(),
     args: z8.array(z8.string()).optional(),
-    env: z8.record(z8.string(), z8.string()).optional()
+    env: z8.record(z8.string(), z8.string()).optional(),
+    envFromEnv: z8.record(z8.string(), z8.string()).optional()
   }),
   z8.object({
     type: z8.literal("http"),
@@ -3857,6 +3858,22 @@ function headersResolvedFrom(server, secretEnv) {
   if (!server.headers && Object.keys(resolved).length === 0) return void 0;
   return { ...server.headers, ...resolved };
 }
+function envAsEnvReferences(server) {
+  const refs = Object.entries(server.envFromEnv ?? {}).map(
+    ([variable, envName]) => [variable, `\${${envName}}`]
+  );
+  if (!server.env && refs.length === 0) return void 0;
+  return { ...server.env, ...Object.fromEntries(refs) };
+}
+function envResolvedFrom(server, secretEnv) {
+  const resolved = {};
+  for (const [variable, envName] of Object.entries(server.envFromEnv ?? {})) {
+    const value = secretEnv?.[envName];
+    if (value !== void 0) resolved[variable] = value;
+  }
+  if (!server.env && Object.keys(resolved).length === 0) return void 0;
+  return { ...server.env, ...resolved };
+}
 
 // packages/agent-runtime/src/claude-code/policy.ts
 import { z as z10 } from "zod";
@@ -3998,7 +4015,9 @@ function buildClaudeCodeOptions(req, augment) {
       const headers = headersAsEnvReferences(server);
       userServers[name] = { ...rest, ...headers ? { headers } : {} };
     } else {
-      userServers[name] = server;
+      const { envFromEnv: _refs, env: _env, ...rest } = server;
+      const env = envAsEnvReferences(server);
+      userServers[name] = { ...rest, ...env ? { env } : {} };
     }
   }
   const mcpServers = {
@@ -5414,8 +5433,10 @@ function buildRunSpec(req, resumeSessionId) {
     sendClientMessageId: resumeSessionId == null,
     ...dialect.agent ? { agent: dialect.agent } : {},
     mcp: buildMcp(req),
+    // Every server this turn installs with a credential resolved into it: a remote one's
+    // `headersFromEnv`, a stdio one's `envFromEnv`. None may take an operator-configured name.
     credentialServers: Object.entries(req.local.mcpServers ?? {}).filter(
-      ([, server]) => "url" in server && Object.keys(server.headersFromEnv ?? {}).length > 0
+      ([, server]) => "url" in server ? Object.keys(server.headersFromEnv ?? {}).length > 0 : Object.keys(server.envFromEnv ?? {}).length > 0
     ).map(([name]) => name)
   };
 }
@@ -5444,10 +5465,11 @@ function buildMcp(req) {
       };
     } else if ("command" in server) {
       const command = [server.command, ...server.args ?? []];
+      const environment = envResolvedFrom(server, req.local.secretEnv);
       mcp[name] = {
         type: "local",
         command,
-        ...server.env ? { environment: server.env } : {},
+        ...environment ? { environment } : {},
         enabled: true
       };
     }
@@ -6656,9 +6678,20 @@ function buildRunSpec2(req, resumeThreadId, instructionsFile = null, threadPromp
     promptRidesInput,
     promptFingerprint,
     config: buildConfig(req, baseInstructionsFile),
-    secretEnv: req.local.secretEnv && Object.keys(req.local.secretEnv).length > 0 ? req.local.secretEnv : null
+    secretEnv: codexSecretEnv(req)
   };
 }
+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 ?? {})) {
+      const value = req.local.secretEnv?.[envName];
+      if (value !== void 0) env[variable] = value;
+    }
+  }
+  return Object.keys(env).length > 0 ? env : null;
+}
 function buildInput(req, promptRidesInput) {
   const userText = req.content.filter((b) => b.type === "text").map((b) => b.text).join("\n\n");
   const body = userText.trim().length > 0 ? userText : req.prompt;
@@ -6687,10 +6720,12 @@ function buildConfig(req, baseInstructionsFile) {
         default_tools_approval_mode: "approve"
       };
     } else if ("command" in server) {
+      const forwarded = Object.keys(server.envFromEnv ?? {}).sort();
       mcp_servers[name] = {
         command: server.command,
         ...server.args ? { args: server.args } : {},
         ...server.env ? { env: server.env } : {},
+        ...forwarded.length > 0 ? { env_vars: forwarded } : {},
         default_tools_approval_mode: "approve"
       };
     }
@@ -8524,7 +8559,10 @@ var mcpStdioServerSchema = z15.object({
   type: z15.literal("stdio").optional(),
   command: z15.string().min(1),
   args: z15.array(z15.string()).optional(),
-  env: z15.record(z15.string(), z15.string()).optional()
+  env: z15.record(z15.string(), z15.string()).optional(),
+  // Variable → the name of a `secretEnv` entry holding its value. Set by the server on a
+  // room's shared browser, whose connect URL is a credential.
+  envFromEnv: z15.record(z15.string(), z15.string()).optional()
 });
 var mcpHttpServerSchema = z15.object({
   type: z15.literal("http"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabane/companion",
-  "version": "0.6.152",
+  "version": "0.6.153",
   "type": "module",
   "description": "The Cabane Companion (headless): connect a coding 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",