@ycodium-ai/agent-codex 0.2.3078 → 0.2.3082

package/dist/index.js

@@ -573,39 +573,15 @@ function codexExecLaunchArgs(launchArgs) {
   }
   return execArgs;
 }
-function hasConfiguredMcpServer(appServerArgs) {
-  return appServerArgs.some((arg) => arg.includes("mcp_servers."));
-}
-var BUILTIN_MCP_SERVER_NAME = "ycodium";
-function codexBearerTokenEnvVar(name) {
-  return name === BUILTIN_MCP_SERVER_NAME ? "YCODIUM_MCP_BEARER_TOKEN" : `YCODIUM_MCP_TOKEN_${name.toUpperCase().replaceAll(/[^A-Z0-9]/g, "_")}`;
-}
-function codexMcpLaunchConfig(servers) {
-  const args = [];
-  const environment = {};
-  const toml = (value) => JSON.stringify(value);
-  for (const server of servers) {
-    const key = `mcp_servers.${server.name}`;
-    if (server.transport.type === "stdio") {
-      args.push("-c", `${key}.command=${toml(server.transport.command)}`);
-      const commandArgs = server.transport.args ?? [];
-      if (commandArgs.length > 0) {
-        args.push("-c", `${key}.args=[${commandArgs.map(toml).join(",")}]`);
-      }
-      for (const [name, value] of Object.entries(server.transport.env ?? {})) {
-        args.push("-c", `${key}.env.${name}=${toml(value)}`);
-      }
-      continue;
-    }
-    args.push("-c", `${key}.url=${server.transport.url}`);
-    const bearer = server.transport.headers?.["Authorization"]?.replace(/^Bearer\s+/, "");
-    if (bearer) {
-      const envVar = codexBearerTokenEnvVar(server.name);
-      environment[envVar] = bearer;
-      args.push("-c", `${key}.bearer_token_env_var=${toml(envVar)}`);
-    }
-  }
-  return { args, environment };
+function codexMcpThreadConfig(servers) {
+  return {
+    mcp_servers: Object.fromEntries(
+      servers.map(({ name, transport }) => [
+        name,
+        transport.type === "stdio" ? { command: transport.command, args: transport.args ?? [], env: transport.env ?? {} } : { url: transport.url, http_headers: transport.headers ?? {} }
+      ])
+    )
+  };
 }
 function modelIdFromSelection(selection) {
   if (typeof selection !== "object" || selection === null || Array.isArray(selection)) {
@@ -669,8 +645,7 @@ function buildCodexSpawnEnv(input) {
   return mergeLaunchEnv({
     accountHome: input.layout.effectiveHomePath !== void 0 ? { CODEX_HOME: input.layout.effectiveHomePath } : {},
     instanceTable,
-    handOverrides: input.crushApiKeys ? CRUSHED_API_KEYS : {},
-    launch: input.launchEnv
+    handOverrides: input.crushApiKeys ? CRUSHED_API_KEYS : {}
   });
 }
 function nativeLoginSpawnEnv(processEnv, isolatedHome) {
@@ -689,13 +664,9 @@ async function spawnCodexAppServer(input) {
   const env = input.env ?? buildCodexSpawnEnv({
     recipe: input.recipe,
     layout: input.layout,
-    ...input.launchEnv === void 0 ? {} : { launchEnv: input.launchEnv },
     crushApiKeys: shouldCrushApiKeys(input.recipe.authMode)
   });
-  const args = input.args ?? [
-    ...codexSpawnArgs(input.recipe, input.layout),
-    ...input.extraArgs ?? []
-  ];
+  const args = input.args ?? codexSpawnArgs(input.recipe, input.layout);
   const handle = await input.host.process.spawn({
     program: input.recipe.binaryPath,
     args,
@@ -3150,6 +3121,7 @@ var CodexSessionRuntime = class {
   /** 这个会话见过的主额度快照（按字段合并），额度用尽停轮时点名窗口用。 */
   rateLimits;
   appServerArgs;
+  hasConfiguredMcpServer;
   host;
   attachments;
   rpc;
@@ -3192,6 +3164,7 @@ var CodexSessionRuntime = class {
     this.runtimeMode = input.runtimeMode;
     this.nativeModeId = input.nativeModeId;
     this.appServerArgs = appServerArgs;
+    this.hasConfiguredMcpServer = (input.mcpServers?.length ?? 0) > 0;
     this.grants = grants ?? createApprovalGrantStore();
     this.declineRelay = declineRelay ?? createDeclineReasonRelay();
     const createdAt = nowIso();
@@ -3711,21 +3684,14 @@ var CodexSessionRuntime = class {
     }
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
-  threadConfigParams() {
-    const config = this.#threadConfig();
-    return {
-      approvalPolicy: config.approvalPolicy,
-      sandbox: config.sandbox,
-      approvalsReviewer: config.approvalsReviewer,
-      cwd: this.cwd
-    };
-  }
   async openThread(input) {
     const resume = input.discardResumeCursor === true ? void 0 : parseCodexResumeCursor(input.resumeCursor);
     const requestedModel = modelIdFromSelection(input.modelSelection);
     const startParams = {
-      ...this.threadConfigParams(),
-      ...requestedModel ? { model: requestedModel } : {}
+      ...this.#threadConfig(),
+      cwd: this.cwd,
+      ...requestedModel ? { model: requestedModel } : {},
+      ...this.hasConfiguredMcpServer ? { config: codexMcpThreadConfig(input.mcpServers ?? []) } : {}
     };
     const result = resume ? await this.withActiveWriterRecovery(
       () => this.rpc.request("thread/resume", { threadId: resume.threadId, ...startParams }, 0),
@@ -3762,7 +3728,7 @@ var CodexSessionRuntime = class {
     return mode;
   }
   developerInstructions(input, mode) {
-    const tools = hasConfiguredMcpServer(this.appServerArgs);
+    const tools = this.hasConfiguredMcpServer;
     const model = this.model ?? DEFAULT_MODEL;
     const effort = modelSelectionStringOption(input.modelSelection, "reasoningEffort") ?? DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
     return buildCodexDeveloperInstructions(mode, { model, reasoningEffort: effort }, tools, tools);
@@ -3799,7 +3765,7 @@ var CodexSessionRuntime = class {
   }
   async sendTurn(input) {
     if (!this.nativeThreadId) throw new Error("codex session has no native thread");
-    if (hasConfiguredMcpServer(this.appServerArgs)) {
+    if (this.hasConfiguredMcpServer) {
       await this.rpc.request("config/mcpServer/reload", void 0, 0).catch((error) => {
         this.host.log.warn("refreshing the codex MCP tool list before a turn failed", {
           threadId: this.threadId,
@@ -4179,17 +4145,35 @@ async function readRolloutModel(input, rolloutPath, sameDirectory) {
 }
 
 // src/mcpOAuth.ts
+function codexMcpOAuthLaunchConfig(name, transport) {
+  const key = `mcp_servers.${name}`;
+  const args = ["-c", `${key}.url=${transport.url}`];
+  const environment = {};
+  const bearer = transport.headers?.["Authorization"]?.replace(/^Bearer\s+/, "");
+  if (bearer) {
+    const envVar = name === "ycodium" ? "YCODIUM_MCP_BEARER_TOKEN" : `YCODIUM_MCP_TOKEN_${name.toUpperCase().replaceAll(/[^A-Z0-9]/g, "_")}`;
+    environment[envVar] = bearer;
+    args.push("-c", `${key}.bearer_token_env_var=${JSON.stringify(envVar)}`);
+  }
+  return { args, environment };
+}
 async function startCodexMcpOAuth(input) {
   if (input.recipe.binaryPath.length === 0) {
     throw new Error("Codex program path is not configured");
   }
-  const mcp = codexMcpLaunchConfig([input.server]);
-  const env = buildCodexSpawnEnv({
-    recipe: input.recipe,
-    layout: input.layout,
-    launchEnv: { ...input.processEnv, ...mcp.environment },
-    crushApiKeys: shouldCrushApiKeys(input.recipe.authMode)
-  });
+  if (input.server.transport.type === "stdio") {
+    throw new Error(`MCP OAuth needs an http server: ${input.server.name}`);
+  }
+  const mcp = codexMcpOAuthLaunchConfig(input.server.name, input.server.transport);
+  const env = {
+    ...buildCodexSpawnEnv({
+      recipe: input.recipe,
+      layout: input.layout,
+      crushApiKeys: shouldCrushApiKeys(input.recipe.authMode)
+    }),
+    ...input.processEnv,
+    ...mcp.environment
+  };
   const { handle } = await spawnCodexAppServer({
     host: input.host,
     recipe: input.recipe,
@@ -5906,15 +5890,11 @@ var createCodexInstance = (config, host, attachments, cache) => {
         threads.delete(input.threadId);
       }
       const layout = layoutFor(recipe);
-      const mcp = codexMcpLaunchConfig(input.mcpServers ?? []);
       const { handle, args } = await spawnCodexAppServer({
         host,
         recipe,
         layout,
-        cwd,
-        extraArgs: mcp.args,
-        // MCP 那几个变量是宿主挑好的 server 带来的，铺在最终层：实例表盖不得。
-        launchEnv: mcp.environment
+        cwd
       });
       trackHandle(handle, [recipe.binaryPath, ...args].join(" "), input.threadId);
       let runtime;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.3078",
+  "version": "0.2.3082",
   "description": "Codex executor: Codex CLI over the app-server JSON-RPC protocol.",
   "keywords": [
     "ycodium",
@@ -29,7 +29,7 @@
     "tailwindcss": "^4.0.0",
     "typescript": "~6.0.3",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3078",
+    "@ycodium-ai/plugin-api": "0.2.0",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {