@ycodium-ai/agent-codex 0.2.3484 → 0.2.3502

package/dist/index.js

@@ -55,7 +55,10 @@ var CODEX_CARD = {
     // 出处不是 provider 文档：这是产品此前对所有 provider 统一施加的单图上限（10 MiB），
     // codex 在这个上限下一直把图片以 data URL 内联。没有查到 Codex / OpenAI 对单图的明文
     // 上限，所以不声明尺寸与合计上限；查到后改这里即可，宿主不需要跟着变。
-    inlineImages: { maxBytes: 10 * 1024 * 1024 }
+    inlineImages: { maxBytes: 10 * 1024 * 1024 },
+    // 其它文件夹每轮进 sandboxPolicy.writableRoots（codexTurnSandboxPolicyForNativeMode）。
+    // CLI 不读这些文件夹里的 AGENTS.md，说明文件由宿主的开场说明点出。
+    acceptsAdditionalDirectories: true
   },
   credentialSources: [],
   diagnostics: [],
@@ -1682,11 +1685,11 @@ function codexThreadConfigForNativeMode(nativeModeId) {
       return runtimeModeToThreadConfig("approval-required");
   }
 }
-function codexTurnSandboxPolicyForNativeMode(nativeModeId) {
+function codexTurnSandboxPolicyForNativeMode(nativeModeId, additionalDirectories = []) {
   switch (nativeModeId) {
     case "workspace-write":
     case "auto-review":
-      return runtimeModeToTurnSandboxPolicy("auto-accept-edits");
+      return additionalDirectories.length > 0 ? { type: "workspaceWrite", writableRoots: additionalDirectories } : runtimeModeToTurnSandboxPolicy("auto-accept-edits");
     case "full-access":
       return runtimeModeToTurnSandboxPolicy("full-access");
     default:
@@ -2452,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);
   }
 }
 
@@ -2726,6 +2710,88 @@ async function createCodexRpcClient(handle, handlers) {
   };
 }
 
+// src/processReuse.ts
+import * as NodeUtil from "node:util";
+
+// src/skills.ts
+var SKILLS_LIST_TIMEOUT_MS = 15e3;
+function codexProbeSkill(raw, includeRepo = false) {
+  if (!isRecord2(raw)) return null;
+  const name = asString(raw["name"]);
+  const path = asString(raw["path"]);
+  const scope = asString(raw["scope"]);
+  if (!name || !path || scope === "repo" && !includeRepo) return null;
+  const face = isRecord2(raw["interface"]) ? raw["interface"] : void 0;
+  const description = asString(raw["description"]);
+  const displayName = asString(face?.["displayName"]);
+  const shortDescription = asString(face?.["shortDescription"]) || asString(raw["shortDescription"]);
+  return {
+    name,
+    path,
+    enabled: raw["enabled"] !== false,
+    ...scope ? { scope } : {},
+    ...description ? { description } : {},
+    ...displayName ? { displayName } : {},
+    ...shortDescription ? { shortDescription } : {}
+  };
+}
+async function listCodexWorkspaceSkills(rpc, cwd) {
+  const response = await rpc.request("skills/list", { cwds: [cwd] }, SKILLS_LIST_TIMEOUT_MS);
+  if (!isRecord2(response) || !Array.isArray(response["data"])) {
+    throw new Error("skills/list returned an unexpected shape");
+  }
+  const skills = /* @__PURE__ */ new Map();
+  for (const entry of response["data"]) {
+    if (!isRecord2(entry) || !Array.isArray(entry["skills"])) continue;
+    for (const raw of entry["skills"]) {
+      const skill = codexProbeSkill(raw, true);
+      if (skill !== null) skills.set(skill.path, skill);
+    }
+  }
+  return [...skills.values()].toSorted((left, right) => left.name.localeCompare(right.name));
+}
+async function listCodexSkills(rpc) {
+  let response;
+  try {
+    response = await rpc.request("skills/list", {}, SKILLS_LIST_TIMEOUT_MS);
+  } catch {
+    return void 0;
+  }
+  if (!isRecord2(response) || !Array.isArray(response["data"])) return void 0;
+  const skills = /* @__PURE__ */ new Map();
+  for (const entry of response["data"]) {
+    if (!isRecord2(entry) || !Array.isArray(entry["skills"])) continue;
+    for (const raw of entry["skills"]) {
+      const skill = codexProbeSkill(raw);
+      if (skill !== null) skills.set(skill.path, skill);
+    }
+  }
+  return [...skills.values()].toSorted((left, right) => left.name.localeCompare(right.name));
+}
+var codexSessionSkillRoot = (skills) => skills === void 0 || skills.names.length === 0 ? void 0 : skills.skillsDir;
+async function setCodexSessionSkillRoots(rpc, skills, log, threadId) {
+  const root = codexSessionSkillRoot(skills);
+  if (root === void 0) return;
+  try {
+    await rpc.request("skills/extraRoots/set", { extraRoots: [root] });
+  } catch (error) {
+    log.warn("codex did not take the session skill root; skills stay on the built-in tools", {
+      threadId,
+      error: error instanceof Error ? error.message : String(error)
+    });
+  }
+}
+
+// src/processReuse.ts
+var reusesCodexProcess = (running, input, cwd) => {
+  const { runtime, launch } = running;
+  const resume = input.discardResumeCursor === true ? void 0 : parseCodexResumeCursor(input.resumeCursor);
+  return !runtime.closing && runtime.nativeThreadId !== void 0 && resume?.threadId === runtime.nativeThreadId && runtime.cwd === cwd && codexNativeModeFor(runtime.runtimeMode, runtime.nativeModeId) === codexNativeModeFor(input.runtimeMode, input.nativeModeId) && NodeUtil.isDeepStrictEqual(
+    codexMcpThreadConfig(launch.mcpServers ?? []),
+    codexMcpThreadConfig(input.mcpServers ?? [])
+  ) && codexSessionSkillRoot(launch.skills) === codexSessionSkillRoot(input.skills);
+};
+
 // src/sessionRuntime.ts
 import * as NodeCrypto4 from "node:crypto";
 
