@armadra/agent 0.6.0 → 0.6.2

package/dist/cli/compose-providers.d.ts

@@ -12,6 +12,8 @@
  * - [W6-O] ChatGPT 登录（docs/wave6-plan.md D14）：`chatgpt` 的缺省渠道按 auth.json 条目的 flavor 定（用户写了
  *   `defaultChannel` 时不动）；`AMA_CHATGPT_BASE_URL` 改该渠道地址；`auth.chatgpt.originator` 改 codex 渠道的
  *   `originator` 头；OAuth 刷新拿到 `auth.chatgpt` 配置与同一份 env。
+ * - 发现缓存（`<dataDir>/models/discovered/<provider>.json`）并入模型表为空的供应商（discovered-cache.ts）；
+ *   chatgpt 的缓存 flavor 与当前登录不符时视为过期、不并入。
  */
 import type { ApiRegistry } from "../ai/apis/api.js";
 import { ProviderRegistry } from "../ai/providers/registry.js";

package/dist/cli/compose-providers.js

@@ -12,9 +12,13 @@
  * - [W6-O] ChatGPT 登录（docs/wave6-plan.md D14）：`chatgpt` 的缺省渠道按 auth.json 条目的 flavor 定（用户写了
  *   `defaultChannel` 时不动）；`AMA_CHATGPT_BASE_URL` 改该渠道地址；`auth.chatgpt.originator` 改 codex 渠道的
  *   `originator` 头；OAuth 刷新拿到 `auth.chatgpt` 配置与同一份 env。
+ * - 发现缓存（`<dataDir>/models/discovered/<provider>.json`）并入模型表为空的供应商（discovered-cache.ts）；
+ *   chatgpt 的缓存 flavor 与当前登录不符时视为过期、不并入。
  */
 import { loadModelsDevIndex } from "../ai/providers/models-dev-cache.js";
 import { ProviderRegistry, discoverLocalModels } from "../ai/providers/registry.js";
+import { mergeDiscoveredModels } from "../ai/providers/discovered-cache.js";
+import { lazyIndex } from "../ai/providers/enrich.js";
 import { readOAuthEntry } from "../auth/oauth/token-store.js";
 import { CHATGPT_BASE_URLS, CHATGPT_PROVIDER_ID } from "../auth/chatgpt/presets.js";
 export const LOCAL_PROBE_TIMEOUT_MS = 300;
@@ -104,6 +108,11 @@ export async function buildProviderRegistry(input, options = {}) {
         if (provider !== undefined)
             registry = make({ provider, apiKey: cli.apiKey });
     }
