@armadra/agent 0.6.0 → 0.6.1

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

@@ -12,6 +12,7 @@
  * - [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）。
  */
 import type { ApiRegistry } from "../ai/apis/api.js";
 import { ProviderRegistry } from "../ai/providers/registry.js";

package/dist/cli/compose-providers.js

@@ -12,9 +12,12 @@
  * - [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）。
  */
 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 +107,9 @@ 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)
+        mergeDiscoveredModels(registry, dataDir, lazyIndex(() => loadModelsDevIndex(dataDir)));
     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/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,8 @@
  * 匹配结果；`--write` 跳过 models.dev 标明不支持工具调用的模型。元数据不写进配置——运行时从缓存补。
  *
  * [W6-O] `chatgpt`：按登录的 flavor 调对应后端的模型列表（SIWC `GET /v1/models` 筛 `visibility: list`；codex
- * `GET /models?client_version=…`），只取 slug 与显示名；`--probe` 不适用（订阅后端只有一种协议）。
+ * `GET /models?client_version=…`），只取 slug 与显示名；`--probe` 不适用（订阅后端只有一种协议）。结果另写进
+ * 发现缓存 `<dataDir>/models/discovered/chatgpt.json`（discovered-cache.ts），`/model` 选择器由此列出。
  */
 import type { Api, Model, ProviderData, ProviderRegistryApi } from "../../ai/types.js";
 import type { ModelsAction } from "./models.js";

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

@@ -18,13 +18,15 @@
  * 匹配结果；`--write` 跳过 models.dev 标明不支持工具调用的模型。元数据不写进配置——运行时从缓存补。
  *
  * [W6-O] `chatgpt`：按登录的 flavor 调对应后端的模型列表（SIWC `GET /v1/models` 筛 `visibility: list`；codex
- * `GET /models?client_version=…`），只取 slug 与显示名；`--probe` 不适用（订阅后端只有一种协议）。
+ * `GET /models?client_version=…`），只取 slug 与显示名；`--probe` 不适用（订阅后端只有一种协议）。结果另写进
+ * 发现缓存 `<dataDir>/models/discovered/chatgpt.json`（discovered-cache.ts），`/model` 选择器由此列出。
  */
 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 { liveToken } from "../../auth/oauth/live.js";
 import { discoverLocalModels, materializeModel } from "../../ai/providers/registry.js";
+import { 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";
@@ -197,6 +199,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 +256,18 @@ async function run(ctx) {
     }
     return ExitCode.Ok;
 }
+/** chatgpt 的发现结果写进发现缓存（选择器与注册表读它）；写失败不影响列表输出。 */
+function cacheChatGpt(ctx, found, apiKey) {
+    try {
+        const flavor = liveToken(apiKey)?.flavor;
+        const models = found.map((m) => ({ id: m.id, ...(m.name !== m.id ? { name: m.name } : {}) }));
+        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`);
+    }
+}
 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({

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/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/i18n/catalog.d.ts

@@ -392,6 +392,19 @@ declare const en: {
             noHits: (all: boolean) => "No matches\n" | "No matches (only sessions of this directory; --all searches all)\n";
             truncated: (limit: number) => string;
         };
+        modelsEnabled: {
+            badRef: (ref: string) => string;
+            unknownModel: (ref: string) => string;
+            added: (refs: string, path: string) => string;
+            alreadyListed: (refs: string) => string;
+            removed: (refs: string, path: string) => string;
+            notListed: (refs: string) => string;
+            cleared: (path: string) => string;
+            listHeader: (path: string) => string;
+            listUnset: string;
+            notInTable: string;
+            nothing: string;
+        };
         configShow: {
             usage: string;
             unknownAction: (action: string) => string;
@@ -441,6 +454,7 @@ declare const en: {
             probeHeader: (count: number, order: string, requests: number, extra: number, limit: number) => string;
             unavailable: string;
             probeStopped: (reason: string) => string;
+            cached: (path: string) => string;
         };
     };
     interactive: {
@@ -636,8 +650,6 @@ declare const en: {
                 hintFilter: (arrows: string) => string;
                 hintNumbers: (arrows: string, n: number) => string;
                 hint: (arrows: string) => string;
-                local: string;
-                noKey: string;
                 justNow: string;
                 minutesAgo: (n: number) => string;
                 hoursAgo: (n: number) => string;
@@ -917,6 +929,27 @@ declare const en: {
             thinkingUnsupported: string;
             emptyText: string;
         };
+        model: {
+            local: string;
+            key: string;
+            oauth: string;
+            needsLogin: string;
+            noKey: string;
+            current: string;
+            listed: string;
+            otherChannels: (names: string) => string;
+            discoverHint: (provider: string) => string;
+            loginHint: (provider: string) => string;
+            footerConfigured: string;
+            footerAll: string;
+            emptyConfigured: string;
+            added: (ref: string) => string;
+            addedFirst: (ref: string) => string;
+            removed: (ref: string) => string;
+            wildcard: (ref: string, pattern: string) => string;
+            noKeyHint: (provider: string) => string;
+            needsLoginHint: (provider: string) => string;
+        };
         plan: {
             title: string;
             titleVersion: (version: number) => string;
@@ -1351,6 +1384,7 @@ declare const en: {
             "models.aliases": string;
             "models.aliases.fast": string;
             "models.aliases.strong": string;
+            "models.enabled": string;
             fallbackModel: string;
             limits: string;
             "limits.maxTurns": string;
@@ -1377,6 +1411,7 @@ declare const en: {
             "subagents.defaultModel": string;
             "models.aliases.fast": string;
             "models.aliases.strong": string;
+            "models.enabled": string;
             fallbackModel: string;
             "limits.maxTurns": string;
             "limits.maxCostUsd": string;
@@ -1402,6 +1437,7 @@ declare const en: {
             stringArray: string;
             array: string;
             modelsDev: string;
+            modelsEnabled: string;
             noChannels: string;
             unknownChannelOf: (name: string, available: readonly string[]) => string;
             modelInput: string;
@@ -1937,11 +1973,12 @@ declare const en: {
             siwcLimitHint: string;
             freePlanHint: (plan: string) => string;
             modelHint: string;
+            modelsCached: (count: number) => string;
         };
         errors: {
             portsBusy: (ports: string, codex: boolean) => string;
             timeout: string;
-            denied: (error: string) => string;
+            denied: (error: string, codexFallback: boolean) => string;
             stateMismatch: string;
             noCode: string;
             invalidToken: (reason: string) => string;
@@ -2116,6 +2153,8 @@ declare const en: {
         setDone: (key: string, value: string, scope: string) => string;
         unsetDone: (key: string, value: string, scope: string) => string;
         stillOverridden: (key: string, source: string) => string;
+        writtenTo: (key: string, value: string, scope: string) => string;
+        overriddenNow: (source: string, effective: string) => string;
         slashUsage: string;
         errors: {
             unknownKey: (key: string) => string;
@@ -2144,6 +2183,7 @@ declare const en: {
             agents: string;
             hooks: string;
             auth: string;
+            modelsEnabled: string;
         };
         cli: {
             usage: string;

package/dist/i18n/messages/auth.d.ts

@@ -45,11 +45,12 @@ export declare const en: {
         siwcLimitHint: string;
         freePlanHint: (plan: string) => string;
         modelHint: string;
+        modelsCached: (count: number) => string;
     };
     errors: {
         portsBusy: (ports: string, codex: boolean) => string;
         timeout: string;
-        denied: (error: string) => string;
+        denied: (error: string, codexFallback: boolean) => string;
         stateMismatch: string;
         noCode: string;
         invalidToken: (reason: string) => string;
@@ -135,11 +136,12 @@ export declare const zh: {
         siwcLimitHint: string;
         freePlanHint: (plan: string) => string;
         modelHint: string;
+        modelsCached: (count: number) => string;
     };
     errors: {
         portsBusy: (ports: string, codex: boolean) => string;
         timeout: string;
-        denied: (error: string) => string;
+        denied: (error: string, codexFallback: boolean) => string;
         stateMismatch: string;
         noCode: string;
         invalidToken: (reason: string) => string;

package/dist/i18n/messages/auth.js

@@ -46,11 +46,18 @@ export const en = {
         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: (plan) => `Note: the "${plan}" 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: (count) => `Your account can use ${count} model(s); pick one with /model or --model chatgpt/<model>.`,
     },
     errors: {
         portsBusy: (ports, codex) => `callback port ${ports} is in use: finish the other sign-in first, or use --paste${codex ? " / --device" : ""}`,
         timeout: "sign-in timed out; run the command again",
-        denied: (error) => `sign-in was not authorized (${error})`,
+        denied: (error, codexFallback) => `sign-in was not authorized (${error}). Possible causes:\n` +
+            "  1. The authorization page was cancelled, or using your ChatGPT plan was not checked: run ama auth login chatgpt again and keep that option checked\n" +
+            "  2. The account or plan is not eligible: plan usage is shared with Plus / Pro only; Team / Enterprise workspaces may not offer it; the browser may be signed in to another account\n" +
+            "  3. Your region is not supported" +
+            (codexFallback
+                ? "\nYou can also try the fallback: ama auth login chatgpt --flavor codex"
+                : ""),
         stateMismatch: "the pasted URL does not belong to this sign-in (state mismatch); start again",
         noCode: "the pasted URL has no code; copy the whole address after the browser redirects",
         invalidToken: (reason) => `id_token failed verification (${reason}); sign-in rejected`,
@@ -137,11 +144,16 @@ export const zh = {
         siwcLimitHint: "提示：可在 ChatGPT → 设置 → Usage → App limits 给 ama 设周上限。仅限本人使用，不要让多人共用一个登录。",
         freePlanHint: (plan) => `注意：「${plan}」计划可能不含给 ama 用的订阅额度。`,
         modelHint: "用 --model chatgpt/<模型> 使用；账户可用的模型用 ama models discover chatgpt 查看。",
+        modelsCached: (count) => `账户可用 ${count} 个模型，用 /model 或 --model chatgpt/<模型> 选择。`,
     },
     errors: {
         portsBusy: (ports, codex) => `回调端口 ${ports} 被占用：请先结束其它登录，或用 --paste${codex ? " / --device" : ""}`,
         timeout: "登录超时，请重新运行命令",
-        denied: (error) => `授权未通过（${error}）`,
+        denied: (error, codexFallback) => `授权未通过（${error}）。可能的原因：\n` +
+            "  1. 在授权页取消了，或没有勾选使用 ChatGPT 套餐额度：重新运行 ama auth login chatgpt 并确认勾选\n" +
+            "  2. 账户或套餐不符合：额度共享只对 Plus / Pro 开放；Team / Enterprise 工作空间可能未开放；浏览器可能登录了别的账户\n" +
+            "  3. 所在地区受限" +
+            (codexFallback ? "\n也可以改用备用方式：ama auth login chatgpt --flavor codex" : ""),
         stateMismatch: "粘贴的 URL 不属于这次登录（state 不符），请重新开始",
         noCode: "粘贴的 URL 里没有 code；请在浏览器跳转后复制完整地址",
         invalidToken: (reason) => `id_token 校验失败（${reason}），已拒绝这次登录`,

package/dist/i18n/messages/cli-help.js

@@ -91,6 +91,8 @@ Subcommands
                                Timeline of turns, requests, tools and subagents (text / HTML / JSON)
   ama models list [--provider <id>]  List models (with source and key status)
   ama models check <provider/id>     Send one minimal request to check availability
+  ama models enable|disable <provider/model|provider/*>…
+                               Edit the /model list (models.enabled); list --enabled shows it
   ama models discover <provider> [--probe] [--write] [--limit N]
                                List models from a relay's /v1/models, probe protocols, write the config
   ama models refresh [--provider <id>]  Refresh models.dev metadata into the data directory (startup stays
@@ -206,6 +208,8 @@ export const zh = {
                                回合、请求、工具与子 Agent 的时间线（文本 / HTML / JSON）
   ama models list [--provider <id>]  列出模型（含来源与 key 状态）
   ama models check <provider/id>     发一次最小请求检查可用性
+  ama models enable|disable <provider/model|provider/*>…
+                               编辑 /model 的模型清单（models.enabled）；list --enabled 查看
   ama models discover <provider> [--probe] [--write] [--limit N]
                                从中转 /v1/models 列出模型，探测协议并写入配置
   ama models refresh [--provider <id>]  联网刷新 models.dev 元数据到数据目录（启动不联网；