@@ -5225,6 +5291,8 @@ var CodexSessionRuntime = class {
   /** 这个会话见过的主额度快照（按字段合并），额度用尽停轮时点名窗口用。 */
   rateLimits;
   appServerArgs;
+  /** 会话除 cwd 外的文件夹，每轮随 `sandboxPolicy` 发；变了由 `setAdditionalDirectories` 换上，进程不重启。 */
+  #additionalDirectories;
   hasConfiguredMcpServer;
   host;
   attachments;
@@ -5250,7 +5318,8 @@ var CodexSessionRuntime = class {
   /** 同上，沙箱策略那一位。 */
   #turnSandboxPolicy() {
     return codexTurnSandboxPolicyForNativeMode(
-      codexNativeModeFor(this.runtimeMode, this.nativeModeId)
+      codexNativeModeFor(this.runtimeMode, this.nativeModeId),
+      this.#additionalDirectories
     );
   }
   constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay, attachments, closeOptions = {}) {
@@ -5272,6 +5341,7 @@ var CodexSessionRuntime = class {
     this.runtimeMode = input.runtimeMode;
     this.nativeModeId = input.nativeModeId;
     this.appServerArgs = appServerArgs;
+    this.#additionalDirectories = input.additionalDirectories ?? [];
     this.hasConfiguredMcpServer = (input.mcpServers?.length ?? 0) > 0;
     this.grants = grants ?? createApprovalGrantStore();
     this.declineRelay = declineRelay ?? createDeclineReasonRelay();
@@ -5295,6 +5365,10 @@ var CodexSessionRuntime = class {
       this.writeAcks.set(jsonRpcId, { resolve: resolve4 });
     });
   }
