@ycodium-ai/agent-codex 0.2.2936 → 0.2.2942

package/dist/index.js

@@ -440,6 +440,9 @@ import {
   ExecutorSpawnRefusedError
 } from "@ycodium-ai/plugin-api/executor";
 
+// src/connection.ts
+import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
+
 // src/config.ts
 import { modelSelectionStringOption } from "@ycodium-ai/plugin-api/executor";
 
@@ -613,7 +616,6 @@ function modelIdFromSelection(selection) {
 }
 
 // src/connection.ts
-import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
 function codexApiConnectionError(recipe, environment) {
   if (recipe.authMode !== "apiKey") return null;
   try {
@@ -681,6 +683,29 @@ function shouldCrushApiKeys(authMode) {
   return authMode === "chatgpt";
 }
 
+// src/appServerLaunch.ts
+async function spawnCodexAppServer(input) {
+  await materializeCodexShadowHome(input.layout, input.host.log);
+  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 handle = await input.host.process.spawn({
+    program: input.recipe.binaryPath,
+    args,
+    owner: { bindingId: input.host.bindingId },
+    ...input.cwd === void 0 ? {} : { cwd: input.cwd },
+    ...input.env !== void 0 || Object.keys(env).length > 0 ? { env } : {}
+  });
+  return { handle, args };
+}
+
 // src/protocol.ts
 var CODEX_INITIALIZE_PARAMS = {
   clientInfo: { name: "ycodium", title: "Ycodium", version: "0" },
@@ -4076,11 +4101,12 @@ async function startCodexMcpOAuth(input) {
     launchEnv: { ...input.processEnv, ...mcp.environment },
     crushApiKeys: shouldCrushApiKeys(input.recipe.authMode)
   });
-  const handle = await input.host.process.spawn({
-    program: input.recipe.binaryPath,
-    args: [...tokenizeLaunchArgs(input.recipe.launchArgs), ...mcp.args],
+  const { handle } = await spawnCodexAppServer({
+    host: input.host,
+    recipe: input.recipe,
+    layout: input.layout,
     cwd: input.cwd,
-    owner: { bindingId: input.host.bindingId },
+    args: [...tokenizeLaunchArgs(input.recipe.launchArgs), ...mcp.args],
     env
   });
   let settle;
@@ -4370,10 +4396,11 @@ async function startCodexSignIn(input) {
   const env = nativeLoginSpawnEnv(input.processEnv, isolatedHome);
   const owner = { bindingId: input.host.bindingId };
   const tryAppServer = async () => {
-    const handle2 = await input.host.process.spawn({
-      program: input.recipe.binaryPath,
+    const { handle: handle2 } = await spawnCodexAppServer({
+      host: input.host,
+      recipe: input.recipe,
+      layout: input.layout,
       args: tokenizeLaunchArgs(input.recipe.launchArgs),
-      owner,
       env
     });
     let completed;
@@ -4471,10 +4498,11 @@ async function verifyCodexSignIn(input) {
     };
   }
   const env = nativeLoginSpawnEnv(input.processEnv, home);
-  const handle = await input.host.process.spawn({
-    program: input.recipe.binaryPath,
+  const { handle } = await spawnCodexAppServer({
+    host: input.host,
+    recipe: input.recipe,
+    layout: input.layout,
     args: tokenizeLaunchArgs(input.recipe.launchArgs),
-    owner: { bindingId: input.host.bindingId },
     env
   });
   const rpc = await createCodexRpcClient(handle, {
@@ -5638,22 +5666,12 @@ var createCodexInstance = (config, host, attachments, cache) => {
   const probeAuth = () => accountToAuth2(readCodexAccount(accountHomeFromLayout(layoutFor(recipe))));
   const probeAppServer = async (input) => {
     const layout = layoutFor(recipe);
-    const env = buildCodexSpawnEnv({
-      recipe,
-      layout,
-      crushApiKeys: shouldCrushApiKeys(recipe.authMode)
-    });
     let handle;
     let rpc;
     let version = null;
     try {
       try {
-        handle = await host.process.spawn({
-          program: recipe.binaryPath,
-          args: [...codexSpawnArgs(recipe, layout)],
-          owner: { bindingId: host.bindingId },
-          ...Object.keys(env).length > 0 ? { env } : {}
-        });
+        ({ handle } = await spawnCodexAppServer({ host, recipe, layout }));
       } catch (error) {
         if (error instanceof ExecutorSpawnRefusedError) throw error;
         host.log.warn("codex binary could not be started", {
@@ -5691,19 +5709,9 @@ var createCodexInstance = (config, host, attachments, cache) => {
     if (disposed) throw new Error("instance disposed");
     if (signal?.aborted === true) throw new Error("aborted");
     const layout = layoutFor(recipe);
-    const env = buildCodexSpawnEnv({
-      recipe,
-      layout,
-      crushApiKeys: shouldCrushApiKeys(recipe.authMode)
-    });
     let handle;
     try {
-      handle = await host.process.spawn({
-        program: recipe.binaryPath,
-        args: [...codexSpawnArgs(recipe, layout)],
-        owner: { bindingId: host.bindingId },
-        ...Object.keys(env).length > 0 ? { env } : {}
-      });
+      ({ handle } = await spawnCodexAppServer({ host, recipe, layout }));
     } catch (error) {
       if (error instanceof ExecutorSpawnRefusedError) {
         const borrowed = [...threads.values()][0];
@@ -5811,22 +5819,15 @@ var createCodexInstance = (config, host, attachments, cache) => {
         threads.delete(input.threadId);
       }
       const layout = layoutFor(recipe);
-      await materializeCodexShadowHome(layout, host.log);
       const mcp = codexMcpLaunchConfig(input.mcpServers ?? []);
-      const env = buildCodexSpawnEnv({
+      const { handle, args } = await spawnCodexAppServer({
+        host,
         recipe,
         layout,
-        // MCP 那几个变量是宿主挑好的 server 带来的，铺在最终层：实例表盖不得。
-        launchEnv: mcp.environment,
-        crushApiKeys: shouldCrushApiKeys(recipe.authMode)
-      });
-      const args = [...codexSpawnArgs(recipe, layout), ...mcp.args];
-      const handle = await host.process.spawn({
-        program: recipe.binaryPath,
-        args,
         cwd,
-        owner: { bindingId: host.bindingId },
-        ...Object.keys(env).length > 0 ? { env } : {}
+        extraArgs: mcp.args,
+        // MCP 那几个变量是宿主挑好的 server 带来的，铺在最终层：实例表盖不得。
+        launchEnv: mcp.environment
       });
       trackHandle(handle, [recipe.binaryPath, ...args].join(" "), input.threadId);
       let runtime;
@@ -5973,19 +5974,8 @@ var createCodexInstance = (config, host, attachments, cache) => {
           throw new Error("Codex program path is not configured");
         }
         const layout = layoutFor(recipe);
-        const env = buildCodexSpawnEnv({
-          recipe,
-          layout,
-          crushApiKeys: shouldCrushApiKeys(recipe.authMode)
-        });
-        const args = [...codexSpawnArgs(recipe, layout)];
-        const handle = await host.process.spawn({
-          program: recipe.binaryPath,
-          args,
-          cwd: input.directory ?? host.workspacePath(input.projectId),
-          owner: { bindingId: host.bindingId },
-          ...Object.keys(env).length > 0 ? { env } : {}
-        });
+        const cwd = input.directory ?? host.workspacePath(input.projectId);
+        const { handle, args } = await spawnCodexAppServer({ host, recipe, layout, cwd });
         trackHandle(handle, [recipe.binaryPath, ...args].join(" "));
         const rpc = await createCodexRpcClient(handle, {
           onNotification: () => void 0,
@@ -6010,18 +6000,11 @@ var createCodexInstance = (config, host, attachments, cache) => {
           throw new Error("Codex program path is not configured");
         }
         const layout = layoutFor(recipe);
-        const env = buildCodexSpawnEnv({
+        const { handle, args } = await spawnCodexAppServer({
+          host,
           recipe,
           layout,
-          crushApiKeys: shouldCrushApiKeys(recipe.authMode)
-        });
-        const args = [...codexSpawnArgs(recipe, layout)];
-        const handle = await host.process.spawn({
-          program: recipe.binaryPath,
-          args,
-          cwd: input.cwd,
-          owner: { bindingId: host.bindingId },
-          ...Object.keys(env).length > 0 ? { env } : {}
+          cwd: input.cwd
         });
         trackHandle(handle, [recipe.binaryPath, ...args].join(" "));
         const rpc = await createCodexRpcClient(handle, {

package/package.json

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