botmux 2.86.0 → 2.87.0

package/dist/worker.js

@@ -23,6 +23,7 @@ import { shouldWriteNow } from './utils/input-gate.js';
 import { mergeQueuedCliInput } from './utils/pending-input-queue.js';
 import { ReadyGate, shouldArmReadyGate } from './utils/ready-gate.js';
 import { shouldRunStartupCommandsOnSpawn, shouldDeferInitialPromptForStartup } from './core/startup-commands.js';
+import { sanitizePerBotEnv } from './core/per-bot-env.js';
 import { InflightInputTracker } from './core/inflight-input-tracker.js';
 import { shouldRunQuietRotation, evaluatePidResolverPullback, decideFingerprintSwitch, shouldHealAbsentBaseline, sessionIdFromJsonlPath, SESSION_ID_FILENAME_RE, } from './services/bridge-rotation-policy.js';
 import { CodexBridgeQueue } from './services/codex-bridge-queue.js';
@@ -4063,6 +4064,16 @@ function spawnCli(cfg) {
     // them past the server's global env.
     if (cliAdapter.spawnEnv)
         Object.assign(childEnv, cliAdapter.spawnEnv);
+    // Per-bot env (bots.json `env`): extra vars for THIS bot's CLI only — e.g.
+    // ANTHROPIC_BASE_URL/ANTHROPIC_AUTH_TOKEN to run a bot on GLM/a 3rd-party
+    // provider, an HTTPS_PROXY, or a CLI feature flag. Passed as injectEnv (NOT
+    // merged into childEnv) so the tmux/zellij backends inject it via the per-pane
+    // `/usr/bin/env` prefix and never into the shared backing-server global env,
+    // keeping it from leaking across bots. Re-sanitized here (crossed IPC).
+    const perBotInjectEnv = sanitizePerBotEnv(cfg.env);
+    const perBotInjectKeys = Object.keys(perBotInjectEnv);
+    if (perBotInjectKeys.length)
+        log(`Injecting ${perBotInjectKeys.length} per-bot env var(s): ${perBotInjectKeys.join(', ')}`);
     // ── File sandbox (oncall): wrap the CLI in bwrap so it can only touch a
     // per-session project copy + de-identified config. The agent's `botmux send`
     // routes through a daemon-side outbox watcher (creds never enter the sandbox).
@@ -4230,6 +4241,7 @@ function spawnCli(cfg) {
         cols: PTY_COLS,
         rows: PTY_ROWS,
         env: childEnv,
+        injectEnv: perBotInjectKeys.length ? perBotInjectEnv : undefined,
     });
     // Write CLI PID marker so agent-facing subcommands (`botmux send`, etc.)
     // can verify they were spawned inside a botmux session by walking the