@ycodium-ai/agent-codex 0.2.2634 → 0.2.2664

package/dist/index.js

@@ -424,7 +424,10 @@ var probeCodexAccount = (accountPath) => {
 
 // src/codexInstance.ts
 import * as NodeProcess from "node:process";
-import { ExecutorSpawnRefusedError } from "@ycodium-ai/plugin-api/executor";
+import {
+  describeExecutorSpawnFailure,
+  ExecutorSpawnRefusedError
+} from "@ycodium-ai/plugin-api/executor";
 
 // src/config.ts
 import { modelSelectionStringOption } from "@ycodium-ai/plugin-api/executor";
@@ -782,7 +785,8 @@ function codexCollaborationMode(input) {
     mode: input.interactionMode === "plan" ? "plan" : "default",
     settings: {
       model: input.model,
-      ...effort ? { reasoning_effort: effort } : {}
+      ...effort ? { reasoning_effort: effort } : {},
+      ...input.developerInstructions ? { developer_instructions: input.developerInstructions } : {}
     }
   };
 }
@@ -868,6 +872,8 @@ var CHILD_AGENT_EVENT_METHODS = /* @__PURE__ */ new Set([
   "turn/completed",
   "thread/status/changed",
   "thread/tokenUsage/updated",
+  "thread/settings/updated",
+  "model/rerouted",
   "item/started",
   "item/completed",
   "thread/closed",
@@ -885,7 +891,6 @@ var CHILD_CHATTER_METHODS = /* @__PURE__ */ new Set([
   "turn/plan/updated",
   "turn/diff/updated",
   "thread/name/updated",
-  "thread/settings/updated",
   "rawResponseItem/completed",
   // 子线程自己的生命周期通知不能改父线程状态（旧宿主 runtime 同名单）。
   "thread/archived",
@@ -1672,9 +1677,13 @@ function mapCollabAgentEvent(input) {
   const role = asString(input.params["agentRole"]) ?? asString(input.params["role"]) ?? pathLeaf(agentPath) ?? "general-purpose";
   const knownName = nickname ?? pathLeaf(agentPath);
   const title = knownName ?? agentThreadId;
+  const model = trimText(input.params["model"]);
+  const effort = trimText(input.params["effort"]);
   const linkage = {
     role,
     ...knownName ? { title: knownName } : {},
+    ...model ? { model } : {},
+    ...effort ? { effort } : {},
     ...agentPath ? { agentPath } : {},
     timelineBypass: true,
     rosterKind: "subagent"
@@ -1735,6 +1744,17 @@ function mapCollabAgentEvent(input) {
       })
     ];
   }
+  if (method === "collabAgent/metadataUpdated") {
+    return [
+      baseEvent({
+        type: "task.updated",
+        threadId,
+        payload: { taskId: agentThreadId, ...linkage },
+        method,
+        providerInstanceId: input.providerInstanceId
+      })
+    ];
+  }
   if (method === "collabAgent/metadata") {
     const status = asCollabChildStatus(input.params["status"]);
     if (status === void 0) return [];
@@ -1810,6 +1830,42 @@ function describeFileChangeApproval(params) {
     fileChanges: toApplyPatchFileChanges(record)
   };
 }
+function describePermissionsApproval(params) {
+  const record = isRecord3(params) ? params : {};
+  const permissions = isRecord3(record["permissions"]) ? record["permissions"] : {};
+  const fileSystem = isRecord3(permissions["fileSystem"]) ? permissions["fileSystem"] : {};
+  const network = isRecord3(permissions["network"]) ? permissions["network"] : {};
+  const pathsOf = (value) => Array.isArray(value) ? value.flatMap((entry) => typeof entry === "string" && entry.length > 0 ? [entry] : []) : [];
+  const read = pathsOf(fileSystem["read"]);
+  const write = pathsOf(fileSystem["write"]);
+  const entries = Array.isArray(fileSystem["entries"]) ? fileSystem["entries"] : [];
+  for (const entry of entries) {
+    if (!isRecord3(entry) || !isRecord3(entry["path"])) continue;
+    const target = entry["path"];
+    const path = target["type"] === "path" ? asString(target["path"]) : target["type"] === "glob_pattern" ? asString(target["pattern"]) : void 0;
+    if (!path) continue;
+    if (entry["access"] === "read") read.push(path);
+    if (entry["access"] === "write") write.push(path);
+  }
+  const reason = trimText(record["reason"]);
+  return {
+    ...reason ? { reason } : {},
+    read: [...new Set(read)],
+    write: [...new Set(write)],
+    network: network["enabled"] === true
+  };
+}
+function toPermissionsResponse(decision, params, persistent) {
+  if (decision !== "allow") return { permissions: {} };
+  const requested = isRecord3(params) && isRecord3(params["permissions"]) ? params["permissions"] : {};
+  return {
+    permissions: {
+      ...requested["fileSystem"] !== void 0 ? { fileSystem: requested["fileSystem"] } : {},
+      ...requested["network"] !== void 0 ? { network: requested["network"] } : {}
+    },
+    scope: persistent ? "session" : "turn"
+  };
+}
 function describeMcpElicitation(params) {
   const record = isRecord3(params) ? params : {};
   const appName = asString(record["appName"]) ?? asString(record["serverName"]) ?? void 0;
@@ -2409,6 +2465,8 @@ function toRequestTypeFromKind(kind) {
       return "apply_patch_approval";
     case "mcp-elicitation":
       return "mcp_elicitation_approval";
+    // 契约没有单独的权限审批类型；宿主把 unknown 当 tool 类审批卡片渲染。
+    case "permission":
     default:
       return "unknown";
   }
@@ -2431,6 +2489,7 @@ function toRequestTypeFromMethod(method) {
       return "tool_user_input";
     case "item/tool/call":
       return "dynamic_tool_call";
+    case "item/permissions/requestApproval":
     default:
       return "unknown";
   }
@@ -2475,6 +2534,17 @@ function mapServerRequestToEvents(input) {
     if (appName) payload["appName"] = appName;
     if (described.message) payload["detail"] = described.message;
     payload["args"] = input.params;
+  } else if (input.method === "item/permissions/requestApproval") {
+    const described = describePermissionsApproval(input.params);
+    const paths = [...described.read, ...described.write];
+    const detail = described.reason ?? (paths.length > 0 ? paths.join(", ") : void 0);
+    if (detail) payload["detail"] = detail;
+    payload["args"] = {
+      ...described.reason ? { reason: described.reason } : {},
+      ...described.read.length > 0 ? { read: described.read.join(", ") } : {},
+      ...described.write.length > 0 ? { write: described.write.join(", ") } : {},
+      ...described.network ? { network: "true" } : {}
+    };
   } else if (input.method === "item/fileChange/requestApproval" || input.method.includes("applyPatch")) {
     const described = describeFileChangeApproval(input.params);
     if (described.detail) payload["detail"] = described.detail;
@@ -2508,7 +2578,13 @@ function mapServerRequestToEvents(input) {
 }
 
 // src/sessionRuntime.ts
+var COLLAB_META_LOOKUP_TIMEOUT_MS = 5e3;
+function metaValue(value) {
+  const text = asString(value)?.trim();
+  return text === void 0 || text.length === 0 ? void 0 : text;
+}
 function cancelWireFor(pending) {
+  if (pending.kind === "permission") return toPermissionsResponse("cancel", pending.params, false);
   return pending.kind === "mcp-elicitation" ? toMcpElicitationResponse("cancel", pending.params) : { decision: "cancel" };
 }
 var sleep = (ms) => new Promise((resolve2) => {
@@ -2558,6 +2634,7 @@ var CodexSessionRuntime = class {
   grants;
   declineRelay;
   collabChildren = /* @__PURE__ */ new Map();
+  collabChildMeta = /* @__PURE__ */ new Map();
   liveForeignTurns = /* @__PURE__ */ new Map();
   collabReceiverTurns = /* @__PURE__ */ new Map();
   memoryThreadIds = /* @__PURE__ */ new Set();
@@ -2766,14 +2843,28 @@ var CodexSessionRuntime = class {
       }
       this.upsertCollabChild(agentThreadId, { agentPath: activity.agentPath });
     }
+    if (method === "thread/settings/updated" || method === "model/rerouted") {
+      const settings = isRecord3(params) && isRecord3(params["threadSettings"]) ? params["threadSettings"] : {};
+      const reroute = method === "model/rerouted";
+      const model = metaValue(
+        reroute ? isRecord3(params) ? params["toModel"] : void 0 : settings["model"]
+      );
+      const effort = reroute ? void 0 : metaValue(settings["effort"]);
+      this.updateCollabChildMeta(conversationId, { model, effort }, true);
+      return;
+    }
     const child = this.collabChildren.get(conversationId);
     if (method === "turn/started") {
+      this.reopenCollabChildMeta(conversationId);
       const turnId = isRecord3(params) ? asString(params["turnId"]) ?? (isRecord3(params["turn"]) ? asString(params["turn"]["id"]) : null) : null;
       if (turnId) this.liveForeignTurns.set(conversationId, turnId);
     }
     if (method === "turn/completed" || method === "thread/closed") {
       this.liveForeignTurns.delete(conversationId);
     }
+    if (method === "thread/closed" && this.collabChildren.has(conversationId)) {
+      this.metaOf(conversationId).closed = true;
+    }
     if (!child) {
       if (CHILD_CHATTER_METHODS.has(method) || !CHILD_AGENT_EVENT_METHODS.has(method)) return;
       return;
@@ -2834,6 +2925,7 @@ var CodexSessionRuntime = class {
       };
       this.collabChildren.set(agentThreadId, child);
       this.emitCollab("collabAgent/started", child);
+      this.startCollabChildMetaLookup(agentThreadId);
       return;
     }
     if (agentPath === existing.agentPath && role === existing.role && nickname === existing.nickname) {
@@ -2848,12 +2940,64 @@ var CodexSessionRuntime = class {
     this.collabChildren.set(agentThreadId, merged);
     this.emitCollab("collabAgent/metadata", merged, { status: merged.status });
   }
+  metaOf(agentThreadId) {
+    let meta = this.collabChildMeta.get(agentThreadId);
+    if (meta === void 0) {
+      meta = { lookupStarted: false, closed: false };
+      this.collabChildMeta.set(agentThreadId, meta);
+    }
+    return meta;
+  }
+  reopenCollabChildMeta(agentThreadId) {
+    const meta = this.collabChildMeta.get(agentThreadId);
+    if (meta !== void 0) meta.closed = false;
+  }
+  /**
+   * 合并子线程的型号与推理档；变了且子代理已登记就补发一条不带状态的更新。
+   * 通知报的是当前值（overwrite），回读只补缺：回读的回包可能比通知晚到，不能盖掉更新的值。
+   */
+  updateCollabChildMeta(agentThreadId, update, overwrite) {
+    const meta = this.metaOf(agentThreadId);
+    const model = update.model !== void 0 && (overwrite || !meta.model) ? update.model : meta.model;
+    const effort = update.effort !== void 0 && (overwrite || !meta.effort) ? update.effort : meta.effort;
+    if (model === meta.model && effort === meta.effort) return;
+    if (model !== void 0) meta.model = model;
+    if (effort !== void 0) meta.effort = effort;
+    const child = this.collabChildren.get(agentThreadId);
+    if (child !== void 0 && !meta.closed) this.emitCollab("collabAgent/metadataUpdated", child);
+  }
+  /**
+   * 子线程已经在 CLI 里加载着：thread/resume 只是重新接上它，不开新一轮；
+   * excludeTurns 避免把它的历史再读一遍。回包带当前的型号与推理档。
+   */
+  startCollabChildMetaLookup(agentThreadId) {
+    const meta = this.metaOf(agentThreadId);
+    if (meta.lookupStarted || meta.closed) return;
+    meta.lookupStarted = true;
+    void this.rpc.request(
+      "thread/resume",
+      { threadId: agentThreadId, excludeTurns: true },
+      COLLAB_META_LOOKUP_TIMEOUT_MS
+    ).then((response) => {
+      if (this.closed || meta.closed || !isRecord3(response)) return;
+      const thread = response["thread"];
+      if (!isRecord3(thread) || thread["id"] !== agentThreadId) return;
+      this.updateCollabChildMeta(
+        agentThreadId,
+        { model: metaValue(response["model"]), effort: metaValue(response["reasoningEffort"]) },
+        false
+      );
+    }).catch(() => void 0);
+  }
   emitCollab(method, child, extra) {
+    const meta = this.collabChildMeta.get(child.agentThreadId);
     const params = {
       agentThreadId: child.agentThreadId,
       agentPath: child.agentPath,
       agentRole: child.role ?? pathLeaf2(child.agentPath) ?? "general-purpose",
       agentNickname: child.nickname,
+      ...meta?.model ? { model: meta.model } : {},
+      ...meta?.effort ? { effort: meta.effort } : {},
       ...isRecord3(extra) ? extra : {}
     };
     for (const event of mapNotificationToEvents({
@@ -2892,6 +3036,16 @@ var CodexSessionRuntime = class {
       await this.handleApproval(id, method, params, "mcp-elicitation", described.identity);
       return;
     }
+    if (method === "item/permissions/requestApproval") {
+      await this.handleApproval(
+        id,
+        method,
+        params,
+        "permission",
+        isRecord3(params) ? asString(params["itemId"]) ?? "permission" : "permission"
+      );
+      return;
+    }
     if (method === "item/tool/requestUserInput") {
       const requestId = this.requestIdFor(id);
       const events = mapServerRequestToEvents({
@@ -2920,7 +3074,7 @@ var CodexSessionRuntime = class {
     await this.rpc.respondError(id, -32601, `Method not found: ${method}`);
   }
   async handleApproval(id, method, params, kind, identity) {
-    const grant = this.grants.lookup(codexApprovalGrantKey(kind, identity));
+    const grant = kind === "permission" ? void 0 : this.grants.lookup(codexApprovalGrantKey(kind, identity));
     if (grant) {
       const decision = wireDecisionFromPersist(kind, grant);
       await this.rpc.respond(id, { decision });
@@ -2962,7 +3116,9 @@ var CodexSessionRuntime = class {
     if (decision === "allow" && pending.kind === "mcp-elicitation") {
       wire = toMcpElicitationResponse("allow", pending.params);
     }
-    if (decision === "allow" && persist) {
+    if (pending.kind === "permission") {
+      wire = toPermissionsResponse(decision, pending.params, persist !== void 0);
+    } else if (decision === "allow" && persist) {
       this.grants.remember(codexApprovalGrantKey(pending.kind, pending.identity), persist);
       if (pending.kind !== "mcp-elicitation") {
         wire = { decision: wireDecisionFromPersist(pending.kind, persist) };
@@ -3095,10 +3251,13 @@ var CodexSessionRuntime = class {
     });
     return this.session;
   }
-  developerInstructions(input) {
-    const mode = typeof input.interactionMode === "string" ? input.interactionMode : void 0;
+  /** 宿主没给模式时沿用上一轮的模式；从没给过按 default。指令每轮都要带上。 */
+  turnInteractionMode(input) {
+    const mode = typeof input.interactionMode === "string" ? input.interactionMode : this.interactionMode ?? "default";
     this.interactionMode = mode;
-    if (mode === void 0) return void 0;
+    return mode;
+  }
+  developerInstructions(input, mode) {
     const tools = hasConfiguredMcpServer(this.appServerArgs);
     const model = this.model ?? DEFAULT_MODEL;
     const effort = modelSelectionStringOption(input.modelSelection, "reasoningEffort") ?? DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
@@ -3146,7 +3305,8 @@ var CodexSessionRuntime = class {
     }
     const sandboxPolicy = this.#turnSandboxPolicy();
     const config = this.#threadConfig();
-    const developerInstructions = this.developerInstructions(input);
+    const interactionMode = this.turnInteractionMode(input);
+    const developerInstructions = this.developerInstructions(input, interactionMode);
     const requestedModel = modelIdFromSelection(input.modelSelection) ?? this.model;
     const serviceTier = modelSelectionStringOption(input.modelSelection, "serviceTier");
     const params = {
@@ -3157,16 +3317,14 @@ var CodexSessionRuntime = class {
       sandboxPolicy,
       ...requestedModel ? { model: requestedModel } : {},
       ...serviceTier ? { serviceTier } : {},
-      ...developerInstructions ? { developerInstructions } : {}
-    };
-    const interactionMode = typeof input.interactionMode === "string" ? input.interactionMode : void 0;
-    if (interactionMode !== void 0) {
-      params["collaborationMode"] = codexCollaborationMode({
+      // 指令只能走这里：turn 顶层的 developerInstructions 会被 CLI 静默丢掉（见 codexCollaborationMode）。
+      collaborationMode: codexCollaborationMode({
         interactionMode,
         model: requestedModel ?? DEFAULT_MODEL,
-        reasoningEffort: modelSelectionStringOption(input.modelSelection, "reasoningEffort") ?? void 0
-      });
-    }
+        reasoningEffort: modelSelectionStringOption(input.modelSelection, "reasoningEffort") ?? void 0,
+        developerInstructions
+      })
+    };
     const isSteer = input.expectedTurnId !== void 0;
     const result = await markProviderRejection(
       () => isSteer ? this.rpc.request(
@@ -3265,9 +3423,10 @@ var CodexSessionRuntime = class {
     }
     return { threadId: this.threadId, turns: this.turns };
   }
-  settlePendingApprovals(decision) {
+  /** 会话收口时把还挂着的审批答成「取消」：应答形状按审批种类，权限审批不认 decision。 */
+  settlePendingApprovals() {
     for (const [requestId, pending] of this.pendingApprovals) {
-      pending.settle({ decision });
+      pending.settle(cancelWireFor(pending));
       this.pendingApprovals.delete(requestId);
     }
   }
@@ -3282,7 +3441,7 @@ var CodexSessionRuntime = class {
     this.closed = true;
     this.requestKinds.clear();
     this.failPendingNativeWrites("session closed before write confirmation");
-    this.settlePendingApprovals("cancel");
+    this.settlePendingApprovals();
     this.settlePendingUserInputs({});
     this.declineRelay.clear(this.threadId);
     this.grants.clear();
@@ -3871,7 +4030,7 @@ async function verifyCodexSignIn(input) {
     return {
       installed: false,
       version: null,
-      readiness: "error",
+      readiness: "not-installed",
       auth: { status: "unknown" },
       detail: "Codex program path is not configured"
     };
@@ -4381,6 +4540,10 @@ ${extra}` : ""}`;
 }
 
 // src/codexInstance.ts
+function missingBinaryDetail(binaryPath) {
+  const relyOnPath = !/[\\/]/.test(binaryPath);
+  return `Could not start Codex (${binaryPath}). Check the "Program path" setting of this provider on this machine.` + (relyOnPath ? " The Codex desktop app may not add codex to PATH; enter the full path to the codex executable there." : " Make sure the configured file exists and can be run.");
+}
 var yieldTick = () => new Promise((resolve2) => {
   setImmediate(resolve2);
 });
@@ -4462,12 +4625,26 @@ var createCodexInstance = (config, host, attachments) => {
     let rpc;
     let version = null;
     try {
-      handle = await host.process.spawn({
-        program: recipe.binaryPath,
-        args: [...codexSpawnArgs(recipe, layout)],
-        owner: { bindingId: host.bindingId },
-        ...Object.keys(env).length > 0 ? { env } : {}
-      });
+      try {
+        handle = await host.process.spawn({
+          program: recipe.binaryPath,
+          args: [...codexSpawnArgs(recipe, layout)],
+          owner: { bindingId: host.bindingId },
+          ...Object.keys(env).length > 0 ? { env } : {}
+        });
+      } catch (error) {
+        if (error instanceof ExecutorSpawnRefusedError) throw error;
+        host.log.warn("codex binary could not be started", {
+          program: recipe.binaryPath,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        return {
+          version: null,
+          models: void 0,
+          skills: void 0,
+          spawnFailed: describeExecutorSpawnFailure(error)
+        };
+      }
       trackHandle(handle, `${recipe.binaryPath} (probe)`);
       rpc = await createCodexRpcClient(handle, {
         onNotification: () => void 0,
@@ -4479,10 +4656,10 @@ var createCodexInstance = (config, host, attachments) => {
       );
       await rpc.notify("initialized");
       const models = input.listModels ? await listCodexModels(rpc) : void 0;
-      return { version, models, skills: await listCodexSkills(rpc) };
+      return { version, models, skills: await listCodexSkills(rpc), spawnFailed: null };
     } catch (error) {
       if (error instanceof ExecutorSpawnRefusedError) throw error;
-      return { version, models: void 0, skills: void 0 };
+      return { version, models: void 0, skills: void 0, spawnFailed: null };
     } finally {
       await rpc?.close().catch(() => void 0);
       await handle?.kill("SIGTERM").catch(() => void 0);
@@ -4503,15 +4680,24 @@ var createCodexInstance = (config, host, attachments) => {
         return {
           installed: false,
           version: null,
-          readiness: "error",
+          readiness: "not-installed",
           auth: { status: "unknown" },
           detail: "Codex program path is not configured"
         };
       }
       const connectionError = codexApiConnectionError(recipe, recipe.environment);
-      const { version, models, skills } = await probeAppServer({
+      const { version, models, skills, spawnFailed } = await probeAppServer({
         listModels: connectionError === null
       });
+      if (spawnFailed !== null) {
+        return {
+          installed: false,
+          version: null,
+          readiness: spawnFailed.readiness,
+          auth: { status: "unknown" },
+          detail: spawnFailed.readiness === "not-installed" ? missingBinaryDetail(recipe.binaryPath) : spawnFailed.detail
+        };
+      }
       if (connectionError) {
         return {
           installed: true,

package/package.json

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