+    // 发现缓存（`ama auth login chatgpt` / `ama models discover chatgpt`）并入模型表为空的供应商
+    if (dataDir !== undefined) {
+        const flavor = readOAuthEntry(input.authFile, CHATGPT_PROVIDER_ID)?.flavor;
+        mergeDiscoveredModels(registry, dataDir, lazyIndex(() => loadModelsDevIndex(dataDir)), (id) => (id === CHATGPT_PROVIDER_ID ? flavor : undefined));
+    }
     const probe = options.probeLocal ?? env[NO_LOCAL_PROBE_ENV] !== "1";
     if (probe && config.defaultModel === undefined && !anyKeyConfigured(registry)) {
         await probeLocalProviders(registry, options.probeTimeoutMs ?? LOCAL_PROBE_TIMEOUT_MS);

package/dist/cli/startup-steps.js

@@ -4,6 +4,7 @@
  */
 import { describeLookupFailure } from "../ai/providers/suggest.js";
 import { formatModelRef } from "../ai/providers/channels.js";
+import { CHATGPT_PROVIDER_ID } from "../auth/chatgpt/presets.js";
 import { statSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { AmaError, StartupError, isAmaError } from "../errors.js";
@@ -126,10 +127,12 @@ export async function resolveModel(args, registry, manager, defaultModel, deps,
     else {
         const change = lastEntry(manager, (e) => e.type === "model_change");
         if (change?.type === "model_change") {
+            // ChatGPT 的渠道跟随当前登录方式：会话里记的渠道不当显式渠道（可能是换登录前的）
+            const channel = change.provider === CHATGPT_PROVIDER_ID ? undefined : change.channel;
             const found = registry.findModel(formatModelRef({
                 provider: change.provider,
                 id: change.modelId,
-                ...(change.channel !== undefined ? { channel: change.channel } : {}),
+                ...(channel !== undefined ? { channel } : {}),
             }));
             if (found.ok)
                 choice = { model: found.model, provider: found.provider };

package/dist/cli/subcommands/config-set.js

@@ -62,16 +62,24 @@ function textRow(value) {
 function scopeLabel(scope) {
     return msg().settings.scope[scope];
 }
-function report(io, result, unset) {
+/**
+ * Receipt of a write. When a higher layer (env, project, cli, profile) still hides the key, the first line shows the
+ * value just written and its layer, and the second line names the overriding source and the effective value.
+ */
+function report(io, result, written) {
     const s = msg().settings;
-    const value = formatSettingValue(result.after.value);
-    io.stdout(`${unset
-        ? s.unsetDone(result.key, value, scopeLabel(result.scope))
-        : s.setDone(result.key, value, scopeLabel(result.scope))}\n`);
-    if (result.overriddenBy !== undefined) {
-        const by = result.after.envName ?? result.overriddenBy;
-        io.stdout(`${s.stillOverridden(result.key, by)}\n`);
-    }
+    const effective = formatSettingValue(result.after.value);
+    const scope = scopeLabel(result.scope);
+    const by = result.after.envName ?? result.overriddenBy;
+    if (written === undefined)
+        io.stdout(`${s.unsetDone(result.key, effective, scope)}\n`);
+    else if (by === undefined)
+        io.stdout(`${s.setDone(result.key, effective, scope)}\n`);
+    else
+        io.stdout(`${s.writtenTo(result.key, formatSettingValue(written), scope)}\n`);
+    if (by === undefined)
+        return;
+    io.stdout(`${written === undefined ? s.stillOverridden(result.key, by) : s.overriddenNow(by, effective)}\n`);
 }
 /** Confirm persisting `permission.mode full-auto`: TTY asks, otherwise `--yes` is required. */
 async function confirmBypass(io, yes, deps) {
@@ -118,7 +126,7 @@ export async function runConfigEdit(action, argv, io, deps = {}) {
         return ExitCode.Ok;
     }
     if (action === "unset") {
-        report(io, setConfigValue({ ...input, scope, key, value: undefined }), true);
+        report(io, setConfigValue({ ...input, scope, key, value: undefined }), undefined);
         return ExitCode.Ok;
     }
     const raw = positionals.slice(1).join(" ");
@@ -132,6 +140,6 @@ export async function runConfigEdit(action, argv, io, deps = {}) {
     // first write to a fresh config dir: lay out config.json + config.schema.json like `ama init`
     if (scope === "user" && !existsSync(join(input.configDir, CONFIG_FILE)))
         initConfigDir(input.configDir);
-    report(io, setConfigValue({ ...input, scope, key, value }), value === undefined);
+    report(io, setConfigValue({ ...input, scope, key, value }), value);
     return ExitCode.Ok;
 }

package/dist/cli/subcommands/models-discover.d.ts

@@ -18,7 +18,9 @@
  * 匹配结果；`--write` 跳过 models.dev 标明不支持工具调用的模型。元数据不写进配置——运行时从缓存补。
  *
  * [W6-O] `chatgpt`：按登录的 flavor 调对应后端的模型列表（SIWC `GET /v1/models` 筛 `visibility: list`；codex
- * `GET /models?client_version=…`），只取 slug 与显示名；`--probe` 不适用（订阅后端只有一种协议）。
+ * `GET /models?client_version=<codexClientVersion>`，另带上下文窗口 / 输入模态 / 推理强度），取 slug 与显示名；
+ * `--probe` 不适用（订阅后端只有一种协议）。结果另写进发现缓存 `<dataDir>/models/discovered/chatgpt.json`
+ * （discovered-cache.ts，0 个也写），`/model` 选择器由此列出；codex 返回 0 个时提示 codexClientVersion 可能过旧。
  */
 import type { Api, Model, ProviderData, ProviderRegistryApi } from "../../ai/types.js";
 import type { ModelsAction } from "./models.js";
@@ -30,6 +32,7 @@ export declare const PROBE_APIS: readonly Api[];
 export declare function modelsUrl(provider: ProviderData): string;
 export declare function discoverModels(provider: ProviderData, apiKey: string | undefined, options?: {
     timeoutMs?: number;
+    codexClientVersion?: string;
 }): Promise<Model[]>;
 export declare function probeOrder(provider: ProviderData): Api[];
 export interface ProbeOptions {

package/dist/cli/subcommands/models-discover.js

@@ -18,13 +18,16 @@
  * 匹配结果；`--write` 跳过 models.dev 标明不支持工具调用的模型。元数据不写进配置——运行时从缓存补。
  *
  * [W6-O] `chatgpt`：按登录的 flavor 调对应后端的模型列表（SIWC `GET /v1/models` 筛 `visibility: list`；codex
- * `GET /models?client_version=…`），只取 slug 与显示名；`--probe` 不适用（订阅后端只有一种协议）。
+ * `GET /models?client_version=<codexClientVersion>`，另带上下文窗口 / 输入模态 / 推理强度），取 slug 与显示名；
+ * `--probe` 不适用（订阅后端只有一种协议）。结果另写进发现缓存 `<dataDir>/models/discovered/chatgpt.json`
+ * （discovered-cache.ts，0 个也写），`/model` 选择器由此列出；codex 返回 0 个时提示 codexClientVersion 可能过旧。
  */
 import { authHeaders, mergeHeaders } from "../../ai/http.js";
 import { listChatGptModels } from "../../auth/chatgpt/backend-client.js";
-import { CHATGPT_PROVIDER_ID } from "../../auth/chatgpt/presets.js";
+import { CHATGPT_PROVIDER_ID, codexClientVersion } from "../../auth/chatgpt/presets.js";
 import { liveToken } from "../../auth/oauth/live.js";
 import { discoverLocalModels, materializeModel } from "../../ai/providers/registry.js";
+import { thinkingMapOf, writeDiscoveredCache, } from "../../ai/providers/discovered-cache.js";
 import { withCustomDefaults } from "../../ai/providers/catalog.js";
 import { describeModelsDev, loadModelsDevIndex } from "../../ai/providers/models-dev-cache.js";
 import { matchLabel, modelsDevFields } from "../../ai/providers/models-dev.js";
@@ -63,11 +66,20 @@ export async function discoverModels(provider, apiKey, options = {}) {
             accessToken: apiKey,
             accountId: live?.accountId,
             originator: channel?.headers?.["originator"],
+            clientVersion: options.codexClientVersion,
         });
         return models.map((m) => {
             const model = withCustomDefaults({ id: m.id }, provider.id, provider.api);
             if (m.name !== undefined)
                 model.name = m.name;
+            if (m.contextWindow !== undefined)
+                model.contextWindow = m.contextWindow;
+            if (m.input !== undefined)
+                model.input = m.input;
+            if (m.reasoningLevels?.some((x) => x !== "none") === true) {
+                model.reasoning = true;
+                model.thinkingLevelMap = thinkingMapOf(m.reasoningLevels);
+            }
             return model;
         });
     }
@@ -189,7 +201,9 @@ async function run(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 (error) {
         io.stderr(m.listFailed(provider.id, error.message));
@@ -197,6 +211,8 @@ async function run(ctx) {
     }
     const configured = new Map(provider.models.map((m) => [m.id, m]));
     io.stdout(m.found(provider.id, found.length, modelsUrl(provider)));
+    if (provider.id === CHATGPT_PROVIDER_ID)
+        cacheChatGpt(ctx, found, key.apiKey);
     // models.dev 只读本地（快照 ⊕ `ama models refresh` 的覆盖），不联网。
     const mdIndex = loadModelsDevIndex(ctx.level.dataDir);
     io.stdout(`${describeModelsDev(ctx.level.dataDir)}\n`);
@@ -252,6 +268,38 @@ async function run(ctx) {
     }
     return ExitCode.Ok;
 }
+/** 发现得到的模型 → 缓存条目（后端给的元数据一并写入；推理强度由映射表还原）。 */
+function cacheEntry(m) {
+    const entry = { id: m.id };
+    if (m.name !== m.id)
+        entry.name = m.name;
+    if (m.contextWindow !== undefined)
+        entry.contextWindow = m.contextWindow;
+    if (m.input.length !== 1 || m.input[0] !== "text")
+        entry.input = [...m.input];
+    if (m.reasoning && m.thinkingLevelMap !== undefined)
+        entry.reasoningLevels = Object.entries(m.thinkingLevelMap).flatMap(([level, value]) => typeof value !== "string" ? [] : level === "off" ? ["none"] : [level]);
+    return entry;
+}
+/**
+ * chatgpt 的发现结果写进发现缓存（选择器与注册表读它；0 个也写，免得残留另一 flavor 的缓存）；写失败不影响
+ * 列表输出。codex 返回 0 个时提示 codexClientVersion 可能过旧。
+ */
+function cacheChatGpt(ctx, found, apiKey) {
+    const flavor = liveToken(apiKey)?.flavor;
+    try {
+        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 (error) {
+        ctx.io.stderr(`ama: ${error.message}\n`);
+    }
+    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)}\n`);
+    }
+}
 export const DISCOVER_ACTION = {
     usage: "ama models discover <provider> [--probe] [--write] [--limit <n>] [--concurrency <n>] [--probe-timeout <ms>]",
     required: "<provider>",

package/dist/cli/subcommands/models-enable.d.ts

@@ -0,0 +1,13 @@
+/**
+ * `ama models enable <ref…>` / `ama models disable <ref…>` / `ama models list --enabled`：编辑与查看用户级
+ * `models.enabled`（模型选择器的显式清单，见 ai/providers/model-visibility.ts）。
+ *
+ * 写回走 config/edit.ts（重读目标文件、校验、`.bak` 备份、原子写）；`models` 只认用户级，没有 `--project`。
+ * 引用要是 `provider/model[@channel]` 或 `provider/*`，供应商必须存在；模型不在模型表里只警告（中转站与
+ * 订阅后端接受任意 id）。清单移空时删掉这个键。
+ */
+import type { ModelsAction, ModelsActionContext } from "./models.js";
+/** `ama models list --enabled`：清单（及各项供应商状态）；没设清单时列出选择器缺省显示的模型。 */
+export declare function listEnabled(ctx: ModelsActionContext): Promise<number>;
+export declare const ENABLE_ACTION: ModelsAction;
+export declare const DISABLE_ACTION: ModelsAction;

package/dist/cli/subcommands/models-enable.js

@@ -0,0 +1,145 @@
+/**
+ * `ama models enable <ref…>` / `ama models disable <ref…>` / `ama models list --enabled`：编辑与查看用户级
+ * `models.enabled`（模型选择器的显式清单，见 ai/providers/model-visibility.ts）。
+ *
+ * 写回走 config/edit.ts（重读目标文件、校验、`.bak` 备份、原子写）；`models` 只认用户级，没有 `--project`。
+ * 引用要是 `provider/model[@channel]` 或 `provider/*`，供应商必须存在；模型不在模型表里只警告（中转站与
+ * 订阅后端接受任意 id）。清单移空时删掉这个键。
+ */
+import { accessReady, addEnabled, enabledList, providerAccess, removeEnabled, splitEnabledRef, } from "../../ai/providers/model-visibility.js";
+import { readSnapshot, setConfigValue } from "../../config/edit.js";
+import { MODELS_ENABLED_REF } from "../../config/types-w5.js";
+import { msg } from "../../i18n/index.js";
+import { UsageError } from "../args.js";
+import { ExitCode } from "../exit-codes.js";
+function layerInput(ctx) {
+    const input = {
+        configDir: ctx.level.configDir,
+        cwd: ctx.io.cwd,
+        env: ctx.io.env,
+    };
+    if (ctx.level.profile !== undefined) {
+        input.profile = { config: ctx.level.profile.config };
+        input.hasProfile = true;
+    }
+    return input;
+}
+/** 校验引用；供应商不存在返回退出码，模型不在表里只警告。 */
+function checkRefs(ctx, refs) {
+    const m = msg().subcommands.modelsEnabled;
+    for (const ref of refs) {
+        const parts = splitEnabledRef(ref);
+        if (!MODELS_ENABLED_REF.test(ref) || parts === undefined)
+            throw new UsageError(m.badRef(ref));
+        const provider = ctx.registry.get(parts.provider);
+        if (provider === undefined) {
+            ctx.io.stderr(msg().subcommands.common.providerNotFound(parts.provider));
+            return ExitCode.NoModel;
+        }
+        if (parts.model !== "*" &&
+            provider.models.length > 0 &&
+            !provider.models.some((model) => model.id === parts.model))
+            ctx.io.stderr(m.unknownModel(ref));
+    }
+    return undefined;
+}
+function userList(input) {
+    return enabledList(readSnapshot(input).user?.models?.enabled);
+}
+async function enable(ctx) {
+    const m = msg().subcommands.modelsEnabled;
+    const refs = [...new Set(ctx.args)];
+    const bad = checkRefs(ctx, refs);
+    if (bad !== undefined)
+        return bad;
+    const input = layerInput(ctx);
+    const current = userList(input);
+    const fresh = refs.filter((ref) => !(current ?? []).includes(ref));
+    if (fresh.length === 0) {
+        ctx.io.stdout(m.alreadyListed(refs.join(", ")));
+        return ExitCode.Ok;
+    }
+    const result = setConfigValue({
+        ...input,
+        scope: "user",
+        key: "models.enabled",
+        value: addEnabled(current, fresh),
+    });
+    ctx.io.stdout(m.added(fresh.join(", "), result.path));
+    return ExitCode.Ok;
+}
+async function disable(ctx) {
+    const m = msg().subcommands.modelsEnabled;
+    const refs = [...new Set(ctx.args)];
+    for (const ref of refs)
+        if (!MODELS_ENABLED_REF.test(ref))
+            throw new UsageError(m.badRef(ref));
+    const input = layerInput(ctx);
+    const current = userList(input) ?? [];
+    const listed = refs.filter((ref) => current.includes(ref));
+    const missing = refs.filter((ref) => !current.includes(ref));
+    if (missing.length > 0)
+        ctx.io.stderr(m.notListed(missing.join(", ")));
+    if (listed.length === 0)
+        return missing.length > 0 ? ExitCode.RuntimeError : ExitCode.Ok;
+    const next = removeEnabled(current, listed);
+    const result = setConfigValue({ ...input, scope: "user", key: "models.enabled", value: next });
+    ctx.io.stdout(next === undefined ? m.cleared(result.path) : m.removed(listed.join(", "), result.path));
+    return ExitCode.Ok;
+}
+/** `ama models list --enabled`：清单（及各项供应商状态）；没设清单时列出选择器缺省显示的模型。 */
+export async function listEnabled(ctx) {
+    const m = msg().subcommands.modelsEnabled;
+    const labels = msg().panels.model;
+    const list = enabledList(ctx.level.merged.config.models?.enabled);
+    const status = async (providerId) => {
+        const provider = ctx.registry.get(providerId);
+        if (provider === undefined)
+            return "?";
+        const access = await providerAccess(ctx.registry, provider);
+        return access === "none" ? labels.noKey : labels[access];
+    };
+    if (list !== undefined) {
+        ctx.io.stdout(m.listHeader(ctx.level.userConfigPath));
+        for (const ref of list) {
+            const parts = splitEnabledRef(ref);
+            const provider = parts === undefined ? undefined : ctx.registry.get(parts.provider);
+            const known = parts === undefined ||
+                parts.model === "*" ||
+                provider === undefined ||
+                provider.models.length === 0 ||
+                provider.models.some((model) => model.id === parts.model);
+            const notes = [
+                parts === undefined ? "?" : await status(parts.provider),
+                ...(known ? [] : [m.notInTable]),
+            ];
+            ctx.io.stdout(`  ${ref}  ${notes.join(" · ")}\n`);
+        }
+        return ExitCode.Ok;
+    }
+    ctx.io.stdout(m.listUnset);
+    let shown = 0;
+    for (const provider of ctx.registry.list()) {
+        const access = await providerAccess(ctx.registry, provider);
+        if (!accessReady(access))
+            continue;
+        const label = access === "none" ? labels.noKey : labels[access];
+        for (const model of provider.models) {
+            ctx.io.stdout(`  ${provider.id}/${model.id}  ${label}\n`);
+            shown++;
+        }
+    }
+    if (shown === 0)
+        ctx.io.stdout(m.nothing);
+    return ExitCode.Ok;
+}
+export const ENABLE_ACTION = {
+    usage: "ama models enable <provider/model[@channel]|provider/*>…",
+    required: "<provider/model>",
+    run: enable,
+};
+export const DISABLE_ACTION = {
+    usage: "ama models disable <provider/model[@channel]|provider/*>…",
+    required: "<provider/model>",
+    run: disable,
+};

package/dist/cli/subcommands/models.d.ts

@@ -9,6 +9,8 @@
  * 选项表与必填位置参数都从表里来。
  *
  * [W5-M1] `refresh`：models.dev 显式刷新（`refresh-catalog` 保留为别名）。
+ *
+ * `enable` / `disable` / `list --enabled`：模型选择器清单 `models.enabled`（models-enable.ts）。
  */
 import type { ProviderRegistryApi } from "../../ai/types.js";
 import type { CliIo, RuntimeDeps } from "../deps.js";

package/dist/cli/subcommands/models.js

@@ -9,6 +9,8 @@
  * 选项表与必填位置参数都从表里来。
  *
  * [W5-M1] `refresh`：models.dev 显式刷新（`refresh-catalog` 保留为别名）。
+ *
+ * `enable` / `disable` / `list --enabled`：模型选择器清单 `models.enabled`（models-enable.ts）。
  */
 import { formatModelRef, modelRefOf } from "../../ai/providers/channels.js";
 import { describeRefresh, modelsDevCachePath, refreshModelsDev, } from "../../ai/providers/models-dev-cache.js";
@@ -18,6 +20,7 @@ import { ExitCode } from "../exit-codes.js";
 import { buildRegistry, loadUserLevel } from "./context.js";
 import { CACHE_PROBE_ACTION } from "./models-cache-probe.js";
 import { DISCOVER_ACTION } from "./models-discover.js";
+import { DISABLE_ACTION, ENABLE_ACTION, listEnabled } from "./models-enable.js";
 import { metadataOf, modelFlags, sourcesLine } from "./model-meta.js";
 import { msg } from "../../i18n/index.js";
 const COMMON_VALUE_OPTIONS = ["profile", "auth-file"];
@@ -113,9 +116,12 @@ const REFRESH_ACTION = {
 /** 动作表：键是子命令名，顺序即用法文本顺序。 */
 export const MODELS_ACTIONS = Object.freeze({
     list: {
-        usage: "ama models list [--provider <id>]",
+        usage: "ama models list [--provider <id>] [--enabled]",
         valueOptions: ["provider"],
-        run: (ctx) => list(ctx.io, ctx.registry, ctx.values.get("provider")),
+        flagOptions: ["enabled"],
+        run: (ctx) => ctx.flags.has("enabled")
+            ? listEnabled(ctx)
+            : list(ctx.io, ctx.registry, ctx.values.get("provider")),
     },
     check: {
         usage: "ama models check <provider/id>",
@@ -132,6 +138,8 @@ export const MODELS_ACTIONS = Object.freeze({
             return msg().subcommands.models.refreshCatalogUsage;
         },
     },
+    enable: ENABLE_ACTION,
+    disable: DISABLE_ACTION,
 });
 export function modelsUsage() {
     return msg().subcommands.models.usage(Object.values(MODELS_ACTIONS).map((a) => a.usage));

package/dist/config/json-schema.js

@@ -151,7 +151,7 @@ function w5Sections() {
             },
         }),
         subagents: object({ maxConcurrent: num(1, 64), maxPending: num(0, 1024), defaultModel: str() }),
-        models: object({ aliases: object({ fast: str(), strong: str() }) }),
+        models: object({ aliases: object({ fast: str(), strong: str() }), enabled: strings }),
         fallbackModel: str(),
         limits: object({ maxTurns: num(1), maxCostUsd: num(0) }),
         reminders: object({
@@ -180,6 +180,7 @@ function w6Sections() {
                 clientId: str(),
                 issuer: str(),
                 originator: str(),
+                codexClientVersion: str(),
                 redirectPorts: {
                     type: "array",
                     items: { type: "integer", minimum: 0, maximum: 65535 },

package/dist/config/key-docs.js

@@ -10,6 +10,7 @@
  *   DISPLAY_DEFAULTS 相同，DISPLAY_DEFAULTS 本身通过 `validateConfig`。
  */
 import { DEFAULT_IDLE_TIMEOUT_MS } from "../ai/http.js";
+import { DEFAULT_CODEX_CLIENT_VERSION } from "../auth/chatgpt/presets.js";
 import { messagesFor, msg } from "../i18n/index.js";
 import { DEFAULT_INLINE_BUDGET } from "../codemode/declarations.js";
 import { DEFAULT_CONFIG, mergeConfig } from "./merge.js";
@@ -33,7 +34,12 @@ const IMPLICIT_DEFAULTS = {
         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: [] },

package/dist/config/schema-w5.js

@@ -7,7 +7,7 @@
 import { PERMISSION_MODES_STRICT_FIRST } from "../permissions/types.js";
 import { msg } from "../i18n/index.js";
 import { Checker, THINKING_LEVELS, checkSection, join } from "./checker.js";
-import { AGENTS_RESERVED_KEYS, IMAGE_RESIZE_MODES, PLAN_BASH_MODES_STRICT_FIRST, PLAN_UNATTENDED_MODES, STATUS_LINE_MODES, } from "./types-w5.js";
+import { AGENTS_RESERVED_KEYS, IMAGE_RESIZE_MODES, MODELS_ENABLED_REF, PLAN_BASH_MODES_STRICT_FIRST, PLAN_UNATTENDED_MODES, STATUS_LINE_MODES, } from "./types-w5.js";
 /** 第五波新增的顶层键（schema.ts 的 CONFIG_KEYS 并入）。 */
 export const W5_CONFIG_KEYS = [
     "images",
@@ -88,7 +88,14 @@ export function validateConfigW5(c, config) {
         c.number(s, "maxPending", p, 0, 1024);
         c.string(s, "defaultModel", p);
     });
-    checkSection(c, config, "models", ["aliases"], (s, p) => {
+    checkSection(c, config, "models", ["aliases", "enabled"], (s, p) => {
+        c.stringArray(s, "enabled", p);
+        const enabled = s["enabled"];
+        if (Array.isArray(enabled))
+            enabled.forEach((ref, i) => {
+                if (typeof ref === "string" && !MODELS_ENABLED_REF.test(ref))
+                    c.error(join(join(p, "enabled"), i), msg().config.schema.modelsEnabled);
+            });
         const aliases = s["aliases"];
         const ap = join(p, "aliases");
         if (aliases === undefined || !c.object(aliases, ap))

package/dist/config/schema-w6.d.ts

@@ -9,7 +9,7 @@ export declare const W6_CONFIG_KEYS: readonly ["memory", "auth"];
 /** 已有 `ui` 段新增的键。 */
 export declare const W6_UI_KEYS: readonly ["language", "replyLanguage", "agentBar"];
 export declare const MEMORY_KEYS: readonly ["enabled", "scopes", "indexMaxBytes", "fileMaxBytes", "maxFiles", "subagents"];
-export declare const CHATGPT_AUTH_KEYS: readonly ["flavor", "clientId", "issuer", "originator", "redirectPorts"];
+export declare const CHATGPT_AUTH_KEYS: readonly ["flavor", "clientId", "issuer", "originator", "codexClientVersion", "redirectPorts"];
 export declare function checkUiW6(c: Checker, ui: Obj, path: string): void;
 /** 第六波顶层段的校验（validateConfig 末尾调用）。 */
 export declare function validateConfigW6(c: Checker, config: Obj): void;

package/dist/config/schema-w6.js

@@ -24,6 +24,7 @@ export const CHATGPT_AUTH_KEYS = [
     "clientId",
     "issuer",
     "originator",
+    "codexClientVersion",
     "redirectPorts",
 ];
 export function checkUiW6(c, ui, path) {
@@ -63,7 +64,7 @@ export function validateConfigW6(c, config) {
             return;
         c.keys(chatgpt, cp, CHATGPT_AUTH_KEYS);
         c.oneOf(chatgpt, "flavor", cp, CHATGPT_FLAVORS);
-        for (const key of ["clientId", "issuer", "originator"])
+        for (const key of ["clientId", "issuer", "originator", "codexClientVersion"])
             c.string(chatgpt, key, cp);
         checkPorts(c, chatgpt, "redirectPorts", cp);
     });

package/dist/config/settings-registry.d.ts

@@ -59,6 +59,9 @@ export declare const SETTING_HINTS: readonly [{
 }, {
     readonly key: "auth.chatgpt";
     readonly hint: "auth";
+}, {
+    readonly key: "models.enabled";
+    readonly hint: "modelsEnabled";
 }];
 export type SettingHintId = (typeof SETTING_HINTS)[number]["hint"];
 type Schema = Record<string, unknown>;

package/dist/config/settings-registry.js

@@ -106,6 +106,7 @@ export const SETTING_HINTS = [
     { key: "agents.<id>", hint: "agents" },
     { key: "hooks", hint: "hooks" },
     { key: "auth.chatgpt", hint: "auth" },
+    { key: "models.enabled", hint: "modelsEnabled" },
 ];
 /** Schema node of a dotted key (undefined when the key is not in the schema). */
 export function schemaAt(key, root = buildConfigJsonSchema()) {

package/dist/config/types-w5.d.ts

@@ -68,12 +68,19 @@ export interface SubagentsConfig {
     /** 子会话缺省模型；不设继承父会话。 */
     defaultModel?: string;
 }
+/** `models.enabled` 的一项：`provider/model[@channel]` 或 `provider/*`。 */
+export declare const MODELS_ENABLED_REF: RegExp;
 /** [W5-G] 模型别名（子 Agent 定义的 `model: fast | strong`）。 */
 export interface ModelsConfig {
     aliases?: {
         fast?: string;
         strong?: string;
     };
+    /**
+     * 模型选择器的显式清单（`provider/model[@channel]`，`provider/*` 整个供应商）：设置后 `/model` 只显示清单内
+     * 的模型（加当前模型）；不设时显示已配置 key / 登录 / 本地可达的供应商的全部模型。只认用户级。
+     */
+    enabled?: string[];
 }
 /** [W5-H1] 档一裁剪参数（其余随窗口缩放的常量不暴露）。 */
 export interface PruneConfig {

package/dist/config/types-w5.js

@@ -18,3 +18,5 @@ export function agentEntry(agents, agentId) {
     const entry = agents[agentId];
     return typeof entry === "object" && !Array.isArray(entry) ? entry : undefined;
 }
+/** `models.enabled` 的一项：`provider/model[@channel]` 或 `provider/*`。 */
+export const MODELS_ENABLED_REF = /^[^/\s]+\/\S+$/;

package/dist/config/types-w6.d.ts

@@ -53,6 +53,11 @@ export interface ChatGptAuthConfig {
     issuer?: string;
     /** codex flavor 的 `originator` 请求头，缺省 codex_cli_rs。 */
     originator?: string;
+    /**
+     * codex flavor 模型列表的 `client_version`（Codex CLI 版本号，后端按它过滤模型），缺省见
+     * `DEFAULT_CODEX_CLIENT_VERSION`；`AMA_CHATGPT_CODEX_CLIENT_VERSION` 优先。
+     */
+    codexClientVersion?: string;
     /** 本地回调端口（依次尝试；0 = 任意空闲端口）。 */
     redirectPorts?: number[];
 }