poe-code 3.0.68 → 3.0.70

package/dist/index.js

@@ -2192,11 +2192,64 @@ var init_src2 = __esm({
   }
 });
 
+// packages/agent-spawn/src/configs/mcp.ts
+function toJsonMcpServers(servers) {
+  const out = {};
+  for (const [name, server] of Object.entries(servers)) {
+    const mapped = { command: server.command };
+    if (server.args && server.args.length > 0) {
+      mapped.args = server.args;
+    }
+    if (server.env && Object.keys(server.env).length > 0) {
+      mapped.env = server.env;
+    }
+    out[name] = mapped;
+  }
+  return out;
+}
+function toTomlString(value) {
+  return JSON.stringify(value);
+}
+function toTomlArray(values) {
+  const serialized = values.map((value) => toTomlString(value));
+  return `[${serialized.join(", ")}]`;
+}
+function toTomlInlineTable(values) {
+  const parts = [];
+  for (const [key, value] of Object.entries(values)) {
+    parts.push(`${JSON.stringify(key)}=${toTomlString(value)}`);
+  }
+  return `{${parts.join(", ")}}`;
+}
+function serializeJsonMcpArgs(servers) {
+  return ["--mcp-config", JSON.stringify({ mcpServers: toJsonMcpServers(servers) })];
+}
+function serializeCodexMcpArgs(servers) {
+  const args = [];
+  for (const [name, server] of Object.entries(servers)) {
+    const prefix = `mcp_servers.${name}`;
+    args.push("-c", `${prefix}.command=${toTomlString(server.command)}`);
+    if (server.args && server.args.length > 0) {
+      args.push("-c", `${prefix}.args=${toTomlArray(server.args)}`);
+    }
+    if (server.env && Object.keys(server.env).length > 0) {
+      args.push("-c", `${prefix}.env=${toTomlInlineTable(server.env)}`);
+    }
+  }
+  return args;
+}
+var init_mcp = __esm({
+  "packages/agent-spawn/src/configs/mcp.ts"() {
+    "use strict";
+  }
+});
+
 // packages/agent-spawn/src/configs/claude-code.ts
 var claudeCodeSpawnConfig;
 var init_claude_code2 = __esm({
   "packages/agent-spawn/src/configs/claude-code.ts"() {
     "use strict";
+    init_mcp();
     claudeCodeSpawnConfig = {
       kind: "cli",
       agentId: "claude-code",
@@ -2211,6 +2264,7 @@ var init_claude_code2 = __esm({
         "stream-json",
         "--verbose"
       ],
+      mcpArgs: serializeJsonMcpArgs,
       modes: {
         yolo: ["--dangerously-skip-permissions"],
         edit: ["--permission-mode", "acceptEdits", "--allowedTools", "Bash,Read,Write,Edit,Glob,Grep,NotebookEdit"],
@@ -2233,6 +2287,7 @@ var codexSpawnConfig;
 var init_codex2 = __esm({
   "packages/agent-spawn/src/configs/codex.ts"() {
     "use strict";
+    init_mcp();
     codexSpawnConfig = {
       kind: "cli",
       agentId: "codex",
@@ -2242,6 +2297,7 @@ var init_codex2 = __esm({
       modelFlag: "--model",
       modelStripProviderPrefix: true,
       defaultArgs: ["--skip-git-repo-check", "--json"],
+      mcpArgs: serializeCodexMcpArgs,
       modes: {
         yolo: ["-s", "danger-full-access"],
         edit: ["-s", "workspace-write"],
@@ -2297,6 +2353,7 @@ var kimiSpawnConfig;
 var init_kimi2 = __esm({
   "packages/agent-spawn/src/configs/kimi.ts"() {
     "use strict";
+    init_mcp();
     kimiSpawnConfig = {
       kind: "cli",
       agentId: "kimi",
@@ -2307,6 +2364,7 @@ var init_kimi2 = __esm({
       promptFlag: "-p",
       modelStripProviderPrefix: true,
       defaultArgs: ["--print", "--output-format", "stream-json"],
+      mcpArgs: serializeJsonMcpArgs,
       modes: {
         yolo: ["--yolo"],
         edit: [],
@@ -2333,6 +2391,20 @@ function getSpawnConfig(input) {
   }
   return lookup2.get(resolvedId);
 }
+function supportsMcpAtSpawn(input) {
+  const config2 = getSpawnConfig(input);
+  return !!config2 && config2.kind === "cli" && typeof config2.mcpArgs === "function";
+}
+function listMcpSupportedAgents() {
+  const supported = [];
+  for (const config2 of allSpawnConfigs) {
+    if (config2.kind !== "cli" || typeof config2.mcpArgs !== "function") {
+      continue;
+    }
+    supported.push(config2.agentId);
+  }
+  return supported;
+}
 var allSpawnConfigs, lookup2;
 var init_configs = __esm({
   "packages/agent-spawn/src/configs/index.ts"() {
@@ -2377,6 +2449,35 @@ var init_resolve_config = __esm({
   }
 });
 
+// packages/agent-spawn/src/mcp-args.ts
+function hasMcpServers(servers) {
+  if (!servers) {
+    return false;
+  }
+  return Object.keys(servers).length > 0;
+}
+function getMcpArgs(config2, servers) {
+  if (!hasMcpServers(servers)) {
+    return [];
+  }
+  if (!config2.mcpArgs) {
+    throw new Error(formatUnsupportedMcpSpawnMessage(config2.agentId));
+  }
+  return config2.mcpArgs(servers);
+}
+function formatUnsupportedMcpSpawnMessage(agentId) {
+  const supported = listMcpSupportedAgents();
+  const supportedText = supported.length > 0 ? supported.join(", ") : "(none)";
+  return `Agent "${agentId}" does not support MCP servers at spawn time.
+Agents with spawn-time MCP support: ${supportedText}`;
+}
+var init_mcp_args = __esm({
+  "packages/agent-spawn/src/mcp-args.ts"() {
+    "use strict";
+    init_configs();
+  }
+});
+
 // packages/agent-spawn/src/model-utils.ts
 function stripModelNamespace(model) {
   const slashIndex = model.indexOf("/");
@@ -2419,6 +2520,7 @@ function buildCliArgs(config2, options, stdinMode) {
     args.push(config2.modelFlag, model);
   }
   args.push(...config2.defaultArgs);
+  args.push(...getMcpArgs(config2, options.mcpServers));
   args.push(...config2.modes[options.mode ?? "yolo"]);
   if (options.args && options.args.length > 0) {
     args.push(...options.args);
@@ -2480,6 +2582,7 @@ var init_spawn = __esm({
   "packages/agent-spawn/src/spawn.ts"() {
     "use strict";
     init_resolve_config();
+    init_mcp_args();
     init_model_utils();
   }
 });
@@ -2516,6 +2619,7 @@ async function spawnInteractive(agentId, options) {
     args.push(spawnConfig.modelFlag, model);
   }
   args.push(...interactive.defaultArgs);
+  args.push(...getMcpArgs(spawnConfig, options.mcpServers));
   const mode = options.mode ?? "yolo";
   args.push(...spawnConfig.modes[mode]);
   if (options.args && options.args.length > 0) {
@@ -2542,6 +2646,7 @@ var init_spawn_interactive = __esm({
   "packages/agent-spawn/src/spawn-interactive.ts"() {
     "use strict";
     init_resolve_config();
+    init_mcp_args();
     init_model_utils();
   }
 });
@@ -3070,7 +3175,7 @@ var init_acp = __esm({
 
 // packages/design-system/src/prompts/index.ts
 import * as clack from "@clack/prompts";
-import { isCancel, cancel, log as log2 } from "@clack/prompts";
+import { isCancel as isCancel2, cancel as cancel2, log as log2 } from "@clack/prompts";
 function stripAnsi3(value) {
   return value.replace(/\u001b\[[0-9;]*m/g, "");
 }
@@ -3877,6 +3982,7 @@ function spawnStreaming(options) {
     args.push(spawnConfig.modelFlag, model);
   }
   args.push(...spawnConfig.defaultArgs);
+  args.push(...getMcpArgs(spawnConfig, options.mcpServers));
   const mode = options.mode ?? "yolo";
   args.push(...spawnConfig.modes[mode]);
   if (useStdin) {
@@ -3933,6 +4039,7 @@ var init_spawn2 = __esm({
     init_adapters();
     init_line_reader();
     init_resolve_config();
+    init_mcp_args();
     init_model_utils();
   }
 });
@@ -4136,6 +4243,7 @@ async function spawnCore(container, service, options, flags = { dryRun: false, v
     args: options.args,
     model: options.model,
     mode: options.mode,
+    mcpServers: options.mcpServers,
     cwd: cwdOverride,
     useStdin: options.useStdin ?? false
   };
@@ -4488,6 +4596,40 @@ var init_prompts2 = __esm({
 function stripBracketedPaste(value) {
   return value.replace(/\x1b\[200~/g, "").replace(/\x1b\[201~/g, "").replace(/undefinedndefined$/, "").replace(/undefined$/, "").replace(/ndefined$/, "");
 }
+function isAlphanumeric(value) {
+  for (let i = 0; i < value.length; i++) {
+    const code = value.charCodeAt(i);
+    const isDigit = code >= 48 && code <= 57;
+    const isUpper = code >= 65 && code <= 90;
+    const isLower = code >= 97 && code <= 122;
+    if (!isDigit && !isUpper && !isLower) return false;
+  }
+  return value.length > 0;
+}
+function isAlphanumericWithSeparators(value) {
+  for (let i = 0; i < value.length; i++) {
+    const code = value.charCodeAt(i);
+    const isDigit = code >= 48 && code <= 57;
+    const isUpper = code >= 65 && code <= 90;
+    const isLower = code >= 97 && code <= 122;
+    const isHyphen = code === 45;
+    const isUnderscore = code === 95;
+    if (!isDigit && !isUpper && !isLower && !isHyphen && !isUnderscore)
+      return false;
+  }
+  return value.length > 0;
+}
+function hasMinimumApiKeyLength(value) {
+  return value.length >= MIN_API_KEY_LENGTH;
+}
+function isValidApiKeyFormat(key) {
+  if (key.length === 0) return false;
+  if (key.startsWith("sk-poe-")) {
+    const hash2 = key.slice(7);
+    return hasMinimumApiKeyLength(hash2) && isAlphanumeric(hash2);
+  }
+  return hasMinimumApiKeyLength(key) && isAlphanumericWithSeparators(key);
+}
 function createOptionResolvers(init) {
   const ensure = async (input) => {
     if (input.value != null) {
@@ -4511,29 +4653,77 @@ function createOptionResolvers(init) {
     }
     return trimmed;
   };
+  const confirmKeyFormat = async (apiKey, assumeYes) => {
+    if (isValidApiKeyFormat(apiKey)) return true;
+    if (assumeYes) return false;
+    return await init.confirm(
+      "Key doesn't match expected API key format. Use it anyway?"
+    );
+  };
   const resolveApiKey = async (input) => {
+    const assumeYes = input.assumeYes ?? false;
+    const allowStored = input.allowStored ?? true;
     if (input.value != null) {
-      const apiKey2 = normalizeApiKey(input.value);
+      const apiKey = normalizeApiKey(input.value);
+      const accepted = await confirmKeyFormat(apiKey, assumeYes);
+      if (!accepted) {
+        throw new Error("API key rejected.");
+      }
       if (!input.dryRun) {
-        await init.apiKeyStore.write(apiKey2);
+        await init.apiKeyStore.write(apiKey);
       }
-      return apiKey2;
+      return apiKey;
     }
-    const stored = await init.apiKeyStore.read();
-    if (stored) {
-      return normalizeApiKey(stored);
+    const envValue = input.envValue;
+    if (typeof envValue === "string" && envValue.trim().length > 0) {
+      const useEnv = assumeYes || await init.confirm(
+        "Use API key from POE_API_KEY environment variable?"
+      );
+      if (useEnv) {
+        const apiKey = normalizeApiKey(envValue);
+        const accepted = await confirmKeyFormat(apiKey, assumeYes);
+        if (accepted) {
+          if (!input.dryRun) {
+            await init.apiKeyStore.write(apiKey);
+          }
+          return apiKey;
+        }
+        if (assumeYes) {
+          throw new Error("API key rejected.");
+        }
+      }
     }
-    const descriptor = init.promptLibrary.loginApiKey();
-    const response = await init.prompts(descriptor);
-    const result = response[descriptor.name];
-    if (typeof result !== "string") {
-      throw new Error("POE API key is required.");
+    if (allowStored) {
+      const stored = await init.apiKeyStore.read();
+      if (stored) {
+        return normalizeApiKey(stored);
+      }
     }
-    const apiKey = normalizeApiKey(result);
-    if (!input.dryRun) {
-      await init.apiKeyStore.write(apiKey);
+    while (true) {
+      const descriptor = init.promptLibrary.loginApiKey();
+      const response = await init.prompts(descriptor);
+      const result = response[descriptor.name];
+      if (typeof result !== "string") {
+        continue;
+      }
+      let apiKey;
+      try {
+        apiKey = normalizeApiKey(result);
+      } catch (error2) {
+        if (error2 instanceof Error && error2.message === "POE API key cannot be empty.") {
+          continue;
+        }
+        throw error2;
+      }
+      const accepted = await confirmKeyFormat(apiKey, assumeYes);
+      if (!accepted) {
+        continue;
+      }
+      if (!input.dryRun) {
+        await init.apiKeyStore.write(apiKey);
+      }
+      return apiKey;
     }
-    return apiKey;
   };
   const resolveModel2 = async ({
     value,
@@ -4593,9 +4783,78 @@ function createOptionResolvers(init) {
     normalizeApiKey
   };
 }
+var API_KEY_REFERENCE_LENGTH, API_KEY_MIN_LENGTH_RATIO, MIN_API_KEY_LENGTH;
 var init_options = __esm({
   "src/cli/options.ts"() {
     "use strict";
+    API_KEY_REFERENCE_LENGTH = 43;
+    API_KEY_MIN_LENGTH_RATIO = 0.8;
+    MIN_API_KEY_LENGTH = Math.ceil(
+      API_KEY_REFERENCE_LENGTH * API_KEY_MIN_LENGTH_RATIO
+    );
+  }
+});
+
+// src/cli/errors.ts
+function isSilentError(error2) {
+  if (error2 instanceof SilentError) {
+    return true;
+  }
+  if (!(error2 instanceof Error)) {
+    return false;
+  }
+  return error2.name === "SilentError" || error2.name === "OperationCancelledError";
+}
+var CliError, SilentError, ApiError, ValidationError, AuthenticationError, OperationCancelledError;
+var init_errors = __esm({
+  "src/cli/errors.ts"() {
+    "use strict";
+    CliError = class extends Error {
+      context;
+      isUserError;
+      constructor(message, context, options) {
+        super(message);
+        this.name = this.constructor.name;
+        this.context = context;
+        this.isUserError = options?.isUserError ?? false;
+        if (Error.captureStackTrace) {
+          Error.captureStackTrace(this, this.constructor);
+        }
+      }
+    };
+    SilentError = class extends CliError {
+      constructor(message = "", options) {
+        super(message, void 0, { isUserError: options?.isUserError ?? false });
+      }
+    };
+    ApiError = class extends CliError {
+      httpStatus;
+      endpoint;
+      constructor(message, options) {
+        super(message, {
+          ...options?.context,
+          httpStatus: options?.httpStatus,
+          apiEndpoint: options?.endpoint
+        });
+        this.httpStatus = options?.httpStatus;
+        this.endpoint = options?.endpoint;
+      }
+    };
+    ValidationError = class extends CliError {
+      constructor(message, context) {
+        super(message, context, { isUserError: true });
+      }
+    };
+    AuthenticationError = class extends CliError {
+      constructor(message, context) {
+        super(message, context, { isUserError: true });
+      }
+    };
+    OperationCancelledError = class extends SilentError {
+      constructor(message = "Operation cancelled.") {
+        super(message, { isUserError: true });
+      }
+    };
   }
 });
 
@@ -4681,6 +4940,9 @@ function createLoggerFactory(emitter, theme) {
    ${value}`, { symbol: symbol2 });
       },
       errorWithStack(error2, errorContext) {
+        if (isSilentError(error2)) {
+          return;
+        }
         emit("error", formatMessage(error2.message));
         if (errorLogger) {
           const fullContext = {
@@ -4694,6 +4956,9 @@ function createLoggerFactory(emitter, theme) {
         }
       },
       logException(error2, operation, errorContext) {
+        if (isSilentError(error2)) {
+          return;
+        }
         emit(
           "error",
           formatMessage(`Error during ${operation}: ${error2.message}`)
@@ -4794,6 +5059,7 @@ var init_logger2 = __esm({
   "src/cli/logger.ts"() {
     "use strict";
     init_src3();
+    init_errors();
   }
 });
 
@@ -5056,7 +5322,9 @@ async function createConfigurePayload(init) {
   const { container, flags, options, context, adapter, logger: logger2 } = init;
   const apiKey = await container.options.resolveApiKey({
     value: options.apiKey,
-    dryRun: flags.dryRun
+    envValue: container.env.getVariable("POE_API_KEY"),
+    dryRun: flags.dryRun,
+    assumeYes: flags.assumeYes
   });
   const payload = { env: context.env, apiKey };
   const modelPrompt = adapter.configurePrompts?.model;
@@ -5370,7 +5638,8 @@ function createSdkContainer(options) {
         filePath: environment.credentialsPath,
         apiKey: value
       })
-    }
+    },
+    confirm: async () => true
   });
   const registry2 = createServiceRegistry();
   const providers = getDefaultProviders().filter(
@@ -5466,7 +5735,8 @@ function spawn3(service, promptOrOptions, maybeOptions) {
           cwd: options.cwd,
           model: options.model,
           mode: options.mode,
-          args: options.args
+          args: options.args,
+          ...options.mcpServers ? { mcpServers: options.mcpServers } : {}
         });
         return {
           stdout: interactiveResult.stdout,
@@ -5484,6 +5754,7 @@ function spawn3(service, promptOrOptions, maybeOptions) {
           model: options.model,
           mode: options.mode,
           args: options.args,
+          ...options.mcpServers ? { mcpServers: options.mcpServers } : {},
           useStdin: false
         });
         resolveEventsOnce(innerEvents);
@@ -5504,6 +5775,7 @@ function spawn3(service, promptOrOptions, maybeOptions) {
           model: options.model,
           mode: options.mode,
           args: options.args,
+          ...options.mcpServers ? { mcpServers: options.mcpServers } : {},
           useStdin: false
         });
       }
@@ -5515,6 +5787,7 @@ function spawn3(service, promptOrOptions, maybeOptions) {
         model: options.model,
         mode: options.mode,
         args: options.args,
+        ...options.mcpServers ? { mcpServers: options.mcpServers } : {},
         useStdin: false
       });
     } catch (error2) {
@@ -5531,59 +5804,10 @@ var init_spawn3 = __esm({
     init_spawn_core();
     await init_container();
     init_src4();
-  }
-});
-
-// src/cli/errors.ts
-var CliError, SilentError, ApiError, ValidationError, AuthenticationError, OperationCancelledError;
-var init_errors = __esm({
-  "src/cli/errors.ts"() {
-    "use strict";
-    CliError = class extends Error {
-      context;
-      isUserError;
-      constructor(message, context, options) {
-        super(message);
-        this.name = this.constructor.name;
-        this.context = context;
-        this.isUserError = options?.isUserError ?? false;
-        if (Error.captureStackTrace) {
-          Error.captureStackTrace(this, this.constructor);
-        }
-      }
-    };
-    SilentError = class extends CliError {
-      constructor(message = "", options) {
-        super(message, void 0, { isUserError: options?.isUserError ?? false });
-      }
-    };
-    ApiError = class extends CliError {
-      httpStatus;
-      endpoint;
-      constructor(message, options) {
-        super(message, {
-          ...options?.context,
-          httpStatus: options?.httpStatus,
-          apiEndpoint: options?.endpoint
-        });
-        this.httpStatus = options?.httpStatus;
-        this.endpoint = options?.endpoint;
-      }
-    };
-    ValidationError = class extends CliError {
-      constructor(message, context) {
-        super(message, context, { isUserError: true });
-      }
-    };
-    AuthenticationError = class extends CliError {
-      constructor(message, context) {
-        super(message, context, { isUserError: true });
-      }
-    };
-    OperationCancelledError = class extends SilentError {
-      constructor(message = "Operation cancelled.") {
-        super(message, { isUserError: true });
-      }
+    spawn3.pretty = async function pretty(service, promptOrOptions, maybeOptions) {
+      const { events, result } = spawn3(service, promptOrOptions, maybeOptions);
+      await renderAcpStream(events);
+      return result;
     };
   }
 });
@@ -5806,6 +6030,14 @@ function createCliContainer(dependencies) {
         filePath: environment.credentialsPath,
         apiKey: value
       })
+    },
+    confirm: async (message) => {
+      const result = await confirm2({ message });
+      if (isCancel2(result)) {
+        cancel2("Operation cancelled.");
+        throw new OperationCancelledError();
+      }
+      return result === true;
     }
   });
   const registry2 = createServiceRegistry();
@@ -5852,6 +6084,7 @@ var init_container2 = __esm({
     init_src3();
     await init_providers();
     init_poe_code_command_runner();
+    init_errors();
   }
 });
 
@@ -6033,7 +6266,10 @@ function registerSpawnCommand(program, container, options = {}) {
   const extraServices = options.extraServices ?? [];
   const serviceList = [...spawnServices, ...extraServices];
   const serviceDescription = `Agent to spawn${formatServiceList(serviceList)}`;
-  program.command("spawn").description("Run a single prompt through a configured agent CLI.").option("--model <model>", "Model identifier override passed to the agent CLI").option("-C, --cwd <path>", "Working directory for the agent CLI").option("--stdin", "Read the prompt from stdin").option("-i, --interactive", "Launch the agent in interactive TUI mode").option("--mode <mode>", "Permission mode: yolo | edit | read (default: yolo)").argument(
+  program.command("spawn").description("Run a single prompt through a configured agent CLI.").option("--model <model>", "Model identifier override passed to the agent CLI").option("-C, --cwd <path>", "Working directory for the agent CLI").option("--stdin", "Read the prompt from stdin").option("-i, --interactive", "Launch the agent in interactive TUI mode").option("--mode <mode>", "Permission mode: yolo | edit | read (default: yolo)").option(
+    "--mcp-config <json>",
+    "MCP server config JSON: {name: {command, args?, env?}}"
+  ).argument(
     "<agent>",
     serviceDescription
   ).argument("[prompt]", "Prompt text to send (or '-' / stdin)").argument(
@@ -6042,6 +6278,7 @@ function registerSpawnCommand(program, container, options = {}) {
   ).action(async function(service, promptText, agentArgs = []) {
     const flags = resolveCommandFlags(program);
     const commandOptions = this.opts();
+    const mcpServers = parseMcpSpawnConfig(commandOptions.mcpConfig);
     const cwdOverride = resolveSpawnWorkingDirectory2(
       container.env.cwd,
       commandOptions.cwd
@@ -6071,6 +6308,7 @@ function registerSpawnCommand(program, container, options = {}) {
         args: forwardedArgs,
         model: commandOptions.model,
         mode: commandOptions.mode,
+        ...mcpServers ? { mcpServers } : {},
         cwd: cwdOverride
       });
       process.exitCode = result.exitCode;
@@ -6091,6 +6329,7 @@ function registerSpawnCommand(program, container, options = {}) {
       args: forwardedArgs,
       model: commandOptions.model,
       mode: commandOptions.mode,
+      mcpServers,
       cwd: cwdOverride,
       useStdin: shouldReadFromStdin
     };
@@ -6136,6 +6375,7 @@ function registerSpawnCommand(program, container, options = {}) {
       }
     }
     try {
+      assertMcpSpawnSupport(adapter.label, canonicalService, mcpServers);
       if (flags.dryRun) {
         await spawnCore(container, canonicalService, spawnOptions, {
           dryRun: true,
@@ -6157,7 +6397,8 @@ function registerSpawnCommand(program, container, options = {}) {
         args: spawnOptions.args,
         model: spawnOptions.model,
         mode: spawnOptions.mode,
-        cwd: spawnOptions.cwd
+        cwd: spawnOptions.cwd,
+        ...spawnOptions.mcpServers ? { mcpServers: spawnOptions.mcpServers } : {}
       });
       await renderAcpStream(events);
       const final = await result;
@@ -6209,7 +6450,10 @@ async function confirmUnconfiguredService(container, service, label, flags) {
   const shouldProceed = await confirm2({
     message: `${label} is not configured via poe. Do you want to proceed?`
   });
-  return !isCancel(shouldProceed) && shouldProceed === true;
+  if (isCancel2(shouldProceed)) {
+    throw new OperationCancelledError();
+  }
+  return shouldProceed === true;
 }
 function resolveSpawnWorkingDirectory2(baseDir, candidate) {
   if (!candidate || candidate.trim().length === 0) {
@@ -6220,6 +6464,94 @@ function resolveSpawnWorkingDirectory2(baseDir, candidate) {
   }
   return path10.resolve(baseDir, candidate);
 }
+function parseMcpSpawnConfig(input) {
+  if (!input) {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(input);
+  } catch {
+    throw new ValidationError(
+      "--mcp-config must be valid JSON in this shape: {name: {command, args?, env?}}"
+    );
+  }
+  if (!isObjectRecord(parsed)) {
+    throw new ValidationError(
+      "--mcp-config must be an object in this shape: {name: {command, args?, env?}}"
+    );
+  }
+  const servers = {};
+  for (const [name, value] of Object.entries(parsed)) {
+    if (!isObjectRecord(value)) {
+      throw new ValidationError(
+        `--mcp-config entry "${name}" must be an object: {command, args?, env?}`
+      );
+    }
+    const command = value.command;
+    if (typeof command !== "string" || command.trim().length === 0) {
+      throw new ValidationError(
+        `--mcp-config entry "${name}" must include a non-empty string "command"`
+      );
+    }
+    let args;
+    if ("args" in value && value.args !== void 0) {
+      if (!Array.isArray(value.args)) {
+        throw new ValidationError(
+          `--mcp-config entry "${name}".args must be an array of strings`
+        );
+      }
+      args = [];
+      for (const arg of value.args) {
+        if (typeof arg !== "string") {
+          throw new ValidationError(
+            `--mcp-config entry "${name}".args must be an array of strings`
+          );
+        }
+        args.push(arg);
+      }
+    }
+    let env;
+    if ("env" in value && value.env !== void 0) {
+      if (!isObjectRecord(value.env)) {
+        throw new ValidationError(
+          `--mcp-config entry "${name}".env must be an object of string values`
+        );
+      }
+      env = {};
+      for (const [envKey, envValue] of Object.entries(value.env)) {
+        if (typeof envValue !== "string") {
+          throw new ValidationError(
+            `--mcp-config entry "${name}".env must be an object of string values`
+          );
+        }
+        env[envKey] = envValue;
+      }
+    }
+    servers[name] = {
+      command,
+      ...args ? { args } : {},
+      ...env ? { env } : {}
+    };
+  }
+  return Object.keys(servers).length > 0 ? servers : void 0;
+}
+function assertMcpSpawnSupport(label, service, servers) {
+  if (!servers || Object.keys(servers).length === 0) {
+    return;
+  }
+  if (supportsMcpAtSpawn(service)) {
+    return;
+  }
+  const supported = listMcpSupportedAgents();
+  throw new ValidationError(
+    `${label} does not support MCP servers at spawn time.
+Agents with spawn-time MCP support: ${supported.join(", ")}`
+  );
+}
+function isObjectRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 var init_spawn4 = __esm({
   async "src/cli/commands/spawn.ts"() {
     "use strict";
@@ -6229,6 +6561,7 @@ var init_spawn4 = __esm({
     init_shared();
     init_spawn_core();
     await init_spawn3();
+    init_errors();
   }
 });
 
@@ -6873,21 +7206,21 @@ function registerLoginCommand(program, container) {
     );
     resources.logger.intro("login");
     try {
-      const input = await resolveApiKeyInput(container, options);
-      const normalized = container.options.normalizeApiKey(input);
       const configuredServices = await loadConfiguredServices({
         fs: container.fs,
         filePath: container.env.credentialsPath
       });
-      await saveCredentials({
-        fs: resources.context.fs,
-        filePath: container.env.credentialsPath,
-        apiKey: normalized
+      const apiKey = await container.options.resolveApiKey({
+        value: options.apiKey,
+        envValue: container.env.getVariable("POE_API_KEY"),
+        dryRun: flags.dryRun,
+        assumeYes: flags.assumeYes,
+        allowStored: false
       });
       await reconfigureServices({
         program,
         container,
-        apiKey: normalized,
+        apiKey,
         configuredServices
       });
       resources.context.complete({
@@ -6906,25 +7239,6 @@ function registerLoginCommand(program, container) {
     }
   });
 }
-async function resolveApiKeyInput(container, options) {
-  if (options.apiKey) {
-    return options.apiKey;
-  }
-  const envKey = container.env.getVariable("POE_API_KEY");
-  if (envKey && envKey.trim().length > 0) {
-    return envKey;
-  }
-  const descriptor = container.promptLibrary.loginApiKey();
-  const response = await container.prompts(descriptor);
-  const value = response[descriptor.name];
-  if (typeof value !== "string" || value.trim() === "") {
-    throw new ValidationError("POE API key is required.", {
-      operation: "login",
-      field: "apiKey"
-    });
-  }
-  return value;
-}
 async function reconfigureServices(input) {
   const { program, container, apiKey, configuredServices } = input;
   const serviceNames = Object.keys(configuredServices);
@@ -6978,7 +7292,6 @@ var init_login = __esm({
     "use strict";
     init_shared();
     init_credentials2();
-    init_errors();
     init_mutation_events();
   }
 });
@@ -34997,8 +35310,8 @@ function registerMcpCommand(program, container) {
           message: "Select agent to configure:",
           options: supportedAgents.map((a) => ({ value: a, label: a }))
         });
-        if (isCancel(selected)) {
-          cancel("Operation cancelled");
+        if (isCancel2(selected)) {
+          cancel2("Operation cancelled");
           return;
         }
         agent = selected;
@@ -35099,7 +35412,7 @@ async function runMcpServer(container, options) {
   await runMcpServerWithTransport(outputFormatPreferences);
 }
 var DEFAULT_MCP_AGENT;
-var init_mcp = __esm({
+var init_mcp2 = __esm({
   "src/cli/commands/mcp.ts"() {
     "use strict";
     init_src3();
@@ -35355,8 +35668,8 @@ function registerSkillCommand(program, container) {
           message: "Select agent to configure:",
           options: supportedAgents2.map((a) => ({ value: a, label: a }))
         });
-        if (isCancel(selected)) {
-          cancel("Operation cancelled");
+        if (isCancel2(selected)) {
+          cancel2("Operation cancelled");
           return;
         }
         agent = selected;
@@ -35388,8 +35701,8 @@ function registerSkillCommand(program, container) {
           { value: "local", label: "Local" }
         ]
       });
-      if (isCancel(selected)) {
-        cancel("Operation cancelled");
+      if (isCancel2(selected)) {
+        cancel2("Operation cancelled");
         return;
       }
       scope = selected;
@@ -35434,8 +35747,8 @@ function registerSkillCommand(program, container) {
         message: "Select agent to unconfigure:",
         options: supportedAgents2.map((a) => ({ value: a, label: a }))
       });
-      if (isCancel(selected)) {
-        cancel("Operation cancelled");
+      if (isCancel2(selected)) {
+        cancel2("Operation cancelled");
         return;
       }
       agent = selected;
@@ -35464,8 +35777,8 @@ function registerSkillCommand(program, container) {
           { value: "local", label: "Local" }
         ]
       });
-      if (isCancel(selected)) {
-        cancel("Operation cancelled");
+      if (isCancel2(selected)) {
+        cancel2("Operation cancelled");
         return;
       }
       scope = selected;
@@ -36558,7 +36871,7 @@ async function defaultPromptOverbake(args) {
       { value: "abort", label: "Abort run" }
     ]
   });
-  if (isCancel(value)) return "abort";
+  if (isCancel2(value)) return "abort";
   return value;
 }
 async function buildLoop(options) {
@@ -37011,7 +37324,7 @@ async function resolvePlanPath(options) {
       value: candidate.path
     }))
   });
-  if (isCancel(selection)) {
+  if (isCancel2(selection)) {
     return null;
   }
   if (typeof selection !== "string" || selection.trim().length === 0) {
@@ -37697,8 +38010,8 @@ function registerRalphCommand(program, container) {
           message: "Select agent to install Ralph for:",
           options: supportedAgents2.map((a) => ({ value: a, label: a }))
         });
-        if (isCancel(selected)) {
-          cancel("Operation cancelled");
+        if (isCancel2(selected)) {
+          cancel2("Operation cancelled");
           return;
         }
         agent2 = selected;
@@ -37726,8 +38039,8 @@ function registerRalphCommand(program, container) {
           { value: "global", label: "Global (user home)" }
         ]
       });
-      if (isCancel(selected)) {
-        cancel("Operation cancelled");
+      if (isCancel2(selected)) {
+        cancel2("Operation cancelled");
         return;
       }
       scope = selected;
@@ -37775,8 +38088,8 @@ function registerRalphCommand(program, container) {
           message: "Should the agent skip committing changes? (--no-commit)",
           initialValue: configuredNoCommit ?? false
         });
-        if (isCancel(answer)) {
-          cancel("Operation cancelled");
+        if (isCancel2(answer)) {
+          cancel2("Operation cancelled");
           return;
         }
         noCommit = Boolean(answer);
@@ -37816,8 +38129,8 @@ function registerRalphCommand(program, container) {
             message: "Enter path to plan file:",
             placeholder: ".agents/poe-code-ralph/plans/plan.yaml"
           });
-          if (isCancel(entered)) {
-            cancel("Operation cancelled");
+          if (isCancel2(entered)) {
+            cancel2("Operation cancelled");
             return;
           }
           planPath = entered;
@@ -38118,7 +38431,10 @@ function registerUsageCommand(program, container) {
         startingAfter = result.data[result.data.length - 1].query_id;
         if (maxPages === void 0) {
           const shouldContinue = await confirm2({ message: "Load more?" });
-          if (isCancel(shouldContinue) || !shouldContinue) {
+          if (isCancel2(shouldContinue)) {
+            throw new OperationCancelledError();
+          }
+          if (!shouldContinue) {
             break;
           }
         }
@@ -38447,7 +38763,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "poe-code",
-      version: "3.0.68",
+      version: "3.0.70",
       description: "CLI tool to configure Poe API for developer workflows.",
       type: "module",
       main: "./dist/index.js",
@@ -38488,6 +38804,7 @@ var init_package = __esm({
         e2e: "vitest run --config e2e/vitest.config.ts",
         "e2e:verbose": "E2E_VERBOSE=1 vitest run --config e2e/vitest.config.ts --reporter=verbose",
         "e2e:cleanup": "tsx packages/e2e-docker-test-runner/scripts/cleanup.ts",
+        "e2e:cleanup:aggressive": "tsx packages/e2e-docker-test-runner/scripts/cleanup.ts --aggressive",
         "e2e:logs": "tsx packages/e2e-docker-test-runner/scripts/logs.ts",
         "e2e:logs:rotate": "tsx packages/e2e-docker-test-runner/scripts/logs.ts --rotate",
         "e2e:cache:clear": "rm -rf ~/.cache/poe-e2e",
@@ -38841,7 +39158,7 @@ var init_program = __esm({
     init_unconfigure();
     init_test();
     init_generate();
-    init_mcp();
+    init_mcp2();
     init_skill();
     init_version2();
     init_ralph();
@@ -38873,8 +39190,8 @@ function createPromptRunner(adapter = {
   text: text3,
   password: password2,
   select: select2,
-  isCancel,
-  cancel
+  isCancel: isCancel2,
+  cancel: cancel2
 }) {
   const runPrompt = async (descriptor) => {
     const type = descriptor.type ?? "text";
@@ -38970,7 +39287,7 @@ function createCliMain(programFactory) {
     try {
       await program.parseAsync(process.argv);
     } catch (error2) {
-      if (error2 instanceof SilentError) {
+      if (isSilentError(error2)) {
         return;
       }
       if (error2 instanceof Error) {