@ycodium-ai/agent-codex 0.2.3254 → 0.2.3265

package/dist/index.js

@@ -439,7 +439,15 @@ var probeCodexAccount = (accountPath) => {
 import * as NodeProcess from "node:process";
 import {
   describeExecutorSpawnFailure,
-  ExecutorSpawnRefusedError
+  ExecutorSpawnRefusedError as ExecutorSpawnRefusedError2,
+  raceAbort
+} from "@ycodium-ai/plugin-api/executor";
+
+// src/appServerLaunch.ts
+import {
+  ExecutorSpawnAbortedError,
+  ExecutorSpawnRefusedError,
+  throwIfExecutorSpawnAborted
 } from "@ycodium-ai/plugin-api/executor";
 
 // src/connection.ts
@@ -661,8 +669,14 @@ function shouldCrushApiKeys(authMode) {
 }
 
 // src/appServerLaunch.ts
+function throwIfCodexSpawnControlled(error) {
+  if (error instanceof ExecutorSpawnRefusedError || error instanceof ExecutorSpawnAbortedError) {
+    throw error;
+  }
+}
 async function spawnCodexAppServer(input) {
   await materializeCodexShadowHome(input.layout, input.host.log);
+  throwIfExecutorSpawnAborted(input.signal);
   const env = input.env ?? buildCodexSpawnEnv({
     recipe: input.recipe,
     layout: input.layout,
@@ -674,11 +688,59 @@ async function spawnCodexAppServer(input) {
     args,
     owner: { bindingId: input.host.bindingId },
     ...input.cwd === void 0 ? {} : { cwd: input.cwd },
-    ...input.env !== void 0 || Object.keys(env).length > 0 ? { env } : {}
+    ...input.env !== void 0 || Object.keys(env).length > 0 ? { env } : {},
+    ...input.signal === void 0 ? {} : { signal: input.signal }
   });
   return { handle, args };
 }
 
+// src/cliVersion.ts
+var CODEX_VERSION_TIMEOUT_MS = 15e3;
+var VERSION_PATTERN = /(?<![\d.])(\d+\.\d+\.\d+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?)/;
+async function collect(stream) {
+  const chunks = [];
+  for await (const chunk of stream) {
+    chunks.push(Buffer.from(chunk));
+    if (Buffer.concat(chunks).length > 64 * 1024) break;
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
+async function readCodexCliVersion(input) {
+  if (input.recipe.binaryPath.length === 0) return null;
+  let handle;
+  try {
+    handle = await input.host.process.spawn({
+      program: input.recipe.binaryPath,
+      args: ["--version"],
+      owner: { bindingId: input.host.bindingId }
+    });
+  } catch {
+    return null;
+  }
+  const collected = Promise.all([collect(handle.stdout), collect(handle.stderr), handle.exited]);
+  let timer;
+  const timeout = new Promise((resolve2) => {
+    timer = setTimeout(() => resolve2("timeout"), CODEX_VERSION_TIMEOUT_MS);
+    timer.unref?.();
+  });
+  try {
+    const settled = await Promise.race([collected, timeout]);
+    if (settled === "timeout") {
+      collected.catch(() => void 0);
+      return null;
+    }
+    const [stdout, stderr, exitCode] = settled;
+    if (exitCode !== 0) return null;
+    return VERSION_PATTERN.exec(`${stdout}
+${stderr}`)?.[1] ?? null;
+  } catch {
+    return null;
+  } finally {
+    if (timer !== void 0) clearTimeout(timer);
+    await handle.kill("SIGTERM").catch(() => void 0);
+  }
+}
+
 // src/failureCategory.ts
 var codexProcessExitCategory = (session) => session !== void 0 && !session.stopRequested && typeof session.nativeThreadId === "string" && session.nativeThreadId.length > 0 ? "transport" : void 0;
 
@@ -5920,9 +5982,14 @@ var createCodexInstance = (config, host, attachments, cache) => {
     let version = null;
     try {
       try {
-        ({ handle } = await spawnCodexAppServer({ host, recipe, layout }));
+        ({ handle } = await spawnCodexAppServer({
+          host,
+          recipe,
+          layout,
+          ...input.signal === void 0 ? {} : { signal: input.signal }
+        }));
       } catch (error) {
-        if (error instanceof ExecutorSpawnRefusedError) throw error;
+        throwIfCodexSpawnControlled(error);
         host.log.warn("codex binary could not be started", {
           program: recipe.binaryPath,
           error: error instanceof Error ? error.message : String(error)
@@ -5935,19 +6002,26 @@ var createCodexInstance = (config, host, attachments, cache) => {
         };
       }
       trackHandle(handle, `${recipe.binaryPath} (probe)`);
-      rpc = await createCodexRpcClient(handle, {
-        onNotification: () => void 0,
-        onServerRequest: () => void 0,
-        onStderrLine: () => void 0
-      });
-      version = codexVersionFromInitialize(
-        await rpc.request("initialize", CODEX_INITIALIZE_PARAMS)
+      const spawned = handle;
+      return await raceAbort(
+        (async () => {
+          rpc = await createCodexRpcClient(spawned, {
+            onNotification: () => void 0,
+            onServerRequest: () => void 0,
+            onStderrLine: () => void 0
+          });
+          version = codexVersionFromInitialize(
+            await rpc.request("initialize", CODEX_INITIALIZE_PARAMS)
+          );
+          await rpc.notify("initialized");
+          const models = input.listModels ? await listCodexModels(rpc) : void 0;
+          return { version, models, skills: await listCodexSkills(rpc), spawnFailed: null };
+        })(),
+        input.signal
       );
-      await rpc.notify("initialized");
-      const models = input.listModels ? await listCodexModels(rpc) : void 0;
-      return { version, models, skills: await listCodexSkills(rpc), spawnFailed: null };
     } catch (error) {
-      if (error instanceof ExecutorSpawnRefusedError) throw error;
+      if (error instanceof ExecutorSpawnRefusedError2) throw error;
+      if (input.signal?.aborted) throw error;
       return { version, models: void 0, skills: void 0, spawnFailed: null };
     } finally {
       await rpc?.close().catch(() => void 0);
@@ -5962,7 +6036,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
     try {
       ({ handle } = await spawnCodexAppServer({ host, recipe, layout }));
     } catch (error) {
-      if (error instanceof ExecutorSpawnRefusedError) {
+      if (error instanceof ExecutorSpawnRefusedError2) {
         const borrowed = [...threads.values()].find((entry) => !entry.closing);
         if (borrowed !== void 0) return await run(borrowed.rpc);
       }
@@ -6008,7 +6082,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
     return booked.closing;
   };
   const instance = {
-    probe: async () => {
+    probe: async (signal) => {
       if (recipe.binaryPath.length === 0) {
         return {
           installed: false,
@@ -6020,7 +6094,8 @@ var createCodexInstance = (config, host, attachments, cache) => {
       }
       const connectionError = codexApiConnectionError(recipe, recipe.environment);
       const { version, models, skills, spawnFailed } = await probeAppServer({
-        listModels: connectionError === null
+        listModels: connectionError === null,
+        ...signal === void 0 ? {} : { signal }
       });
       if (spawnFailed !== null) {
         return {
@@ -6054,6 +6129,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
         ...CODEX_NATIVE_MODE_REPORT
       };
     },
+    readCliVersion: () => readCodexCliVersion({ recipe, host }),
     // 有意不处理 input.readOnlyDirectories：codex 的沙箱只限制写入，读不受限，
     // 附件目录本来就能读，无需放行。
     startSession: async (input, signal) => {
@@ -6387,7 +6463,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-codex",
-  apiVersion: 30,
+  apiVersion: 31,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.3254",
+  "version": "0.2.3265",
   "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.3254",
+    "@ycodium-ai/plugin-api": "0.2.3265",
     "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {