@bunny-agent/runner-cli 0.9.58 → 0.9.59-beta.1

package/dist/__tests__/env-payload.test.js

@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { takeToolRefsFromEnv } from "../env-payload.js";
+import { takeMcpConfigFromEnv, takeToolRefsFromEnv } from "../env-payload.js";
 describe("takeToolRefsFromEnv", () => {
     beforeEach(() => {
         vi.spyOn(console, "error").mockImplementation(() => { });
@@ -51,4 +51,56 @@ describe("takeToolRefsFromEnv", () => {
         expect(takeToolRefsFromEnv(env)).toBeNull();
     });
 });
+describe("takeMcpConfigFromEnv", () => {
+    beforeEach(() => {
+        vi.spyOn(console, "error").mockImplementation(() => { });
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("parses and removes a request-scoped MCP config", () => {
+        const env = {
+            BUNNY_AGENT_MCP_CONFIG_JSON: JSON.stringify({
+                config: {
+                    mcpServers: {
+                        remote: {
+                            url: "https://mcp.example.com",
+                            auth: "bearer",
+                            bearerToken: "secret",
+                        },
+                    },
+                },
+            }),
+        };
+        expect(takeMcpConfigFromEnv(env)?.config).toMatchObject({
+            mcpServers: {
+                remote: { bearerToken: "secret" },
+            },
+        });
+        expect(env.BUNNY_AGENT_MCP_CONFIG_JSON).toBeUndefined();
+    });
+    it("removes malformed payloads before returning", () => {
+        const env = {
+            BUNNY_AGENT_MCP_CONFIG_JSON: "{not-json",
+        };
+        expect(takeMcpConfigFromEnv(env)).toBeNull();
+        expect(env.BUNNY_AGENT_MCP_CONFIG_JSON).toBeUndefined();
+    });
+    it("removes an empty payload before returning", () => {
+        const env = {
+            BUNNY_AGENT_MCP_CONFIG_JSON: "",
+        };
+        expect(takeMcpConfigFromEnv(env)).toBeNull();
+        expect(env.BUNNY_AGENT_MCP_CONFIG_JSON).toBeUndefined();
+    });
+    it("is one-shot", () => {
+        const env = {
+            BUNNY_AGENT_MCP_CONFIG_JSON: JSON.stringify({
+                config: { mcpServers: {} },
+            }),
+        };
+        expect(takeMcpConfigFromEnv(env)).not.toBeNull();
+        expect(takeMcpConfigFromEnv(env)).toBeNull();
+    });
+});
 //# sourceMappingURL=env-payload.test.js.map

package/dist/__tests__/env-payload.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-payload.test.js","sourceRoot":"","sources":["../../src/__tests__/env-payload.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,GAAG,GAAG,EAAuB,CAAC;QACpC,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,aAAa,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,GAAG,GAAG;YACV,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC;gBACzC,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,GAAG;wBACT,WAAW,EAAE,EAAE;wBACf,WAAW,EAAE,EAAE;wBACf,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE;qBAC3C;iBACF;aACF,CAAC;SACkB,CAAC;QAEvB,MAAM,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,aAAa,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,MAAM,GAAG,GAAG;YACV,0BAA0B,EAAE,WAAW;SACnB,CAAC;QAEvB,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,aAAa,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,GAAG,GAAG;YACV,0BAA0B,EAAE,0BAA0B;SAClC,CAAC;QAEvB,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5C,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,aAAa,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,GAAG,GAAG;YACV,0BAA0B,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;SACrC,CAAC;QAEvB,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"env-payload.test.js","sourceRoot":"","sources":["../../src/__tests__/env-payload.test.ts"],"names":[],"mappings":"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"}

package/dist/bundle.mjs

@@ -167,6 +167,28 @@ function takeToolRefsFromEnv(env = process.env) {
     return null;
   }
 }
+function takeMcpConfigFromEnv(env = process.env) {
+  const raw = env.BUNNY_AGENT_MCP_CONFIG_JSON;
+  if (raw === void 0) return null;
+  delete env.BUNNY_AGENT_MCP_CONFIG_JSON;
+  if (raw.length === 0) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed.config == null || typeof parsed.config !== "object" || Array.isArray(parsed.config)) {
+      console.error(
+        "[bunny-agent] BUNNY_AGENT_MCP_CONFIG_JSON missing config object; ignoring."
+      );
+      return null;
+    }
+    return { config: parsed.config };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(
+      `[bunny-agent] Failed to parse BUNNY_AGENT_MCP_CONFIG_JSON: ${message}`
+    );
+    return null;
+  }
+}
 
 // ../../packages/runner-harness/dist/agent-context.js
 var BUNNY_AGENT_SYSTEM_PROMPT = [
@@ -19078,6 +19100,308 @@ function createOpenCodeRunner(options = {}) {
   });
 }
 
