@ycodium-ai/agent-codex 0.2.2163 → 0.2.2488

package/README.md

@@ -17,7 +17,8 @@ Facts:
 - Manifest permission is `{ kind: "executor" }`.
 - `runtimeModeSwitch` is `next-turn` (same table the host adapter reads).
 - `sessionModelSwitch` is `in-session`.
-- Native ChatGPT device-code login is supported (`supportsNativeSubscription`).
+- Native ChatGPT device-code login is supported: `deviceCodeSignInArgs` runs
+  `codex login --device-auth`.
 
 Develop with `vp run --filter @ycodium-ai/agent-codex typecheck`, `build`, and `test`.
 

package/dist/index.js

@@ -11,6 +11,13 @@ var CODEX_CARD = {
   commandName: "codex",
   launchArgs: CODEX_DEFAULT_LAUNCH_ARGS,
   homeEnvVar: "CODEX_HOME",
+  // 影子目录只分开凭据，会话文件仍写在共用 home 下（`resolveCodexHomeLayout`
+  // 的 authOverlay：auth.json 是真文件，sessions 是指回共用 home 的软链）。
+  homeLayout: {
+    accountConfigKey: "shadowHomePath",
+    credentialFile: "auth.json",
+    transcriptSubdir: "sessions"
+  },
   environment: [],
   install: { kind: "npm" },
   signIn: [{ kind: "command", command: "codex login" }],
@@ -31,9 +38,6 @@ var CODEX_CARD = {
     "5.3-spark": "gpt-5.3-codex-spark",
     "gpt-5.3-spark": "gpt-5.3-codex-spark"
   },
-  modelsDevProviderIds: ["openai"],
-  modelsDevSlugPrefixed: false,
-  modelSlugPrefix: "",
   mcpTransports: ["stdio", "http"],
   pluginManaged: true,
   verifiedSkills: true,
@@ -45,20 +49,53 @@ var CODEX_CARD = {
     runtimeModeSwitch: "next-turn",
     // 三字段组合在 openThread 时定，切档要重开会话（与 runtimeModeSwitch 同为 next-turn）。
     nativeModeSwitch: true,
-    contextCompaction: "native"
+    contextCompaction: "native",
+    // 子代理经 collab 通知报成 task.*（events.ts 的 mapCollabAgentEvent）。
+    reportsSpawnedAgents: true
   },
   credentialSources: [],
   diagnostics: [],
+  // 设置表单照这份画：带 x-ycodium-form 的属性才进表单（enabled、customModels 等另有入口，不在此列），
+  // 顺序看 x-ycodium-form-order；文案键在本插件 locales/<locale>.json 里解析，宿主不兜底。
   configSchema: {
     type: "object",
+    "x-ycodium-form-order": ["binaryPath", "homePath", "shadowHomePath", "launchArgs"],
     properties: {
       authMode: { type: "string", enum: ["default", "chatgpt", "apiKey"] },
       apiBaseUrl: { type: "string" },
       enabled: { type: "boolean" },
-      binaryPath: { type: "string" },
-      homePath: { type: "string" },
-      shadowHomePath: { type: "string" },
-      launchArgs: { type: "string" },
+      binaryPath: {
+        type: "string",
+        "x-ycodium-form": {
+          titleKey: "form.binaryPath.title",
+          descriptionKey: "form.binaryPath.description",
+          placeholderKey: "form.binaryPath.placeholder",
+          control: "executable-path"
+        }
+      },
+      homePath: {
+        type: "string",
+        "x-ycodium-form": {
+          titleKey: "form.homePath.title",
+          descriptionKey: "form.homePath.description",
+          placeholderKey: "form.homePath.placeholder"
+        }
+      },
+      shadowHomePath: {
+        type: "string",
+        "x-ycodium-form": {
+          titleKey: "form.shadowHomePath.title",
+          descriptionKey: "form.shadowHomePath.description",
+          placeholderKey: "form.shadowHomePath.placeholder"
+        }
+      },
+      launchArgs: {
+        type: "string",
+        "x-ycodium-form": {
+          titleKey: "form.launchArgs.title",
+          descriptionKey: "form.launchArgs.description"
+        }
+      },
       customModels: { type: "array" },
       driver: { type: "string" },
       config: { type: "object" },
@@ -72,12 +109,12 @@ var CODEX_CARD = {
     nativePathSuffix: "/responses",
     credentialEnvKey: "CODEX_API_KEY",
     supportsNativeSubscription: true,
-    // codex 不认「地址一个变量」：端点写在 `-c model_providers.<id>.base_url` 上，
-    // 凭据只能经环境变量、变量名还得告诉它。`$providerId` / `$credentialEnvKey`
-    // 由宿主按 binding 生成，同一台机器上两份绑定因此不抢同一个变量名。
+    // codex 不认「地址一个变量」：地址写在 `-c model_providers.<id>.base_url` 上，
+    // 凭据只能经环境变量、变量名还得告诉它。这只手的「API URL and key」账户连接
+    // （`connection.ts`）就按这个形状拼；这一栏只是说明，宿主不读。
     //
-    // `forced_login_method=api` 要写在最后：chatgpt 实例自己先注了
-    // `forced_login_method=chatgpt`，不盖掉的话手仍走订阅登录，代理地址白注。
+    // `forced_login_method=api` 要写在最后：chatgpt 实例自己先加了
+    // `forced_login_method=chatgpt`，不盖掉的话手仍走订阅登录，填的地址白填。
     extraLaunchArgs: [
       { key: "model_provider", value: "$providerId" },
       { key: "model_providers.$providerId.name", value: "Ycodium API" },
@@ -90,13 +127,196 @@ var CODEX_CARD = {
   }
 };
 
-// src/codexInstance.ts
-import * as NodeProcess from "node:process";
-import { ExecutorSpawnRefusedError } from "@ycodium-ai/plugin-api/executor";
-
 // src/codexAccount.ts
 import * as NodeFS from "node:fs";
+import * as NodePath3 from "node:path";
+
+// src/homeLayout.ts
+import * as NodeFSP from "node:fs/promises";
+import * as NodeOS2 from "node:os";
+import * as NodePath2 from "node:path";
+
+// src/paths.ts
+import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
+function expandHomePath(value) {
+  if (value === "~") return NodeOS.homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return NodePath.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",
+  "sqlite",
+  "shell_snapshots",
+  "worktrees",
+  "skills",
+  "plugins",
+  "cache",
+  "logs",
+  "mcp-oauth-locks"
+];
+var PRIVATE_ENTRY_NAMES = /* @__PURE__ */ new Set(["auth.json", "models_cache.json"]);
+var SHADOW_LOCAL_ENTRY_NAMES = /* @__PURE__ */ new Set(["log", "memories", "tmp"]);
+var REPLACEABLE_SHARED_RUNTIME_DIRECTORIES = /* @__PURE__ */ new Set(["mcp-oauth-locks"]);
+function resolveCodexHomeDirectory(value) {
+  const expanded = value && value.trim().length > 0 ? expandHomePath(value) : NodePath2.join(NodeOS2.homedir(), ".codex");
+  return NodePath2.resolve(expanded);
+}
+function resolveCodexHomeLayout(input) {
+  const configuredHome = input.homePath.trim() || (input.environmentHome?.trim() ?? "");
+  const sharedHomePath = resolveCodexHomeDirectory(configuredHome || void 0);
+  const shadowHomePath = input.shadowHomePath.trim();
+  if (shadowHomePath.length === 0) {
+    return {
+      mode: "direct",
+      sharedHomePath,
+      effectiveHomePath: configuredHome.length > 0 ? sharedHomePath : void 0,
+      continuationKey: `codex:home:${sharedHomePath}`
+    };
+  }
+  return {
+    mode: "authOverlay",
+    sharedHomePath,
+    effectiveHomePath: NodePath2.resolve(expandHomePath(shadowHomePath)),
+    continuationKey: `codex:home:${sharedHomePath}`
+  };
+}
+function codexContinuationKey(input) {
+  return resolveCodexHomeLayout({
+    homePath: input.homePath,
+    shadowHomePath: "",
+    environmentHome: input.instanceEnvironment["CODEX_HOME"] ?? input.inheritedEnvironment["CODEX_HOME"]
+  }).continuationKey;
+}
+async function readLinkState(linkPath) {
+  try {
+    const target = await NodeFSP.readlink(linkPath);
+    return { _tag: "Symlink", target };
+  } catch (error) {
+    const code = typeof error === "object" && error !== null && "code" in error ? String(error.code) : "";
+    if (code === "ENOENT") return { _tag: "Missing" };
+    if (code === "EINVAL") return { _tag: "NotSymlink" };
+    throw error;
+  }
+}
+async function createEntryLink(target, link) {
+  const type = await NodeFSP.stat(target).then(
+    (info) => info.isDirectory() ? "junction" : "file",
+    () => "file"
+  );
+  await NodeFSP.symlink(target, link, type);
+}
+async function removePrivateSymlink(effectiveHomePath, entryName) {
+  const privatePath = NodePath2.join(effectiveHomePath, entryName);
+  const state = await readLinkState(privatePath);
+  if (state._tag === "Symlink") await NodeFSP.rm(privatePath, { force: true });
+}
+async function ensureSymlink(input) {
+  const target = NodePath2.join(input.sharedHomePath, input.entryName);
+  const link = NodePath2.join(input.effectiveHomePath, input.entryName);
+  const state = await readLinkState(link);
+  if (state._tag === "NotSymlink") {
+    if (!REPLACEABLE_SHARED_RUNTIME_DIRECTORIES.has(input.entryName)) {
+      throw new Error(
+        `Cannot create Codex shadow home entry '${input.entryName}' because '${link}' already exists and is not a symlink.`
+      );
+    }
+    await NodeFSP.rm(link, { recursive: true, force: true });
+    await createEntryLink(target, link);
+    return;
+  }
+  if (state._tag === "Missing") {
+    await createEntryLink(target, link);
+    return;
+  }
+  const resolvedExisting = NodePath2.resolve(NodePath2.dirname(link), state.target);
+  if (resolvedExisting !== target) {
+    await NodeFSP.rm(link, { force: true });
+    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;
+  if (!effectiveHomePath) return;
+  if (layout.sharedHomePath === effectiveHomePath) {
+    throw new Error(
+      `Codex shadow home path '${effectiveHomePath}' must be different from the shared home path '${layout.sharedHomePath}'.`
+    );
+  }
+  await makeDirectory(layout.sharedHomePath);
+  await makeDirectory(effectiveHomePath);
+  await Promise.all(
+    KNOWN_SHARED_DIRECTORIES.map(
+      (directory) => makeDirectory(NodePath2.join(layout.sharedHomePath, directory))
+    )
+  );
+  let sharedEntryNames = [];
+  try {
+    sharedEntryNames = await NodeFSP.readdir(layout.sharedHomePath);
+  } catch (error) {
+    throw new Error(
+      `Codex shadow home filesystem operation 'readDirectory' failed for '${layout.sharedHomePath}': ${String(error)}`,
+      { cause: error }
+    );
+  }
+  const entries = new Set(KNOWN_SHARED_DIRECTORIES);
+  for (const entryName of sharedEntryNames) {
+    if (!PRIVATE_ENTRY_NAMES.has(entryName) && !SHADOW_LOCAL_ENTRY_NAMES.has(entryName)) {
+      entries.add(entryName);
+    }
+  }
+  for (const entryName of PRIVATE_ENTRY_NAMES) {
+    if (entryName === "auth.json") continue;
+    await removePrivateSymlink(effectiveHomePath, entryName);
+  }
+  for (const entryName of entries) {
+    if (PRIVATE_ENTRY_NAMES.has(entryName)) continue;
+    try {
+      await ensureSymlink({
+        sharedHomePath: layout.sharedHomePath,
+        effectiveHomePath,
+        entryName
+      });
+    } catch (error) {
+      log?.warn("Codex shadow home entry left unlinked.", {
+        entryName,
+        effectiveHomePath,
+        reason: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+  const authPath = NodePath2.join(effectiveHomePath, "auth.json");
+  const authState = await readLinkState(authPath);
+  if (authState._tag === "Symlink") {
+    throw new Error(
+      `Codex shadow home private entry 'auth.json' at '${authPath}' must be a real file, not a symlink.`
+    );
+  }
+}
+function accountHomeFromLayout(layout) {
+  return layout.effectiveHomePath ?? layout.sharedHomePath;
+}
+
+// src/codexAccount.ts
 var AUTH_FILE_NAME = "auth.json";
 var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 var readString = (record, key) => {
@@ -137,14 +357,16 @@ var signedOutProbe = (exists) => ({
   directoryExists: exists,
   email: void 0,
   name: void 0,
-  expiresAt: void 0
+  expiresAt: void 0,
+  authType: void 0
 });
 var unreadableProbe = (exists) => ({
   state: "unreadable",
   directoryExists: exists,
   email: void 0,
   name: void 0,
-  expiresAt: void 0
+  expiresAt: void 0,
+  authType: void 0
 });
 var epochMillisToIso = (ms) => {
   if (ms === void 0) return void 0;
@@ -164,7 +386,7 @@ function decodeJwtClaims(token) {
 }
 var readCodexAccount = (homePath) => {
   const exists = directoryExists(homePath);
-  const raw = readCredentialFile(NodePath.join(homePath, AUTH_FILE_NAME));
+  const raw = readCredentialFile(NodePath3.join(homePath, AUTH_FILE_NAME));
   if (raw === void 0) return signedOutProbe(exists);
   const parsed = parseJsonRecord(raw);
   if (parsed === void 0 || !("OPENAI_API_KEY" in parsed || "tokens" in parsed)) {
@@ -185,10 +407,26 @@ var readCodexAccount = (homePath) => {
     directoryExists: exists,
     email: claims === void 0 ? void 0 : readString(claims, "email"),
     name: void 0,
-    expiresAt
+    expiresAt,
+    authType: accessToken !== void 0 ? "chatgpt" : "apiKey"
+  };
+};
+var probeCodexAccount = (accountPath) => {
+  const resolved = resolveCodexHomeDirectory(accountPath || process.env.CODEX_HOME);
+  const account = readCodexAccount(resolved);
+  return {
+    accountPath: resolved,
+    state: account.state,
+    ...account.email === void 0 ? {} : { email: account.email },
+    ...account.expiresAt === void 0 ? {} : { expiresAt: account.expiresAt },
+    ...account.authType === void 0 ? {} : { authType: account.authType }
   };
 };
 
+// src/codexInstance.ts
+import * as NodeProcess from "node:process";
+import { ExecutorSpawnRefusedError } from "@ycodium-ai/plugin-api/executor";
+
 // src/config.ts
 import { modelSelectionStringOption } from "@ycodium-ai/plugin-api/executor";
 var CODEX_INSTANCE_API_KEY_ENV = "YCODIUM_CODEX_API_KEY";
@@ -349,12 +587,6 @@ function codexMcpLaunchConfig(servers) {
   }
   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(" ");
-}
 function modelIdFromSelection(selection) {
   if (typeof selection !== "object" || selection === null || Array.isArray(selection)) {
     return void 0;
@@ -364,7 +596,7 @@ function modelIdFromSelection(selection) {
 }
 
 // src/connection.ts
-import { mergeLaunchEnv, brainSlotEnvKeys } from "@ycodium-ai/plugin-api/executor";
+import { mergeLaunchEnv } from "@ycodium-ai/plugin-api/executor";
 function codexApiConnectionError(recipe, environment) {
   if (recipe.authMode !== "apiKey") return null;
   try {
@@ -404,16 +636,7 @@ function connectionArgv(recipe, layout) {
   }
   return args;
 }
-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")}`
-    ];
-  }
+function codexSpawnArgs(recipe, layout) {
   const needsOverrides = layout.mode === "authOverlay" || recipe.authMode !== "default";
   if (!needsOverrides) return tokenizeLaunchArgs(recipe.launchArgs);
   return connectionArgv(recipe, layout);
@@ -425,7 +648,6 @@ var CRUSHED_API_KEYS = {
 function buildCodexSpawnEnv(input) {
   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 : {},
@@ -434,7 +656,6 @@ function buildCodexSpawnEnv(input) {
 }
 function nativeLoginSpawnEnv(processEnv, isolatedHome) {
   return mergeLaunchEnv({
-    brainSlots: brainSlotEnvKeys(CODEX_CARD),
     inherited: processEnv,
     handOverrides: { ...CRUSHED_API_KEYS, CODEX_HOME: isolatedHome }
   });
@@ -443,191 +664,6 @@ function shouldCrushApiKeys(authMode) {
   return authMode === "chatgpt";
 }
 
-// src/homeLayout.ts
-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",
-  "sqlite",
-  "shell_snapshots",
-  "worktrees",
-  "skills",
-  "plugins",
-  "cache",
-  "logs",
-  "mcp-oauth-locks"
-];
-var PRIVATE_ENTRY_NAMES = /* @__PURE__ */ new Set(["auth.json", "models_cache.json"]);
-var SHADOW_LOCAL_ENTRY_NAMES = /* @__PURE__ */ new Set(["log", "memories", "tmp"]);
-var REPLACEABLE_SHARED_RUNTIME_DIRECTORIES = /* @__PURE__ */ new Set(["mcp-oauth-locks"]);
-function resolveCodexHomeDirectory(value) {
-  const expanded = value && value.trim().length > 0 ? expandHomePath(value) : NodePath3.join(NodeOS2.homedir(), ".codex");
-  return NodePath3.resolve(expanded);
-}
-function resolveCodexHomeLayout(input) {
-  const configuredHome = input.homePath.trim() || (input.environmentHome?.trim() ?? "");
-  const sharedHomePath = resolveCodexHomeDirectory(configuredHome || void 0);
-  const shadowHomePath = input.shadowHomePath.trim();
-  if (shadowHomePath.length === 0) {
-    return {
-      mode: "direct",
-      sharedHomePath,
-      effectiveHomePath: configuredHome.length > 0 ? sharedHomePath : void 0,
-      continuationKey: `codex:home:${sharedHomePath}`
-    };
-  }
-  return {
-    mode: "authOverlay",
-    sharedHomePath,
-    effectiveHomePath: NodePath3.resolve(expandHomePath(shadowHomePath)),
-    continuationKey: `codex:home:${sharedHomePath}`
-  };
-}
-function codexContinuationKey(input) {
-  return resolveCodexHomeLayout({
-    homePath: input.homePath,
-    shadowHomePath: "",
-    environmentHome: input.instanceEnvironment["CODEX_HOME"] ?? input.inheritedEnvironment["CODEX_HOME"]
-  }).continuationKey;
-}
-async function readLinkState(linkPath) {
-  try {
-    const target = await NodeFSP.readlink(linkPath);
-    return { _tag: "Symlink", target };
-  } catch (error) {
-    const code = typeof error === "object" && error !== null && "code" in error ? String(error.code) : "";
-    if (code === "ENOENT") return { _tag: "Missing" };
-    if (code === "EINVAL") return { _tag: "NotSymlink" };
-    throw error;
-  }
-}
-async function createEntryLink(target, link) {
-  const type = await NodeFSP.stat(target).then(
-    (info) => info.isDirectory() ? "junction" : "file",
-    () => "file"
-  );
-  await NodeFSP.symlink(target, link, type);
-}
-async function removePrivateSymlink(effectiveHomePath, entryName) {
-  const privatePath = NodePath3.join(effectiveHomePath, entryName);
-  const state = await readLinkState(privatePath);
-  if (state._tag === "Symlink") await NodeFSP.rm(privatePath, { force: true });
-}
-async function ensureSymlink(input) {
-  const target = NodePath3.join(input.sharedHomePath, input.entryName);
-  const link = NodePath3.join(input.effectiveHomePath, input.entryName);
-  const state = await readLinkState(link);
-  if (state._tag === "NotSymlink") {
-    if (!REPLACEABLE_SHARED_RUNTIME_DIRECTORIES.has(input.entryName)) {
-      throw new Error(
-        `Cannot create Codex shadow home entry '${input.entryName}' because '${link}' already exists and is not a symlink.`
-      );
-    }
-    await NodeFSP.rm(link, { recursive: true, force: true });
-    await createEntryLink(target, link);
-    return;
-  }
-  if (state._tag === "Missing") {
-    await createEntryLink(target, link);
-    return;
-  }
-  const resolvedExisting = NodePath3.resolve(NodePath3.dirname(link), state.target);
-  if (resolvedExisting !== target) {
-    await NodeFSP.rm(link, { force: true });
-    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;
-  if (!effectiveHomePath) return;
-  if (layout.sharedHomePath === effectiveHomePath) {
-    throw new Error(
-      `Codex shadow home path '${effectiveHomePath}' must be different from the shared home path '${layout.sharedHomePath}'.`
-    );
-  }
-  await makeDirectory(layout.sharedHomePath);
-  await makeDirectory(effectiveHomePath);
-  await Promise.all(
-    KNOWN_SHARED_DIRECTORIES.map(
-      (directory) => makeDirectory(NodePath3.join(layout.sharedHomePath, directory))
-    )
-  );
-  let sharedEntryNames = [];
-  try {
-    sharedEntryNames = await NodeFSP.readdir(layout.sharedHomePath);
-  } catch (error) {
-    throw new Error(
-      `Codex shadow home filesystem operation 'readDirectory' failed for '${layout.sharedHomePath}': ${String(error)}`,
-      { cause: error }
-    );
-  }
-  const entries = new Set(KNOWN_SHARED_DIRECTORIES);
-  for (const entryName of sharedEntryNames) {
-    if (!PRIVATE_ENTRY_NAMES.has(entryName) && !SHADOW_LOCAL_ENTRY_NAMES.has(entryName)) {
-      entries.add(entryName);
-    }
-  }
-  for (const entryName of PRIVATE_ENTRY_NAMES) {
-    if (entryName === "auth.json") continue;
-    await removePrivateSymlink(effectiveHomePath, entryName);
-  }
-  for (const entryName of entries) {
-    if (PRIVATE_ENTRY_NAMES.has(entryName)) continue;
-    try {
-      await ensureSymlink({
-        sharedHomePath: layout.sharedHomePath,
-        effectiveHomePath,
-        entryName
-      });
-    } catch (error) {
-      log?.warn("Codex shadow home entry left unlinked.", {
-        entryName,
-        effectiveHomePath,
-        reason: error instanceof Error ? error.message : String(error)
-      });
-    }
-  }
-  const authPath = NodePath3.join(effectiveHomePath, "auth.json");
-  const authState = await readLinkState(authPath);
-  if (authState._tag === "Symlink") {
-    throw new Error(
-      `Codex shadow home private entry 'auth.json' at '${authPath}' must be a real file, not a symlink.`
-    );
-  }
-}
-function accountHomeFromLayout(layout) {
-  return layout.effectiveHomePath ?? layout.sharedHomePath;
-}
-
 // src/protocol.ts
 var CODEX_INITIALIZE_PARAMS = {
   clientInfo: { name: "ycodium", title: "Ycodium", version: "0" },
@@ -1057,6 +1093,9 @@ async function createCodexRpcClient(handle, handlers) {
   };
 }
 
+// src/sessionRuntime.ts
+import * as NodeCrypto2 from "node:crypto";
+
 // src/approvalGrant.ts
 function codexApprovalGrantKey(kind, identity) {
   if (kind === "mcp-elicitation") return `codex:mcp:${identity || "unknown"}`;
@@ -1111,7 +1150,7 @@ You are running inside Ycodium. The \`ycodium\` MCP server is the product-native
 
 For browser work, first call \`preview_status\`. If no automation-capable preview is attached, call \`preview_open\` before concluding that the browser is unavailable. Then use \`preview_navigate\`, \`preview_snapshot\`, and the focused interaction tools. Prefer snapshot-provided locators over coordinates.
 
-Do not switch to global browser skills, Chrome, Node REPL browser automation, standalone Playwright, or agent-browser merely because the preview is initially closed or a first call fails. Use an alternative browser system only when the Ycodium preview tools are absent, the user explicitly requests another browser, or \`preview_open\` returns an explicit unsupported/unavailable error. A failed Ycodium preview tool call should be inspected and retried with corrected arguments when the error is actionable.
+Do not switch to global browser skills, Chrome, Node REPL browser automation, standalone Playwright, or agent-browser merely because the preview is initially closed or a first call fails. Use an alternative browser system only when the Ycodium preview tools are absent, the user explicitly requests another browser, or \`preview_open\` returns an explicit unsupported/unavailable error. A failed Ycodium preview tool call should be inspected and retried with corrected arguments when the error is actionable. The exception is a tool result saying the user has not allowed agents to use a tab's browser profile: that is the user's decision, not a fault. Do not retry on that tab or work around it with another browser; follow the message (open a new tab, or ask the user).
 `;
 var YCODIUM_THREAD_TOOL_INSTRUCTIONS = `
 
@@ -1279,11 +1318,13 @@ function buildCodexDeveloperInstructions(interactionMode, runtime, browserToolsA
 }
 
 // src/events.ts
+import * as NodeCrypto from "node:crypto";
 var CODEX_PROVIDER = "codex";
+var EVENT_ID_PREFIX = `codex-evt-${NodeCrypto.randomUUID()}`;
 var eventSeq = 0;
 function nextEventId() {
   eventSeq += 1;
-  return `codex-evt-${eventSeq}`;
+  return `${EVENT_ID_PREFIX}-${eventSeq}`;
 }
 function trimText(value) {
   if (typeof value !== "string") return void 0;
@@ -1562,7 +1603,8 @@ function mapCollabAgentEvent(input) {
     role,
     ...knownName ? { title: knownName } : {},
     ...agentPath ? { agentPath } : {},
-    timelineBypass: true
+    timelineBypass: true,
+    rosterKind: "subagent"
   };
   const threadId = input.rootThreadId;
   const method = input.method;
@@ -1639,16 +1681,17 @@ function mapCollabAgentEvent(input) {
     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;
-    }
+    const inputTokens = count(total["inputTokens"]);
+    const cachedInputTokens = count(total["cachedInputTokens"]);
+    const outputTokens = count(total["outputTokens"]);
+    const reasoningOutputTokens = count(total["reasoningOutputTokens"]);
+    const typedUsage = {
+      totalTokens,
+      ...inputTokens !== void 0 ? { inputTokens } : {},
+      ...cachedInputTokens !== void 0 ? { cachedInputTokens } : {},
+      ...outputTokens !== void 0 ? { outputTokens } : {},
+      ...reasoningOutputTokens !== void 0 ? { reasoningOutputTokens } : {}
+    };
     return [
       baseEvent({
         type: "task.progress",
@@ -2316,7 +2359,7 @@ function elicitationOptions(params) {
   ];
 }
 function mapServerRequestToEvents(input) {
-  const requestId = String(input.id);
+  const requestId = input.requestId;
   if (input.method === "item/tool/requestUserInput") {
     const questions = toUserInputQuestions(input.params);
     if (!questions) return [];
@@ -2378,6 +2421,9 @@ function mapServerRequestToEvents(input) {
 }
 
 // src/sessionRuntime.ts
+function cancelWireFor(pending) {
+  return pending.kind === "mcp-elicitation" ? toMcpElicitationResponse("cancel", pending.params) : { decision: "cancel" };
+}
 var sleep = (ms) => new Promise((resolve2) => {
   setTimeout(resolve2, ms);
 });
@@ -2430,8 +2476,18 @@ var CodexSessionRuntime = class {
   memoryThreadIds = /* @__PURE__ */ new Set();
   appServerArgs;
   host;
+  attachments;
   rpc;
   emit;
+  /**
+   * 对外 requestId 的前缀，每个会话（即每个 app-server 进程）一份。JSON-RPC id 每个进程
+   * 都从 0 数起，宿主按 requestId 记「已接受」，不加前缀的话重启后的新请求会撞上旧请求。
+   */
+  #requestIdPrefix = `codex-${NodeCrypto2.randomUUID()}:`;
+  /** JSON-RPC id → 对外 requestId。`serverRequest/resolved` 里的 id 可能是数字也可能是字符串。 */
+  requestIdFor(jsonRpcId) {
+    return `${this.#requestIdPrefix}${String(jsonRpcId)}`;
+  }
   /** 这一轮该用哪套三字段组合：只由这一轮的档决定（见 `codexNativeModeFor`）。 */
   #threadConfig() {
     return codexThreadConfigForNativeMode(codexNativeModeFor(this.runtimeMode, this.nativeModeId));
@@ -2451,7 +2507,8 @@ var CodexSessionRuntime = class {
       error: error instanceof Error ? error.message : String(error)
     });
   }
-  constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay) {
+  constructor(host, rpc, emit, input, cwd, appServerArgs, grants, declineRelay, attachments) {
+    this.attachments = attachments;
     this.host = host;
     this.rpc = rpc;
     this.emit = emit;
@@ -2510,7 +2567,7 @@ var CodexSessionRuntime = class {
     if (kind === "drop") return;
     if (isFatalStderr(line)) {
       this.emit({
-        eventId: `codex-stderr-${Date.now()}`,
+        eventId: nextEventId(),
         provider: CODEX_DRIVER_KIND,
         threadId: this.threadId,
         createdAt: nowIso(),
@@ -2553,21 +2610,24 @@ var CodexSessionRuntime = class {
   }
   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
-          }
-        });
-      }
+      const rawId = isRecord3(params) ? params["requestId"] : void 0;
+      if (typeof rawId !== "number" && typeof rawId !== "string") return;
+      const resolvedId = this.requestIdFor(rawId);
+      const pending = this.pendingApprovals.get(resolvedId);
+      if (pending === void 0) return;
+      pending.release();
+      this.emit({
+        eventId: nextEventId(),
+        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({
@@ -2746,9 +2806,9 @@ var CodexSessionRuntime = class {
       return;
     }
     if (method === "item/tool/requestUserInput") {
-      const requestId = String(id);
+      const requestId = this.requestIdFor(id);
       const events = mapServerRequestToEvents({
-        id,
+        requestId,
         method,
         params,
         threadId: this.threadId,
@@ -2779,9 +2839,9 @@ var CodexSessionRuntime = class {
       await this.rpc.respond(id, { decision });
       return;
     }
-    const requestId = String(id);
+    const requestId = this.requestIdFor(id);
     const events = mapServerRequestToEvents({
-      id,
+      requestId,
       method,
       params,
       threadId: this.threadId,
@@ -2798,6 +2858,10 @@ var CodexSessionRuntime = class {
         settle: (decision) => {
           this.pendingApprovals.delete(requestId);
           void this.rpc.respond(id, decision).catch((error) => this.#warnAnswerWriteFailed(method, id, error)).finally(resolve2);
+        },
+        release: () => {
+          this.pendingApprovals.delete(requestId);
+          resolve2();
         }
       });
       for (const event of events) this.emit(event);
@@ -2805,7 +2869,7 @@ var CodexSessionRuntime = class {
   }
   async respondToRequest(requestId, decision, reason, persist) {
     const pending = this.pendingApprovals.get(requestId);
-    if (!pending) throw new Error(`unknown request ${requestId}`);
+    if (!pending) throw new Error(`Unknown pending Codex approval request: ${requestId}`);
     if (decision === "deny" && reason) this.declineRelay.queue(this.threadId, reason);
     let wire = { decision: decision === "allow" ? "accept" : "decline" };
     if (decision === "allow" && pending.kind === "mcp-elicitation") {
@@ -2821,7 +2885,7 @@ var CodexSessionRuntime = class {
     pending.settle(wire);
     const delivery = await ack.catch(() => "closed");
     this.emit({
-      eventId: `codex-req-${requestId}`,
+      eventId: nextEventId(),
       provider: CODEX_DRIVER_KIND,
       threadId: this.threadId,
       createdAt: nowIso(),
@@ -2838,7 +2902,7 @@ var CodexSessionRuntime = class {
   }
   async respondToUserInput(requestId, answers) {
     const pending = this.pendingUserInputs.get(requestId);
-    if (!pending) throw new Error(`unknown user-input ${requestId}`);
+    if (!pending) throw new Error(`Unknown pending Codex user input request: ${requestId}`);
     const mapped = toCodexUserInputAnswers(answers);
     if (mapped === void 0) {
       throw new Error(`invalid user input answers for request ${requestId}`);
@@ -2847,7 +2911,7 @@ var CodexSessionRuntime = class {
     pending.settle({ answers: mapped });
     const delivery = await ack.catch(() => "closed");
     this.emit({
-      eventId: `codex-ui-${requestId}`,
+      eventId: nextEventId(),
       provider: CODEX_DRIVER_KIND,
       threadId: this.threadId,
       createdAt: nowIso(),
@@ -2899,7 +2963,7 @@ var CodexSessionRuntime = class {
   }
   async openThread(input) {
     const resume = input.discardResumeCursor === true ? void 0 : parseCodexResumeCursor(input.resumeCursor);
-    const requestedModel = input.launch.requestedModelId?.trim() || modelIdFromSelection(input.modelSelection);
+    const requestedModel = modelIdFromSelection(input.modelSelection);
     const startParams = {
       ...this.threadConfigParams(),
       ...requestedModel ? { model: requestedModel } : {}
@@ -2935,7 +2999,7 @@ var CodexSessionRuntime = class {
       ...this.model ? { model: this.model } : {}
     };
     this.emit({
-      eventId: `codex-session-${this.threadId}`,
+      eventId: nextEventId(),
       provider: CODEX_DRIVER_KIND,
       threadId: this.threadId,
       createdAt: nowIso(),
@@ -2953,24 +3017,45 @@ var CodexSessionRuntime = class {
     const effort = modelSelectionStringOption(input.modelSelection, "reasoningEffort") ?? DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
     return buildCodexDeveloperInstructions(mode, { model, reasoningEffort: effort }, tools, tools);
   }
-  turnInput(input) {
+  async turnInput(input) {
+    const images = await this.#imageInputs(input.attachments);
     const items = [];
     const declined = this.declineRelay.take(this.threadId);
     const text = [declined, input.input ?? ""].filter((part) => part && part.length > 0).join("\n\n");
     if (text.length > 0) items.push({ type: "text", text });
-    if (Array.isArray(input.attachments)) {
-      for (const attachment of input.attachments) {
-        if (!isRecord3(attachment)) continue;
-        const url = asString(attachment["dataUrl"]) ?? asString(attachment["url"]);
-        if (url) items.push({ type: "image", url });
+    items.push(...images);
+    return items;
+  }
+  /** 宿主只给附件 id：字节经附件接口读回，拼成 data URL 交给 codex。读不到就报错，不悄悄丢图。 */
+  async #imageInputs(attachments) {
+    const items = [];
+    for (const attachment of attachments ?? []) {
+      if (!isRecord3(attachment) || attachment["type"] !== "image") continue;
+      const id = asString(attachment["id"]);
+      const mimeType = asString(attachment["mimeType"]);
+      if (!id || !mimeType) {
+        throw new Error("codex image attachment is missing its id or mime type");
       }
+      if (!this.attachments) {
+        throw new Error(`codex cannot read image attachment ${id}: no attachment access`);
+      }
+      const bytes = await this.attachments.read(id);
+      items.push({
+        type: "image",
+        url: `data:${mimeType};base64,${Buffer.from(bytes).toString("base64")}`
+      });
     }
     return items;
   }
   async sendTurn(input) {
     if (!this.nativeThreadId) throw new Error("codex session has no native thread");
     if (hasConfiguredMcpServer(this.appServerArgs)) {
-      await this.rpc.request("mcpServer/reload", {}, 0).catch(() => void 0);
+      await this.rpc.request("config/mcpServer/reload", void 0, 0).catch((error) => {
+        this.host.log.warn("refreshing the codex MCP tool list before a turn failed", {
+          threadId: this.threadId,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      });
     }
     const sandboxPolicy = this.#turnSandboxPolicy();
     const config = this.#threadConfig();
@@ -2979,7 +3064,7 @@ var CodexSessionRuntime = class {
     const serviceTier = modelSelectionStringOption(input.modelSelection, "serviceTier");
     const params = {
       threadId: this.nativeThreadId,
-      input: this.turnInput(input),
+      input: await this.turnInput(input),
       approvalPolicy: config.approvalPolicy,
       approvalsReviewer: config.approvalsReviewer,
       sandboxPolicy,
@@ -3039,24 +3124,29 @@ var CodexSessionRuntime = class {
     );
     if (!this.nativeThreadId) return;
     const target = turnId ?? this.activeTurnId;
-    if (!target) return;
-    await this.rpc.request("turn/interrupt", { threadId: this.nativeThreadId, turnId: target }, 0).catch(() => void 0);
+    if (target) {
+      await this.rpc.request("turn/interrupt", { threadId: this.nativeThreadId, turnId: target }, 0).catch(() => void 0);
+    }
+    this.cancelPendingApprovals();
+  }
+  /** 把还挂着的审批答成「取消」，逐条发 request.resolved。 */
+  cancelPendingApprovals() {
+    for (const [requestId, pending] of this.pendingApprovals) {
+      pending.settle(cancelWireFor(pending));
+      this.emit({
+        eventId: nextEventId(),
+        provider: CODEX_DRIVER_KIND,
+        threadId: this.threadId,
+        createdAt: nowIso(),
+        type: "request.resolved",
+        requestId,
+        payload: { requestType: toRequestTypeFromKind(pending.kind), decision: "cancel" }
+      });
+    }
   }
   async compactContext() {
     if (!this.nativeThreadId) return;
-    await this.rpc.request("thread/compact", { threadId: this.nativeThreadId }, 0).catch(() => void 0);
-  }
-  async uploadFeedback(reason) {
-    const result = await this.rpc.request(
-      "feedback/upload",
-      {
-        threadId: this.nativeThreadId,
-        ...reason ? { reason } : {}
-      },
-      0
-    );
-    const id = (isRecord3(result) ? asString(result["feedbackId"]) : null) ?? `codex-feedback-${Date.now()}`;
-    return { feedbackId: id };
+    await this.rpc.request("thread/compact/start", { threadId: this.nativeThreadId }, 0);
   }
   async readThread() {
     if (!this.nativeThreadId) return { threadId: this.threadId, turns: this.turns };
@@ -3111,7 +3201,7 @@ var CodexSessionRuntime = class {
     }
     this.closeCompleted = true;
     this.emit({
-      eventId: `codex-close-${this.threadId}`,
+      eventId: nextEventId(),
       provider: CODEX_DRIVER_KIND,
       threadId: this.threadId,
       createdAt: nowIso(),
@@ -3466,10 +3556,6 @@ function serviceTierDescriptor(row) {
     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"]);
@@ -3482,7 +3568,6 @@ function codexProbeModel(row) {
     slug,
     ...displayName ? { name: codexModelDisplayName(displayName) } : {},
     ...row["isDefault"] === true ? { isDefault: true } : {},
-    ...isSupersededModel(row) ? { isLegacy: true } : {},
     ...row["hidden"] === true ? { hidden: true } : {},
     // 空表也给 `capabilities`：`{}` 与 `null` 对宿主是一回事（都不画那一格），
     // 但给对象保住「这只手确实答过这一问」这层意思。
@@ -3515,6 +3600,47 @@ async function listCodexModels(rpc) {
   return models;
 }
 
+// src/skills.ts
+var SKILLS_LIST_TIMEOUT_MS = 15e3;
+function codexProbeSkill(raw) {
+  if (!isRecord3(raw)) return null;
+  const name = asString(raw["name"]);
+  const path = asString(raw["path"]);
+  const scope = asString(raw["scope"]);
+  if (!name || !path || scope === "repo") return null;
+  const face = isRecord3(raw["interface"]) ? raw["interface"] : void 0;
+  const description = asString(raw["description"]);
+  const displayName = asString(face?.["displayName"]);
+  const shortDescription = asString(face?.["shortDescription"]) || asString(raw["shortDescription"]);
+  return {
+    name,
+    path,
+    enabled: raw["enabled"] !== false,
+    ...scope ? { scope } : {},
+    ...description ? { description } : {},
+    ...displayName ? { displayName } : {},
+    ...shortDescription ? { shortDescription } : {}
+  };
+}
+async function listCodexSkills(rpc) {
+  let response;
+  try {
+    response = await rpc.request("skills/list", {}, SKILLS_LIST_TIMEOUT_MS);
+  } catch {
+    return void 0;
+  }
+  if (!isRecord3(response) || !Array.isArray(response["data"])) return void 0;
+  const skills = /* @__PURE__ */ new Map();
+  for (const entry of response["data"]) {
+    if (!isRecord3(entry) || !Array.isArray(entry["skills"])) continue;
+    for (const raw of entry["skills"]) {
+      const skill = codexProbeSkill(raw);
+      if (skill !== null) skills.set(skill.path, skill);
+    }
+  }
+  return [...skills.values()].toSorted((left, right) => left.name.localeCompare(right.name));
+}
+
 // src/signIn.ts
 var DEVICE_CODE_URL = /https?:\/\/\S+/;
 var DEVICE_CODE_VALUE = /\b([A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+)\b/;
@@ -3704,8 +3830,7 @@ 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
+  mergeLaunchEnv as mergeLaunchEnv2
 } from "@ycodium-ai/plugin-api/executor";
 var CODEX_TIMEOUT_MS = 18e4;
 var EARLIER_CONTENT_TRUNCATION_MARKER = "[Earlier content truncated]\n\n";
@@ -3852,7 +3977,7 @@ async function collectStream(stream) {
   return out;
 }
 function createCodexTextGeneration(input) {
-  const run = async (operation, cwd, prompt, schema, modelSelection, launch, imagePaths, signal) => {
+  const run = async (operation, cwd, prompt, schema, modelSelection, imagePaths, signal) => {
     if (input.recipe.binaryPath.length === 0) {
       throw new Error("Codex CLI is required but not available on PATH.");
     }
@@ -3861,33 +3986,16 @@ function createCodexTextGeneration(input) {
     const outputPath = NodePath5.join(tmp, "output.json");
     await NodeFSP2.writeFile(schemaPath, JSON.stringify(schema));
     await NodeFSP2.writeFile(outputPath, "");
-    const launchRecord = isRecord3(launch) ? launch : {};
-    const processEnv = isRecord3(launchRecord.processEnv) ? Object.fromEntries(
-      Object.entries(launchRecord.processEnv).filter(
-        (entry) => typeof entry[1] === "string"
-      )
-    ) : {};
-    const overlay = Array.isArray(launchRecord.launchArgOverrides) && launchRecord.launchArgOverrides.length > 0 ? encodeCodexConfigOverrides(
-      launchRecord.launchArgOverrides.flatMap((entry) => {
-        if (!isRecord3(entry) || typeof entry.key !== "string") return [];
-        const value = entry.value;
-        if (typeof value !== "string" && typeof value !== "boolean") return [];
-        return [{ key: entry.key, value }];
-      })
-    ) : "";
-    const launchArgs = [input.recipe.launchArgs, overlay].filter((value) => value.length > 0).join(" ");
     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 model = modelIdFromSelection(modelSelection) ?? "gpt-5.6-luna";
     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
+      instanceTable: input.recipe.environment
     });
     const args = [
       "exec",
-      ...codexExecLaunchArgs(launchArgs),
+      ...codexExecLaunchArgs(input.recipe.launchArgs),
       "--ephemeral",
       "--skip-git-repo-check",
       "-s",
@@ -3985,7 +4093,6 @@ function createCodexTextGeneration(input) {
         prompt,
         includeBranch ? COMMIT_WITH_BRANCH_SCHEMA : COMMIT_SCHEMA,
         inputRecord.modelSelection,
-        inputRecord.launch,
         [],
         signal
       );
@@ -4036,7 +4143,6 @@ function createCodexTextGeneration(input) {
         prompt,
         PR_SCHEMA,
         inputRecord.modelSelection,
-        inputRecord.launch,
         [],
         signal
       );
@@ -4076,7 +4182,6 @@ function createCodexTextGeneration(input) {
         prompt,
         BRANCH_SCHEMA,
         inputRecord.modelSelection,
-        inputRecord.launch,
         absoluteImagePaths(attachments),
         signal
       );
@@ -4113,7 +4218,6 @@ ${extra}` : ""}`;
         prompt,
         TITLE_SCHEMA,
         inputRecord.modelSelection,
-        inputRecord.launch,
         absoluteImagePaths(attachments),
         signal
       );
@@ -4142,7 +4246,6 @@ ${extra}` : ""}`;
         prompt,
         HANDOVER_SCHEMA,
         inputRecord.modelSelection,
-        inputRecord.launch,
         [],
         signal
       );
@@ -4201,18 +4304,15 @@ function accountToAuth2(account) {
       return { status: "unknown" };
   }
 }
-function layoutFor(recipe, launchHome, nativeSubscription = false) {
+function layoutFor(recipe) {
   const environmentHome = recipe.environment["CODEX_HOME"];
-  if (nativeSubscription && launchHome?.trim()) {
-    return resolveCodexHomeLayout({ homePath: launchHome.trim(), shadowHomePath: "" });
-  }
   return resolveCodexHomeLayout({
-    homePath: launchHome?.trim() || recipe.homePath,
+    homePath: recipe.homePath,
     shadowHomePath: recipe.shadowHomePath,
     ...environmentHome === void 0 ? {} : { environmentHome }
   });
 }
-var createCodexInstance = (config, host) => {
+var createCodexInstance = (config, host, attachments) => {
   const recipe = parseCodexInstanceConfig(config);
   const events = new EventBus();
   const threads = /* @__PURE__ */ new Map();
@@ -4252,10 +4352,11 @@ var createCodexInstance = (config, host) => {
         await rpc.request("initialize", CODEX_INITIALIZE_PARAMS)
       );
       await rpc.notify("initialized");
-      return { version, models: input.listModels ? await listCodexModels(rpc) : void 0 };
+      const models = input.listModels ? await listCodexModels(rpc) : void 0;
+      return { version, models, skills: await listCodexSkills(rpc) };
     } catch (error) {
       if (error instanceof ExecutorSpawnRefusedError) throw error;
-      return { version, models: void 0 };
+      return { version, models: void 0, skills: void 0 };
     } finally {
       await rpc?.close().catch(() => void 0);
       await handle?.kill("SIGTERM").catch(() => void 0);
@@ -4282,7 +4383,9 @@ var createCodexInstance = (config, host) => {
         };
       }
       const connectionError = codexApiConnectionError(recipe, recipe.environment);
-      const { version, models } = await probeAppServer({ listModels: connectionError === null });
+      const { version, models, skills } = await probeAppServer({
+        listModels: connectionError === null
+      });
       if (connectionError) {
         return {
           installed: true,
@@ -4290,6 +4393,7 @@ var createCodexInstance = (config, host) => {
           readiness: "error",
           auth: probeAuth(),
           detail: connectionError,
+          ...skills === void 0 ? {} : { skills },
           ...CODEX_NATIVE_MODE_REPORT
         };
       }
@@ -4299,6 +4403,7 @@ var createCodexInstance = (config, host) => {
         readiness: models === void 0 ? "unchecked" : "ready",
         auth: probeAuth(),
         ...models === void 0 ? {} : { models },
+        ...skills === void 0 ? {} : { skills },
         // 宿主拿的是这一份。登录核验那份（`verifyCodexSignIn`）报了档、这里没报，
         // 界面就一直画宿主四档——2026-09-20 真发生过，浏览器里才看得见。
         ...CODEX_NATIVE_MODE_REPORT
@@ -4317,22 +4422,17 @@ var createCodexInstance = (config, host) => {
         await stopBooked(existing);
         threads.delete(input.threadId);
       }
-      const nativeSubscription = input.launch.nativeSubscription === true;
-      const layout = layoutFor(recipe, input.launch.homePath, nativeSubscription);
+      const layout = layoutFor(recipe);
       await materializeCodexShadowHome(layout, host.log);
       const mcp = codexMcpLaunchConfig(input.mcpServers ?? []);
       const env = buildCodexSpawnEnv({
         recipe,
         layout,
-        // MCP 那几个变量是宿主挑好的 server 带来的，与绑定同一层：实例表盖不得。
-        launchEnv: { ...input.launch.processEnv, ...mcp.environment },
-        crushApiKeys: nativeSubscription || shouldCrushApiKeys(recipe.authMode)
+        // MCP 那几个变量是宿主挑好的 server 带来的，铺在最终层：实例表盖不得。
+        launchEnv: mcp.environment,
+        crushApiKeys: shouldCrushApiKeys(recipe.authMode)
       });
-      const args = [
-        ...codexSpawnArgs(recipe, layout, nativeSubscription),
-        ...codexOverrideArgs(input.launch.launchArgOverrides),
-        ...mcp.args
-      ];
+      const args = [...codexSpawnArgs(recipe, layout), ...mcp.args];
       const handle = await host.process.spawn({
         program: recipe.binaryPath,
         args,
@@ -4367,7 +4467,17 @@ var createCodexInstance = (config, host) => {
           }
         }
       });
-      runtime = new CodexSessionRuntime(host, rpc, (event) => events.push(event), input, cwd, args);
+      runtime = new CodexSessionRuntime(
+        host,
+        rpc,
+        (event) => events.push(event),
+        input,
+        cwd,
+        args,
+        void 0,
+        void 0,
+        attachments
+      );
       try {
         await rpc.request("initialize", CODEX_INITIALIZE_PARAMS);
         await rpc.notify("initialized");
@@ -4435,10 +4545,6 @@ var createCodexInstance = (config, host) => {
       const booked = requireThread(threadId);
       return await booked.runtime.readThread();
     },
-    uploadFeedback: async (input) => {
-      const booked = requireThread(input.threadId);
-      return await booked.runtime.uploadFeedback(input.reason);
-    },
     events,
     dispose: async () => {
       if (disposed) return;
@@ -4624,13 +4730,15 @@ var createCodexInstance = (config, host) => {
 };
 
 // src/index.ts
+var capturedAttachments;
 var executors = [
   {
     card: CODEX_CARD,
     createInstance: async (config, host) => {
       host.log.info("createInstance");
-      return createCodexInstance(config, host);
-    }
+      return createCodexInstance(config, host, capturedAttachments);
+    },
+    probeAccount: async ({ accountPath }) => probeCodexAccount(accountPath)
   }
 ];
 var index_default = definePlugin({
@@ -4638,6 +4746,7 @@ var index_default = definePlugin({
   apiVersion: 2,
   executors,
   activate(ctx) {
+    capturedAttachments = ctx.attachments;
     ctx.log.info("codex executor ready");
   }
 });

package/locales/en.json

@@ -0,0 +1,23 @@
+{
+  "form": {
+    "binaryPath": {
+      "title": "Program path",
+      "description": "Path to the Codex program this provider runs.",
+      "placeholder": "codex"
+    },
+    "homePath": {
+      "title": "CODEX_HOME path",
+      "description": "Custom Codex home and config directory.",
+      "placeholder": "~/.codex"
+    },
+    "shadowHomePath": {
+      "title": "Shadow home path",
+      "description": "Account-specific Codex home. Keeps auth.json separate while sharing state from CODEX_HOME.",
+      "placeholder": "~/.codex-personal"
+    },
+    "launchArgs": {
+      "title": "Launch arguments",
+      "description": "Additional CLI arguments passed to codex app-server on session start."
+    }
+  }
+}

package/locales/zh-CN.json

@@ -0,0 +1,23 @@
+{
+  "form": {
+    "binaryPath": {
+      "title": "程序路径",
+      "description": "此 provider 运行的 Codex 程序的路径。",
+      "placeholder": "codex"
+    },
+    "homePath": {
+      "title": "CODEX_HOME 路径",
+      "description": "自定义的 Codex 主目录与配置目录。",
+      "placeholder": "~/.codex"
+    },
+    "shadowHomePath": {
+      "title": "影子目录路径",
+      "description": "账户专用的 Codex 目录。auth.json 单独保存，其余状态仍与 CODEX_HOME 共用。",
+      "placeholder": "~/.codex-personal"
+    },
+    "launchArgs": {
+      "title": "启动参数",
+      "description": "会话启动时传给 codex app-server 的额外命令行参数。"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-codex",
-  "version": "0.2.2163",
+  "version": "0.2.2488",
   "description": "Codex executor: Codex CLI over the app-server JSON-RPC protocol.",
   "keywords": [
     "ycodium",
@@ -10,6 +10,7 @@
   "files": [
     "dist",
     "assets",
+    "locales",
     "README.md"
   ],
   "type": "module",
@@ -20,7 +21,8 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.0"
+    "@ycodium-ai/plugin-api": "0.2.2488",
+    "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",