+  /** 下一轮（含插话）起按这份发可写根；正在跑的一轮不变。 */
+  setAdditionalDirectories(directories) {
+    this.#additionalDirectories = directories;
+  }
   settleNativeWrite(requestId, status) {
     const ack = this.writeAcks.get(requestId);
     if (!ack) return;
@@ -5906,73 +5980,6 @@ async function listCodexModels(rpc) {
   return models;
 }
 
-// src/skills.ts
-var SKILLS_LIST_TIMEOUT_MS = 15e3;
-function codexProbeSkill(raw, includeRepo = false) {
-  if (!isRecord2(raw)) return null;
-  const name = asString(raw["name"]);
-  const path = asString(raw["path"]);
-  const scope = asString(raw["scope"]);
-  if (!name || !path || scope === "repo" && !includeRepo) return null;
-  const face = isRecord2(raw["interface"]) ? raw["interface"] : void 0;
-  const description = asString(raw["description"]);
-  const displayName = asString(face?.["displayName"]);
-  const shortDescription = asString(face?.["shortDescription"]) || asString(raw["shortDescription"]);
-  return {
-    name,
-    path,
-    enabled: raw["enabled"] !== false,
-    ...scope ? { scope } : {},
-    ...description ? { description } : {},
-    ...displayName ? { displayName } : {},
-    ...shortDescription ? { shortDescription } : {}
-  };
-}
-async function listCodexWorkspaceSkills(rpc, cwd) {
-  const response = await rpc.request("skills/list", { cwds: [cwd] }, SKILLS_LIST_TIMEOUT_MS);
-  if (!isRecord2(response) || !Array.isArray(response["data"])) {
-    throw new Error("skills/list returned an unexpected shape");
-  }
-  const skills = /* @__PURE__ */ new Map();
-  for (const entry of response["data"]) {
-    if (!isRecord2(entry) || !Array.isArray(entry["skills"])) continue;
-    for (const raw of entry["skills"]) {
-      const skill = codexProbeSkill(raw, true);
-      if (skill !== null) skills.set(skill.path, skill);
-    }
-  }
-  return [...skills.values()].toSorted((left, right) => left.name.localeCompare(right.name));
-}
-async function listCodexSkills(rpc) {
-  let response;
-  try {
-    response = await rpc.request("skills/list", {}, SKILLS_LIST_TIMEOUT_MS);
-  } catch {
-    return void 0;
-  }
-  if (!isRecord2(response) || !Array.isArray(response["data"])) return void 0;
-  const skills = /* @__PURE__ */ new Map();
-  for (const entry of response["data"]) {
-    if (!isRecord2(entry) || !Array.isArray(entry["skills"])) continue;
-    for (const raw of entry["skills"]) {
-      const skill = codexProbeSkill(raw);
-      if (skill !== null) skills.set(skill.path, skill);
-    }
-  }
-  return [...skills.values()].toSorted((left, right) => left.name.localeCompare(right.name));
-}
-async function setCodexSessionSkillRoots(rpc, skills, log, threadId) {
-  if (skills === void 0 || skills.names.length === 0) return;
-  try {
-    await rpc.request("skills/extraRoots/set", { extraRoots: [skills.skillsDir] });
-  } catch (error) {
-    log.warn("codex did not take the session skill root; skills stay on the built-in tools", {
-      threadId,
-      error: error instanceof Error ? error.message : String(error)
-    });
-  }
-}
-
 // src/workspaceInventory.ts
 import * as NodeFS6 from "node:fs";
 import * as NodePath8 from "node:path";
@@ -6366,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) {
@@ -6518,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 {
@@ -7611,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) => {
@@ -7625,6 +7616,11 @@ var createCodexInstance = (config, host, attachments, cache) => {
       const existing = threads.get(input.threadId);
       if (existing !== void 0) {
         if (existing.closing) throw new Error(`thread ${input.threadId} is closing`);
+        if (reusesCodexProcess(existing, input, cwd)) {
+          existing.runtime.setAdditionalDirectories(input.additionalDirectories ?? []);
+          host.log.info("session reused", { threadId: input.threadId });
+          return existing.runtime.session;
+        }
         await stopBooked(input.threadId, existing);
       }
       const layout = layoutFor(recipe);
@@ -7679,7 +7675,7 @@ var createCodexInstance = (config, host, attachments, cache) => {
         attachments,
         { requestClose: () => stopBooked(input.threadId, booked, "process") }
       );
-      booked = { runtime, rpc, handle };
+      booked = { runtime, rpc, handle, launch: input };
       threads.set(input.threadId, booked);
       try {
         await rpc.request("initialize", CODEX_INITIALIZE_PARAMS);
@@ -7924,7 +7920,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-codex",
-  apiVersion: 39,
+  apiVersion: 41,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.3484",
+  "version": "0.2.3502",
   "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.3484",
+    "ycodium-jsonl-stream": "0.0.0",
     "ycodium-executor-testing": "0.0.0",
-    "ycodium-jsonl-stream": "0.0.0"
+    "@ycodium-ai/plugin-api": "0.2.3502"
   },
   "ycodium": {
     "plugin": "./dist/index.js",