+// ../../packages/runner-pi/dist/mcp-config.js
+import { createJiti } from "jiti";
+var MAX_SERVERS = 50;
+var MAX_MAP_ENTRIES = 100;
+var MAX_ARRAY_ENTRIES = 100;
+var MAX_NAME_LENGTH = 128;
+var MAX_STRING_LENGTH = 32768;
+var MAX_URL_LENGTH = 4096;
+var MAX_TIMEOUT_MS = 3e5;
+var McpConfigValidationError = class extends Error {
+  constructor(message) {
+    super(`Invalid MCP config: ${message}`);
+    this.name = "McpConfigValidationError";
+  }
+};
+var mcpAdapterModule;
+function getMcpAdapterModule() {
+  if (!mcpAdapterModule) {
+    const jiti = createJiti(import.meta.url, {
+      fsCache: false,
+      moduleCache: true
+    });
+    mcpAdapterModule = jiti("pi-mcp-adapter");
+  }
+  return mcpAdapterModule;
+}
+function fail(message) {
+  throw new McpConfigValidationError(message);
+}
+function hasControlCharacter(value) {
+  for (let index = 0; index < value.length; index += 1) {
+    const code = value.charCodeAt(index);
+    if (code <= 31 || code === 127)
+      return true;
+  }
+  return false;
+}
+function isPlainRecord(value) {
+  if (value == null || typeof value !== "object" || Array.isArray(value)) {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function assertAllowedKeys(value, allowed, path2) {
+  for (const key of Object.keys(value)) {
+    if (!allowed.has(key)) {
+      fail(`${path2}.${key} is not supported`);
+    }
+  }
+}
+function assertOptionalBoolean(value, key, path2) {
+  const candidate = value[key];
+  if (candidate !== void 0 && typeof candidate !== "boolean") {
+    fail(`${path2}.${key} must be a boolean`);
+  }
+}
+function assertOptionalNumber(value, key, path2, options = {}) {
+  const candidate = value[key];
+  if (candidate === void 0)
+    return;
+  if (typeof candidate !== "number" || !Number.isFinite(candidate) || candidate < (options.min ?? 0) || candidate > (options.max ?? Number.MAX_SAFE_INTEGER)) {
+    fail(`${path2}.${key} is outside the supported range`);
+  }
+}
+function assertOptionalString(value, key, path2, options = {}) {
+  const candidate = value[key];
+  if (candidate === void 0)
+    return;
+  if (typeof candidate !== "string" || candidate.length < (options.min ?? 0) || candidate.length > (options.max ?? MAX_STRING_LENGTH)) {
+    fail(`${path2}.${key} must be a bounded string`);
+  }
+}
+function assertStringArray(candidate, path2) {
+  if (!Array.isArray(candidate) || candidate.length > MAX_ARRAY_ENTRIES) {
+    fail(`${path2} must be an array with at most ${MAX_ARRAY_ENTRIES} entries`);
+  }
+  for (const [index, entry] of candidate.entries()) {
+    if (typeof entry !== "string" || entry.length === 0 || entry.length > MAX_STRING_LENGTH) {
+      fail(`${path2}[${index}] must be a non-empty bounded string`);
+    }
+  }
+}
+function assertOptionalStringArray(value, key, path2) {
+  const candidate = value[key];
+  if (candidate !== void 0) {
+    assertStringArray(candidate, `${path2}.${key}`);
+  }
+}
+function assertStringMap(candidate, path2) {
+  if (!isPlainRecord(candidate)) {
+    fail(`${path2} must be an object`);
+  }
+  const entries = Object.entries(candidate);
+  if (entries.length > MAX_MAP_ENTRIES) {
+    fail(`${path2} must have at most ${MAX_MAP_ENTRIES} entries`);
+  }
+  for (const [key, value] of entries) {
+    if (key.length === 0 || key.length > MAX_NAME_LENGTH || typeof value !== "string" || value.length > MAX_STRING_LENGTH) {
+      fail(`${path2} contains an invalid key or value`);
+    }
+  }
+}
+var COMMON_SERVER_KEYS = /* @__PURE__ */ new Set([
+  "lifecycle",
+  "requestTimeoutMs",
+  "directTools",
+  "includeTools",
+  "excludeTools",
+  "exposeResources",
+  "disabled"
+]);
+var HTTP_SERVER_KEYS = /* @__PURE__ */ new Set([
+  ...COMMON_SERVER_KEYS,
+  "url",
+  "headers",
+  "auth",
+  "bearerToken"
+]);
+var STDIO_SERVER_KEYS = /* @__PURE__ */ new Set([
+  ...COMMON_SERVER_KEYS,
+  "command",
+  "args",
+  "env",
+  "cwd"
+]);
+function validateCommonServerOptions(server, path2) {
+  const lifecycle = server.lifecycle;
+  if (lifecycle !== void 0 && lifecycle !== "lazy" && lifecycle !== "eager" && lifecycle !== "keep-alive") {
+    fail(`${path2}.lifecycle is not supported`);
+  }
+  assertOptionalNumber(server, "requestTimeoutMs", path2, {
+    min: 1,
+    max: MAX_TIMEOUT_MS
+  });
+  assertOptionalBoolean(server, "exposeResources", path2);
+  assertOptionalBoolean(server, "disabled", path2);
+  assertOptionalStringArray(server, "includeTools", path2);
+  assertOptionalStringArray(server, "excludeTools", path2);
+  const directTools = server.directTools;
+  if (directTools !== void 0 && typeof directTools !== "boolean" && !Array.isArray(directTools)) {
+    fail(`${path2}.directTools must be a boolean or string array`);
+  }
+  if (Array.isArray(directTools)) {
+    assertStringArray(directTools, `${path2}.directTools`);
+  }
+}
+function validateHttpServer(server, path2) {
+  assertAllowedKeys(server, HTTP_SERVER_KEYS, path2);
+  assertOptionalString(server, "url", path2, {
+    min: 1,
+    max: MAX_URL_LENGTH
+  });
+  let url2;
+  try {
+    url2 = new URL(server.url);
+  } catch {
+    fail(`${path2}.url must be an absolute URL`);
+  }
+  if (url2.protocol !== "http:" && url2.protocol !== "https:") {
+    fail(`${path2}.url must use HTTP or HTTPS`);
+  }
+  if (url2.username || url2.password) {
+    fail(`${path2}.url must not contain embedded credentials`);
+  }
+  if (server.headers !== void 0) {
+    assertStringMap(server.headers, `${path2}.headers`);
+  }
+  const auth = server.auth;
+  if (auth !== void 0 && auth !== false && auth !== "bearer") {
+    fail(`${path2}.auth must be "bearer" or false`);
+  }
+  assertOptionalString(server, "bearerToken", path2, {
+    min: 1,
+    max: MAX_STRING_LENGTH
+  });
+  if (auth === "bearer" && typeof server.bearerToken !== "string") {
+    fail(`${path2}.bearerToken is required for bearer auth`);
+  }
+  if (server.bearerToken !== void 0 && auth !== "bearer") {
+    fail(`${path2}.bearerToken requires auth to be "bearer"`);
+  }
+}
+function validateStdioServer(server, path2) {
+  assertAllowedKeys(server, STDIO_SERVER_KEYS, path2);
+  if (typeof server.command !== "string") {
+    fail(`${path2}.command must be a non-empty bounded string`);
+  }
+  assertOptionalString(server, "command", path2, {
+    min: 1,
+    max: MAX_STRING_LENGTH
+  });
+  assertOptionalString(server, "cwd", path2, {
+    min: 1,
+    max: MAX_STRING_LENGTH
+  });
+  if (server.args !== void 0) {
+    assertStringArray(server.args, `${path2}.args`);
+  }
+  if (server.env !== void 0) {
+    assertStringMap(server.env, `${path2}.env`);
+  }
+}
+function validateServer(server, serverName) {
+  const path2 = `mcpServers.${serverName}`;
+  if (!isPlainRecord(server)) {
+    fail(`${path2} must be an object`);
+  }
+  const serverKeys = Object.keys(server);
+  const hasUrl = serverKeys.includes("url");
+  const hasCommand = serverKeys.includes("command");
+  if (hasUrl === hasCommand) {
+    fail(`${path2} must define exactly one of url or command`);
+  }
+  validateCommonServerOptions(server, path2);
+  if (hasUrl) {
+    validateHttpServer(server, path2);
+  } else {
+    validateStdioServer(server, path2);
+  }
+}
+var SETTINGS_KEYS = /* @__PURE__ */ new Set([
+  "toolPrefix",
+  "hostConfigDiscovery",
+  "idleTimeout",
+  "requestTimeoutMs",
+  "directTools",
+  "disableProxyTool",
+  "autoAuth",
+  "sampling",
+  "samplingAutoApprove",
+  "elicitation",
+  "outputGuard"
+]);
+function validateSettings(settings) {
+  if (!isPlainRecord(settings)) {
+    fail("settings must be an object");
+  }
+  assertAllowedKeys(settings, SETTINGS_KEYS, "settings");
+  const toolPrefix = settings.toolPrefix;
+  if (toolPrefix !== void 0 && toolPrefix !== "server" && toolPrefix !== "none" && toolPrefix !== "short" && toolPrefix !== "mcp") {
+    fail("settings.toolPrefix is not supported");
+  }
+  const hostConfigDiscovery = settings.hostConfigDiscovery;
+  if (hostConfigDiscovery !== void 0 && hostConfigDiscovery !== "off" && hostConfigDiscovery !== "prompt" && hostConfigDiscovery !== "on") {
+    fail("settings.hostConfigDiscovery is not supported");
+  }
+  assertOptionalNumber(settings, "idleTimeout", "settings", {
+    min: 0,
+    max: 1440
+  });
+  assertOptionalNumber(settings, "requestTimeoutMs", "settings", {
+    min: 1,
+    max: MAX_TIMEOUT_MS
+  });
+  for (const key of [
+    "directTools",
+    "disableProxyTool",
+    "autoAuth",
+    "sampling",
+    "samplingAutoApprove",
+    "elicitation",
+    "outputGuard"
+  ]) {
+    assertOptionalBoolean(settings, key, "settings");
+  }
+}
+function validateMcpConfig(config3) {
+  if (!isPlainRecord(config3)) {
+    fail("root value must be an object");
+  }
+  assertAllowedKeys(config3, /* @__PURE__ */ new Set(["mcpServers", "settings"]), "config");
+  if (!isPlainRecord(config3.mcpServers)) {
+    fail("mcpServers must be an object");
+  }
+  const servers = Object.entries(config3.mcpServers);
+  if (servers.length > MAX_SERVERS) {
+    fail(`mcpServers must have at most ${MAX_SERVERS} entries`);
+  }
+  for (const [name, server] of servers) {
+    if (name.length === 0 || name.length > MAX_NAME_LENGTH || hasControlCharacter(name)) {
+      fail("mcpServers contains an invalid server name");
+    }
+    validateServer(server, name);
+  }
+  if (config3.settings !== void 0) {
+    validateSettings(config3.settings);
+  }
+  return structuredClone(config3);
+}
+function shouldEnableMcp(config3, allowedTools) {
+  return config3 !== void 0 && (!allowedTools || allowedTools.includes("mcp"));
+}
+function createMcpExtension(config3) {
+  const validated = validateMcpConfig(config3);
+  const { createMcpAdapter } = getMcpAdapterModule();
+  return {
+    name: "bunny-agent-mcp",
+    factory: createMcpAdapter({ config: validated })
+  };
+}
+
 // ../../packages/runner-pi/dist/pi-runner.js
 import { appendFileSync as appendFileSync2, existsSync as existsSync9, unlinkSync as unlinkSync6 } from "node:fs";
 import { join as join11 } from "node:path";
@@ -19415,7 +19739,8 @@ var BunnyAgentResourceLoader = class {
     this.delegate = new DefaultResourceLoader({
       cwd: this.cwd,
       agentDir: this.agentDir,
-      settingsManager: options.settingsManager
+      settingsManager: options.settingsManager,
+      extensionFactories: options.extensionFactories
     });
   }
   async reload() {
@@ -23534,6 +23859,18 @@ function serializeResult(result) {
 // ../../packages/runner-pi/dist/pi-runner.js
 var LOG_PREFIX2 = "[bunny-agent:pi]";
 var LLM_THOUGHT_SIGNATURE_SEPARATOR = "__thought__";
+async function disposePiSession(session) {
+  try {
+    if (session.hasExtensionHandlers("session_shutdown")) {
+      await session.extensionRunner.emit({
+        type: "session_shutdown",
+        reason: "quit"
+      });
+    }
+  } finally {
+    session.dispose();
+  }
+}
 function applyAllowedTools(tools, allowedTools) {
   if (!allowedTools)
     return tools;
@@ -23685,6 +24022,7 @@ function createPiRunner(options = {}) {
   const apiKeyEnvKey = `${provider.toUpperCase().replace(/-/g, "_")}_API_KEY`;
   const inlineApiKey = typeof options.env?.[apiKeyEnvKey] === "string" && options.env[apiKeyEnvKey].length > 0 ? options.env[apiKeyEnvKey] : void 0;
   const imageModelName = resolveImageModelName(provider, options.env);
+  const mcpExtension = shouldEnableMcp(options.mcpConfig, options.allowedTools) ? createMcpExtension(options.mcpConfig) : void 0;
   return {
     async *run(userInput) {
       const modelRuntime = await ModelRuntime.create({
@@ -23759,10 +24097,11 @@ function createPiRunner(options = {}) {
           return SessionManager2.create(cwd);
         })();
         stripLLMThoughtSignaturesFromSessionManager(sessionManager, model);
-        const resourceLoader = options.skillPaths || options.systemPrompt ? new BunnyAgentResourceLoader({
+        const resourceLoader = options.skillPaths || options.systemPrompt || mcpExtension ? new BunnyAgentResourceLoader({
           cwd,
           skillPaths: options.skillPaths,
-          appendSystemPrompt: options.systemPrompt
+          appendSystemPrompt: options.systemPrompt,
+          extensionFactories: mcpExtension ? [mcpExtension] : void 0
         }) : void 0;
         if (options.skillPaths && options.skillPaths.length > 0) {
           console.error(`${LOG_PREFIX2} runner: cwd=${cwd} skillPaths=${JSON.stringify(options.skillPaths)}`);
@@ -23802,6 +24141,12 @@ function createPiRunner(options = {}) {
             ...toolRefDefinitions
           ]
         });
+        try {
+          await session.bindExtensions({ mode: "print" });
+        } catch (error48) {
+          await disposePiSession(session);
+          throw error48;
+        }
         const eventQueue = [];
         let promptSettled = false;
         let promptError;
@@ -23901,7 +24246,7 @@ function createPiRunner(options = {}) {
             abortSignal.removeEventListener("abort", abortHandler);
           }
           unsubscribe();
-          session.dispose();
+          await disposePiSession(session);
         }
       } finally {
         if (inlineApiKey !== void 0) {
@@ -24021,6 +24366,7 @@ function dispatchRunner(runner, base, cwd, options) {
         forkFrom: options.forkFrom,
         skillPaths: options.skillPaths ?? discoverSkillPaths(cwd),
         toolRefs: options.toolRefs,
+        mcpConfig: options.mcpConfig,
         effort: options.effort,
         systemEnv: options.systemEnv
       }).run(options.userInput);
@@ -24323,6 +24669,7 @@ async function main() {
       const args = parseRunArgs();
       process.chdir(args.cwd);
       const toolRefs = takeToolRefsFromEnv();
+      const mcpConfig = takeMcpConfigFromEnv();
       await runAgent({
         runner: args.runner,
         model: args.model,
@@ -24335,7 +24682,8 @@ async function main() {
         forkFrom: args.forkFrom,
         yolo: args.yolo,
         effort: args.effort,
-        ...toolRefs ? { toolRefs: toolRefs.tools } : {}
+        ...toolRefs ? { toolRefs: toolRefs.tools } : {},
+        ...mcpConfig ? { mcpConfig: mcpConfig.config } : {}
       });
       break;
     }

package/dist/cli.js

@@ -15,7 +15,7 @@ config({ path: resolve(process.cwd(), "../.env") });
 config({ path: resolve(process.cwd(), "../../.env") });
 import { parseArgs } from "node:util";
 import { buildImage } from "./build-image.js";
-import { takeToolRefsFromEnv } from "./env-payload.js";
+import { takeMcpConfigFromEnv, takeToolRefsFromEnv } from "./env-payload.js";
 import { runAgent } from "./runner.js";
 // ---------------------------------------------------------------------------
 // Shared helpers
@@ -259,6 +259,7 @@ async function main() {
             const args = parseRunArgs();
             process.chdir(args.cwd);
             const toolRefs = takeToolRefsFromEnv();
+            const mcpConfig = takeMcpConfigFromEnv();
             await runAgent({
                 runner: args.runner,
                 model: args.model,
@@ -272,6 +273,7 @@ async function main() {
                 yolo: args.yolo,
                 effort: args.effort,
                 ...(toolRefs ? { toolRefs: toolRefs.tools } : {}),
+                ...(mcpConfig ? { mcpConfig: mcpConfig.config } : {}),
             });
             break;
         }

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,4CAA4C;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,2DAA2D;AAC3D,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;AACjD,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;AACpD,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;AAE9E,2DAA2D;AAC3D,SAAS,aAAa;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,IAAI;YAAE,MAAM;QACtB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,qFAAqF;AACrF,SAAS,gBAAgB;IACvB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,IAAI;YAAE,MAAM;QACtB,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,KAAK,EAAE,CAAC;YACR,IAAI,KAAK,KAAK,CAAC;gBAAE,OAAO,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,sDAAsD;AACtD,SAAS,oBAAoB,CAAC,CAAS;IACrC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACjE,KAAK,EAAE,CAAC;YACR,IAAI,KAAK,KAAK,CAAC;gBAAE,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAqBD,SAAS,YAAY;IACnB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC;QACxC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAC7B,OAAO,EAAE;YACP,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE;YACzD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,0BAA0B;aACpC;YACD,GAAG,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,OAAO,CAAC,GAAG,EAAE;aAC5D;YACD,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE;YAC/C,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE;YAC3C,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE;YAC/C,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;YAChD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE;SACtC;QACD,gBAAgB,EAAE,IAAI;QACtB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,YAAY,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,SAAS,GAAG,EAAE,CAAC;IACnB,IAAI,SAAS,KAAK,CAAC,CAAC,IAAI,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;SAAM,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC/C,OAAO,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAO,CAAC;IAC9B,IACE,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAC5E,CAAC;QACD,OAAO,CAAC,KAAK,CACX,0FAA0F,CAC3F,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO;QACL,MAAM;QACN,KAAK,EAAE,MAAM,CAAC,KAAM;QACpB,GAAG,EAAE,MAAM,CAAC,GAAI;QAChB,YAAY,EAAE,MAAM,CAAC,eAAe,CAAC;QACrC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC;YAC3B,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;YAC1C,CAAC,CAAC,SAAS;QACb,YAAY,EAAE,MAAM,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtE,UAAU,EAAE,MAAM,CAAC,YAAY,CAAyB;QACxD,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC;QAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC;QACxB,SAAS;KACV,CAAC;AACJ,CAAC;AAeD,SAAS,mBAAmB;IAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;QAC3B,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAC7B,OAAO,EAAE;YACP,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE;YAChD,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE;YAC1C,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE;YACpD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YACzC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE;SACtC;QACD,gBAAgB,EAAE,KAAK;QACvB,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,mBAAmB,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAK;QAClB,GAAG,EAAE,MAAM,CAAC,GAAI;QAChB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,QAAQ,EAAE,MAAM,CAAC,QAAS;QAC1B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,KAAK;KAC3B,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,YAAY;AACZ,8EAA8E;AAE9E,SAAS,YAAY;IACnB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCb,CAAC,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;CAsBb,CAAC,CAAC;AACH,CAAC;AAED,SAAS,cAAc;IACrB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;CAYb,CAAC,CAAC;AACH,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;CAWb,CAAC,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,KAAK,UAAU,IAAI;IACjB,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAE5B,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC7C,eAAe,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,mBAAmB,EAAE,CAAC;YACvC,MAAM,QAAQ,CAAC;gBACb,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClD,CAAC,CAAC;YACH,MAAM;QACR,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAClC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACtD,cAAc,EAAE,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;gBACnC,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC;gBACrD,cAAc,EAAE,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,MAAM;QACR,CAAC;QACD;YACE,OAAO,CAAC,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;YACzC,eAAe,EAAE,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/env-payload.d.ts

@@ -5,22 +5,31 @@
  * processes (notably the pi runner's bash tool) cannot inherit it via
  * `process.env`.
  *
- * Currently only `BUNNY_AGENT_TOOL_REFS_JSON` lives here — toolRefs may
- * carry Bearer tokens / HTTP headers that must never reach bash. Plain
- * `env` / `systemEnv` go through normal `sandbox.exec({env})` because in
- * CLI mode each runner-cli invocation is single-request, and pi's default
- * `ctx.env` (= the runner's `process.env`) is the expected bash environment.
+ * Tool refs and MCP configuration may carry bearer tokens or HTTP headers
+ * that must never reach bash. Plain `env` / `systemEnv` go through normal
+ * `sandbox.exec({env})` because in CLI mode each runner-cli invocation is
+ * single-request, and pi's default `ctx.env` (= the runner's `process.env`)
+ * is the expected bash environment.
  */
 import type { PiRunnerOptions } from "@bunny-agent/runner-pi";
 type RunnerToolRefs = NonNullable<PiRunnerOptions["toolRefs"]>;
 export type RunnerToolRefsPayload = {
     tools: RunnerToolRefs;
 };
+type RunnerMcpConfig = NonNullable<PiRunnerOptions["mcpConfig"]>;
+export type RunnerMcpConfigPayload = {
+    config: RunnerMcpConfig;
+};
 /**
  * Take `BUNNY_AGENT_TOOL_REFS_JSON`. Returns null when the var is absent or
  * malformed. The var is deleted before parsing so even malformed payloads
  * don't linger in `process.env` for subsequent spawns.
  */
 export declare function takeToolRefsFromEnv(env?: NodeJS.ProcessEnv): RunnerToolRefsPayload | null;
+/**
+ * Take `BUNNY_AGENT_MCP_CONFIG_JSON`. The variable is deleted before parsing
+ * so malformed or secret-bearing payloads cannot reach runner child processes.
+ */
+export declare function takeMcpConfigFromEnv(env?: NodeJS.ProcessEnv): RunnerMcpConfigPayload | null;
 export {};
 //# sourceMappingURL=env-payload.d.ts.map

package/dist/env-payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"env-payload.d.ts","sourceRoot":"","sources":["../src/env-payload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,KAAK,cAAc,GAAG,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,qBAAqB,GAAG;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,qBAAqB,GAAG,IAAI,CAoB9B"}
+{"version":3,"file":"env-payload.d.ts","sourceRoot":"","sources":["../src/env-payload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,KAAK,cAAc,GAAG,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,qBAAqB,GAAG;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAC9D,KAAK,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;AACjE,MAAM,MAAM,sBAAsB,GAAG;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC;AAEjE;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,qBAAqB,GAAG,IAAI,CAoB9B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,sBAAsB,GAAG,IAAI,CA0B/B"}

package/dist/env-payload.js

@@ -5,11 +5,11 @@
  * processes (notably the pi runner's bash tool) cannot inherit it via
  * `process.env`.
  *
- * Currently only `BUNNY_AGENT_TOOL_REFS_JSON` lives here — toolRefs may
- * carry Bearer tokens / HTTP headers that must never reach bash. Plain
- * `env` / `systemEnv` go through normal `sandbox.exec({env})` because in
- * CLI mode each runner-cli invocation is single-request, and pi's default
- * `ctx.env` (= the runner's `process.env`) is the expected bash environment.
+ * Tool refs and MCP configuration may carry bearer tokens or HTTP headers
+ * that must never reach bash. Plain `env` / `systemEnv` go through normal
+ * `sandbox.exec({env})` because in CLI mode each runner-cli invocation is
+ * single-request, and pi's default `ctx.env` (= the runner's `process.env`)
+ * is the expected bash environment.
  */
 /**
  * Take `BUNNY_AGENT_TOOL_REFS_JSON`. Returns null when the var is absent or
@@ -35,4 +35,31 @@ export function takeToolRefsFromEnv(env = process.env) {
         return null;
     }
 }
+/**
+ * Take `BUNNY_AGENT_MCP_CONFIG_JSON`. The variable is deleted before parsing
+ * so malformed or secret-bearing payloads cannot reach runner child processes.
+ */
+export function takeMcpConfigFromEnv(env = process.env) {
+    const raw = env.BUNNY_AGENT_MCP_CONFIG_JSON;
+    if (raw === undefined)
+        return null;
+    delete env.BUNNY_AGENT_MCP_CONFIG_JSON;
+    if (raw.length === 0)
+        return null;
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed.config == null ||
+            typeof parsed.config !== "object" ||
+            Array.isArray(parsed.config)) {
+            console.error("[bunny-agent] BUNNY_AGENT_MCP_CONFIG_JSON missing config object; ignoring.");
+            return null;
+        }
+        return { config: parsed.config };
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(`[bunny-agent] Failed to parse BUNNY_AGENT_MCP_CONFIG_JSON: ${message}`);
+        return null;
+    }
+}
 //# sourceMappingURL=env-payload.js.map

package/dist/env-payload.js.map

@@ -1 +1 @@
-{"version":3,"file":"env-payload.js","sourceRoot":"","sources":["../src/env-payload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAOH;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,GAAG,GAAG,GAAG,CAAC,0BAA0B,CAAC;IAC3C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,GAAG,CAAC,0BAA0B,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA+B,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,KAAK,CACX,yEAAyE,CAC1E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CACX,6DAA6D,OAAO,EAAE,CACvE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"env-payload.js","sourceRoot":"","sources":["../src/env-payload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AASH;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,GAAG,GAAG,GAAG,CAAC,0BAA0B,CAAC;IAC3C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,OAAO,GAAG,CAAC,0BAA0B,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAA+B,CAAC;QAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,KAAK,CACX,yEAAyE,CAC1E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CACX,6DAA6D,OAAO,EAAE,CACvE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAClC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,GAAG,GAAG,GAAG,CAAC,2BAA2B,CAAC;IAC5C,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,GAAG,CAAC,2BAA2B,CAAC;IACvC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAElC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAyB,CAAC;QACvD,IACE,MAAM,CAAC,MAAM,IAAI,IAAI;YACrB,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;YACjC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAC5B,CAAC;YACD,OAAO,CAAC,KAAK,CACX,4EAA4E,CAC7E,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAyB,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CACX,8DAA8D,OAAO,EAAE,CACxE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.9.58",
+  "version": "0.9.59-beta.1",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -45,9 +45,13 @@
     "@earendil-works/pi-agent-core": "0.80.10",
     "@earendil-works/pi-ai": "0.80.10",
     "@earendil-works/pi-coding-agent": "0.80.10",
+    "@earendil-works/pi-tui": "0.80.10",
     "@github/copilot-sdk": "1.0.7",
     "@openai/codex-sdk": "^0.144.6",
     "dotenv": "^17.3.1",
+    "jiti": "2.7.0",
+    "pi-mcp-adapter": "2.15.0",
+    "typebox": "1.1.38",
     "zod": "^4.0.0"
   },
   "devDependencies": {
@@ -55,19 +59,19 @@
     "esbuild": "^0.27.2",
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
-    "@bunny-agent/apply-patch": "0.1.0",
-    "@bunny-agent/runner-copilot": "0.1.0",
     "@bunny-agent/runner-claude": "0.6.2",
+    "@bunny-agent/apply-patch": "0.1.0",
     "@bunny-agent/runner-codex": "0.6.2",
-    "@bunny-agent/runner-pi": "0.6.4-beta.0",
-    "@bunny-agent/runner-harness": "0.1.1-beta.0",
+    "@bunny-agent/runner-copilot": "0.1.0",
     "@bunny-agent/runner-gemini": "0.6.2",
-    "@bunny-agent/runner-opencode": "0.6.2"
+    "@bunny-agent/runner-pi": "0.6.4-beta.0",
+    "@bunny-agent/runner-opencode": "0.6.2",
+    "@bunny-agent/runner-harness": "0.1.1-beta.0"
   },
   "scripts": {
     "build": "tsc && pnpm bundle",
     "build:bundle": "tsc && pnpm bundle",
-    "bundle": "esbuild src/cli.ts --bundle --platform=node --format=esm --external:dotenv --external:@anthropic-ai/claude-agent-sdk --external:@github/copilot-sdk --external:@openai/codex-sdk --external:@earendil-works/pi-agent-core --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --outfile=dist/bundle.mjs && esbuild src/apply-patch-bin.ts --bundle --platform=node --format=esm --outfile=dist/apply-patch-bin.js --allow-overwrite",
+    "bundle": "esbuild src/cli.ts --bundle --platform=node --format=esm --external:dotenv --external:jiti --external:@anthropic-ai/claude-agent-sdk --external:@github/copilot-sdk --external:@openai/codex-sdk --external:@earendil-works/pi-agent-core --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --outfile=dist/bundle.mjs && esbuild src/apply-patch-bin.ts --bundle --platform=node --format=esm --outfile=dist/apply-patch-bin.js --allow-overwrite",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
     "typecheck": "tsc --noEmit",