@armadra/agent 0.6.1 → 0.6.2

package/dist/bundle/ama.cjs

@@ -41,7 +41,7 @@ var AMA_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    AMA_VERSION = true ? "0.6.1" : readPackageVersion();
+    AMA_VERSION = true ? "0.6.2" : readPackageVersion();
   }
 });
 
@@ -3622,6 +3622,7 @@ var init_config_keys = __esm({
       "auth.chatgpt.clientId": "OAuth client id",
       "auth.chatgpt.issuer": "Authorization server (override with AMA_CHATGPT_ISSUER for tests)",
       "auth.chatgpt.originator": "originator request header for the codex flavor",
+      "auth.chatgpt.codexClientVersion": "Codex CLI version sent as client_version when listing codex-flavor models (the backend hides models newer than it); AMA_CHATGPT_CODEX_CLIENT_VERSION overrides",
       "auth.chatgpt.redirectPorts": "Local callback ports, tried in order; 0 = any free port",
       skills: "Skills",
       "skills.dirs": "Extra skill directories; accumulated across levels",
@@ -3740,6 +3741,7 @@ var init_config_keys = __esm({
       "auth.chatgpt.clientId": "OAuth 客户端 id",
       "auth.chatgpt.issuer": "授权服务器（测试用 AMA_CHATGPT_ISSUER 覆盖）",
       "auth.chatgpt.originator": "codex flavor 的 originator 请求头",
+      "auth.chatgpt.codexClientVersion": "codex flavor 列模型时作为 client_version 发送的 Codex CLI 版本号（后端不给比它新的模型）；AMA_CHATGPT_CODEX_CLIENT_VERSION 优先",
       "auth.chatgpt.redirectPorts": "本地回调端口，依次尝试；0 = 任意空闲端口",
       skills: "Skill",
       "skills.dirs": "追加的 Skill 目录；各层累加",
@@ -5114,7 +5116,13 @@ Then paste the full URL from the address bar (http://127.0.0.1:…/auth/callback
         siwcLimitHint: "Tip: set a weekly limit for ama in ChatGPT → Settings → Usage → App limits. For personal use only; never share one sign-in between several people.",
         freePlanHint: (plan2) => `Note: the "${plan2}" plan may not include subscription usage for ama.`,
         modelHint: "Use it with --model chatgpt/<model>; list the models your account can use with ama models discover chatgpt.",
-        modelsCached: (count2) => `Your account can use ${count2} model(s); pick one with /model or --model chatgpt/<model>.`
+        modelsCached: (count2) => `Your account can use ${count2} model(s); pick one with /model or --model chatgpt/<model>.`,
+        siwcEligibilityHint: "Whether this account can share its plan usage with ama is only confirmed on the first request.",
+        codexNoModels: (version) => `The codex backend returned no models. codexClientVersion (${version}) may be too old: set a newer Codex CLI version with ama config set auth.chatgpt.codexClientVersion <version>, then run ama models discover chatgpt.`
+      },
+      request: {
+        notEligible: "this ChatGPT account cannot share plan usage with ama (403 subscription_sharing_user_not_eligible). Possible causes:\n  1. Plan: plan usage is shared with Plus / Pro only\n  2. Workspace account: Team / Enterprise / Edu workspaces may not offer it\n  3. Region restriction, or not yet rolled out during the preview (most likely when a Pro account still gets this error)\nYou can sign in the other way instead: ama auth login chatgpt --flavor codex",
+        flavorMismatch: (current3, ref, pinned) => `signed in with ${current3}, but ${ref} pins the @${pinned} channel. Drop @${pinned} so the channel follows the sign-in, or run ama auth login chatgpt --flavor ${pinned}`
       },
       errors: {
         portsBusy: (ports, codex) => `callback port ${ports} is in use: finish the other sign-in first, or use --paste${codex ? " / --device" : ""}`,
@@ -5215,7 +5223,13 @@ Then paste the full URL from the address bar (http://127.0.0.1:…/auth/callback
         siwcLimitHint: "提示：可在 ChatGPT → 设置 → Usage → App limits 给 ama 设周上限。仅限本人使用，不要让多人共用一个登录。",
         freePlanHint: (plan2) => `注意：「${plan2}」计划可能不含给 ama 用的订阅额度。`,
         modelHint: "用 --model chatgpt/<模型> 使用；账户可用的模型用 ama models discover chatgpt 查看。",
-        modelsCached: (count2) => `账户可用 ${count2} 个模型，用 /model 或 --model chatgpt/<模型> 选择。`
+        modelsCached: (count2) => `账户可用 ${count2} 个模型，用 /model 或 --model chatgpt/<模型> 选择。`,
+        siwcEligibilityHint: "这个账户能否把套餐额度共享给 ama，要到首次请求时才能确认。",
+        codexNoModels: (version) => `codex 后端没有返回模型，可能是 codexClientVersion（${version}）过旧：用 ama config set auth.chatgpt.codexClientVersion <版本> 设为较新的 Codex CLI 版本，再运行 ama models discover chatgpt。`
+      },
+      request: {
+        notEligible: "这个 ChatGPT 账户不能把套餐额度共享给 ama（403 subscription_sharing_user_not_eligible）。可能的原因：\n  1. 账户套餐：额度共享只对 Plus / Pro 开放\n  2. 工作空间账户：Team / Enterprise / Edu 工作空间可能未开放\n  3. 地区受限，或预览期尚未开放（Pro 账户仍报此错时最可能是这一条）\n可以改用另一种登录方式：ama auth login chatgpt --flavor codex",
+        flavorMismatch: (current3, ref, pinned) => `当前以 ${current3} 方式登录，但 ${ref} 显式指定了 @${pinned} 渠道。去掉 @${pinned} 让渠道跟随登录方式，或运行 ama auth login chatgpt --flavor ${pinned}`
       },
       errors: {
         portsBusy: (ports, codex) => `回调端口 ${ports} 被占用：请先结束其它登录，或用 --paste${codex ? " / --device" : ""}`,
@@ -6410,7 +6424,8 @@ function validateConfigW6(c, config) {
     if (chatgpt === void 0 || !c.object(chatgpt, cp)) return;
     c.keys(chatgpt, cp, CHATGPT_AUTH_KEYS);
     c.oneOf(chatgpt, "flavor", cp, CHATGPT_FLAVORS);
-    for (const key of ["clientId", "issuer", "originator"]) c.string(chatgpt, key, cp);
+    for (const key of ["clientId", "issuer", "originator", "codexClientVersion"])
+      c.string(chatgpt, key, cp);
     checkPorts(c, chatgpt, "redirectPorts", cp);
   });
 }
@@ -6477,6 +6492,7 @@ var init_schema_w6 = __esm({
       "clientId",
       "issuer",
       "originator",
+      "codexClientVersion",
       "redirectPorts"
     ];
   }
@@ -9695,6 +9711,113 @@ var init_channels = __esm({
   }
 });
 
+// src/auth/chatgpt/presets.ts
+function nonEmpty2(value) {
+  const trimmed = value?.trim();
+  return trimmed === void 0 || trimmed === "" ? void 0 : trimmed;
+}
+function chatgptBaseUrl(flavor, env = process.env) {
+  return nonEmpty2(env["AMA_CHATGPT_BASE_URL"]) ?? CHATGPT_BASE_URLS[flavor];
+}
+function codexClientVersion(config, env = process.env) {
+  return nonEmpty2(env["AMA_CHATGPT_CODEX_CLIENT_VERSION"]) ?? nonEmpty2(config?.codexClientVersion) ?? DEFAULT_CODEX_CLIENT_VERSION;
+}
+function resolveChatGptPreset(flavor, overrides = {}) {
+  const env = overrides.env ?? process.env;
+  const config = overrides.config;
+  const issuer = (nonEmpty2(env["AMA_CHATGPT_ISSUER"]) ?? nonEmpty2(config?.issuer) ?? DEFAULT_ISSUER).replace(/\/+$/, "");
+  const sameFlavor = overrides.entry?.flavor === flavor ? overrides.entry : void 0;
+  const explicitClient = nonEmpty2(env["AMA_CHATGPT_CLIENT_ID"]) ?? nonEmpty2(config?.clientId);
+  const ports = overrides.port !== void 0 ? [overrides.port] : config?.redirectPorts !== void 0 && config.redirectPorts.length > 0 ? [...config.redirectPorts] : void 0;
+  if (flavor === "siwc") {
+    const issued = sameFlavor?.clientId !== SIWC_REGISTRATION_CLIENT_ID ? sameFlavor?.clientId : void 0;
+    const clientId = explicitClient ?? issued ?? SIWC_REGISTRATION_CLIENT_ID;
+    return {
+      flavor,
+      issuer,
+      clientId,
+      registering: clientId === SIWC_REGISTRATION_CLIENT_ID,
+      authorizeUrl: `${issuer}/api/accounts/authorize`,
+      tokenUrl: `${issuer}/api/accounts/oauth/token`,
+      scopes: [
+        "openid",
+        "profile",
+        "email",
+        "offline_access",
+        "resource.invoke",
+        SIWC_REQUIRED_SCOPE
+      ],
+      // 端口可变（scheme / host / path 不变）：1455 被占用就用任意空闲端口
+      redirectPorts: ports ?? [1455, 0],
+      resource: SIWC_RESOURCE,
+      refreshEncoding: "form",
+      baseUrl: chatgptBaseUrl(flavor, env),
+      verifyIdToken: true,
+      requiredScope: SIWC_REQUIRED_SCOPE,
+      device: false,
+      revoke: true
+    };
+  }
+  return {
+    flavor,
+    issuer,
+    clientId: explicitClient ?? CODEX_CLIENT_ID,
+    registering: false,
+    authorizeUrl: `${issuer}/oauth/authorize`,
+    tokenUrl: `${issuer}/oauth/token`,
+    scopes: ["openid", "profile", "email", "offline_access"],
+    // 公开客户端只登记了这两个端口；被占用不抢占
+    redirectPorts: ports ?? [1455, 1457],
+    refreshEncoding: "json",
+    baseUrl: chatgptBaseUrl(flavor, env),
+    verifyIdToken: false,
+    device: true,
+    revoke: false,
+    originator: nonEmpty2(config?.originator) ?? DEFAULT_ORIGINATOR
+  };
+}
+function authorizeUrl(preset, input2) {
+  const params = new URLSearchParams({
+    response_type: "code",
+    client_id: preset.clientId,
+    redirect_uri: input2.redirectUri,
+    scope: preset.scopes.join(" "),
+    code_challenge: input2.challenge,
+    code_challenge_method: "S256",
+    state: input2.state
+  });
+  if (preset.flavor === "siwc") {
+    params.set("nonce", input2.nonce);
+    if (preset.resource !== void 0) params.set("resource", preset.resource);
+    if (input2.hostId !== void 0) params.set("ext_agent_host_id", input2.hostId);
+    if (preset.registering) params.set("agent_name_hint", AGENT_NAME_HINT);
+  } else {
+    params.set("id_token_add_organizations", "true");
+    params.set("codex_cli_simplified_flow", "true");
+    if (preset.originator !== void 0) params.set("originator", preset.originator);
+  }
+  return `${preset.authorizeUrl}?${params.toString()}`;
+}
+var CHATGPT_PROVIDER_ID, DEFAULT_ISSUER, SIWC_REGISTRATION_CLIENT_ID, CODEX_CLIENT_ID, SIWC_RESOURCE, SIWC_REQUIRED_SCOPE, AGENT_NAME_HINT, DEFAULT_ORIGINATOR, DEFAULT_CODEX_CLIENT_VERSION, CHATGPT_BASE_URLS;
+var init_presets = __esm({
+  "src/auth/chatgpt/presets.ts"() {
+    "use strict";
+    CHATGPT_PROVIDER_ID = "chatgpt";
+    DEFAULT_ISSUER = "https://auth.openai.com";
+    SIWC_REGISTRATION_CLIENT_ID = "dynamic_agent_client";
+    CODEX_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
+    SIWC_RESOURCE = "https://api.openai.com/v1";
+    SIWC_REQUIRED_SCOPE = "chatgpt.tokens.use.direct";
+    AGENT_NAME_HINT = "ama";
+    DEFAULT_ORIGINATOR = "codex_cli_rs";
+    DEFAULT_CODEX_CLIENT_VERSION = "0.160.0";
+    CHATGPT_BASE_URLS = {
+      siwc: "https://api.openai.com/v1",
+      codex: "https://chatgpt.com/backend-api/codex"
+    };
+  }
+});
+
 // src/ai/providers/catalog-data.ts
 var CATALOG_SOURCES;
 var init_catalog_data = __esm({
@@ -11802,11 +11925,12 @@ async function resolveModel(args, registry2, manager, defaultModel, deps, intera
   } else {
     const change = lastEntry(manager, (e) => e.type === "model_change");
     if (change?.type === "model_change") {
+      const channel = change.provider === CHATGPT_PROVIDER_ID ? void 0 : change.channel;
       const found = registry2.findModel(
         formatModelRef({
           provider: change.provider,
           id: change.modelId,
-          ...change.channel !== void 0 ? { channel: change.channel } : {}
+          ...channel !== void 0 ? { channel } : {}
         })
       );
       if (found.ok) choice3 = { model: found.model, provider: found.provider };
@@ -11883,6 +12007,7 @@ var init_startup_steps = __esm({
     "use strict";
     init_suggest();
     init_channels();
+    init_presets();
     import_node_fs14 = require("node:fs");
     import_node_path16 = require("node:path");
     init_errors();
@@ -16579,7 +16704,7 @@ function resolvePreset(input2) {
   return { preset, codemode, builtin: names.sort(), warnings };
 }
 var CODEMODE_TOOL, PRESET_TOOLS, PresetToolRegistry;
-var init_presets = __esm({
+var init_presets2 = __esm({
   "src/tools/presets.ts"() {
     "use strict";
     init_capability();
@@ -16939,7 +17064,7 @@ var init_tool_runner = __esm({
     import_node_path35 = require("node:path");
     init_loop_guard();
     init_schema2();
-    init_presets();
+    init_presets2();
     init_registry();
     init_truncate();
     ABORTED_TOOL_TEXT = "aborted by user";
@@ -24127,9 +24252,72 @@ var init_session_extensions = __esm({
   }
 });
 
+// src/auth/oauth/live.ts
+function registerLiveToken(token, context) {
+  live.delete(token);
+  live.set(token, context);
+  while (live.size > MAX_LIVE) {
+    const oldest = live.keys().next().value;
+    if (oldest === void 0) break;
+    live.delete(oldest);
+  }
+}
+function liveToken(token) {
+  return token === void 0 ? void 0 : live.get(token);
+}
+var MAX_LIVE, live;
+var init_live = __esm({
+  "src/auth/oauth/live.ts"() {
+    "use strict";
+    MAX_LIVE = 32;
+    live = /* @__PURE__ */ new Map();
+  }
+});
+
+// src/auth/chatgpt/follow.ts
+function backendOf(compat) {
+  if (typeof compat !== "object" || compat === null) return void 0;
+  const value = compat.chatgptBackend;
+  return value === "siwc" || value === "codex" ? value : void 0;
+}
+function followChatGptLogin(model, provider, apiKey) {
+  const current3 = backendOf(model.compat);
+  if (current3 === void 0 || model.channelPinned === true) return model;
+  const flavor = liveToken(apiKey)?.flavor;
+  if (flavor === void 0 || flavor === current3) return model;
+  const channels = provider?.channels ?? [];
+  const target = channels.find((c) => backendOf(c.compat) === flavor) ?? channels.find((c) => c.name === flavor);
+  if (target === void 0) return model;
+  const previous = channels.find((c) => c.name === model.channel);
+  const headers2 = { ...model.headers };
+  for (const name of Object.keys(previous?.headers ?? {})) delete headers2[name];
+  Object.assign(headers2, target.headers);
+  const next = {
+    ...model,
+    api: target.api,
+    baseUrl: target.baseUrl,
+    channel: target.name,
+    compat: { ...model.compat, ...target.compat, chatgptBackend: flavor }
+  };
+  if (Object.keys(headers2).length > 0) next.headers = headers2;
+  else delete next.headers;
+  return next;
+}
+var init_follow = __esm({
+  "src/auth/chatgpt/follow.ts"() {
+    "use strict";
+    init_live();
+  }
+});
+
 // src/agent/session-settings.ts
 function providerStream(providers) {
-  return (model, context, streamOptions) => {
+  return (requested, context, streamOptions) => {
+    const model = followChatGptLogin(
+      requested,
+      providers.get(requested.provider),
+      streamOptions.apiKey
+    );
     const api = providers.getApi(model.api);
     if (api === void 0) {
       throw new AmaError("provider_not_found", `no implementation registered for api ${model.api}`);
@@ -24141,6 +24329,7 @@ var SessionSettings;
 var init_session_settings = __esm({
   "src/agent/session-settings.ts"() {
     "use strict";
+    init_follow();
     init_errors();
     init_session_sync();
     SessionSettings = class {
@@ -33625,7 +33814,7 @@ var init_compose_session = __esm({
     init_expand();
     init_index_prompt();
     init_templates();
-    init_presets();
+    init_presets2();
     init_compose_store();
     init_compose_extensions();
     init_compose_memory();
@@ -34299,10 +34488,20 @@ var init_token_store = __esm({
 function discoveredCachePath(dataDir, provider) {
   return (0, import_node_path66.join)(dataDir, "models", "discovered", `${provider}.json`);
 }
-function isEntry(value) {
-  if (typeof value !== "object" || value === null) return false;
-  const { id, name } = value;
-  return typeof id === "string" && id !== "" && (name === void 0 || typeof name === "string");
+function toEntry(value) {
+  if (typeof value !== "object" || value === null) return void 0;
+  const raw = value;
+  const { id, name, contextWindow, input: input2, reasoningLevels } = raw;
+  if (typeof id !== "string" || id === "") return void 0;
+  const out = { id };
+  if (typeof name === "string" && name !== "") out.name = name;
+  if (typeof contextWindow === "number" && Number.isInteger(contextWindow) && contextWindow > 0)
+    out.contextWindow = contextWindow;
+  if (Array.isArray(input2) && input2.includes("text"))
+    out.input = ["text", "image"].filter((x) => input2.includes(x));
+  if (Array.isArray(reasoningLevels) && reasoningLevels.every((x) => typeof x === "string"))
+    out.reasoningLevels = reasoningLevels;
+  return out;
 }
 function readDiscoveredCache(dataDir, provider) {
   let parsed;
@@ -34319,7 +34518,7 @@ function readDiscoveredCache(dataDir, provider) {
     provider,
     fetchedAt: typeof file.fetchedAt === "string" ? file.fetchedAt : "",
     ...typeof file.flavor === "string" ? { flavor: file.flavor } : {},
-    models: file.models.filter(isEntry).map((m) => m.name ? { id: m.id, name: m.name } : { id: m.id })
+    models: file.models.map(toEntry).filter((m) => m !== void 0)
   };
 }
 function writeDiscoveredCache(dataDir, provider, input2, now = Date.now()) {
@@ -34329,7 +34528,7 @@ function writeDiscoveredCache(dataDir, provider, input2, now = Date.now()) {
     provider,
     fetchedAt: new Date(now).toISOString(),
     ...input2.flavor !== void 0 ? { flavor: input2.flavor } : {},
-    models: input2.models.map((m) => m.name ? { id: m.id, name: m.name } : { id: m.id })
+    models: input2.models.map(toEntry).filter((m) => m !== void 0)
   };
   (0, import_node_fs44.mkdirSync)((0, import_node_path66.dirname)(path), { recursive: true, mode: 448 });
   const tmp = `${path}.${process.pid}.tmp`;
@@ -34344,10 +34543,32 @@ function clearDiscoveredCache(dataDir, provider) {
   (0, import_node_fs44.rmSync)(path, { force: true });
   return true;
 }
+function thinkingMapOf(levels) {
+  const map = {
+    off: levels.includes("none") ? "none" : null
+  };
+  for (const level of EFFORT_LEVELS) map[level] = levels.includes(level) ? level : null;
+  return map;
+}
+function withBackendMetadata(model, cached, matched) {
+  if (model.contextWindow === void 0 && cached.contextWindow !== void 0)
+    model.contextWindow = cached.contextWindow;
+  if (matched) return;
+  if (cached.input !== void 0) model.input = [...cached.input];
+  const efforts = (cached.reasoningLevels ?? []).filter((x) => x !== "none");
+  if (efforts.length > 0) {
+    model.reasoning = true;
+    model.thinkingLevelMap = thinkingMapOf(cached.reasoningLevels ?? []);
+  }
+}
 function discoveredModels(file, provider, modelsDev) {
   return file.models.map((m) => {
-    const { entry } = enrichEntry(m.name ? { id: m.id, name: m.name } : { id: m.id }, modelsDev);
+    const { entry, metadata } = enrichEntry(
+      m.name ? { id: m.id, name: m.name } : { id: m.id },
+      modelsDev
+    );
     const model = withCustomDefaults(entry, provider.id, provider.api);
+    withBackendMetadata(model, m, metadata.match !== void 0);
     const names = (provider.channels ?? []).map((c) => c.name);
     if (names.length > 0) {
       const own = file.flavor !== void 0 && names.includes(file.flavor) ? file.flavor : void 0;
@@ -34356,18 +34577,20 @@ function discoveredModels(file, provider, modelsDev) {
     return model;
   });
 }
-function mergeDiscoveredModels(registry2, dataDir, modelsDev) {
+function mergeDiscoveredModels(registry2, dataDir, modelsDev, loginFlavor = () => void 0) {
   const merged = [];
   for (const provider of registry2.list()) {
     if (provider.models.length > 0 || !provider.requiresApiKey) continue;
     const file = readDiscoveredCache(dataDir, provider.id);
     if (file === void 0 || file.models.length === 0) continue;
+    const flavor = loginFlavor(provider.id);
+    if (flavor !== void 0 && file.flavor !== void 0 && file.flavor !== flavor) continue;
     registry2.addModels(provider.id, discoveredModels(file, provider, modelsDev), "discovered");
     merged.push(provider.id);
   }
   return merged;
 }
-var import_node_fs44, import_node_path66, DISCOVERED_CACHE_VERSION;
+var import_node_fs44, import_node_path66, DISCOVERED_CACHE_VERSION, EFFORT_LEVELS;
 var init_discovered_cache = __esm({
   "src/ai/providers/discovered-cache.ts"() {
     "use strict";
@@ -34376,6 +34599,7 @@ var init_discovered_cache = __esm({
     init_catalog2();
     init_enrich();
     DISCOVERED_CACHE_VERSION = 1;
+    EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh"];
   }
 });
 
@@ -34464,109 +34688,6 @@ var init_chatgpt_rate_limits = __esm({
   }
 });
 
-// src/auth/chatgpt/presets.ts
-function nonEmpty2(value) {
-  const trimmed = value?.trim();
-  return trimmed === void 0 || trimmed === "" ? void 0 : trimmed;
-}
-function chatgptBaseUrl(flavor, env = process.env) {
-  return nonEmpty2(env["AMA_CHATGPT_BASE_URL"]) ?? CHATGPT_BASE_URLS[flavor];
-}
-function resolveChatGptPreset(flavor, overrides = {}) {
-  const env = overrides.env ?? process.env;
-  const config = overrides.config;
-  const issuer = (nonEmpty2(env["AMA_CHATGPT_ISSUER"]) ?? nonEmpty2(config?.issuer) ?? DEFAULT_ISSUER).replace(/\/+$/, "");
-  const sameFlavor = overrides.entry?.flavor === flavor ? overrides.entry : void 0;
-  const explicitClient = nonEmpty2(env["AMA_CHATGPT_CLIENT_ID"]) ?? nonEmpty2(config?.clientId);
-  const ports = overrides.port !== void 0 ? [overrides.port] : config?.redirectPorts !== void 0 && config.redirectPorts.length > 0 ? [...config.redirectPorts] : void 0;
-  if (flavor === "siwc") {
-    const issued = sameFlavor?.clientId !== SIWC_REGISTRATION_CLIENT_ID ? sameFlavor?.clientId : void 0;
-    const clientId = explicitClient ?? issued ?? SIWC_REGISTRATION_CLIENT_ID;
-    return {
-      flavor,
-      issuer,
-      clientId,
-      registering: clientId === SIWC_REGISTRATION_CLIENT_ID,
-      authorizeUrl: `${issuer}/api/accounts/authorize`,
-      tokenUrl: `${issuer}/api/accounts/oauth/token`,
-      scopes: [
-        "openid",
-        "profile",
-        "email",
-        "offline_access",
-        "resource.invoke",
-        SIWC_REQUIRED_SCOPE
-      ],
-      // 端口可变（scheme / host / path 不变）：1455 被占用就用任意空闲端口
-      redirectPorts: ports ?? [1455, 0],
-      resource: SIWC_RESOURCE,
-      refreshEncoding: "form",
-      baseUrl: chatgptBaseUrl(flavor, env),
-      verifyIdToken: true,
-      requiredScope: SIWC_REQUIRED_SCOPE,
-      device: false,
-      revoke: true
-    };
-  }
-  return {
-    flavor,
-    issuer,
-    clientId: explicitClient ?? CODEX_CLIENT_ID,
-    registering: false,
-    authorizeUrl: `${issuer}/oauth/authorize`,
-    tokenUrl: `${issuer}/oauth/token`,
-    scopes: ["openid", "profile", "email", "offline_access"],
-    // 公开客户端只登记了这两个端口；被占用不抢占
-    redirectPorts: ports ?? [1455, 1457],
-    refreshEncoding: "json",
-    baseUrl: chatgptBaseUrl(flavor, env),
-    verifyIdToken: false,
-    device: true,
-    revoke: false,
-    originator: nonEmpty2(config?.originator) ?? DEFAULT_ORIGINATOR
-  };
-}
-function authorizeUrl(preset, input2) {
-  const params = new URLSearchParams({
-    response_type: "code",
-    client_id: preset.clientId,
-    redirect_uri: input2.redirectUri,
-    scope: preset.scopes.join(" "),
-    code_challenge: input2.challenge,
-    code_challenge_method: "S256",
-    state: input2.state
-  });
-  if (preset.flavor === "siwc") {
-    params.set("nonce", input2.nonce);
-    if (preset.resource !== void 0) params.set("resource", preset.resource);
-    if (input2.hostId !== void 0) params.set("ext_agent_host_id", input2.hostId);
-    if (preset.registering) params.set("agent_name_hint", AGENT_NAME_HINT);
-  } else {
-    params.set("id_token_add_organizations", "true");
-    params.set("codex_cli_simplified_flow", "true");
-    if (preset.originator !== void 0) params.set("originator", preset.originator);
-  }
-  return `${preset.authorizeUrl}?${params.toString()}`;
-}
-var CHATGPT_PROVIDER_ID, DEFAULT_ISSUER, SIWC_REGISTRATION_CLIENT_ID, CODEX_CLIENT_ID, SIWC_RESOURCE, SIWC_REQUIRED_SCOPE, AGENT_NAME_HINT, DEFAULT_ORIGINATOR, CHATGPT_BASE_URLS;
-var init_presets2 = __esm({
-  "src/auth/chatgpt/presets.ts"() {
-    "use strict";
-    CHATGPT_PROVIDER_ID = "chatgpt";
-    DEFAULT_ISSUER = "https://auth.openai.com";
-    SIWC_REGISTRATION_CLIENT_ID = "dynamic_agent_client";
-    CODEX_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
-    SIWC_RESOURCE = "https://api.openai.com/v1";
-    SIWC_REQUIRED_SCOPE = "chatgpt.tokens.use.direct";
-    AGENT_NAME_HINT = "ama";
-    DEFAULT_ORIGINATOR = "codex_cli_rs";
-    CHATGPT_BASE_URLS = {
-      siwc: "https://api.openai.com/v1",
-      codex: "https://chatgpt.com/backend-api/codex"
-    };
-  }
-});
-
 // src/auth/oauth/token-client.ts
 function oauthErrorCode(body) {
   try {
@@ -34832,6 +34953,7 @@ var init_key_docs = __esm({
   "src/config/key-docs.ts"() {
     "use strict";
     init_http();
+    init_presets();
     init_i18n();
     init_declarations();
     init_merge();
@@ -34854,7 +34976,12 @@ var init_key_docs = __esm({
         subagents: "read"
       },
       auth: {
-        chatgpt: { flavor: "siwc", issuer: "https://auth.openai.com", originator: "codex_cli_rs" }
+        chatgpt: {
+          flavor: "siwc",
+          issuer: "https://auth.openai.com",
+          originator: "codex_cli_rs",
+          codexClientVersion: DEFAULT_CODEX_CLIENT_VERSION
+        }
       },
       checkpoints: { ...DEFAULT_CHECKPOINTS_CONFIG },
       sandbox: { enabled: "auto", bash: "off", network: "deny", writable: [] },
@@ -35146,6 +35273,7 @@ function w6Sections() {
         clientId: str3(),
         issuer: str3(),
         originator: str3(),
+        codexClientVersion: str3(),
         redirectPorts: {
           type: "array",
           items: { type: "integer", minimum: 0, maximum: 65535 }
@@ -36168,28 +36296,6 @@ var init_openai_compat = __esm({
   }
 });
 
-// src/auth/oauth/live.ts
-function registerLiveToken(token, context) {
-  live.delete(token);
-  live.set(token, context);
-  while (live.size > MAX_LIVE) {
-    const oldest = live.keys().next().value;
-    if (oldest === void 0) break;
-    live.delete(oldest);
-  }
-}
-function liveToken(token) {
-  return token === void 0 ? void 0 : live.get(token);
-}
-var MAX_LIVE, live;
-var init_live = __esm({
-  "src/auth/oauth/live.ts"() {
-    "use strict";
-    MAX_LIVE = 32;
-    live = /* @__PURE__ */ new Map();
-  }
-});
-
 // src/auth/oauth/refresh.ts
 function authExpiredError(provider) {
   return new AmaError(
@@ -36288,7 +36394,7 @@ var init_refresh = __esm({
   "src/auth/oauth/refresh.ts"() {
     "use strict";
     init_errors();
-    init_presets2();
+    init_presets();
     init_token_client();
     init_token_store();
     REFRESH_MARGIN_MS = 5 * 6e4;
@@ -36342,8 +36448,10 @@ function chatgptPrecheck(model, compat, apiKey) {
   if (live2 === void 0) return;
   if (live2.needsLogin === true) throw authExpiredError(live2.provider);
   if (live2.flavor !== compat.chatgptBackend) {
+    const pinned = String(compat.chatgptBackend);
+    const ref = `${model.provider}/${model.id}@${pinned}`;
     throw new Error(
-      `chatgpt_flavor_mismatch: logged in with ${live2.flavor} but ${model.provider}/${model.id} uses the ${String(compat.chatgptBackend)} channel; run \`ama auth login ${live2.provider} --flavor ${String(compat.chatgptBackend)}\` or switch channel`
+      `chatgpt_flavor_mismatch: ${msg().auth.request.flavorMismatch(live2.flavor, ref, pinned)}`
     );
   }
 }
@@ -36427,9 +36535,7 @@ function recoverChatGptError(error2, model, compat, options, apiKey, tried) {
   if (backend === "siwc" && error2.status === 403 && code === "subscription_sharing_user_not_eligible")
     return {
       kind: "fail",
-      error: new Error(
-        "not_eligible: this ChatGPT account cannot share plan usage with ama (403 subscription_sharing_user_not_eligible)"
-      )
+      error: new Error(`not_eligible: ${msg().auth.request.notEligible}`)
     };
   if (backend === "siwc" && error2.status === 400 && code === "subscription_sharing_unsupported_capability" && !tried.has("strip")) {
     const param = typeof body["param"] === "string" ? body["param"].split(/[.[]/)[0] : void 0;
@@ -36455,6 +36561,7 @@ var init_chatgpt_backend = __esm({
     "use strict";
     init_live();
     init_refresh();
+    init_i18n();
     init_chatgpt_rate_limits();
     SIWC_FORBIDDEN_FIELDS = [
       "background",
@@ -38733,8 +38840,8 @@ var init_registry2 = __esm({
             candidates: available.filter(Boolean).map((c) => `${provider.id}/${model.id}@${c}`)
           };
         }
-        if (channel === model.channel) return { ok: true, model, provider };
-        return { ok: true, model: this.materialize(provider, model, channel), provider };
+        const picked = channel === model.channel ? model : this.materialize(provider, model, channel);
+        return { ok: true, model: { ...picked, channelPinned: true }, provider };
       }
       /**
        * `provider/model`、`provider/model@渠道` 或裸模型 id。`@` 先按渠道解析（id 里本来就带 `@` 且已登记的
@@ -38763,9 +38870,9 @@ var init_registry2 = __esm({
             const open2 = this.relayed.has(provider.id) || this.openTables.has(provider.id);
             const relayed = provider.models.length === 0 || open2;
             if (synthesize && relayed && id.length > 0) {
-              const synthesized = this.synthesize(provider, id);
-              if (channel !== void 0 && provider.channels?.some((c) => c.name === channel))
-                synthesized.channels = [.../* @__PURE__ */ new Set([...synthesized.channels ?? [], channel])];
+              const known = provider.channels?.some((c) => c.name === channel) ? channel : void 0;
+              const synthesized = this.synthesize(provider, id, known);
+              if (known) synthesized.channels = [.../* @__PURE__ */ new Set([...synthesized.channels ?? [], known])];
               return { ok: true, model: synthesized, provider };
             }
             return { ok: false, reason: "not_found", candidates: this.similar(id, provider.id) };
@@ -46723,7 +46830,7 @@ var init_tool = __esm({
     import_node_fs65 = require("node:fs");
     import_node_os13 = require("node:os");
     import_node_path88 = require("node:path");
-    init_presets();
+    init_presets2();
     init_capability();
     init_declarations();
     init_host_side();
@@ -46873,7 +46980,7 @@ var init_codemode_notice = __esm({
     "use strict";
     import_node_fs66 = require("node:fs");
     import_node_path89 = require("node:path");
-    init_presets();
+    init_presets2();
     init_i18n();
     NOTICES_FILE = "notices.json";
     KEY = "codemodeNonStrictDefault";
@@ -46959,12 +47066,15 @@ async function buildProviderRegistry(input2, options = {}) {
     }
     if (provider !== void 0) registry2 = make({ provider, apiKey: cli.apiKey });
   }
-  if (dataDir !== void 0)
+  if (dataDir !== void 0) {
+    const flavor = readOAuthEntry(input2.authFile, CHATGPT_PROVIDER_ID)?.flavor;
     mergeDiscoveredModels(
       registry2,
       dataDir,
-      lazyIndex(() => loadModelsDevIndex(dataDir))
+      lazyIndex(() => loadModelsDevIndex(dataDir)),
+      (id) => id === CHATGPT_PROVIDER_ID ? flavor : void 0
     );
+  }
   const probe = options.probeLocal ?? env[NO_LOCAL_PROBE_ENV] !== "1";
   if (probe && config.defaultModel === void 0 && !anyKeyConfigured(registry2)) {
     await probeLocalProviders(registry2, options.probeTimeoutMs ?? LOCAL_PROBE_TIMEOUT_MS);
@@ -46999,7 +47109,7 @@ var init_compose_providers = __esm({
     init_discovered_cache();
     init_enrich();
     init_token_store();
-    init_presets2();
+    init_presets();
     LOCAL_PROBE_TIMEOUT_MS = 300;
     NO_LOCAL_PROBE_ENV = "AMA_NO_LOCAL_PROBE";
   }
@@ -47741,7 +47851,7 @@ var init_model_items = __esm({
   "src/modes/interactive/model-items.ts"() {
     "use strict";
     init_model_visibility();
-    init_presets2();
+    init_presets();
     init_i18n();
     HINT_PREFIX = "ama:hint:";
   }
@@ -48951,7 +49061,7 @@ var init_startup_screen = __esm({
     init_builtin3();
     import_node_path92 = require("node:path");
     init_channels();
-    init_presets();
+    init_presets2();
     init_i18n();
     init_version();
   }
@@ -54723,7 +54833,7 @@ var init_status_area = __esm({
     init_info();
     init_bash();
     init_detect();
-    init_presets();
+    init_presets2();
     init_tui2();
     init_status_bar();
     init_status_line();
@@ -57271,7 +57381,7 @@ var init_compose2 = __esm({
     init_bash();
     import_node_path99 = require("node:path");
     init_paths();
-    init_presets();
+    init_presets2();
     init_registry();
     init_tool2();
     init_codemode_notice();
@@ -58811,8 +58921,7 @@ init_discovered_cache();
 
 // src/auth/chatgpt/backend-client.ts
 init_chatgpt_rate_limits();
-init_version();
-init_presets2();
+init_presets();
 var BACKEND_TIMEOUT_MS = 15e3;
 function headers(auth) {
   const out = {
@@ -58829,9 +58938,29 @@ function listed(item) {
   const visibility = item["visibility"];
   return visibility === void 0 || visibility === "list";
 }
+function codexMetadata(item) {
+  const out = {};
+  const window2 = item["context_window"];
+  if (typeof window2 === "number" && Number.isInteger(window2) && window2 > 0)
+    out.contextWindow = window2;
+  const modalities = item["input_modalities"];
+  if (Array.isArray(modalities)) {
+    const input2 = ["text", "image"].filter((x) => modalities.includes(x));
+    if (input2.includes("text")) out.input = input2;
+  }
+  const levels = item["supported_reasoning_levels"];
+  if (Array.isArray(levels)) {
+    const efforts = levels.map(
+      (level) => typeof level === "string" ? level : typeof level === "object" && level !== null ? level["effort"] : void 0
+    ).filter((x) => typeof x === "string" && x !== "");
+    if (efforts.length > 0) out.reasoningLevels = [...new Set(efforts)];
+  }
+  return out;
+}
 async function listChatGptModels(fetchFn, baseUrl, auth) {
   const base4 = baseUrl.replace(/\/+$/, "");
-  const url = auth.flavor === "codex" ? `${base4}/models?client_version=${encodeURIComponent(AMA_VERSION)}` : `${base4}/models`;
+  const version = auth.clientVersion ?? DEFAULT_CODEX_CLIENT_VERSION;
+  const url = auth.flavor === "codex" ? `${base4}/models?client_version=${encodeURIComponent(version)}` : `${base4}/models`;
   const response = await fetchFn(url, {
     headers: headers(auth),
     signal: AbortSignal.timeout(BACKEND_TIMEOUT_MS)
@@ -58846,7 +58975,11 @@ async function listChatGptModels(fetchFn, baseUrl, auth) {
     if (typeof id !== "string" || id === "" || seen.has(id)) continue;
     seen.add(id);
     const name = item["display_name"];
-    out.push(typeof name === "string" && name !== "" ? { id, name } : { id });
+    out.push({
+      id,
+      ...typeof name === "string" && name !== "" ? { name } : {},
+      ...auth.flavor === "codex" ? codexMetadata(item) : {}
+    });
   }
   return out;
 }
@@ -59299,7 +59432,7 @@ function readOrCreateHostId(dataDir) {
 }
 
 // src/auth/chatgpt/login.ts
-init_presets2();
+init_presets();
 var DEFAULT_ACCESS_TTL_S = 3600;
 function flowPreset(preset, hostId) {
   return {
@@ -59412,7 +59545,7 @@ async function revokeChatGpt(fetchFn, entry, overrides = {}) {
 }
 
 // src/auth/chatgpt/cli.ts
-init_presets2();
+init_presets();
 init_quota_text();
 function userAuthConfig(io) {
   try {
@@ -59564,14 +59697,18 @@ async function runLogin(args, io, deps = {}) {
   if (entry.planType === "free") io.stdout(`${m.freePlanHint(entry.planType)}
 `);
   if (flavor === "siwc") io.stdout(`${m.siwcLimitHint}
+${m.siwcEligibilityHint}
 `);
   const count2 = await cacheModels(io, entry, config, deps);
-  io.stdout(`${count2 === void 0 ? m.modelHint : m.modelsCached(count2)}
+  const done = count2 === 0 && flavor === "codex" ? m.codexNoModels(codexClientVersion(config, io.env)) : count2 === void 0 || count2 === 0 ? m.modelHint : m.modelsCached(count2);
+  io.stdout(`${done}
 `);
   return ExitCode.Ok;
 }
 async function cacheModels(io, entry, config, deps) {
+  const dataDir = resolveDataDir({ env: io.env });
   try {
+    clearDiscoveredCache(dataDir, CHATGPT_PROVIDER_ID);
     const models = await listChatGptModels(
       deps.fetch ?? fetch,
       chatgptBaseUrl(entry.flavor, io.env),
@@ -59579,11 +59716,10 @@ async function cacheModels(io, entry, config, deps) {
         flavor: entry.flavor,
         accessToken: entry.accessToken,
         accountId: entry.accountId,
-        originator: config?.originator
+        originator: config?.originator,
+        clientVersion: codexClientVersion(config, io.env)
       }
     );
-    if (models.length === 0) return void 0;
-    const dataDir = resolveDataDir({ env: io.env });
     writeDiscoveredCache(dataDir, CHATGPT_PROVIDER_ID, { models, flavor: entry.flavor });
     return models.length;
   } catch {
@@ -59790,7 +59926,7 @@ init_types2();
 init_capability();
 init_registry2();
 init_auth_file();
-init_presets();
+init_presets2();
 init_registry();
 init_args();
 init_default_model();
@@ -60424,7 +60560,7 @@ init_types_w6();
 
 // src/auth/chatgpt/doctor.ts
 init_i18n();
-init_presets2();
+init_presets();
 init_quota_text();
 async function oauthDoctorLines(provider, entry, options = {}) {
   const m = msg().auth;
@@ -60891,7 +61027,7 @@ var CACHE_PROBE_ACTION = {
 
 // src/cli/subcommands/models-discover.ts
 init_http();
-init_presets2();
+init_presets();
 init_live();
 init_registry2();
 init_discovered_cache();
@@ -61160,11 +61296,18 @@ async function discoverModels(provider, apiKey, options = {}) {
       flavor,
       accessToken: apiKey,
       accountId: live2?.accountId,
-      originator: channel?.headers?.["originator"]
+      originator: channel?.headers?.["originator"],
+      clientVersion: options.codexClientVersion
     });
     return models.map((m) => {
       const model = withCustomDefaults({ id: m.id }, provider.id, provider.api);
       if (m.name !== void 0) model.name = m.name;
+      if (m.contextWindow !== void 0) model.contextWindow = m.contextWindow;
+      if (m.input !== void 0) model.input = m.input;
+      if (m.reasoningLevels?.some((x) => x !== "none") === true) {
+        model.reasoning = true;
+        model.thinkingLevelMap = thinkingMapOf(m.reasoningLevels);
+      }
       return model;
     });
   }
@@ -61279,7 +61422,9 @@ async function run6(ctx) {
   }
   let found;
   try {
-    found = await discoverModels(provider, key.apiKey);
+    found = await discoverModels(provider, key.apiKey, {
+      codexClientVersion: codexClientVersion(ctx.level.merged.config.auth?.chatgpt, io.env)
+    });
   } catch (error2) {
     io.stderr(m.listFailed(provider.id, error2.message));
     return ExitCode.RuntimeError;
@@ -61345,14 +61490,30 @@ async function run6(ctx) {
   }
   return ExitCode.Ok;
 }
+function cacheEntry(m) {
+  const entry = { id: m.id };
+  if (m.name !== m.id) entry.name = m.name;
+  if (m.contextWindow !== void 0) entry.contextWindow = m.contextWindow;
+  if (m.input.length !== 1 || m.input[0] !== "text") entry.input = [...m.input];
+  if (m.reasoning && m.thinkingLevelMap !== void 0)
+    entry.reasoningLevels = Object.entries(m.thinkingLevelMap).flatMap(
+      ([level, value]) => typeof value !== "string" ? [] : level === "off" ? ["none"] : [level]
+    );
+  return entry;
+}
 function cacheChatGpt(ctx, found, apiKey) {
+  const flavor = liveToken(apiKey)?.flavor;
   try {
-    const flavor = liveToken(apiKey)?.flavor;
-    const models = found.map((m) => ({ id: m.id, ...m.name !== m.id ? { name: m.name } : {} }));
+    const models = found.map(cacheEntry);
     const path = writeDiscoveredCache(ctx.level.dataDir, CHATGPT_PROVIDER_ID, { models, flavor });
     ctx.io.stdout(msg().subcommands.discover.cached(path));
   } catch (error2) {
     ctx.io.stderr(`ama: ${error2.message}
+`);
+  }
+  if (found.length === 0 && flavor === "codex") {
+    const version = codexClientVersion(ctx.level.merged.config.auth?.chatgpt, ctx.io.env);
+    ctx.io.stderr(`${msg().auth.login.codexNoModels(version)}
 `);
   }
 }