@ycodium-ai/agent-codex 0.2.2126 → 0.2.2143

package/dist/index.js

@@ -92,6 +92,7 @@ var CODEX_CARD = {
 
 // src/codexInstance.ts
 import * as NodeProcess from "node:process";
+import { ExecutorSpawnRefusedError } from "@ycodium-ai/plugin-api/executor";
 
 // src/codexAccount.ts
 import * as NodeFS from "node:fs";
@@ -500,6 +501,13 @@ function resolveCodexHomeLayout(input) {
     continuationKey: `codex:home:${sharedHomePath}`
   };
 }
+function codexContinuationKey(input) {
+  return resolveCodexHomeLayout({
+    homePath: input.homePath,
+    shadowHomePath: "",
+    environmentHome: input.instanceEnvironment["CODEX_HOME"] ?? input.inheritedEnvironment["CODEX_HOME"]
+  }).continuationKey;
+}
 async function readLinkState(linkPath) {
   try {
     const target = await NodeFSP.readlink(linkPath);
@@ -748,6 +756,10 @@ function asString(value) {
 function asNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
+function codexVersionFromInitialize(initializeResult) {
+  const userAgent = isRecord3(initializeResult) ? asString(initializeResult["userAgent"]) : null;
+  return userAgent?.match(/\/(\S+)/)?.[1] ?? null;
+}
 function decodeThreadOpen(result) {
   const thread = isRecord3(result) ? isRecord3(result["thread"]) ? result["thread"] : result : null;
   const id = thread ? asString(thread["id"]) : null;
@@ -985,7 +997,15 @@ async function createCodexRpcClient(handle, handlers) {
     const settled = new Promise((resolve2, reject) => {
       pending.set(id, { resolve: resolve2, reject, method });
     });
-    await writeLine({ id, method, ...params === void 0 ? {} : { params } });
+    try {
+      await Promise.race([
+        writeLine({ id, method, ...params === void 0 ? {} : { params } }),
+        settled
+      ]);
+    } catch (error) {
+      pending.delete(id);
+      throw error;
+    }
     const limit = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
     if (limit <= 0) return await settled;
     let timer;
@@ -1026,7 +1046,15 @@ async function createCodexRpcClient(handle, handlers) {
     failAll("the client was closed");
     await Promise.all([pumpStdout, pumpStderr]);
   };
-  return { request, notify, respond, respondError, close, pid: handle.pid };
+  return {
+    request,
+    notify,
+    respond,
+    respondError,
+    close,
+    pid: handle.pid,
+    pendingCountForTests: () => pending.size
+  };
 }
 
 // src/approvalGrant.ts
@@ -2334,6 +2362,11 @@ function pathLeaf2(value) {
   const parts = value.split("/").filter((part) => part.length > 0);
   return parts.at(-1);
 }
+function undeliveredAnswerError(requestId, delivery) {
+  return new Error(
+    delivery === "closed" ? `codex did not receive the answer to request ${requestId}: the session closed before the answer was written` : `codex did not receive the answer to request ${requestId}: writing it to the CLI failed`
+  );
+}
 var CodexSessionRuntime = class {
   threadId;
   cwd;
@@ -2372,6 +2405,15 @@ var CodexSessionRuntime = class {
       codexNativeModeFor(this.runtimeMode, this.nativeModeId)
     );
   }
+  /** 给 CLI 的应答没写进去：带上线程与方法名记一行 warn。 */
+  #warnAnswerUndelivered(method, jsonRpcId, error) {
+    this.host.log.warn("codex did not receive an answer", {
+      threadId: this.threadId,
+      method,
+      jsonRpcId,
+      error: error instanceof Error ? error.message : String(error)
+    });
+  }
   constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay) {
     this.host = host;
     this.rpc = rpc;
@@ -2641,7 +2683,7 @@ var CodexSessionRuntime = class {
           jsonRpcId: id,
           settle: (result) => {
             this.pendingUserInputs.delete(requestId);
-            void this.rpc.respond(id, result).finally(resolve2);
+            void this.rpc.respond(id, result).catch((error) => this.#warnAnswerUndelivered(method, id, error)).finally(resolve2);
           }
         });
         for (const event of events) this.emit(event);
@@ -2675,7 +2717,7 @@ var CodexSessionRuntime = class {
         identity,
         settle: (decision) => {
           this.pendingApprovals.delete(requestId);
-          void this.rpc.respond(id, decision).finally(resolve2);
+          void this.rpc.respond(id, decision).catch((error) => this.#warnAnswerUndelivered(method, id, error)).finally(resolve2);
         }
       });
       for (const event of events) this.emit(event);
@@ -2697,7 +2739,7 @@ var CodexSessionRuntime = class {
     }
     const ack = this.registerWriteAck(pending.jsonRpcId);
     pending.settle(wire);
-    await ack.catch(() => "closed");
+    const delivery = await ack.catch(() => "closed");
     this.emit({
       eventId: `codex-req-${requestId}`,
       provider: CODEX_DRIVER_KIND,
@@ -2712,6 +2754,7 @@ var CodexSessionRuntime = class {
         ...reason ? { reason } : {}
       }
     });
+    if (delivery !== "written") throw undeliveredAnswerError(requestId, delivery);
   }
   async respondToUserInput(requestId, answers) {
     const pending = this.pendingUserInputs.get(requestId);
@@ -2720,7 +2763,9 @@ var CodexSessionRuntime = class {
     if (mapped === void 0) {
       throw new Error(`invalid user input answers for request ${requestId}`);
     }
+    const ack = this.registerWriteAck(pending.jsonRpcId);
     pending.settle({ answers: mapped });
+    const delivery = await ack.catch(() => "closed");
     this.emit({
       eventId: `codex-ui-${requestId}`,
       provider: CODEX_DRIVER_KIND,
@@ -2731,6 +2776,7 @@ var CodexSessionRuntime = class {
       // 契约的 answers 是 questionId → 答案 的 record，不是数组。
       payload: { answers: toCanonicalUserInputAnswers(mapped) }
     });
+    if (delivery !== "written") throw undeliveredAnswerError(requestId, delivery);
   }
   async withActiveWriterRecovery(run, allowUnsubscribe) {
     let lastError;
@@ -3532,15 +3578,18 @@ async function verifyCodexSignIn(input) {
     onServerRequest: () => void 0,
     onStderrLine: () => void 0
   });
+  let version = null;
   try {
-    await rpc.request("initialize", CODEX_INITIALIZE_PARAMS, 15e3);
+    version = codexVersionFromInitialize(
+      await rpc.request("initialize", CODEX_INITIALIZE_PARAMS, 15e3)
+    );
     await rpc.notify("initialized");
     const account = await rpc.request("account/read", { refreshToken: true }, 15e3);
     const type = isRecord3(account) ? asString(account["type"]) : null;
     if (type !== "chatgpt") {
       return {
         installed: true,
-        version: null,
+        version,
         readiness: "unchecked",
         auth: { status: "unauthenticated" },
         ...CODEX_NATIVE_MODE_REPORT
@@ -3549,7 +3598,7 @@ async function verifyCodexSignIn(input) {
     const models = await listCodexModels(rpc);
     return {
       installed: true,
-      version: null,
+      version,
       readiness: "ready",
       auth,
       ...models === void 0 ? {} : { models },
@@ -3558,7 +3607,7 @@ async function verifyCodexSignIn(input) {
   } catch {
     return {
       installed: true,
-      version: null,
+      version,
       readiness: "unchecked",
       auth: { status: "unknown" },
       ...CODEX_NATIVE_MODE_REPORT
@@ -4094,7 +4143,7 @@ var createCodexInstance = (config, host) => {
     return booked;
   };
   const probeAuth = () => accountToAuth2(readCodexAccount(accountHomeFromLayout(layoutFor(recipe))));
-  const probeModels = async () => {
+  const probeAppServer = async (input) => {
     const layout = layoutFor(recipe);
     const env = buildCodexSpawnEnv({
       recipe,
@@ -4103,6 +4152,7 @@ var createCodexInstance = (config, host) => {
     });
     let handle;
     let rpc;
+    let version = null;
     try {
       handle = await host.process.spawn({
         program: recipe.binaryPath,
@@ -4116,11 +4166,14 @@ var createCodexInstance = (config, host) => {
         onServerRequest: () => void 0,
         onStderrLine: () => void 0
       });
-      await rpc.request("initialize", CODEX_INITIALIZE_PARAMS);
+      version = codexVersionFromInitialize(
+        await rpc.request("initialize", CODEX_INITIALIZE_PARAMS)
+      );
       await rpc.notify("initialized");
-      return await listCodexModels(rpc);
-    } catch {
-      return void 0;
+      return { version, models: input.listModels ? await listCodexModels(rpc) : void 0 };
+    } catch (error) {
+      if (error instanceof ExecutorSpawnRefusedError) throw error;
+      return { version, models: void 0 };
     } finally {
       await rpc?.close().catch(() => void 0);
       await handle?.kill("SIGTERM").catch(() => void 0);
@@ -4147,20 +4200,20 @@ var createCodexInstance = (config, host) => {
         };
       }
       const connectionError = codexApiConnectionError(recipe, recipe.environment);
+      const { version, models } = await probeAppServer({ listModels: connectionError === null });
       if (connectionError) {
         return {
           installed: true,
-          version: null,
+          version,
           readiness: "error",
           auth: probeAuth(),
           detail: connectionError,
           ...CODEX_NATIVE_MODE_REPORT
         };
       }
-      const models = await probeModels();
       return {
         installed: true,
-        version: null,
+        version,
         readiness: models === void 0 ? "unchecked" : "ready",
         auth: probeAuth(),
         ...models === void 0 ? {} : { models },
@@ -4212,7 +4265,13 @@ var createCodexInstance = (config, host) => {
           runtime?.handleNotification(notification.method, notification.params);
         },
         onServerRequest: (request) => {
-          void runtime?.handleServerRequest(request.id, request.method, request.params);
+          void runtime?.handleServerRequest(request.id, request.method, request.params).catch((error) => {
+            host.log.warn("codex server request was not answered", {
+              threadId: input.threadId,
+              method: request.method,
+              error: error instanceof Error ? error.message : String(error)
+            });
+          });
         },
         onStderrLine: (line) => {
           runtime?.handleStderrLine(line);
@@ -4317,6 +4376,11 @@ var createCodexInstance = (config, host) => {
       recipe,
       layout: layoutFor(recipe)
     }),
+    continuationKey: codexContinuationKey({
+      homePath: recipe.homePath,
+      instanceEnvironment: recipe.environment,
+      inheritedEnvironment: process.env
+    }),
     sessions: {
       scan: async (input) => {
         if (recipe.binaryPath.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.2126",
+  "version": "0.2.2143",
   "description": "Codex executor: Codex CLI over the app-server JSON-RPC protocol.",
   "keywords": [
     "ycodium",
@@ -20,7 +20,7 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.2126"
+    "@ycodium-ai/plugin-api": "0.2.2143"
   },
   "ycodium": {
     "plugin": "./dist/index.js",