agent-relay-runner 0.120.4 → 0.120.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.120.4",
+  "version": "0.120.6",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "agent-relay-providers": "0.104.3",
-    "agent-relay-sdk": "0.2.109",
+    "agent-relay-sdk": "0.2.111",
     "callmux": "0.23.0"
   },
   "devDependencies": {

package/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.120.4",
+  "version": "0.120.6",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/provisioning.ts

@@ -36,6 +36,7 @@ function coerceProjectMcpServer(raw: unknown): ProvisioningMcpServer | null {
   if (typeof r.command === "string") server.command = r.command;
   if (Array.isArray(r.args) && r.args.every((a) => typeof a === "string")) server.args = r.args as string[];
   if (r.env && typeof r.env === "object") server.env = r.env as Record<string, string>;
+  if (r.configEnv && typeof r.configEnv === "object") server.configEnv = r.configEnv as Record<string, string>;
   if (typeof r.url === "string") server.url = r.url;
   if (r.headers && typeof r.headers === "object") server.headers = r.headers as Record<string, string>;
   // Drop an entry that names no transport (neither a command nor a url) — nothing to launch.

package/src/relay-mcp.ts

@@ -79,14 +79,23 @@ export function sharedMcpBridgeServer(url: string, cwd: string): ProvisioningMcp
   };
 }
 
+function mergedConfigEnv(server: ProvisioningMcpServer): ProvisioningMcpServer {
+  if (!server.configEnv || Object.keys(server.configEnv).length === 0) return server;
+  return {
+    ...server,
+    env: { ...server.configEnv, ...(server.env ?? {}) },
+  };
+}
+
 function claudeMcpServerEntry(server: ProvisioningMcpServer): Record<string, unknown> {
+  const merged = mergedConfigEnv(server);
   const entry: Record<string, unknown> = {};
-  if (server.type) entry.type = server.type;
-  if (server.command) entry.command = server.command;
-  if (server.args?.length) entry.args = server.args;
-  if (server.env && Object.keys(server.env).length) entry.env = server.env;
-  if (server.url) entry.url = server.url;
-  if (server.headers && Object.keys(server.headers).length) entry.headers = server.headers;
+  if (merged.type) entry.type = merged.type;
+  if (merged.command) entry.command = merged.command;
+  if (merged.args?.length) entry.args = merged.args;
+  if (merged.env && Object.keys(merged.env).length) entry.env = merged.env;
+  if (merged.url) entry.url = merged.url;
+  if (merged.headers && Object.keys(merged.headers).length) entry.headers = merged.headers;
   return entry;
 }
 
@@ -132,8 +141,9 @@ export function claudeMcpLaunchArgs(opts: {
 // server, the same shape relayMcpCodexConfigArgs uses for the relay endpoint.
 export function codexProvisionedMcpArgs(servers?: Record<string, ProvisioningMcpServer>): string[] {
   const args: string[] = [];
-  for (const [name, server] of Object.entries(servers ?? {})) {
+  for (const [name, rawServer] of Object.entries(servers ?? {})) {
     if (name === RELAY_MCP_SERVER_NAME) continue;
+    const server = mergedConfigEnv(rawServer);
     const key = `mcp_servers.${name}`;
     if (server.command) args.push("-c", `${key}.command=${tomlString(server.command)}`);
     if (server.args?.length) args.push("-c", `${key}.args=[${server.args.map(tomlString).join(",")}]`);