@ycodium-ai/agent-codex 0.2.2143 → 0.2.2163

package/dist/index.js

@@ -1119,7 +1119,7 @@ var YCODIUM_THREAD_TOOL_INSTRUCTIONS = `
 
 The \`ycodium\` MCP server can start child threads on this environment. When \`start_thread\` is listed, use it to hand a self-contained piece of work to another thread \u2014 optionally on a different provider instance or model \u2014 instead of doing everything inline or spawning your own background processes.
 
-Call \`list_providers\` and \`list_models\` first when you want a specific provider, model, or effort level; passing an effort a model does not offer is rejected rather than ignored. Pass \`isolate: true\` when the child must not share your working tree.
+Call \`list_providers\` and \`list_models\` first when you want a specific provider, model, effort level, or another model option such as a service tier (pass those as \`options\`, with the ids and values \`list_models\` gives); a value a model does not offer is rejected rather than ignored. Pass \`isolate: true\` when the child must not share your working tree.
 
 \`start_thread\` returns as soon as the child is running. You do not need to poll: a message arrives in this thread when the child finishes, fails, stops, or needs an approval, and it names the child thread id. Use \`get_thread_activity\` to read the full transcript behind a truncated summary, \`send_message\` to follow up, \`respond_to_permission\` to answer its approval requests, and \`stop_thread\` to end it. You can only steer child threads you started yourself.
 `;
@@ -1360,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";
@@ -1582,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
       })
@@ -1605,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;
@@ -2357,14 +2385,23 @@ 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 undeliveredAnswerError(requestId, delivery) {
+function unconfirmedAnswerError(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`
+    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 {
@@ -2405,9 +2442,9 @@ var CodexSessionRuntime = class {
       codexNativeModeFor(this.runtimeMode, this.nativeModeId)
     );
   }
-  /** 给 CLI 的应答没写进去：带上线程与方法名记一行 warn。 */
-  #warnAnswerUndelivered(method, jsonRpcId, error) {
-    this.host.log.warn("codex did not receive an answer", {
+  /** 给 CLI 的应答写入失败：带上线程与方法名记一行 warn。 */
+  #warnAnswerWriteFailed(method, jsonRpcId, error) {
+    this.host.log.warn("writing an answer to codex failed", {
       threadId: this.threadId,
       method,
       jsonRpcId,
@@ -2508,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) {
@@ -2548,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);
@@ -2574,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") {
@@ -2602,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;
     }
@@ -2621,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,
@@ -2683,7 +2763,7 @@ var CodexSessionRuntime = class {
           jsonRpcId: id,
           settle: (result) => {
             this.pendingUserInputs.delete(requestId);
-            void this.rpc.respond(id, result).catch((error) => this.#warnAnswerUndelivered(method, id, error)).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);
@@ -2717,7 +2797,7 @@ var CodexSessionRuntime = class {
         identity,
         settle: (decision) => {
           this.pendingApprovals.delete(requestId);
-          void this.rpc.respond(id, decision).catch((error) => this.#warnAnswerUndelivered(method, id, error)).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);
@@ -2754,7 +2834,7 @@ var CodexSessionRuntime = class {
         ...reason ? { reason } : {}
       }
     });
-    if (delivery !== "written") throw undeliveredAnswerError(requestId, delivery);
+    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
   }
   async respondToUserInput(requestId, answers) {
     const pending = this.pendingUserInputs.get(requestId);
@@ -2776,7 +2856,7 @@ var CodexSessionRuntime = class {
       // 契约的 answers 是 questionId → 答案 的 record，不是数组。
       payload: { answers: toCanonicalUserInputAnswers(mapped) }
     });
-    if (delivery !== "written") throw undeliveredAnswerError(requestId, delivery);
+    if (delivery !== "written") throw unconfirmedAnswerError(requestId, delivery);
   }
   async withActiveWriterRecovery(run, allowUnsubscribe) {
     let lastError;
@@ -2896,6 +2976,7 @@ var CodexSessionRuntime = class {
     const config = this.#threadConfig();
     const developerInstructions = this.developerInstructions(input);
     const requestedModel = modelIdFromSelection(input.modelSelection) ?? this.model;
+    const serviceTier = modelSelectionStringOption(input.modelSelection, "serviceTier");
     const params = {
       threadId: this.nativeThreadId,
       input: this.turnInput(input),
@@ -2903,6 +2984,7 @@ var CodexSessionRuntime = class {
       approvalsReviewer: config.approvalsReviewer,
       sandboxPolicy,
       ...requestedModel ? { model: requestedModel } : {},
+      ...serviceTier ? { serviceTier } : {},
       ...developerInstructions ? { developerInstructions } : {}
     };
     const interactionMode = typeof input.interactionMode === "string" ? input.interactionMode : void 0;

package/package.json

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