@ycodium-ai/agent-codex 0.2.2130 → 0.2.2147

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";
@@ -755,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;
@@ -992,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;
@@ -1033,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
@@ -1339,6 +1360,20 @@ function toTurnStatus(status) {
       return "completed";
   }
 }
+var COLLAB_CHILD_STATUSES = /* @__PURE__ */ new Set([
+  "running",
+  "idle",
+  "failed",
+  "interrupted",
+  "cancelled"
+]);
+function asCollabChildStatus(value) {
+  return typeof value === "string" && COLLAB_CHILD_STATUSES.has(value) ? value : void 0;
+}
+function collabTurnEndStatus(turnStatus) {
+  const state = toTurnStatus(turnStatus);
+  return state === "completed" ? "idle" : state;
+}
 function threadStateFromStatus(status) {
   const type = isRecord3(status) ? asString(status["type"]) : asString(status);
   if (type === "idle") return "idle";
@@ -1561,11 +1596,12 @@ function mapCollabAgentEvent(input) {
     ];
   }
   if (method === "collabAgent/completed" || method === "task.completed") {
+    const status = collabTurnEndStatus(asString(input.params["turnStatus"]) ?? void 0);
     return [
       baseEvent({
         type: "task.updated",
         threadId,
-        payload: { taskId: agentThreadId, status: "idle", ...linkage },
+        payload: { taskId: agentThreadId, status, ...linkage },
         method,
         providerInstanceId: input.providerInstanceId
       })
@@ -1584,6 +1620,19 @@ function mapCollabAgentEvent(input) {
       })
     ];
   }
