@ycodium-ai/agent-codex 0.2.2098 → 0.2.2126

package/dist/index.js

@@ -43,6 +43,8 @@ var CODEX_CARD = {
     sessionModelSwitch: "in-session",
     exclusiveSessionWriter: true,
     runtimeModeSwitch: "next-turn",
+    // 三字段组合在 openThread 时定，切档要重开会话（与 runtimeModeSwitch 同为 next-turn）。
+    nativeModeSwitch: true,
     contextCompaction: "native"
   },
   credentialSources: [],
@@ -69,7 +71,22 @@ var CODEX_CARD = {
     acceptsExternalEndpoints: true,
     nativePathSuffix: "/responses",
     credentialEnvKey: "CODEX_API_KEY",
-    supportsNativeSubscription: true
+    supportsNativeSubscription: true,
+    // codex 不认「地址一个变量」：端点写在 `-c model_providers.<id>.base_url` 上，
+    // 凭据只能经环境变量、变量名还得告诉它。`$providerId` / `$credentialEnvKey`
+    // 由宿主按 binding 生成，同一台机器上两份绑定因此不抢同一个变量名。
+    //
+    // `forced_login_method=api` 要写在最后：chatgpt 实例自己先注了
+    // `forced_login_method=chatgpt`，不盖掉的话手仍走订阅登录，代理地址白注。
+    extraLaunchArgs: [
+      { key: "model_provider", value: "$providerId" },
+      { key: "model_providers.$providerId.name", value: "Ycodium API" },
+      { key: "model_providers.$providerId.base_url", value: "$baseUrl" },
+      { key: "model_providers.$providerId.env_key", value: "$credentialEnvKey" },
+      { key: "model_providers.$providerId.requires_openai_auth", value: false },
+      { key: "model_providers.$providerId.wire_api", value: "responses" },
+      { key: "forced_login_method", value: "api" }
+    ]
   }
 };
 
@@ -172,6 +189,7 @@ var readCodexAccount = (homePath) => {
 };
 
 // src/config.ts
