@ycodium-ai/agent-codex 0.2.3488 → 0.2.3506

package/dist/index.js

@@ -2455,49 +2455,30 @@ async function spawnCodexAppServer(input) {
 }
 
 // src/cliVersion.ts
+import {
+  runProcessOperation,
+  isOperationCleanupError
+} from "@ycodium-ai/plugin-api/process-operation";
 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) {
+  input.signal?.throwIfAborted();
   if (input.recipe.binaryPath.length === 0) return null;
-  let handle;
   try {
-    handle = await input.host.process.spawn({
+    const { stdout, stderr, exitCode } = await runProcessOperation(input.host, {
       program: input.recipe.binaryPath,
       args: ["--version"],
-      owner: { bindingId: input.host.bindingId }
+      owner: { bindingId: input.host.bindingId },
+      signal: input.signal,
+      timeoutMs: CODEX_VERSION_TIMEOUT_MS,
+      maxOutputBytes: 64 * 1024
     });
-  } catch {
-    return null;
-  }
-  const collected = Promise.all([collect(handle.stdout), collect(handle.stderr), handle.exited]);
-  let timer;
-  const timeout = new Promise((resolve4) => {
-    timer = setTimeout(() => resolve4("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 VERSION_PATTERN.exec(stdout + "\n" + stderr)?.[1] ?? null;
+  } catch (error) {
+    if (isOperationCleanupError(error)) throw error;
+    input.signal?.throwIfAborted();
     return null;
-  } finally {
-    if (timer !== void 0) clearTimeout(timer);
-    await handle.kill("SIGTERM").catch(() => void 0);
   }
 }
 
@@ -6392,6 +6373,10 @@ import * as NodePath9 from "node:path";
 import {
   mergeLaunchEnv as mergeLaunchEnv2
 } from "@ycodium-ai/plugin-api/executor";
+import {
+  OperationCleanupError,
+  runProcessOperation as runProcessOperation2
+} from "@ycodium-ai/plugin-api/process-operation";
 var CODEX_TIMEOUT_MS = 18e4;
 var EARLIER_CONTENT_TRUNCATION_MARKER = "[Earlier content truncated]\n\n";
 function limitSection(value, maxChars) {
@@ -6544,98 +6529,78 @@ function absoluteImagePaths(attachments) {
   }
   return paths;
 }
-async function collectStream(stream) {
-  const decoder = new TextDecoder();
-  let out = "";
-  for await (const chunk of stream) out += decoder.decode(chunk, { stream: true });
-  return out;
-}
 function createCodexTextGeneration(input) {
   const run = async (operation, cwd, prompt, schema, modelSelection, imagePaths, signal) => {
     if (input.recipe.binaryPath.length === 0) {
       throw new Error("Codex CLI is required but not available on PATH.");
     }
+    signal?.throwIfAborted();
     const tmp = await NodeFSP5.mkdtemp(NodePath9.join(NodeOS3.tmpdir(), "ycodium-codex-tg-"));
-    const schemaPath = NodePath9.join(tmp, "schema.json");
-    const outputPath = NodePath9.join(tmp, "output.json");
-    await NodeFSP5.writeFile(schemaPath, JSON.stringify(schema));
-    await NodeFSP5.writeFile(outputPath, "");
-    const reasoningEffort = modelSelectionStringOption(modelSelection, "reasoningEffort") ?? DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
-    const serviceTier = modelSelectionStringOption(modelSelection, "serviceTier");
-    const model = modelIdFromSelection(modelSelection) ?? "gpt-5.6-luna";
-    const env = mergeLaunchEnv2({
-      accountHome: input.layout.effectiveHomePath ? { CODEX_HOME: input.layout.effectiveHomePath } : input.recipe.homePath.trim() ? { CODEX_HOME: expandHomePath(input.recipe.homePath) } : {},
-      instanceTable: input.recipe.environment
-    });
-    const args = [
-      "exec",
-      ...codexExecLaunchArgs(input.recipe.launchArgs),
-      "--ephemeral",
-      "--skip-git-repo-check",
-      "-s",
-      "read-only",
-      "--model",
-      model,
-      "--config",
-      `model_reasoning_effort="${reasoningEffort}"`,
-      ...serviceTier ? ["--config", `service_tier="${serviceTier}"`] : [],
-      "--output-schema",
-      schemaPath,
-      "--output-last-message",
-      outputPath,
-      ...imagePaths.flatMap((imagePath) => ["--image", imagePath]),
-      "-"
-    ];
-    const handle = await input.host.process.spawn({
-      program: input.recipe.binaryPath,
-      args,
-      cwd: operation === "summarizeTurn" ? tmp : cwd,
-      env,
-      owner: { bindingId: input.host.bindingId }
-    });
-    const onAbort = () => {
-      void handle.kill("SIGTERM").catch(() => void 0);
-    };
-    signal?.addEventListener("abort", onAbort);
-    let timer;
+    let safeToRemove = true;
     try {
-      await handle.writeStdin(prompt);
-      await handle.closeStdin();
-      const timedOut = await Promise.race([
-        handle.exited.then(() => false),
-        new Promise((resolve4) => {
-          timer = setTimeout(() => resolve4(true), CODEX_TIMEOUT_MS);
-        })
-      ]);
-      if (timedOut) {
-        await handle.kill("SIGTERM").catch(() => void 0);
-        throw new Error("Codex CLI request timed out.");
-      }
-      const [stdout, stderr, exitCode] = await Promise.all([
-        collectStream(handle.stdout),
-        collectStream(handle.stderr),
-        handle.exited
-      ]);
-      if (exitCode !== 0) {
-        const detail = stderr.trim() || stdout.trim();
-        throw new Error(
-          detail.length > 0 ? `Codex CLI command failed: ${detail}` : `Codex CLI command failed with code ${String(exitCode)}.`
-        );
-      }
-      const raw = await NodeFSP5.readFile(outputPath, "utf8");
-      let parsed;
+      const schemaPath = NodePath9.join(tmp, "schema.json");
+      const outputPath = NodePath9.join(tmp, "output.json");
+      await NodeFSP5.writeFile(schemaPath, JSON.stringify(schema));
+      await NodeFSP5.writeFile(outputPath, "");
+      const reasoningEffort = modelSelectionStringOption(modelSelection, "reasoningEffort") ?? DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
+      const serviceTier = modelSelectionStringOption(modelSelection, "serviceTier");
+      const model = modelIdFromSelection(modelSelection) ?? "gpt-5.6-luna";
+      const env = mergeLaunchEnv2({
+        accountHome: input.layout.effectiveHomePath ? { CODEX_HOME: input.layout.effectiveHomePath } : input.recipe.homePath.trim() ? { CODEX_HOME: expandHomePath(input.recipe.homePath) } : {},
+        instanceTable: input.recipe.environment
+      });
+      const args = [
+        "exec",
+        ...codexExecLaunchArgs(input.recipe.launchArgs),
+        "--ephemeral",
+        "--skip-git-repo-check",
+        "-s",
+        "read-only",
+        "--model",
+        model,
+        "--config",
+        `model_reasoning_effort="${reasoningEffort}"`,
+        ...serviceTier ? ["--config", `service_tier="${serviceTier}"`] : [],
+        "--output-schema",
+        schemaPath,
+        "--output-last-message",
+        outputPath,
+        ...imagePaths.flatMap((imagePath) => ["--image", imagePath]),
+        "-"
+      ];
       try {
-        parsed = JSON.parse(raw);
+        const { stdout, stderr, exitCode } = await runProcessOperation2(input.host, {
+          program: input.recipe.binaryPath,
+          args,
+          cwd: operation === "summarizeTurn" ? tmp : cwd,
+          env,
+          owner: { bindingId: input.host.bindingId },
+          signal,
+          timeoutMs: CODEX_TIMEOUT_MS,
+          input: prompt
+        });
+        if (exitCode !== 0) {
+          const detail = stderr.trim() || stdout.trim();
+          throw new Error(
+            detail.length > 0 ? `Codex CLI command failed: ${detail}` : `Codex CLI command failed with code ${String(exitCode)}.`
+          );
+        }
+        const raw = await NodeFSP5.readFile(outputPath, "utf8");
+        let parsed;
+        try {
+          parsed = JSON.parse(raw);
+        } catch (cause) {
+          throw new Error("Codex returned invalid structured output.", { cause });
+        }
+        if (!isRecord2(parsed)) throw new Error("Codex returned invalid structured output.");
+        return parsed;
       } catch (cause) {
-        throw new Error("Codex returned invalid structured output.", { cause });
+        if (cause instanceof OperationCleanupError) safeToRemove = false;
+        throw cause;
       }
-      if (!isRecord2(parsed)) throw new Error("Codex returned invalid structured output.");
-      return parsed;
     } finally {
-      if (timer !== void 0) clearTimeout(timer);
-      signal?.removeEventListener("abort", onAbort);
-      await NodeFSP5.rm(tmp, { recursive: true, force: true }).catch(() => void 0);
-      void operation;
+      if (safeToRemove)
+        await NodeFSP5.rm(tmp, { recursive: true, force: true }).catch(() => void 0);
     }
   };
   return {
@@ -7637,7 +7602,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
         ...CODEX_NATIVE_MODE_REPORT
       };
     },
-    readCliVersion: () => readCodexCliVersion({ recipe, host }),
+    readCliVersion: (signal) => readCodexCliVersion({ recipe, host, ...signal ? { signal } : {} }),
     // 有意不处理 input.readOnlyDirectories：codex 的沙箱只限制写入，读不受限，
     // 附件目录本来就能读，无需放行。
     startSession: async (input, signal) => {
@@ -7955,7 +7920,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-codex",
-  apiVersion: 39,
+  apiVersion: 42,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

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