+  if (method === "collabAgent/metadata") {
+    const status = asCollabChildStatus(input.params["status"]);
+    if (status === void 0) return [];
+    return [
+      baseEvent({
+        type: "task.updated",
+        threadId,
+        payload: { taskId: agentThreadId, status, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
+  }
   if (method === "collabAgent/tokenUsage") {
     const tokenUsage = isRecord3(input.params["tokenUsage"]) ? input.params["tokenUsage"] : void 0;
     const total = tokenUsage && isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
@@ -2336,11 +2385,25 @@ function isRootChild(agentPath, agentThreadId, rootThreadId) {
   if (agentThreadId === rootThreadId) return true;
   return agentPath === "/root" || agentPath === "/";
 }
+function readSubAgentActivity(method, params) {
+  if (method !== "item/started" && method !== "item/completed") return void 0;
+  if (itemTypeOf(params) !== "subAgentActivity") return void 0;
+  const item = isRecord3(params) ? isRecord3(params["item"]) ? params["item"] : params : {};
+  return {
+    agentThreadId: asString(item["agentThreadId"]) ?? void 0,
+    agentPath: asString(item["agentPath"]) ?? void 0
+  };
+}
 function pathLeaf2(value) {
   if (!value) return void 0;
   const parts = value.split("/").filter((part) => part.length > 0);
   return parts.at(-1);
 }
+function unconfirmedAnswerError(requestId, delivery) {
+  return new Error(
+    delivery === "closed" ? `could not confirm that codex received the answer to request ${requestId}: the session closed before the write was confirmed` : `could not confirm that codex received the answer to request ${requestId}: writing it to the CLI failed`
+  );
+}
 var CodexSessionRuntime = class {
   threadId;
   cwd;
@@ -2379,6 +2442,15 @@ var CodexSessionRuntime = class {
       codexNativeModeFor(this.runtimeMode, this.nativeModeId)
     );
   }
+  /** 给 CLI 的应答写入失败：带上线程与方法名记一行 warn。 */
+  #warnAnswerWriteFailed(method, jsonRpcId, error) {
+    this.host.log.warn("writing an answer to codex failed", {
+      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;
@@ -2473,6 +2545,10 @@ var CodexSessionRuntime = class {
         return;
       }
     }
+    const activity = readSubAgentActivity(method, params);
+    if (activity?.agentThreadId !== void 0 && !isRootChild(activity.agentPath, activity.agentThreadId, this.nativeThreadId ?? this.threadId)) {
+      this.upsertCollabChild(activity.agentThreadId, { agentPath: activity.agentPath });
+    }
     this.dispatchMapped(method, params);
   }
   dispatchMapped(method, params) {
@@ -2513,23 +2589,19 @@ var CodexSessionRuntime = class {
     }
   }
   interceptCollab(method, params, conversationId) {
-    const source = isRecord3(params) ? params["source"] : void 0;
+    const thread = isRecord3(params) && isRecord3(params["thread"]) ? params["thread"] : void 0;
+    const source = thread === void 0 ? void 0 : thread["source"];
     const subAgent = isRecord3(source) ? source["subAgent"] : void 0;
     const spawn = isRecord3(subAgent) ? subAgent["thread_spawn"] : void 0;
-    if (method === "thread/started" && isRecord3(spawn)) {
+    if (method === "thread/started" && thread !== void 0 && isRecord3(spawn)) {
       const agentPath = asString(spawn["agent_path"]) ?? void 0;
-      if (isRootChild(agentPath, conversationId, this.nativeThreadId ?? this.threadId)) return;
-      const existing = this.collabChildren.get(conversationId);
-      const spawnTurnId = existing?.spawnTurnId ?? this.activeTurnId;
-      const child2 = {
-        agentThreadId: conversationId,
-        ...agentPath ? { agentPath } : {},
-        ...asString(spawn["agent_role"]) ? { role: asString(spawn["agent_role"]) } : {},
-        ...asString(spawn["agent_nickname"]) ? { nickname: asString(spawn["agent_nickname"]) } : {},
-        ...spawnTurnId ? { spawnTurnId } : {}
-      };
-      this.collabChildren.set(conversationId, child2);
-      this.emitCollab("collabAgent/started", child2);
+      const knownPath = agentPath ?? this.collabChildren.get(conversationId)?.agentPath;
+      if (isRootChild(knownPath, conversationId, this.nativeThreadId ?? this.threadId)) return;
+      this.upsertCollabChild(conversationId, {
+        agentPath,
+        role: asString(spawn["agent_role"]) ?? asString(thread["agentRole"]) ?? void 0,
+        nickname: asString(spawn["agent_nickname"]) ?? asString(thread["agentNickname"]) ?? void 0
+      });
       return;
     }
     const itemType = itemTypeOf(params);
@@ -2539,21 +2611,13 @@ var CodexSessionRuntime = class {
       if (receiver && this.activeTurnId) this.collabReceiverTurns.set(receiver, this.activeTurnId);
       return;
     }
-    if ((method === "item/started" || method === "item/completed") && itemType === "subAgentActivity") {
-      const item = isRecord3(params) ? isRecord3(params["item"]) ? params["item"] : params : {};
-      const agentThreadId = asString(item["agentThreadId"]) ?? conversationId;
-      const agentPath = asString(item["agentPath"]) ?? void 0;
-      if (isRootChild(agentPath, agentThreadId, this.nativeThreadId ?? this.threadId)) return;
-      if (!this.collabChildren.has(agentThreadId)) {
-        const spawnTurnId = this.activeTurnId;
-        const child2 = {
-          agentThreadId,
-          ...agentPath ? { agentPath } : {},
-          ...spawnTurnId ? { spawnTurnId } : {}
-        };
-        this.collabChildren.set(agentThreadId, child2);
-        this.emitCollab("collabAgent/started", child2);
+    const activity = readSubAgentActivity(method, params);
+    if (activity !== void 0) {
+      const agentThreadId = activity.agentThreadId ?? conversationId;
+      if (isRootChild(activity.agentPath, agentThreadId, this.nativeThreadId ?? this.threadId)) {
+        return;
       }
+      this.upsertCollabChild(agentThreadId, { agentPath: activity.agentPath });
     }
     const child = this.collabChildren.get(conversationId);
     if (method === "turn/started") {
@@ -2567,13 +2631,26 @@ var CodexSessionRuntime = class {
       if (CHILD_CHATTER_METHODS.has(method) || !CHILD_AGENT_EVENT_METHODS.has(method)) return;
       return;
     }
+    if (method === "turn/started") {
+      child.status = "running";
+      this.emitCollab("collabAgent/statusChanged", child, { status: "running" });
+      return;
+    }
     if (method === "turn/completed") {
-      this.emitCollab("collabAgent/completed", child);
+      const turn = isRecord3(params) && isRecord3(params["turn"]) ? params["turn"] : void 0;
+      const turnStatus = turn === void 0 ? void 0 : asString(turn["status"]) ?? void 0;
+      child.status = collabTurnEndStatus(turnStatus);
+      this.emitCollab(
+        "collabAgent/completed",
+        child,
+        turnStatus === void 0 ? {} : { turnStatus }
+      );
       return;
     }
     if (method === "error") {
       const willRetry = isRecord3(params) ? params["willRetry"] === true : false;
       if (willRetry) return;
+      child.status = "failed";
       this.emitCollab("collabAgent/statusChanged", child, { status: "systemError" });
       return;
     }
@@ -2586,6 +2663,44 @@ var CodexSessionRuntime = class {
       this.emitCollab("collabAgent/progress", child, params);
     }
   }
+  /**
+   * 两条登记路（根线程的 subAgentActivity、子线程的 thread/started）都走这里。
+   * 第一次见到就登记并宣布；已登记的只合并身份：已有的字段保留，缺的补上，补到了就发
+   * 一条带当前状态的元数据更新。不能再宣布一次：一轮结束之后才到的宣布，会让宿主把
+   * idle 当成新一轮开始。
+   */
+  upsertCollabChild(agentThreadId, identity) {
+    const fill = (known, next) => known ?? (next !== void 0 && next.length > 0 ? next : void 0);
+    const existing = this.collabChildren.get(agentThreadId);
+    const agentPath = fill(existing?.agentPath, identity.agentPath);
+    const role = fill(existing?.role, identity.role);
+    const nickname = fill(existing?.nickname, identity.nickname);
+    if (existing === void 0) {
+      const spawnTurnId = this.activeTurnId;
+      const child = {
+        agentThreadId,
+        ...agentPath ? { agentPath } : {},
+        ...role ? { role } : {},
+        ...nickname ? { nickname } : {},
+        ...spawnTurnId ? { spawnTurnId } : {},
+        status: "running"
+      };
+      this.collabChildren.set(agentThreadId, child);
+      this.emitCollab("collabAgent/started", child);
+      return;
+    }
+    if (agentPath === existing.agentPath && role === existing.role && nickname === existing.nickname) {
+      return;
+    }
+    const merged = {
+      ...existing,
+      ...agentPath ? { agentPath } : {},
+      ...role ? { role } : {},
+      ...nickname ? { nickname } : {}
+    };
+    this.collabChildren.set(agentThreadId, merged);
+    this.emitCollab("collabAgent/metadata", merged, { status: merged.status });
+  }
   emitCollab(method, child, extra) {
     const params = {
       agentThreadId: child.agentThreadId,
@@ -2648,7 +2763,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.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
           }
         });
         for (const event of events) this.emit(event);
@@ -2682,7 +2797,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.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
         }
       });
       for (const event of events) this.emit(event);
@@ -2704,7 +2819,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,
@@ -2719,6 +2834,7 @@ var CodexSessionRuntime = class {
         ...reason ? { reason } : {}
       }
     });
+    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
   }
   async respondToUserInput(requestId, answers) {
     const pending = this.pendingUserInputs.get(requestId);
@@ -2727,7 +2843,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,
@@ -2738,6 +2856,7 @@ var CodexSessionRuntime = class {
       // 契约的 answers 是 questionId → 答案 的 record，不是数组。
       payload: { answers: toCanonicalUserInputAnswers(mapped) }
     });
+    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
   }
   async withActiveWriterRecovery(run, allowUnsubscribe) {
     let lastError;
@@ -3539,15 +3658,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
@@ -3556,7 +3678,7 @@ async function verifyCodexSignIn(input) {
     const models = await listCodexModels(rpc);
     return {
       installed: true,
-      version: null,
+      version,
       readiness: "ready",
       auth,
       ...models === void 0 ? {} : { models },
@@ -3565,7 +3687,7 @@ async function verifyCodexSignIn(input) {
   } catch {
     return {
       installed: true,
-      version: null,
+      version,
       readiness: "unchecked",
       auth: { status: "unknown" },
       ...CODEX_NATIVE_MODE_REPORT
@@ -4101,7 +4223,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,
@@ -4110,6 +4232,7 @@ var createCodexInstance = (config, host) => {
     });
     let handle;
     let rpc;
+    let version = null;
     try {
       handle = await host.process.spawn({
         program: recipe.binaryPath,
@@ -4123,11 +4246,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);
@@ -4154,20 +4280,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 },
@@ -4219,7 +4345,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.2130",
+  "version": "0.2.2147",
   "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.2130"
+    "@ycodium-ai/plugin-api": "0.2.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",