+import { modelSelectionStringOption } from "@ycodium-ai/plugin-api/executor";
 var CODEX_INSTANCE_API_KEY_ENV = "YCODIUM_CODEX_API_KEY";
 var CODEX_INSTANCE_MODEL_PROVIDER = "ycodium_api";
 function isRecord2(value) {
@@ -299,6 +317,40 @@ function codexExecLaunchArgs(launchArgs) {
 function hasConfiguredMcpServer(appServerArgs) {
   return appServerArgs.some((arg) => arg.includes("mcp_servers."));
 }
+var BUILTIN_MCP_SERVER_NAME = "ycodium";
+function codexBearerTokenEnvVar(name) {
+  return name === BUILTIN_MCP_SERVER_NAME ? "YCODIUM_MCP_BEARER_TOKEN" : `YCODIUM_MCP_TOKEN_${name.toUpperCase().replaceAll(/[^A-Z0-9]/g, "_")}`;
+}
+function codexMcpLaunchConfig(servers) {
+  const args = [];
+  const environment = {};
+  const toml = (value) => JSON.stringify(value);
+  for (const server of servers) {
+    const key = `mcp_servers.${server.name}`;
+    if (server.transport.type === "stdio") {
+      args.push("-c", `${key}.command=${toml(server.transport.command)}`);
+      const commandArgs = server.transport.args ?? [];
+      if (commandArgs.length > 0) {
+        args.push("-c", `${key}.args=[${commandArgs.map(toml).join(",")}]`);
+      }
+      for (const [name, value] of Object.entries(server.transport.env ?? {})) {
+        args.push("-c", `${key}.env.${name}=${toml(value)}`);
+      }
+      continue;
+    }
+    args.push("-c", `${key}.url=${server.transport.url}`);
+    const bearer = server.transport.headers?.["Authorization"]?.replace(/^Bearer\s+/, "");
+    if (bearer) {
+      const envVar = codexBearerTokenEnvVar(server.name);
+      environment[envVar] = bearer;
+      args.push("-c", `${key}.bearer_token_env_var=${toml(envVar)}`);
+    }
+  }
+  return { args, environment };
+}
+function codexOverrideArgs(overrides) {
+  return overrides.flatMap(({ key, value }) => ["-c", `${key}=${JSON.stringify(value)}`]);
+}
 function encodeCodexConfigOverrides(overrides) {
   return overrides.map(({ key, value }) => `-c ${JSON.stringify(`${key}=${JSON.stringify(value)}`)}`).join(" ");
 }
@@ -309,44 +361,9 @@ function modelIdFromSelection(selection) {
   const model = selection["model"];
   return typeof model === "string" ? model.trim() || void 0 : void 0;
 }
-function modelSelectionStringOption(selection, optionId) {
-  if (typeof selection !== "object" || selection === null || Array.isArray(selection)) {
-    return void 0;
-  }
-  const options = selection["options"];
-  if (!Array.isArray(options)) return void 0;
-  for (const entry of options) {
-    if (typeof entry !== "object" || entry === null || Array.isArray(entry)) continue;
-    const id = entry["id"];
-    if (id !== optionId) continue;
-    const value = entry["value"];
-    return typeof value === "string" ? value.trim() || void 0 : void 0;
-  }
-  return void 0;
-}
-
-// src/paths.ts
-import * as NodeOS from "node:os";
-import * as NodePath2 from "node:path";
-function expandHomePath(value) {
-  if (value === "~") return NodeOS.homedir();
-  if (value.startsWith("~/") || value.startsWith("~\\")) {
-    return NodePath2.join(NodeOS.homedir(), value.slice(2));
-  }
-  return value;
-}
-function compactEnv(env) {
-  const out = {};
-  for (const [key, value] of Object.entries(env)) {
-    if (value !== void 0) out[key] = value;
-  }
-  return out;
-}
-function nowIso() {
-  return (/* @__PURE__ */ new Date()).toISOString();
-}
 
 // src/connection.ts
+import { mergeLaunchEnv, brainSlotEnvKeys } from "@ycodium-ai/plugin-api/executor";
 function codexApiConnectionError(recipe, environment) {
   if (recipe.authMode !== "apiKey") return null;
   try {
@@ -386,38 +403,40 @@ function connectionArgv(recipe, layout) {
   }
   return args;
 }
-function codexSpawnArgs(recipe, layout) {
+function codexSpawnArgs(recipe, layout, nativeSubscription = false) {
+  if (nativeSubscription) {
+    return [
+      ...tokenizeLaunchArgs(recipe.launchArgs),
+      "-c",
+      `model_provider=${JSON.stringify("openai")}`,
+      "-c",
+      `forced_login_method=${JSON.stringify("chatgpt")}`
+    ];
+  }
   const needsOverrides = layout.mode === "authOverlay" || recipe.authMode !== "default";
   if (!needsOverrides) return tokenizeLaunchArgs(recipe.launchArgs);
   return connectionArgv(recipe, layout);
 }
-function crushInheritedApiKeys(env) {
-  const out = { ...env };
-  delete out["OPENAI_API_KEY"];
-  delete out["CODEX_API_KEY"];
-  return out;
-}
+var CRUSHED_API_KEYS = {
+  OPENAI_API_KEY: void 0,
+  CODEX_API_KEY: void 0
+};
 function buildCodexSpawnEnv(input) {
-  const merged = {
-    ...compactEnv(input.processEnv),
-    ...input.layout.effectiveHomePath !== void 0 ? { CODEX_HOME: input.layout.effectiveHomePath } : {},
-    ...input.recipe.environment
-  };
-  const withoutHomeOverride = { ...merged };
-  if (input.processEnv["HOME"] !== void 0) {
-    withoutHomeOverride["HOME"] = input.processEnv["HOME"];
-  } else {
-    delete withoutHomeOverride["HOME"];
-  }
-  return input.crushApiKeys ? crushInheritedApiKeys(withoutHomeOverride) : withoutHomeOverride;
+  const { HOME: _instanceHome, ...instanceTable } = input.recipe.environment;
+  return mergeLaunchEnv({
+    brainSlots: brainSlotEnvKeys(CODEX_CARD),
+    accountHome: input.layout.effectiveHomePath !== void 0 ? { CODEX_HOME: input.layout.effectiveHomePath } : {},
+    instanceTable,
+    handOverrides: input.crushApiKeys ? CRUSHED_API_KEYS : {},
+    launch: input.launchEnv
+  });
 }
 function nativeLoginSpawnEnv(processEnv, isolatedHome) {
-  const merged = compactEnv(processEnv);
-  delete merged["OPENAI_API_KEY"];
-  delete merged["CODEX_API_KEY"];
-  delete merged["CODEX_HOME"];
-  merged["CODEX_HOME"] = isolatedHome;
-  return merged;
+  return mergeLaunchEnv({
+    brainSlots: brainSlotEnvKeys(CODEX_CARD),
+    inherited: processEnv,
+    handOverrides: { ...CRUSHED_API_KEYS, CODEX_HOME: isolatedHome }
+  });
 }
 function shouldCrushApiKeys(authMode) {
   return authMode === "chatgpt";
@@ -427,6 +446,22 @@ function shouldCrushApiKeys(authMode) {
 import * as NodeFSP from "node:fs/promises";
 import * as NodeOS2 from "node:os";
 import * as NodePath3 from "node:path";
+
+// src/paths.ts
+import * as NodeOS from "node:os";
+import * as NodePath2 from "node:path";
+function expandHomePath(value) {
+  if (value === "~") return NodeOS.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return NodePath2.join(NodeOS.homedir(), value.slice(2));
+  }
+  return value;
+}
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+
+// src/homeLayout.ts
 var KNOWN_SHARED_DIRECTORIES = [
   "sessions",
   "archived_sessions",
@@ -512,6 +547,16 @@ async function ensureSymlink(input) {
     await createEntryLink(target, link);
   }
 }
+async function makeDirectory(directoryPath) {
+  try {
+    await NodeFSP.mkdir(directoryPath, { recursive: true });
+  } catch (error) {
+    throw new Error(
+      `Codex shadow home filesystem operation 'makeDirectory' failed for '${directoryPath}': ${String(error)}`,
+      { cause: error }
+    );
+  }
+}
 async function materializeCodexShadowHome(layout, log) {
   if (layout.mode !== "authOverlay") return;
   const effectiveHomePath = layout.effectiveHomePath;
@@ -521,11 +566,11 @@ async function materializeCodexShadowHome(layout, log) {
       `Codex shadow home path '${effectiveHomePath}' must be different from the shared home path '${layout.sharedHomePath}'.`
     );
   }
-  await NodeFSP.mkdir(layout.sharedHomePath, { recursive: true });
-  await NodeFSP.mkdir(effectiveHomePath, { recursive: true });
+  await makeDirectory(layout.sharedHomePath);
+  await makeDirectory(effectiveHomePath);
   await Promise.all(
     KNOWN_SHARED_DIRECTORIES.map(
-      (directory) => NodeFSP.mkdir(NodePath3.join(layout.sharedHomePath, directory), { recursive: true })
+      (directory) => makeDirectory(NodePath3.join(layout.sharedHomePath, directory))
     )
   );
   let sharedEntryNames = [];
@@ -584,6 +629,73 @@ var ACTIVE_WRITER_ATTEMPTS = 5;
 var ACTIVE_WRITER_DELAY_MS = 200;
 var DEFAULT_MODEL = "gpt-5.6-sol";
 var DEFAULT_TEXT_GENERATION_REASONING_EFFORT = "low";
+var CODEX_NATIVE_MODES = [
+  {
+    id: "read-only",
+    name: "Read only",
+    description: "Sandboxed to reading. Asks before anything that writes or runs."
+  },
+  {
+    id: "workspace-write",
+    name: "Workspace write",
+    description: "Writes inside the workspace. Asks you before stepping outside it."
+  },
+  {
+    id: "auto-review",
+    name: "Auto review",
+    description: "Writes inside the workspace. Codex approves its own requests, not you."
+  },
+  {
+    id: "full-access",
+    name: "Full access",
+    description: "No sandbox, never asks. Every command runs immediately."
+  }
+];
+var CODEX_DEFAULT_NATIVE_MODE_ID = "read-only";
+var CODEX_NATIVE_MODE_BY_RUNTIME_MODE = {
+  "approval-required": "read-only",
+  "auto-accept-edits": "workspace-write",
+  auto: "auto-review",
+  "full-access": "full-access"
+};
+var CODEX_NATIVE_MODE_REPORT = {
+  nativeModes: CODEX_NATIVE_MODES.map((mode) => ({
+    id: mode.id,
+    name: mode.name,
+    description: mode.description
+  })),
+  currentNativeModeId: CODEX_DEFAULT_NATIVE_MODE_ID,
+  nativeModeByRuntimeMode: CODEX_NATIVE_MODE_BY_RUNTIME_MODE
+};
+function isCodexNativeModeId(value) {
+  return CODEX_NATIVE_MODES.some((mode) => mode.id === value);
+}
+function codexNativeModeFor(runtimeMode, nativeModeId) {
+  return nativeModeId !== void 0 && isCodexNativeModeId(nativeModeId) ? nativeModeId : CODEX_NATIVE_MODE_BY_RUNTIME_MODE[runtimeMode];
+}
+function codexThreadConfigForNativeMode(nativeModeId) {
+  switch (nativeModeId) {
+    case "workspace-write":
+      return runtimeModeToThreadConfig("auto-accept-edits");
+    case "auto-review":
+      return runtimeModeToThreadConfig("auto");
+    case "full-access":
+      return runtimeModeToThreadConfig("full-access");
+    default:
+      return runtimeModeToThreadConfig("approval-required");
+  }
+}
+function codexTurnSandboxPolicyForNativeMode(nativeModeId) {
+  switch (nativeModeId) {
+    case "workspace-write":
+    case "auto-review":
+      return runtimeModeToTurnSandboxPolicy("auto-accept-edits");
+    case "full-access":
+      return runtimeModeToTurnSandboxPolicy("full-access");
+    default:
+      return runtimeModeToTurnSandboxPolicy("approval-required");
+  }
+}
 function runtimeModeToThreadConfig(mode) {
   switch (mode) {
     case "approval-required":
@@ -617,6 +729,16 @@ function runtimeModeToTurnSandboxPolicy(mode) {
       return { type: "dangerFullAccess" };
   }
 }
+function codexCollaborationMode(input) {
+  const effort = input.reasoningEffort?.trim();
+  return {
+    mode: input.interactionMode === "plan" ? "plan" : "default",
+    settings: {
+      model: input.model,
+      ...effort ? { reasoning_effort: effort } : {}
+    }
+  };
+}
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -697,11 +819,19 @@ var CHILD_AGENT_EVENT_METHODS = /* @__PURE__ */ new Set([
 ]);
 var CHILD_CHATTER_METHODS = /* @__PURE__ */ new Set([
   "item/agentMessage/delta",
-  "item/reasoning/delta",
-  "item/reasoning/summaryDelta",
+  "item/reasoning/textDelta",
+  "item/reasoning/summaryTextDelta",
   "item/reasoning/summaryPartAdded",
+  "item/commandExecution/outputDelta",
+  "item/fileChange/outputDelta",
+  "item/fileChange/patchUpdated",
   "item/plan/delta",
+  "turn/plan/updated",
+  "turn/diff/updated",
   "thread/name/updated",
+  "thread/settings/updated",
+  "rawResponseItem/completed",
+  // 子线程自己的生命周期通知不能改父线程状态（旧宿主 runtime 同名单）。
   "thread/archived",
   "thread/unarchived",
   "thread/compacted",
@@ -1120,95 +1250,6 @@ function buildCodexDeveloperInstructions(interactionMode, runtime, browserToolsA
 <runtime_info>In case you're asked: you are running in Ycodium through the Codex harness, as ${toSingleLine(runtime.model)} with ${toSingleLine(runtime.reasoningEffort)} reasoning effort. No need to mention this otherwise.</runtime_info>`;
 }
 
-// src/imageMime.ts
-var IMAGE_EXTENSION_BY_MIME_TYPE = {
-  "image/avif": ".avif",
-  "image/bmp": ".bmp",
-  "image/gif": ".gif",
-  "image/heic": ".heic",
-  "image/heif": ".heif",
-  "image/jpeg": ".jpg",
-  "image/jpg": ".jpg",
-  "image/png": ".png",
-  "image/svg+xml": ".svg",
-  "image/tiff": ".tiff",
-  "image/webp": ".webp"
-};
-var SAFE_IMAGE_FILE_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".avif",
-  ".bmp",
-  ".gif",
-  ".heic",
-  ".heif",
-  ".ico",
-  ".jpeg",
-  ".jpg",
-  ".png",
-  ".svg",
-  ".tiff",
-  ".webp"
-]);
-function isBase64Char(code) {
-  return code >= 97 && code <= 122 || code >= 65 && code <= 90 || code >= 48 && code <= 57 || code === 43 || code === 47 || code === 61;
-}
-function isBase64Whitespace(code) {
-  return code === 13 || code === 10 || code === 32;
-}
-function parseBase64DataUrl(dataUrl) {
-  const trimmed = dataUrl.trim();
-  if (trimmed.slice(0, 5).toLowerCase() !== "data:") return null;
-  const commaIndex = trimmed.indexOf(",");
-  if (commaIndex === -1) return null;
-  const header = trimmed.slice(5, commaIndex);
-  if (header.length === 0) return null;
-  const headerParts = [];
-  for (const part of header.split(";")) {
-    const partTrimmed = part.trim();
-    if (partTrimmed.length > 0) headerParts.push(partTrimmed);
-  }
-  if (headerParts.length < 2) return null;
-  const trailingToken = headerParts.at(-1)?.toLowerCase();
-  if (trailingToken !== "base64") return null;
-  const mimeType = headerParts[0]?.toLowerCase();
-  if (!mimeType) return null;
-  const payload = trimmed.slice(commaIndex + 1);
-  const runs = [];
-  let runStart = -1;
-  for (let index = 0; index < payload.length; index += 1) {
-    const code = payload.charCodeAt(index);
-    if (isBase64Char(code)) {
-      if (runStart === -1) runStart = index;
-      continue;
-    }
-    if (!isBase64Whitespace(code)) return null;
-    if (runStart !== -1) {
-      runs.push(payload.slice(runStart, index));
-      runStart = -1;
-    }
-  }
-  if (runStart !== -1) runs.push(payload.slice(runStart));
-  const base64 = runs.length === 1 ? runs[0] : runs.join("");
-  if (base64.length === 0 || base64.length % 4 !== 0) return null;
-  const firstPad = base64.indexOf("=");
-  if (firstPad !== -1) {
-    if (base64.length - firstPad > 2) return null;
-    for (let index = firstPad; index < base64.length; index += 1) {
-      if (base64.charCodeAt(index) !== 61) return null;
-    }
-  }
-  return { mimeType, base64 };
-}
-function inferImageExtension(input) {
-  const key = input.mimeType.toLowerCase();
-  const fromMime = Object.hasOwn(IMAGE_EXTENSION_BY_MIME_TYPE, key) ? IMAGE_EXTENSION_BY_MIME_TYPE[key] : void 0;
-  if (fromMime) return fromMime;
-  const fileName = input.fileName?.trim() ?? "";
-  const extensionMatch = /\.([a-z0-9]{1,8})$/i.exec(fileName);
-  const fileNameExtension = extensionMatch ? `.${extensionMatch[1].toLowerCase()}` : "";
-  if (SAFE_IMAGE_FILE_EXTENSIONS.has(fileNameExtension)) return fileNameExtension;
-  return ".bin";
-}
-
 // src/events.ts
 var CODEX_PROVIDER = "codex";
 var eventSeq = 0;
@@ -1225,28 +1266,27 @@ function nowIso2() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
 function normalizeItemType(value) {
-  if (!value) return "unknown";
-  return value.replace(/([a-z])([A-Z])/g, "$1 $2").replace(/[_/.-]+/g, " ").toLowerCase().trim();
+  if (!value) return "item";
+  return value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[._/-]/g, " ").replace(/\s+/g, " ").trim().toLowerCase();
 }
 function toCanonicalItemType(raw) {
   const type = normalizeItemType(raw);
-  if (type.includes("user") && type.includes("message")) return "user";
-  if (type.includes("agent") && type.includes("message")) return "assistant";
-  if (type.includes("assistant")) return "assistant";
-  if (type.includes("reason") || type.includes("thought")) return "reasoning";
+  if (type.includes("user")) return "user_message";
+  if (type.includes("agent message") || type.includes("assistant")) return "assistant_message";
+  if (type.includes("reasoning") || type.includes("thought")) return "reasoning";
   if (type.includes("plan") || type.includes("todo")) return "plan";
-  if (type.includes("command")) return "command";
+  if (type.includes("command")) return "command_execution";
   if (type.includes("file change") || type.includes("patch") || type.includes("edit")) {
-    return "fileChange";
-  }
-  if (type.includes("mcp")) return "mcp";
-  if (type.includes("dynamic tool")) return "dynamicTool";
-  if (type.includes("collab")) return "collab";
-  if (type.includes("web search")) return "webSearch";
-  if (type.includes("image")) return "image";
-  if (type.includes("review entered")) return "reviewEntered";
-  if (type.includes("review exited")) return "reviewExited";
-  if (type.includes("compact")) return "compact";
+    return "file_change";
+  }
+  if (type.includes("mcp")) return "mcp_tool_call";
+  if (type.includes("dynamic tool")) return "dynamic_tool_call";
+  if (type.includes("collab")) return "collab_agent_tool_call";
+  if (type.includes("web search")) return "web_search";
+  if (type.includes("image")) return "image_view";
+  if (type.includes("review entered")) return "review_entered";
+  if (type.includes("review exited")) return "review_exited";
+  if (type.includes("compact")) return "context_compaction";
   if (type.includes("error")) return "error";
   return "unknown";
 }
@@ -1255,6 +1295,11 @@ function itemIdOf(params) {
   const item = isRecord3(params["item"]) ? params["item"] : params;
   return asString(item["id"]) ?? asString(params["itemId"]) ?? void 0;
 }
+function itemStatusOf(params) {
+  if (!isRecord3(params)) return void 0;
+  const item = isRecord3(params["item"]) ? params["item"] : params;
+  return asString(item["status"]) ?? void 0;
+}
 function turnIdOf(params) {
   if (!isRecord3(params)) return void 0;
   return asString(params["turnId"]) ?? (isRecord3(params["turn"]) ? asString(params["turn"]["id"]) : null) ?? void 0;
@@ -1287,45 +1332,45 @@ function toTurnStatus(status) {
       return "completed";
   }
 }
-function toThreadState(status) {
-  if (status === "idle") return "idle";
-  if (status === "systemError" || status === "error") return "error";
+function threadStateFromStatus(status) {
+  const type = isRecord3(status) ? asString(status["type"]) : asString(status);
+  if (type === "idle") return "idle";
+  if (type === "systemError" || type === "error") return "error";
   return "active";
 }
-function contentStreamKindFromMethod(method) {
-  if (method.includes("agentMessage")) return "assistant";
-  if (method.includes("reasoning")) return "reasoning";
-  if (method.includes("plan")) return "plan";
-  return void 0;
+function codexCompactionId(threadId, turnId) {
+  return `codex:${threadId}:${turnId ?? "session"}`;
 }
-function normalizeCodexTokenUsage(params) {
-  if (!isRecord3(params)) return void 0;
-  const usage = isRecord3(params["usage"]) ? params["usage"] : params;
-  const last = isRecord3(usage["last"]) ? usage["last"] : usage;
-  const total = isRecord3(usage["total"]) ? usage["total"] : void 0;
-  const usedTokens = asNumber(last["totalTokens"]) ?? asNumber(last["total_tokens"]);
-  if (usedTokens === null || usedTokens <= 0) return void 0;
-  const totalProcessed = total ? asNumber(total["totalTokens"]) ?? asNumber(total["total_tokens"]) : null;
-  const payload = {
+function normalizeCodexTokenUsage(tokenUsage) {
+  if (!isRecord3(tokenUsage)) return void 0;
+  const last = isRecord3(tokenUsage["last"]) ? tokenUsage["last"] : void 0;
+  const total = isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
+  const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+  const usedTokens = count(last?.["totalTokens"]);
+  if (usedTokens === void 0 || usedTokens <= 0) return void 0;
+  const totalProcessedTokens = count(total?.["totalTokens"]);
+  const maxTokens = count(tokenUsage["modelContextWindow"]);
+  const inputTokens = count(last?.["inputTokens"]);
+  const cachedInputTokens = count(last?.["cachedInputTokens"]);
+  const outputTokens = count(last?.["outputTokens"]);
+  const reasoningOutputTokens = count(last?.["reasoningOutputTokens"]);
+  return {
     usedTokens,
+    lastUsedTokens: usedTokens,
+    ...totalProcessedTokens !== void 0 && totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
+    ...maxTokens !== void 0 && maxTokens > 0 ? { maxTokens } : {},
+    ...inputTokens !== void 0 ? { inputTokens, lastInputTokens: inputTokens } : {},
+    ...cachedInputTokens !== void 0 ? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens } : {},
+    ...outputTokens !== void 0 ? { outputTokens, lastOutputTokens: outputTokens } : {},
+    ...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens } : {},
     compactsAutomatically: true
   };
-  if (totalProcessed !== null && totalProcessed > usedTokens) {
-    payload["totalProcessedTokens"] = totalProcessed;
-  }
-  const maxTokens = asNumber(params["modelContextWindow"]) ?? asNumber(usage["modelContextWindow"]);
-  if (maxTokens !== null && maxTokens > 0) payload["maxTokens"] = maxTokens;
-  const lastInput = asNumber(last["inputTokens"]) ?? asNumber(last["input_tokens"]);
-  const lastOutput = asNumber(last["outputTokens"]) ?? asNumber(last["output_tokens"]);
-  if (lastInput !== null) payload["lastInputTokens"] = lastInput;
-  if (lastOutput !== null) payload["lastOutputTokens"] = lastOutput;
-  return payload;
 }
 function turnCompletedControlFlow(params) {
   const turn = isRecord3(params) ? isRecord3(params["turn"]) ? params["turn"] : params : {};
-  const status = toTurnStatus(asString(turn["status"]) ?? void 0);
+  const state = toTurnStatus(asString(turn["status"]) ?? void 0);
   const error = isRecord3(turn["error"]) ? trimText(turn["error"]["message"]) : void 0;
-  return error ? { status, errorMessage: error } : { status };
+  return error ? { state, errorMessage: error } : { state };
 }
 function toApplyPatchFileChanges(params) {
   if (!isRecord3(params)) return [];
@@ -1343,10 +1388,33 @@ function toApplyPatchFileChanges(params) {
     if (!path) continue;
     const kind = (asString(entry["type"]) ?? asString(entry["kind"]) ?? "update").toLowerCase();
     const movePath = asString(entry["move_path"]) ?? asString(entry["movePath"]);
-    if (kind === "add") out.push({ path, kind: "add" });
-    else if (kind === "delete") out.push({ path, kind: "delete" });
-    else if (movePath) out.push({ path, kind: "rename", to: movePath });
-    else out.push({ path, kind: "modify" });
+    const diff = asString(entry["unified_diff"]) ?? asString(entry["unifiedDiff"]);
+    const content = asString(entry["content"]);
+    if (kind === "add") {
+      out.push({
+        path,
+        changeKind: "add",
+        ...content !== void 0 ? { content: { kind: "replace", newText: content } } : {}
+      });
+    } else if (kind === "delete") {
+      out.push({
+        path,
+        changeKind: "delete",
+        ...content !== void 0 ? { content: { kind: "replace", oldText: content, newText: "" } } : {}
+      });
+    } else if (movePath) {
+      out.push({
+        path,
+        changeKind: "rename",
+        ...diff ? { content: { kind: "unified", diff } } : {}
+      });
+    } else {
+      out.push({
+        path,
+        changeKind: "modify",
+        ...diff ? { content: { kind: "unified", diff } } : {}
+      });
+    }
   }
   return out;
 }
@@ -1359,7 +1427,18 @@ function toUserInputQuestions(params) {
     const id = asString(question["id"]);
     const header = asString(question["header"]);
     const text = asString(question["question"]);
-    const options = Array.isArray(question["options"]) ? question["options"] : [];
+    const rawOptions = Array.isArray(question["options"]) ? question["options"] : [];
+    const options = [];
+    for (const option of rawOptions) {
+      if (!isRecord3(option)) continue;
+      const label = trimText(option["label"]);
+      if (!label) continue;
+      options.push({
+        ...asString(option["id"]) ? { id: asString(option["id"]) } : {},
+        label,
+        description: trimText(option["description"]) ?? ""
+      });
+    }
     if (!id || !header || !text || options.length === 0) return void 0;
     mapped.push({
       id,
@@ -1372,15 +1451,32 @@ function toUserInputQuestions(params) {
   return mapped.length > 0 ? mapped : void 0;
 }
 function toCodexUserInputAnswers(answers) {
-  if (typeof answers === "string") return [answers];
-  if (Array.isArray(answers) && answers.every((entry) => typeof entry === "string")) {
-    return answers;
-  }
-  if (isRecord3(answers) && Array.isArray(answers["answers"])) {
-    const values = answers["answers"];
-    if (values.every((entry) => typeof entry === "string")) return values;
+  if (!isRecord3(answers)) return void 0;
+  const out = {};
+  for (const [questionId, value] of Object.entries(answers)) {
+    if (typeof value === "string") {
+      out[questionId] = { answers: [value] };
+      continue;
+    }
+    if (Array.isArray(value) && value.every((entry) => typeof entry === "string")) {
+      out[questionId] = { answers: [...value] };
+      continue;
+    }
+    if (isRecord3(value) && Array.isArray(value["answers"]) && value["answers"].every((entry) => typeof entry === "string")) {
+      out[questionId] = { answers: [...value["answers"]] };
+      continue;
+    }
+    return void 0;
   }
-  return void 0;
+  return out;
+}
+function toCanonicalUserInputAnswers(answers) {
+  return Object.fromEntries(
+    Object.entries(answers).map(([questionId, value]) => [
+      questionId,
+      value.answers.length === 1 ? value.answers[0] : [...value.answers]
+    ])
+  );
 }
 function pathLeaf(value) {
   if (!value) return void 0;
@@ -1418,10 +1514,11 @@ function mapCollabAgentEvent(input) {
   const agentPath = asString(input.params["agentPath"]) ?? asString(input.params["path"]) ?? void 0;
   const nickname = asString(input.params["agentNickname"]) ?? asString(input.params["nickname"]);
   const role = asString(input.params["agentRole"]) ?? asString(input.params["role"]) ?? pathLeaf(agentPath) ?? "general-purpose";
-  const title = nickname ?? pathLeaf(agentPath) ?? agentThreadId;
+  const knownName = nickname ?? pathLeaf(agentPath);
+  const title = knownName ?? agentThreadId;
   const linkage = {
     role,
-    title,
+    ...knownName ? { title: knownName } : {},
     ...agentPath ? { agentPath } : {},
     timelineBypass: true
   };
@@ -1439,14 +1536,17 @@ function mapCollabAgentEvent(input) {
     ];
   }
   if (method === "collabAgent/progress" || method === "task.progress") {
+    const summary = trimText(input.params["detail"]) ?? trimText(input.params["text"]);
     return [
       baseEvent({
         type: "task.progress",
         threadId,
+        // 契约 TaskProgressPayload 的 description 是必填；子代理行靠它显示名字。
         payload: {
           taskId: agentThreadId,
-          ...linkage,
-          detail: trimText(input.params["detail"]) ?? trimText(input.params["text"])
+          description: title,
+          ...summary ? { summary } : {},
+          ...linkage
         },
         method,
         providerInstanceId: input.providerInstanceId
@@ -1456,37 +1556,53 @@ function mapCollabAgentEvent(input) {
   if (method === "collabAgent/completed" || method === "task.completed") {
     return [
       baseEvent({
-        type: "task.completed",
+        type: "task.updated",
         threadId,
-        payload: { taskId: agentThreadId, ...linkage },
+        payload: { taskId: agentThreadId, status: "idle", ...linkage },
         method,
         providerInstanceId: input.providerInstanceId
       })
     ];
   }
   if (method === "collabAgent/statusChanged") {
+    const raw = asString(input.params["status"]);
+    const status = raw === "systemError" || raw === "error" ? "failed" : raw === "idle" ? "idle" : "running";
     return [
       baseEvent({
         type: "task.updated",
         threadId,
-        payload: {
-          taskId: agentThreadId,
-          ...linkage,
-          status: asString(input.params["status"]) ?? "running"
-        },
+        payload: { taskId: agentThreadId, status, ...linkage },
         method,
         providerInstanceId: input.providerInstanceId
       })
     ];
   }
   if (method === "collabAgent/tokenUsage") {
-    const usage = normalizeCodexTokenUsage(input.params);
-    if (!usage) return [];
+    const tokenUsage = isRecord3(input.params["tokenUsage"]) ? input.params["tokenUsage"] : void 0;
+    const total = tokenUsage && isRecord3(tokenUsage["total"]) ? tokenUsage["total"] : void 0;
+    const count = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
+    const totalTokens = total ? count(total["totalTokens"]) : void 0;
+    if (total === void 0 || totalTokens === void 0) return [];
+    const typedUsage = { totalTokens };
+    for (const key of [
+      "inputTokens",
+      "cachedInputTokens",
+      "outputTokens",
+      "reasoningOutputTokens"
+    ]) {
+      const value = count(total[key]);
+      if (value !== void 0) typedUsage[key] = value;
+    }
     return [
       baseEvent({
-        type: "thread.token-usage.updated",
-        threadId: agentThreadId,
-        payload: usage,
+        type: "task.progress",
+        threadId,
+        payload: {
+          taskId: agentThreadId,
+          description: title,
+          typedUsage,
+          ...linkage
+        },
         method,
         providerInstanceId: input.providerInstanceId
       })
@@ -1581,52 +1697,6 @@ function toMcpElicitationResponse(decision, params) {
     ...persist ? { _meta: { persist } } : {}
   };
 }
-function producedImages(params) {
-  if (!isRecord3(params)) return [];
-  const item = isRecord3(params["item"]) ? params["item"] : params;
-  const type = toCanonicalItemType(asString(item["type"]) ?? void 0);
-  const events = [];
-  const threadId = conversationIdFromNotification(params) ?? "";
-  const emit = (payload) => {
-    events.push(
-      baseEvent({
-        type: "assistant.attachment.produced",
-        threadId,
-        payload,
-        itemId: asString(item["id"]) ?? void 0,
-        turnId: turnIdOf(params),
-        method: "item/completed"
-      })
-    );
-  };
-  if (type === "image") {
-    const savedPath = asString(item["savedPath"]) ?? asString(item["path"]);
-    if (savedPath) emit({ path: savedPath, mimeType: "image/png" });
-  }
-  const content = Array.isArray(item["content"]) ? item["content"] : [];
-  for (const entry of content) {
-    if (!isRecord3(entry)) continue;
-    if (entry["type"] === "image" && typeof entry["data"] === "string") {
-      const mimeType = asString(entry["mimeType"]) ?? "image/png";
-      emit({
-        mimeType,
-        data: entry["data"],
-        extension: inferImageExtension({ mimeType })
-      });
-    }
-    if (entry["type"] === "inputImage" && typeof entry["imageUrl"] === "string") {
-      const parsed = parseBase64DataUrl(entry["imageUrl"]);
-      if (parsed) {
-        emit({
-          mimeType: parsed.mimeType,
-          data: parsed.base64,
-          extension: inferImageExtension({ mimeType: parsed.mimeType })
-        });
-      }
-    }
-  }
-  return events;
-}
 function mapNotificationToEvents(input) {
   const { method, params, threadId, providerInstanceId } = input;
   if (method.startsWith("collabAgent/")) {
@@ -1678,58 +1748,121 @@ function mapNotificationToEvents(input) {
   const itemId = itemIdOf(params);
   const type = itemTypeOf(params);
   switch (method) {
-    case "thread/started":
+    case "thread/started": {
+      const startedThread = isRecord3(params) ? params["thread"] : void 0;
+      const providerThreadId = isRecord3(startedThread) ? trimText(startedThread["id"]) : void 0;
       return [
         baseEvent({
           type: "thread.started",
           threadId,
-          payload: isRecord3(params) ? params : {},
+          payload: providerThreadId ? { providerThreadId } : {},
           method,
           providerInstanceId
         })
       ];
+    }
     case "thread/status/changed": {
-      const status = isRecord3(params) ? asString(params["status"]) : void 0;
+      const status = isRecord3(params) ? params["status"] : void 0;
       return [
         baseEvent({
           type: "thread.state.changed",
           threadId,
-          payload: { state: toThreadState(status ?? void 0), status },
+          payload: {
+            state: threadStateFromStatus(status),
+            ...params !== void 0 ? { detail: params } : {}
+          },
           method,
           providerInstanceId
         })
       ];
     }
-    case "thread/name/updated":
+    case "thread/archived":
+    case "thread/unarchived":
+      return [
+        baseEvent({
+          type: "thread.state.changed",
+          threadId,
+          payload: {
+            state: method === "thread/archived" ? "archived" : "active",
+            ...params !== void 0 ? { detail: params } : {}
+          },
+          method,
+          providerInstanceId
+        })
+      ];
+    case "thread/closed":
+      return [
+        baseEvent({
+          type: "thread.state.changed",
+          threadId,
+          payload: {
+            state: "closed",
+            ...params !== void 0 ? { detail: params } : {}
+          },
+          method,
+          providerInstanceId
+        })
+      ];
+    case "thread/compacted":
+      return [
+        baseEvent({
+          type: "thread.state.changed",
+          threadId,
+          payload: {
+            state: "compacted",
+            compaction: {
+              compactionId: codexCompactionId(threadId, turnId),
+              // Codex 不报触发方，手动压缩也走同一条通知。
+              trigger: "automatic"
+            },
+            ...params !== void 0 ? { detail: params } : {}
+          },
+          method,
+          providerInstanceId
+        })
+      ];
+    case "thread/name/updated": {
+      const threadName = isRecord3(params) ? trimText(params["threadName"]) ?? trimText(params["name"]) : void 0;
+      const nativeThreadId = isRecord3(params) ? asString(params["threadId"]) : void 0;
       return [
         baseEvent({
           type: "thread.metadata.updated",
           threadId,
-          payload: { title: isRecord3(params) ? asString(params["name"]) : null },
+          payload: {
+            ...threadName ? { name: threadName } : {},
+            ...nativeThreadId || threadName !== void 0 ? {
+              metadata: {
+                ...nativeThreadId ? { threadId: nativeThreadId } : {},
+                ...threadName !== void 0 ? { threadName } : {}
+              }
+            } : {}
+          },
           method,
           providerInstanceId
         })
       ];
+    }
     case "thread/tokenUsage/updated": {
-      const usage = normalizeCodexTokenUsage(params);
+      const usage = normalizeCodexTokenUsage(
+        isRecord3(params) ? params["tokenUsage"] ?? params["usage"] : void 0
+      );
       if (!usage) return [];
       return [
         baseEvent({
           type: "thread.token-usage.updated",
           threadId,
-          payload: usage,
+          payload: { usage },
           method,
           providerInstanceId
         })
       ];
     }
-    case "thread/closed":
     case "session/closed":
       return [
         baseEvent({
           type: "session.exited",
           threadId,
-          payload: {},
+          payload: { exitKind: "graceful" },
           method,
           providerInstanceId
         })
@@ -1740,43 +1873,85 @@ function mapNotificationToEvents(input) {
           type: "turn.started",
           threadId,
           turnId,
-          payload: { turnId },
+          payload: {},
           method,
           providerInstanceId
         })
       ];
-    case "turn/completed": {
-      const flow = turnCompletedControlFlow(params);
-      const typeName = flow.status === "cancelled" || flow.status === "interrupted" ? "turn.aborted" : "turn.completed";
+    case "turn/completed":
       return [
         baseEvent({
-          type: typeName,
+          type: "turn.completed",
           threadId,
           turnId,
-          payload: flow,
+          payload: turnCompletedControlFlow(params),
+          method,
+          providerInstanceId
+        })
+      ];
+    case "turn/aborted":
+      return [
+        baseEvent({
+          type: "turn.aborted",
+          threadId,
+          turnId,
+          payload: {
+            reason: (isRecord3(params) ? trimText(params["reason"]) : void 0) ?? (isRecord3(params) ? trimText(params["message"]) : void 0) ?? "Turn aborted"
+          },
           method,
           providerInstanceId
         })
       ];
-    }
     case "turn/plan":
+    case "turn/plan/updated": {
+      const rawPlan = isRecord3(params) && Array.isArray(params["plan"]) ? params["plan"] : [];
+      const plan = rawPlan.filter(isRecord3).map((step) => ({
+        step: trimText(step["step"]) ?? "step",
+        status: step["status"] === "completed" || step["status"] === "inProgress" ? step["status"] : "pending"
+      }));
+      const explanation = isRecord3(params) ? trimText(params["explanation"]) : void 0;
       return [
         baseEvent({
           type: "turn.plan.updated",
           threadId,
           turnId,
-          payload: params,
+          payload: {
+            ...explanation ? { explanation } : {},
+            plan
+          },
+          method,
+          providerInstanceId
+        })
+      ];
+    }
+    case "turn/diff/updated": {
+      const unifiedDiff = isRecord3(params) ? asString(params["diff"]) : void 0;
+      if (unifiedDiff === void 0) return [];
+      return [
+        baseEvent({
+          type: "turn.diff.updated",
+          threadId,
+          turnId,
+          payload: { unifiedDiff },
           method,
           providerInstanceId
         })
       ];
+    }
     case "item/started": {
       if (type && normalizeItemType(type).includes("compact")) {
         return [
           baseEvent({
             type: "thread.state.changed",
             threadId,
-            payload: { state: "compacting" },
+            payload: {
+              state: "compacting",
+              compaction: {
+                compactionId: codexCompactionId(threadId, turnId),
+                trigger: "automatic"
+              },
+              ...params !== void 0 ? { detail: params } : {}
+            },
             turnId,
             itemId,
             method,
@@ -1784,6 +1959,8 @@ function mapNotificationToEvents(input) {
           })
         ];
       }
+      const canonical = toCanonicalItemType(type);
+      if (canonical === "unknown") return [];
       return [
         baseEvent({
           type: "item.started",
@@ -1791,9 +1968,11 @@ function mapNotificationToEvents(input) {
           turnId,
           itemId,
           payload: {
-            itemType: toCanonicalItemType(type),
-            title: itemTitle(params),
-            detail: itemDetail(params)
+            itemType: canonical,
+            status: "inProgress",
+            ...itemTitle(params) ? { title: itemTitle(params) } : {},
+            ...itemDetail(params) ? { detail: itemDetail(params) } : {},
+            ...params !== void 0 ? { data: params } : {}
           },
           method,
           providerInstanceId
@@ -1806,7 +1985,14 @@ function mapNotificationToEvents(input) {
           baseEvent({
             type: "thread.state.changed",
             threadId,
-            payload: { state: "compacted" },
+            payload: {
+              state: "compacted",
+              compaction: {
+                compactionId: codexCompactionId(threadId, turnId),
+                trigger: "automatic"
+              },
+              ...params !== void 0 ? { detail: params } : {}
+            },
             turnId,
             itemId,
             method,
@@ -1815,18 +2001,24 @@ function mapNotificationToEvents(input) {
         ];
       }
       if (type && normalizeItemType(type).includes("plan")) {
+        const planMarkdown = itemDetail(params);
+        if (!planMarkdown) return [];
         return [
           baseEvent({
             type: "turn.proposed.completed",
             threadId,
             turnId,
             itemId,
-            payload: params,
+            payload: { planMarkdown },
             method,
             providerInstanceId
           })
         ];
       }
+      const canonical = toCanonicalItemType(type);
+      if (canonical === "unknown") return [];
+      const rawStatus = itemStatusOf(params);
+      const status = rawStatus === "failed" || rawStatus === "declined" ? rawStatus : "completed";
       return [
         baseEvent({
           type: "item.completed",
@@ -1834,45 +2026,62 @@ function mapNotificationToEvents(input) {
           turnId,
           itemId,
           payload: {
-            itemType: toCanonicalItemType(type),
-            title: itemTitle(params),
-            detail: itemDetail(params)
+            itemType: canonical,
+            status,
+            ...itemTitle(params) ? { title: itemTitle(params) } : {},
+            ...itemDetail(params) ? { detail: itemDetail(params) } : {},
+            ...params !== void 0 ? { data: params } : {}
           },
           method,
           providerInstanceId
-        }),
-        ...producedImages(params).map((event) => ({ ...event, threadId }))
+        })
       ];
     }
-    case "item/plan/delta":
+    case "item/plan/delta": {
+      const delta = isRecord3(params) ? asString(params["delta"]) : void 0;
+      if (!delta) return [];
       return [
         baseEvent({
           type: "turn.proposed.delta",
           threadId,
           turnId,
           itemId,
-          payload: params,
+          payload: { delta },
           method,
           providerInstanceId
         })
       ];
+    }
     case "item/agentMessage/delta":
-    case "item/reasoning/delta":
-    case "item/reasoning/summaryDelta": {
+    case "item/reasoning/textDelta":
+    case "item/reasoning/summaryTextDelta":
+    case "item/commandExecution/outputDelta":
+    case "item/fileChange/outputDelta": {
       const delta = isRecord3(params) ? asString(params["delta"]) ?? asString(params["text"]) ?? "" : "";
+      if (delta.length === 0) return [];
+      const streamKind = method === "item/agentMessage/delta" ? "assistant_text" : method === "item/reasoning/textDelta" ? "reasoning_text" : method === "item/reasoning/summaryTextDelta" ? "reasoning_summary_text" : method === "item/commandExecution/outputDelta" ? "command_output" : "file_change_output";
+      const summaryIndex = method === "item/reasoning/summaryTextDelta" && isRecord3(params) ? asNumber(params["summaryIndex"]) : null;
+      const contentIndex = method === "item/reasoning/textDelta" && isRecord3(params) ? asNumber(params["contentIndex"]) : null;
       return [
         baseEvent({
           type: "content.delta",
           threadId,
           turnId,
           itemId,
-          payload: { kind: contentStreamKindFromMethod(method), delta },
+          payload: {
+            streamKind,
+            delta,
+            ...summaryIndex !== null ? { summaryIndex } : {},
+            ...contentIndex !== null ? { contentIndex } : {}
+          },
           method,
           providerInstanceId
         })
       ];
     }
-    case "item/reasoning/summaryPartAdded":
+    case "item/reasoning/summaryPartAdded": {
+      const summaryIndex = isRecord3(params) ? asNumber(params["summaryIndex"]) : null;
+      if (summaryIndex === null) return [];
       return [
         baseEvent({
           type: "content.delta",
@@ -1880,59 +2089,176 @@ function mapNotificationToEvents(input) {
           turnId,
           itemId,
           payload: {
-            kind: "reasoning",
+            streamKind: "reasoning_summary_text",
             delta: "",
-            summaryIndex: isRecord3(params) ? asNumber(params["summaryIndex"]) : null
+            summaryIndex
+          },
+          method,
+          providerInstanceId
+        })
+      ];
+    }
+    case "item/mcpToolCall/progress": {
+      const summary = isRecord3(params) ? trimText(params["message"]) : void 0;
+      if (!summary) return [];
+      return [
+        baseEvent({
+          type: "tool.progress",
+          threadId,
+          turnId,
+          itemId,
+          payload: { summary },
+          method,
+          providerInstanceId
+        })
+      ];
+    }
+    case "item/commandExecution/terminalInteraction":
+      return [
+        baseEvent({
+          type: "item.updated",
+          threadId,
+          turnId,
+          itemId,
+          payload: {
+            itemType: "command_execution",
+            ...params !== void 0 ? { data: params } : {}
           },
           method,
           providerInstanceId
         })
       ];
     case "account/updated":
+      return [
+        baseEvent({
+          type: "account.updated",
+          threadId,
+          payload: { account: params ?? {} },
+          method,
+          providerInstanceId
+        })
+      ];
     case "account/rateLimits/updated":
       return [
         baseEvent({
-          type: method === "account/updated" ? "account.updated" : "account.rate-limits.updated",
+          type: "account.rate-limits.updated",
           threadId,
-          payload: params,
+          payload: {
+            rateLimits: isRecord3(params) && "rateLimits" in params ? params["rateLimits"] : params ?? {}
+          },
           method,
           providerInstanceId
         })
       ];
-    case "model/rerouted":
+    case "model/rerouted": {
+      const fromModel = isRecord3(params) ? trimText(params["fromModel"]) : void 0;
+      const toModel = isRecord3(params) ? trimText(params["toModel"]) : void 0;
+      const reason = isRecord3(params) ? trimText(params["reason"]) : void 0;
+      if (!fromModel || !toModel || !reason) return [];
       return [
         baseEvent({
           type: "model.rerouted",
           threadId,
-          payload: params,
+          turnId,
+          payload: { fromModel, toModel, reason },
           method,
           providerInstanceId
         })
       ];
-    case "config/warning":
+    }
+    case "configWarning":
+    case "deprecationNotice": {
+      const summary = isRecord3(params) ? trimText(params["summary"]) : void 0;
+      if (!summary) return [];
+      const details = isRecord3(params) ? trimText(params["details"]) : void 0;
       return [
         baseEvent({
-          type: "config.warning",
+          type: method === "configWarning" ? "config.warning" : "deprecation.notice",
           threadId,
-          payload: params,
+          payload: {
+            summary,
+            ...details ? { details } : {},
+            ...method === "configWarning" && isRecord3(params) ? {
+              ...trimText(params["path"]) ? { path: trimText(params["path"]) } : {},
+              ...params["range"] !== void 0 && params["range"] !== null ? { range: params["range"] } : {}
+            } : {}
+          },
           method,
           providerInstanceId
         })
       ];
-    case "mcp/oauth/completed":
+    }
+    case "mcpServer/oauthLogin/completed": {
+      const success = isRecord3(params) ? params["success"] : void 0;
+      if (typeof success !== "boolean") return [];
+      const name = isRecord3(params) ? trimText(params["name"]) : void 0;
+      const error = isRecord3(params) ? trimText(params["error"]) : void 0;
       return [
         baseEvent({
           type: "mcp.oauth.completed",
           threadId,
-          payload: params,
+          payload: {
+            success,
+            ...name ? { name } : {},
+            ...error ? { error } : {}
+          },
           method,
           providerInstanceId
         })
       ];
+    }
     default:
       return [];
   }
 }
+function toRequestTypeFromKind(kind) {
+  switch (kind) {
+    case "command":
+      return "command_execution_approval";
+    case "file-read":
+      return "file_read_approval";
+    case "file-change":
+      return "file_change_approval";
+    case "apply-patch":
+      return "apply_patch_approval";
+    case "mcp-elicitation":
+      return "mcp_elicitation_approval";
+    default:
+      return "unknown";
+  }
+}
+function toRequestTypeFromMethod(method) {
+  switch (method) {
+    case "item/commandExecution/requestApproval":
+      return "command_execution_approval";
+    case "execCommandApproval":
+      return "exec_command_approval";
+    case "item/fileRead/requestApproval":
+      return "file_read_approval";
+    case "item/fileChange/requestApproval":
+      return "file_change_approval";
+    case "applyPatchApproval":
+      return "apply_patch_approval";
+    case "mcpServer/elicitation/request":
+      return "mcp_elicitation_approval";
+    case "item/tool/requestUserInput":
+      return "tool_user_input";
+    case "item/tool/call":
+      return "dynamic_tool_call";
+    default:
+      return "unknown";
+  }
+}
+function elicitationOptions(params) {
+  const persist = persistFromMeta(isRecord3(params) ? params["_meta"] : void 0);
+  return [
+    { decision: "cancel", label: "Cancel" },
+    { decision: "decline", label: "Decline" },
+    ...persist === "session" ? [{ decision: "acceptForSession", label: "Always allow this session" }] : [],
+    ...persist === "always" ? [{ decision: "acceptAlways", label: "Always allow" }] : [],
+    { decision: "accept", label: "Approve" }
+  ];
+}
 function mapServerRequestToEvents(input) {
   const requestId = String(input.id);
   if (input.method === "item/tool/requestUserInput") {
@@ -1950,18 +2276,44 @@ function mapServerRequestToEvents(input) {
       })
     ];
   }
-  const kind = input.method === "item/commandExecution/requestApproval" ? "command" : input.method === "item/fileChange/requestApproval" ? "file-change" : input.method === "mcpServer/elicitation/request" ? "mcp-elicitation" : input.method.includes("applyPatch") ? "apply-patch" : "command";
-  const args = kind === "command" ? describeCommandApproval(input.params) : kind === "file-change" || kind === "apply-patch" ? describeFileChangeApproval(input.params) : describeMcpElicitation(input.params);
+  const requestType = toRequestTypeFromMethod(input.method);
+  const payload = {
+    requestType,
+    // Codex 的审批回复只有一个枚举,理由随下一条 prompt 送达。
+    declineReasonRelay: "queued"
+  };
+  if (input.method === "mcpServer/elicitation/request") {
+    const described = describeMcpElicitation(input.params);
+    const appName = described.appName ?? described.serverName ?? void 0;
+    payload["options"] = elicitationOptions(input.params);
+    if (appName) payload["appName"] = appName;
+    if (described.message) payload["detail"] = described.message;
+    payload["args"] = input.params;
+  } else if (input.method === "item/fileChange/requestApproval" || input.method.includes("applyPatch")) {
+    const described = describeFileChangeApproval(input.params);
+    if (described.reason) payload["detail"] = described.reason;
+    if (described.fileChanges.length > 0) payload["fileChanges"] = described.fileChanges;
+    payload["args"] = {
+      ...described.callId ? { callId: described.callId } : {},
+      ...described.reason ? { reason: described.reason } : {},
+      ...described.grantRoot ? { grantRoot: described.grantRoot } : {}
+    };
+  } else {
+    const described = describeCommandApproval(input.params);
+    const detail = described.command || described.reason;
+    if (detail) payload["detail"] = detail;
+    payload["args"] = {
+      command: described.command,
+      ...described.cwd ? { cwd: described.cwd } : {},
+      ...described.reason ? { reason: described.reason } : {}
+    };
+  }
   return [
     baseEvent({
       type: "request.opened",
       threadId: input.threadId,
       requestId,
-      payload: {
-        kind,
-        args,
-        declineReasonRelay: "queued"
-      },
+      payload,
       method: input.method,
       source: "codex.app-server.request",
       providerInstanceId: input.providerInstanceId
@@ -1990,12 +2342,15 @@ var CodexSessionRuntime = class {
   activeTurnId;
   model;
   runtimeMode;
+  /** 宿主解好的这一轮的档（座位画的就是它）。缺席 = 宿主没给，按 `runtimeMode` 查表。 */
+  nativeModeId;
   interactionMode;
   closed = false;
   closeCompleted = false;
   turns = [];
   pendingApprovals = /* @__PURE__ */ new Map();
   pendingUserInputs = /* @__PURE__ */ new Map();
+  requestKinds = /* @__PURE__ */ new Map();
   writeAcks = /* @__PURE__ */ new Map();
   grants;
   declineRelay;
@@ -2007,6 +2362,16 @@ var CodexSessionRuntime = class {
   host;
   rpc;
   emit;
+  /** 这一轮该用哪套三字段组合：只由这一轮的档决定（见 `codexNativeModeFor`）。 */
+  #threadConfig() {
+    return codexThreadConfigForNativeMode(codexNativeModeFor(this.runtimeMode, this.nativeModeId));
+  }
+  /** 同上，沙箱策略那一位。 */
+  #turnSandboxPolicy() {
+    return codexTurnSandboxPolicyForNativeMode(
+      codexNativeModeFor(this.runtimeMode, this.nativeModeId)
+    );
+  }
   constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay) {
     this.host = host;
     this.rpc = rpc;
@@ -2014,6 +2379,7 @@ var CodexSessionRuntime = class {
     this.threadId = input.threadId;
     this.cwd = cwd;
     this.runtimeMode = input.runtimeMode;
+    this.nativeModeId = input.nativeModeId;
     this.appServerArgs = appServerArgs;
     this.grants = grants ?? createApprovalGrantStore();
     this.declineRelay = declineRelay ?? createDeclineReasonRelay();
@@ -2023,6 +2389,7 @@ var CodexSessionRuntime = class {
       providerInstanceId: host.instanceId,
       status: "idle",
       runtimeMode: input.runtimeMode,
+      nativeModeId: codexNativeModeFor(input.runtimeMode, input.nativeModeId),
       cwd,
       threadId: input.threadId,
       createdAt,
@@ -2102,6 +2469,24 @@ var CodexSessionRuntime = class {
     this.dispatchMapped(method, params);
   }
   dispatchMapped(method, params) {
+    if (method === "serverRequest/resolved") {
+      const resolvedId = (isRecord3(params) ? asString(params["requestId"]) : null) ?? void 0;
+      if (resolvedId !== void 0) {
+        this.emit({
+          eventId: `codex-req-resolved-${resolvedId}`,
+          provider: CODEX_DRIVER_KIND,
+          threadId: this.threadId,
+          createdAt: nowIso(),
+          type: "request.resolved",
+          requestId: resolvedId,
+          payload: {
+            requestType: toRequestTypeFromKind(this.requestKinds.get(resolvedId)),
+            resolution: params
+          }
+        });
+      }
+      return;
+    }
     for (const event of mapNotificationToEvents({
       method,
       params,
@@ -2280,6 +2665,7 @@ var CodexSessionRuntime = class {
       threadId: this.threadId,
       providerInstanceId: this.host.instanceId
     });
+    this.requestKinds.set(requestId, kind);
     await new Promise((resolve2) => {
       this.pendingApprovals.set(requestId, {
         jsonRpcId: id,
@@ -2319,14 +2705,22 @@ var CodexSessionRuntime = class {
       createdAt: nowIso(),
       type: "request.resolved",
       requestId,
-      payload: { decision }
+      // requestType 是契约必填；缺了它宿主整条解不动，卡片停在「等待决议」。
+      payload: {
+        requestType: toRequestTypeFromKind(pending.kind),
+        decision,
+        ...reason ? { reason } : {}
+      }
     });
   }
   async respondToUserInput(requestId, answers) {
     const pending = this.pendingUserInputs.get(requestId);
     if (!pending) throw new Error(`unknown user-input ${requestId}`);
     const mapped = toCodexUserInputAnswers(answers);
-    pending.settle(mapped === void 0 ? {} : { answers: mapped });
+    if (mapped === void 0) {
+      throw new Error(`invalid user input answers for request ${requestId}`);
+    }
+    pending.settle({ answers: mapped });
     this.emit({
       eventId: `codex-ui-${requestId}`,
       provider: CODEX_DRIVER_KIND,
@@ -2334,7 +2728,8 @@ var CodexSessionRuntime = class {
       createdAt: nowIso(),
       type: "user-input.resolved",
       requestId,
-      payload: { answers: mapped ?? [] }
+      // 契约的 answers 是 questionId → 答案 的 record，不是数组。
+      payload: { answers: toCanonicalUserInputAnswers(mapped) }
     });
   }
   async withActiveWriterRecovery(run, allowUnsubscribe) {
@@ -2368,7 +2763,7 @@ var CodexSessionRuntime = class {
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
   threadConfigParams() {
-    const config = runtimeModeToThreadConfig(this.runtimeMode);
+    const config = this.#threadConfig();
     return {
       approvalPolicy: config.approvalPolicy,
       sandbox: config.sandbox,
@@ -2419,7 +2814,7 @@ var CodexSessionRuntime = class {
       threadId: this.threadId,
       createdAt: nowIso(),
       type: "session.started",
-      payload: { resumeCursor: this.session.resumeCursor }
+      payload: { resume: this.session.resumeCursor }
     });
     return this.session;
   }
@@ -2451,8 +2846,8 @@ var CodexSessionRuntime = class {
     if (hasConfiguredMcpServer(this.appServerArgs)) {
       await this.rpc.request("mcpServer/reload", {}, 0).catch(() => void 0);
     }
-    const sandboxPolicy = runtimeModeToTurnSandboxPolicy(this.runtimeMode);
-    const config = runtimeModeToThreadConfig(this.runtimeMode);
+    const sandboxPolicy = this.#turnSandboxPolicy();
+    const config = this.#threadConfig();
     const developerInstructions = this.developerInstructions(input);
     const requestedModel = modelIdFromSelection(input.modelSelection) ?? this.model;
     const params = {
@@ -2464,15 +2859,22 @@ var CodexSessionRuntime = class {
       ...requestedModel ? { model: requestedModel } : {},
       ...developerInstructions ? { developerInstructions } : {}
     };
-    if (input.interactionMode !== void 0) {
-      params["collaborationMode"] = input.interactionMode === "plan" ? "plan" : "default";
+    const interactionMode = typeof input.interactionMode === "string" ? input.interactionMode : void 0;
+    if (interactionMode !== void 0) {
+      params["collaborationMode"] = codexCollaborationMode({
+        interactionMode,
+        model: requestedModel ?? DEFAULT_MODEL,
+        reasoningEffort: modelSelectionStringOption(input.modelSelection, "reasoningEffort") ?? void 0
+      });
     }
     const isSteer = input.expectedTurnId !== void 0;
     const result = isSteer ? await this.rpc.request(
       "turn/steer",
       {
         ...params,
-        turnId: input.expectedTurnId
+        // 这一位的名字是 `expectedTurnId`,不是 `turnId`:0.155.1 少了它整条拒收
+        // （`Invalid request: missing field \`expectedTurnId\``），插队的那句话发不出去。
+        expectedTurnId: input.expectedTurnId
       },
       0
     ) : await this.withActiveWriterRecovery(() => this.rpc.request("turn/start", params, 0), false);
@@ -2569,6 +2971,7 @@ var CodexSessionRuntime = class {
   async close() {
     if (this.closeCompleted) return;
     this.closed = true;
+    this.requestKinds.clear();
     this.failPendingNativeWrites("session closed before write confirmation");
     this.settlePendingApprovals("cancel");
     this.settlePendingUserInputs({});
@@ -2792,6 +3195,198 @@ async function readRolloutModel(input, rolloutPath, sameDirectory) {
   return model;
 }
 
+// src/mcpOAuth.ts
+async function startCodexMcpOAuth(input) {
+  if (input.recipe.binaryPath.length === 0) {
+    throw new Error("Codex program path is not configured");
+  }
+  const mcp = codexMcpLaunchConfig([input.server]);
+  const env = buildCodexSpawnEnv({
+    recipe: input.recipe,
+    layout: input.layout,
+    launchEnv: { ...input.processEnv, ...mcp.environment },
+    crushApiKeys: shouldCrushApiKeys(input.recipe.authMode)
+  });
+  const handle = await input.host.process.spawn({
+    program: input.recipe.binaryPath,
+    args: [...tokenizeLaunchArgs(input.recipe.launchArgs), ...mcp.args],
+    cwd: input.cwd,
+    owner: { bindingId: input.host.bindingId },
+    env
+  });
+  let settle;
+  const completed = new Promise((resolve2) => {
+    settle = resolve2;
+  });
+  const rpc = await createCodexRpcClient(handle, {
+    onNotification: (notification) => {
+      if (notification.method !== "mcpServer/oauthLogin/completed") return;
+      const params = isRecord3(notification.params) ? notification.params : {};
+      if (asString(params["name"]) !== input.server.name) return;
+      const error = asString(params["error"]);
+      settle?.({
+        success: params["success"] === true,
+        ...error === null || error === void 0 ? {} : { error }
+      });
+    },
+    onServerRequest: () => void 0,
+    onStderrLine: () => void 0
+  });
+  const close = async () => {
+    settle?.({ success: false, error: "cancelled" });
+    await rpc.close().catch(() => void 0);
+  };
+  try {
+    await rpc.request("initialize", CODEX_INITIALIZE_PARAMS);
+    await rpc.notify("initialized");
+    const response = await rpc.request("mcpServer/oauth/login", {
+      name: input.server.name,
+      ...input.timeoutSecs === void 0 ? {} : { timeoutSecs: input.timeoutSecs }
+    });
+    const authorizationUrl = isRecord3(response) ? asString(response["authorizationUrl"]) : void 0;
+    if (!authorizationUrl) {
+      await close();
+      throw new Error(`Codex did not return an authorization URL for '${input.server.name}'.`);
+    }
+    return { authorizationUrl, handle, completed, close };
+  } catch (error) {
+    await close();
+    throw error;
+  }
+}
+
+// src/models.ts
+var MODEL_LIST_MAX_PAGES = 20;
+var MODEL_LIST_TIMEOUT_MS = 15e3;
+var REASONING_EFFORT_LABELS = {
+  none: "None",
+  minimal: "Minimal",
+  low: "Low",
+  medium: "Medium",
+  high: "High",
+  xhigh: "Extra High",
+  max: "Max",
+  ultra: "Ultra"
+};
+var DEFAULT_SERVICE_TIER_ID = "default";
+var reasoningEffortLabel = (effort) => REASONING_EFFORT_LABELS[effort] ?? effort;
+function codexModelDisplayName(displayName) {
+  return displayName.replace(/^gpt/i, "GPT").replace(/-([a-z])/g, (_, c) => `-${c.toUpperCase()}`);
+}
+function reasoningDescriptor(row) {
+  const supported = row["supportedReasoningEfforts"];
+  if (!Array.isArray(supported) || supported.length === 0) return null;
+  const defaultEffort = asString(row["defaultReasoningEffort"]);
+  const options = supported.flatMap((entry) => {
+    if (!isRecord3(entry)) return [];
+    const id = asString(entry["reasoningEffort"]);
+    if (!id) return [];
+    const description = asString(entry["description"]);
+    return [
+      {
+        id,
+        label: reasoningEffortLabel(id),
+        ...description ? { description } : {},
+        ...id === defaultEffort ? { isDefault: true } : {}
+      }
+    ];
+  });
+  if (options.length === 0) return null;
+  return {
+    id: "reasoningEffort",
+    label: "Reasoning",
+    type: "select",
+    options,
+    ...defaultEffort ? { currentValue: defaultEffort } : {}
+  };
+}
+function serviceTierDescriptor(row) {
+  const declared = Array.isArray(row["serviceTiers"]) ? row["serviceTiers"] : [];
+  const tiers = declared.length > 0 ? declared.flatMap((entry) => {
+    if (!isRecord3(entry)) return [];
+    const id = asString(entry["id"]);
+    if (!id) return [];
+    const name = asString(entry["name"]);
+    const description = asString(entry["description"]);
+    return [{ id, name: name ?? id, ...description ? { description } : {} }];
+  }) : (Array.isArray(row["additionalSpeedTiers"]) ? row["additionalSpeedTiers"] : []).flatMap(
+    (entry) => {
+      const id = typeof entry === "string" ? entry : null;
+      return id === null ? [] : [{ id, name: id === "fast" ? "Fast" : id }];
+    }
+  );
+  if (tiers.length === 0) return null;
+  const declaredDefault = asString(row["defaultServiceTier"]);
+  const defaultTier = declaredDefault && tiers.some((tier) => tier.id === declaredDefault) ? declaredDefault : DEFAULT_SERVICE_TIER_ID;
+  return {
+    id: "serviceTier",
+    label: "Service Tier",
+    type: "select",
+    options: [
+      {
+        id: DEFAULT_SERVICE_TIER_ID,
+        label: "Standard",
+        ...defaultTier === DEFAULT_SERVICE_TIER_ID ? { isDefault: true } : {}
+      },
+      ...tiers.map((tier) => ({
+        id: tier.id,
+        label: tier.name,
+        ...tier.description ? { description: tier.description } : {},
+        ...defaultTier === tier.id ? { isDefault: true } : {}
+      }))
+    ],
+    currentValue: defaultTier
+  };
+}
+function isSupersededModel(row) {
+  if (isRecord3(row["upgradeInfo"])) return true;
+  return (asString(row["upgrade"]) ?? "").length > 0;
+}
+function codexProbeModel(row) {
+  if (!isRecord3(row)) return null;
+  const slug = asString(row["model"]);
+  if (!slug) return null;
+  const displayName = asString(row["displayName"]);
+  const optionDescriptors = [reasoningDescriptor(row), serviceTierDescriptor(row)].filter(
+    (descriptor) => descriptor !== null
+  );
+  return {
+    slug,
+    ...displayName ? { name: codexModelDisplayName(displayName) } : {},
+    ...row["isDefault"] === true ? { isDefault: true } : {},
+    ...isSupersededModel(row) ? { isLegacy: true } : {},
+    ...row["hidden"] === true ? { hidden: true } : {},
+    // 空表也给 `capabilities`：`{}` 与 `null` 对宿主是一回事（都不画那一格），
+    // 但给对象保住「这只手确实答过这一问」这层意思。
+    capabilities: { optionDescriptors }
+  };
+}
+async function listCodexModels(rpc) {
+  const models = [];
+  let cursor;
+  for (let page = 0; page < MODEL_LIST_MAX_PAGES; page++) {
+    let response;
+    try {
+      response = await rpc.request(
+        "model/list",
+        cursor === void 0 ? {} : { cursor },
+        MODEL_LIST_TIMEOUT_MS
+      );
+    } catch {
+      return void 0;
+    }
+    if (!isRecord3(response) || !Array.isArray(response["data"])) return void 0;
+    for (const row of response["data"]) {
+      const model = codexProbeModel(row);
+      if (model !== null) models.push(model);
+    }
+    const next = asString(response["nextCursor"]);
+    if (!next || next === cursor) return models;
+    cursor = next;
+  }
+  return models;
+}
+
 // src/signIn.ts
 var DEVICE_CODE_URL = /https?:\/\/\S+/;
 var DEVICE_CODE_VALUE = /\b([A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+)\b/;
@@ -2947,22 +3542,26 @@ async function verifyCodexSignIn(input) {
         installed: true,
         version: null,
         readiness: "unchecked",
-        auth: { status: "unauthenticated" }
+        auth: { status: "unauthenticated" },
+        ...CODEX_NATIVE_MODE_REPORT
       };
     }
-    await rpc.request("model/list", {}, 15e3).catch(() => void 0);
+    const models = await listCodexModels(rpc);
     return {
       installed: true,
       version: null,
       readiness: "ready",
-      auth
+      auth,
+      ...models === void 0 ? {} : { models },
+      ...CODEX_NATIVE_MODE_REPORT
     };
   } catch {
     return {
       installed: true,
       version: null,
       readiness: "unchecked",
-      auth: { status: "unknown" }
+      auth: { status: "unknown" },
+      ...CODEX_NATIVE_MODE_REPORT
     };
   } finally {
     await rpc.close().catch(() => void 0);
@@ -2973,6 +3572,10 @@ async function verifyCodexSignIn(input) {
 import * as NodeFSP2 from "node:fs/promises";
 import * as NodeOS3 from "node:os";
 import * as NodePath5 from "node:path";
+import {
+  mergeLaunchEnv as mergeLaunchEnv2,
+  brainSlotEnvKeys as brainSlotEnvKeys2
+} from "@ycodium-ai/plugin-api/executor";
 var CODEX_TIMEOUT_MS = 18e4;
 var EARLIER_CONTENT_TRUNCATION_MARKER = "[Earlier content truncated]\n\n";
 function limitSection(value, maxChars) {
@@ -3145,14 +3748,12 @@ function createCodexTextGeneration(input) {
     const reasoningEffort = modelSelectionStringOption(modelSelection, "reasoningEffort") ?? DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
     const serviceTier = modelSelectionStringOption(modelSelection, "serviceTier");
     const model = asString(launchRecord.requestedModelId) ?? modelIdFromSelection(modelSelection) ?? "gpt-5.6-luna";
-    const env = {
-      ...processEnv,
-      ...input.recipe.environment,
-      ...input.layout.effectiveHomePath ? { CODEX_HOME: input.layout.effectiveHomePath } : input.recipe.homePath.trim() ? { CODEX_HOME: expandHomePath(input.recipe.homePath) } : {}
-    };
-    if (input.recipe.environment[CODEX_INSTANCE_API_KEY_ENV]) {
-      env[CODEX_INSTANCE_API_KEY_ENV] = input.recipe.environment[CODEX_INSTANCE_API_KEY_ENV];
-    }
+    const env = mergeLaunchEnv2({
+      brainSlots: brainSlotEnvKeys2(CODEX_CARD),
+      accountHome: input.layout.effectiveHomePath ? { CODEX_HOME: input.layout.effectiveHomePath } : input.recipe.homePath.trim() ? { CODEX_HOME: expandHomePath(input.recipe.homePath) } : {},
+      instanceTable: input.recipe.environment,
+      launch: processEnv
+    });
     const args = [
       "exec",
       ...codexExecLaunchArgs(launchArgs),
@@ -3469,8 +4070,11 @@ function accountToAuth2(account) {
       return { status: "unknown" };
   }
 }
-function layoutFor(recipe, launchHome) {
+function layoutFor(recipe, launchHome, nativeSubscription = false) {
   const environmentHome = recipe.environment["CODEX_HOME"];
+  if (nativeSubscription && launchHome?.trim()) {
+    return resolveCodexHomeLayout({ homePath: launchHome.trim(), shadowHomePath: "" });
+  }
   return resolveCodexHomeLayout({
     homePath: launchHome?.trim() || recipe.homePath,
     shadowHomePath: recipe.shadowHomePath,
@@ -3490,6 +4094,38 @@ var createCodexInstance = (config, host) => {
     return booked;
   };
   const probeAuth = () => accountToAuth2(readCodexAccount(accountHomeFromLayout(layoutFor(recipe))));
+  const probeModels = async () => {
+    const layout = layoutFor(recipe);
+    const env = buildCodexSpawnEnv({
+      recipe,
+      layout,
+      crushApiKeys: shouldCrushApiKeys(recipe.authMode)
+    });
+    let handle;
+    let rpc;
+    try {
+      handle = await host.process.spawn({
+        program: recipe.binaryPath,
+        args: [...codexSpawnArgs(recipe, layout)],
+        owner: { bindingId: host.bindingId },
+        ...Object.keys(env).length > 0 ? { env } : {}
+      });
+      trackHandle(handle, `${recipe.binaryPath} (probe)`);
+      rpc = await createCodexRpcClient(handle, {
+        onNotification: () => void 0,
+        onServerRequest: () => void 0,
+        onStderrLine: () => void 0
+      });
+      await rpc.request("initialize", CODEX_INITIALIZE_PARAMS);
+      await rpc.notify("initialized");
+      return await listCodexModels(rpc);
+    } catch {
+      return void 0;
+    } finally {
+      await rpc?.close().catch(() => void 0);
+      await handle?.kill("SIGTERM").catch(() => void 0);
+    }
+  };
   const trackHandle = (handle, command, threadId) => {
     live.set(handle.pid, { command, ...threadId === void 0 ? {} : { threadId } });
     void handle.exited.finally(() => {
@@ -3517,14 +4153,20 @@ var createCodexInstance = (config, host) => {
           version: null,
           readiness: "error",
           auth: probeAuth(),
-          detail: connectionError
+          detail: connectionError,
+          ...CODEX_NATIVE_MODE_REPORT
         };
       }
+      const models = await probeModels();
       return {
         installed: true,
         version: null,
-        readiness: "unchecked",
-        auth: probeAuth()
+        readiness: models === void 0 ? "unchecked" : "ready",
+        auth: probeAuth(),
+        ...models === void 0 ? {} : { models },
+        // 宿主拿的是这一份。登录核验那份（`verifyCodexSignIn`）报了档、这里没报，
+        // 界面就一直画宿主四档——2026-09-20 真发生过，浏览器里才看得见。
+        ...CODEX_NATIVE_MODE_REPORT
       };
     },
     startSession: async (input, signal) => {
@@ -3540,15 +4182,22 @@ var createCodexInstance = (config, host) => {
         await stopBooked(existing);
         threads.delete(input.threadId);
       }
-      const layout = layoutFor(recipe, input.launch.homePath);
+      const nativeSubscription = input.launch.nativeSubscription === true;
+      const layout = layoutFor(recipe, input.launch.homePath, nativeSubscription);
       await materializeCodexShadowHome(layout, host.log);
+      const mcp = codexMcpLaunchConfig(input.mcpServers ?? []);
       const env = buildCodexSpawnEnv({
         recipe,
         layout,
-        processEnv: input.launch.processEnv,
-        crushApiKeys: shouldCrushApiKeys(recipe.authMode)
+        // MCP 那几个变量是宿主挑好的 server 带来的，与绑定同一层：实例表盖不得。
+        launchEnv: { ...input.launch.processEnv, ...mcp.environment },
+        crushApiKeys: nativeSubscription || shouldCrushApiKeys(recipe.authMode)
       });
-      const args = [...codexSpawnArgs(recipe, layout)];
+      const args = [
+        ...codexSpawnArgs(recipe, layout, nativeSubscription),
+        ...codexOverrideArgs(input.launch.launchArgOverrides),
+        ...mcp.args
+      ];
       const handle = await host.process.spawn({
         program: recipe.binaryPath,
         args,
@@ -3677,7 +4326,6 @@ var createCodexInstance = (config, host) => {
         const env = buildCodexSpawnEnv({
           recipe,
           layout,
-          processEnv: {},
           crushApiKeys: shouldCrushApiKeys(recipe.authMode)
         });
         const args = [...codexSpawnArgs(recipe, layout)];
@@ -3715,7 +4363,6 @@ var createCodexInstance = (config, host) => {
         const env = buildCodexSpawnEnv({
           recipe,
           layout,
-          processEnv: {},
           crushApiKeys: shouldCrushApiKeys(recipe.authMode)
         });
         const args = [...codexSpawnArgs(recipe, layout)];
@@ -3776,6 +4423,25 @@ var createCodexInstance = (config, host) => {
         processEnv: process.env
       })
     },
+    mcpOAuth: {
+      start: async (input) => {
+        const started = await startCodexMcpOAuth({
+          host,
+          recipe,
+          layout: layoutFor(recipe),
+          processEnv: process.env,
+          server: input.server,
+          cwd: input.cwd,
+          ...input.timeoutSecs === void 0 ? {} : { timeoutSecs: input.timeoutSecs }
+        });
+        trackHandle(started.handle, `${recipe.binaryPath} app-server (mcp oauth)`);
+        return {
+          authorizationUrl: started.authorizationUrl,
+          completed: started.completed,
+          close: started.close
+        };
+      }
+    },
     listLiveProcesses: async () => [...live.entries()].map(([pid, entry]) => ({
       pid,
       command: entry.command,