@armadra/agent 0.5.1 → 0.6.1

package/dist/ai/providers/auth.js

@@ -10,11 +10,20 @@
  * auth.json 的 `apiKey` 以 `!` 开头 = 执行命令取值（stdout 去首尾空白；超时 10 s；空输出或
  * 非零退出视为未配置，继续找下一来源）；同一命令进程内只执行一次。
  * 密钥只出现在 `resolve()` 的返回值里：warning 文案不含密钥与命令输出。
+ *
+ * [W6-O] auth.json 的 OAuth 条目（`type: "oauth"`，ChatGPT 登录）在 ②③ 的位置解析：每次从磁盘重读（绕过
+ * `fileCache`），临近过期经 `auth/oauth/refresh.ts` 刷新（跨进程锁），返回 `{ source: "oauth" }`，并把 token 的
+ * 上下文登记进 `auth/oauth/live.ts` 供协议层取账户 id、401 时强制刷新。永久失效（needsLogin）时仍返回旧 token
+ * 并在登记里标 needsLogin，协议层据此直接报 `auth_expired`（不发请求）。
  */
 import { exec } from "node:child_process";
 import { readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { registerLiveToken } from "../../auth/oauth/live.js";
+import { authExpiredError, freshOAuthEntry } from "../../auth/oauth/refresh.js";
+import { readOAuthEntry } from "../../auth/oauth/token-store.js";
+import { apiKeyEntry, isOAuthEntry } from "../../config/types-w6.js";
 /** 用户级配置目录：AMA_CONFIG_DIR > %APPDATA%\ama > $XDG_CONFIG_HOME/ama > ~/.config/ama。 */
 export function defaultConfigDir(env = process.env) {
     if (env["AMA_CONFIG_DIR"])
@@ -110,12 +119,61 @@ export class ApiKeyResolver {
     /** auth.json 里该供应商的条目（按 ② ③ 顺序第一个）。 */
     authEntry(providerId) {
         for (const path of this.authFiles()) {
-            const entry = this.loadFile(path)?.providers[providerId];
+            const entry = apiKeyEntry(this.loadFile(path)?.providers[providerId]);
             if (entry && typeof entry.apiKey === "string")
                 return { entry, path };
         }
         return undefined;
     }
+    /** [W6-O] 第一个给该供应商写了条目的 auth.json 若是 OAuth 条目，返回其路径。 */
+    oauthPath(providerId) {
+        for (const path of this.authFiles()) {
+            const raw = this.loadFile(path)?.providers[providerId];
+            if (raw === undefined)
+                continue;
+            return isOAuthEntry(raw) ? path : undefined;
+        }
+        return undefined;
+    }
+    register(path, providerId, entry) {
+        const deps = this.options.oauth ?? {};
+        registerLiveToken(entry.accessToken, {
+            provider: providerId,
+            flavor: entry.flavor,
+            accountId: entry.accountId,
+            planType: entry.planType,
+            ...(entry.needsLogin === true ? { needsLogin: true } : {}),
+            refresh: async () => {
+                const next = await freshOAuthEntry(path, providerId, deps, {
+                    force: true,
+                    staleToken: entry.accessToken,
+                });
+                if (next === undefined)
+                    throw authExpiredError(providerId);
+                this.register(path, providerId, next);
+                return next.accessToken;
+            },
+        });
+    }
+    async fromOAuth(providerId, path) {
+        let entry;
+        try {
+            entry = await freshOAuthEntry(path, providerId, this.options.oauth ?? {});
+        }
+        catch (error) {
+            // 失效：用旧 token 登记 needsLogin，协议层报 auth_expired；暂时失败：先用现有 token
+            entry = readOAuthEntry(path, providerId);
+            const code = error.code;
+            if (entry !== undefined && code === "auth_expired")
+                entry = { ...entry, needsLogin: true };
+            else
+                this.warn(`${providerId}: OAuth token refresh failed (${String(code ?? "error")})`);
+        }
+        if (entry === undefined)
+            return undefined;
+        this.register(path, providerId, entry);
+        return { apiKey: entry.accessToken, source: "oauth", origin: path };
+    }
     runCommand(command, extraEnv) {
         const key = `${command}\0${JSON.stringify(extraEnv ?? {})}`;
         let pending = this.commandCache.get(key);
@@ -138,7 +196,14 @@ export class ApiKeyResolver {
     }
     async fromAuthFiles(providerId) {
         for (const path of this.authFiles()) {
-            const entry = this.loadFile(path)?.providers[providerId];
+            const raw = this.loadFile(path)?.providers[providerId];
+            if (isOAuthEntry(raw)) {
+                const resolved = await this.fromOAuth(providerId, path);
+                if (resolved)
+                    return resolved;
+                continue;
+            }
+            const entry = apiKeyEntry(raw);
             if (!entry || typeof entry.apiKey !== "string" || entry.apiKey.length === 0)
                 continue;
             const value = entry.apiKey.startsWith("!")
@@ -194,6 +259,8 @@ export class ApiKeyResolver {
             return true;
         if (this.authEntry(provider.id)?.entry.apiKey)
             return true;
+        if (this.oauthPath(provider.id) !== undefined)
+            return true;
         const raw = this.options.configKeys?.[provider.id];
         if (raw && (raw.startsWith("!") || expandEnvRefs(raw, this.env) !== undefined))
             return true;

package/dist/ai/providers/builtin.js

@@ -227,6 +227,33 @@ export const BUILTIN_PROVIDERS = [
         envKeys: ["TOKENHUB_API_KEY", "HUNYUAN_API_KEY", "AMA_API_KEY_TENCENT"],
         requiresApiKey: true,
     },
+    {
+        // [W6-O] ChatGPT 订阅（docs/wave6-plan.md §4、D14）：`ama auth login chatgpt` 写 auth.json 的 OAuth 条目；
+        // 缺省渠道在组装时按条目的 flavor 定（compose-providers.ts）。模型表为空：`chatgpt/<slug>` 任意接受，
+        // `ama models discover chatgpt` 列出账户可用的 slug。缓存只有 prompt_cache_key（无 24h / 30m 显式缓存）。
+        id: "chatgpt",
+        name: "ChatGPT (subscription)",
+        api: RESPONSES,
+        baseUrl: "https://api.openai.com/v1",
+        channels: [
+            ch("siwc", RESPONSES, "https://api.openai.com/v1", { compat: { chatgptBackend: "siwc" } }),
+            ch("codex", RESPONSES, "https://chatgpt.com/backend-api/codex", {
+                headers: { originator: "codex_cli_rs" },
+                compat: { chatgptBackend: "codex" },
+            }),
+        ],
+        defaultChannel: "siwc",
+        envKeys: [],
+        requiresApiKey: true,
+        compat: {
+            supportsStore: true,
+            supportsReasoningSummary: true,
+            sendPromptCacheKey: true,
+            sendSessionAffinityHeaders: false,
+            supportsLongCacheRetention: false,
+            supportsExplicitPromptCacheMode: false,
+        },
+    },
     {
         id: "ollama",
         name: "Ollama (local)",

package/dist/ai/providers/catalog-data.js

@@ -4,6 +4,7 @@
  */
 export const CATALOG_SOURCES = {
     anthropic: '{"version":1,"provider":"anthropic","modelsDev":"anthropic","models":[{"id":"claude-fable-5-1","thinkingLevelMap":{"off":null,"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-fable-5","thinkingLevelMap":{"off":null,"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-5-5","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-5","thinkingLevelMap":{"off":null,"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-4-8","thinkingLevelMap":{"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":1024},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-4-7","thinkingLevelMap":{"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":2048},"compat":{"adaptiveThinking":true}},{"id":"claude-opus-4-6","promptCache":{"short":300,"long":3600,"minTokens":4096},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-5-5","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":512},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-5","thinkingLevelMap":{"xhigh":"xhigh"},"promptCache":{"short":300,"long":3600,"minTokens":1024},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-4-6","promptCache":{"short":300,"long":3600,"minTokens":1024},"compat":{"adaptiveThinking":true}},{"id":"claude-sonnet-4-5","promptCache":{"short":300,"long":3600,"minTokens":1024}},{"id":"claude-haiku-4-5","promptCache":{"short":300,"long":3600,"minTokens":4096}},{"id":"claude-opus-4-5","promptCache":{"short":300,"long":3600,"minTokens":4096}}]}',
+    chatgpt: '{"version":1,"provider":"chatgpt","modelsDev":false,"models":[]}',
     dashscope: '{"version":1,"provider":"dashscope","modelsDev":"alibaba-cn","models":[{"id":"qwen3.8-max","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":null,"xhigh":"xhigh"},"compat":{"supportsReasoningEffort":true}},{"id":"qwen3.8-flash","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":null,"xhigh":"xhigh"},"compat":{"supportsReasoningEffort":true}},{"id":"qwen3.7-max","maxTokens":131072,"compat":{"supportsReasoningEffort":false}},{"id":"qwen3.7-plus","maxTokens":65536,"compat":{"supportsReasoningEffort":false}},{"id":"qwen3.6-plus","compat":{"supportsReasoningEffort":false}},{"id":"qwen3.6-flash","compat":{"supportsReasoningEffort":false}}]}',
     deepseek: '{"version":1,"provider":"deepseek","modelsDev":"deepseek","models":[{"id":"deepseek-v4-pro","maxTokens":384000,"cost":{"input":1.32,"output":3.96,"cacheRead":0.044},"thinkingLevelMap":{"minimal":null,"low":null,"medium":null,"high":"high"},"_reason":"按官方价格页的高峰价（UTC 工作日 01–04、06–10 时）计，作上界；平峰为半价。快照价是平峰价或旧价"},{"id":"deepseek-flash","maxTokens":384000,"cost":{"input":0.3,"output":1.2,"cacheRead":0.006},"thinkingLevelMap":{"minimal":null,"low":"low","medium":null,"high":"high"},"_reason":"按官方价格页的高峰价（UTC 工作日 01–04、06–10 时）计，作上界；平峰为半价。快照价是平峰价或旧价"}]}',
     google: '{"version":1,"provider":"google","modelsDev":"google","models":[{"id":"gemini-3.8-flash","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.7-flash","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.5-flash","thinkingLevelMap":{"off":null,"minimal":"minimal","low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.5-flash-lite","thinkingLevelMap":{"off":null,"minimal":"minimal","low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3.1-pro-preview","thinkingLevelMap":{"off":null,"minimal":null,"low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-3-flash-preview","thinkingLevelMap":{"off":null,"minimal":"minimal","low":"low","medium":"medium","high":"high","xhigh":null}},{"id":"gemini-2.5-pro","thinkingLevelMap":{"off":null,"minimal":128,"low":2048,"medium":8192,"high":32768}},{"id":"gemini-2.5-flash","thinkingLevelMap":{"minimal":128,"low":2048,"medium":8192,"high":24576}},{"id":"gemini-2.5-flash-lite","thinkingLevelMap":{"minimal":512,"low":2048,"medium":8192,"high":24576}}]}',

package/dist/ai/providers/discovered-cache.d.ts

@@ -0,0 +1,48 @@
+/**
+ * 发现得到的模型列表缓存：`<dataDir>/models/discovered/<provider>.json`。
+ *
+ * 模型表为空、接受任意 slug 的供应商（`chatgpt` 的订阅后端）在选择器里原本一个模型都看不到。
+ * `ama auth login chatgpt` 成功后与 `ama models discover chatgpt` 把账户可用的 slug 写进这里；组装注册表时
+ * （`mergeDiscoveredModels`）并入**模型表仍为空**的供应商，元数据用 models.dev（快照 ⊕ 用户刷新）补全。
+ * `ama auth logout chatgpt` 删掉它。只存 slug、显示名、flavor 与时间戳——没有 token、账户 id。
+ */
+import type { Model, ProviderData } from "../types.js";
+import type { ModelsDevIndex } from "./models-dev.js";
+export declare const DISCOVERED_CACHE_VERSION = 1;
+export interface DiscoveredCacheFile {
+    version: number;
+    provider: string;
+    /** ISO 时间。 */
+    fetchedAt: string;
+    /** ChatGPT 登录的 flavor（siwc / codex）；其它供应商不写。 */
+    flavor?: string;
+    models: {
+        id: string;
+        name?: string;
+    }[];
+}
+/** 缓存文件位置。 */
+export declare function discoveredCachePath(dataDir: string, provider: string): string;
+/** 读缓存；不存在、损坏或形状不对返回 undefined（不报错，选择器给提示行）。 */
+export declare function readDiscoveredCache(dataDir: string, provider: string): DiscoveredCacheFile | undefined;
+/** 写缓存（先写临时文件再改名）；返回路径。 */
+export declare function writeDiscoveredCache(dataDir: string, provider: string, input: {
+    models: readonly {
+        id: string;
+        name?: string | undefined;
+    }[];
+    flavor?: string | undefined;
+}, now?: number): string;
+/** 删缓存；删了返回 true。 */
+export declare function clearDiscoveredCache(dataDir: string, provider: string): boolean;
+/** 缓存里的模型 → 注册表模型（models.dev 补元数据，补不到用自定义缺省）。 */
+export declare function discoveredModels(file: DiscoveredCacheFile, provider: ProviderData, modelsDev: () => ModelsDevIndex | undefined): Model[];
+/** 注册表里能追加模型的最小接口（`ProviderRegistry.addModels`）。 */
+export interface DiscoveredTarget {
+    list(): readonly ProviderData[];
+    addModels(providerId: string, models: readonly Model[], source?: "discovered"): void;
+}
+/**
+ * 把缓存并入模型表为空的供应商（本地服务除外：它们每次启动现场探测）。返回并入了的供应商 id。
+ */
+export declare function mergeDiscoveredModels(registry: DiscoveredTarget, dataDir: string, modelsDev: () => ModelsDevIndex | undefined): string[];

package/dist/ai/providers/discovered-cache.js

@@ -0,0 +1,102 @@
+/**
+ * 发现得到的模型列表缓存：`<dataDir>/models/discovered/<provider>.json`。
+ *
+ * 模型表为空、接受任意 slug 的供应商（`chatgpt` 的订阅后端）在选择器里原本一个模型都看不到。
+ * `ama auth login chatgpt` 成功后与 `ama models discover chatgpt` 把账户可用的 slug 写进这里；组装注册表时
+ * （`mergeDiscoveredModels`）并入**模型表仍为空**的供应商，元数据用 models.dev（快照 ⊕ 用户刷新）补全。
+ * `ama auth logout chatgpt` 删掉它。只存 slug、显示名、flavor 与时间戳——没有 token、账户 id。
+ */
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { withCustomDefaults } from "./catalog.js";
+import { enrichEntry } from "./enrich.js";
+export const DISCOVERED_CACHE_VERSION = 1;
+/** 缓存文件位置。 */
+export function discoveredCachePath(dataDir, provider) {
+    return 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 === undefined || typeof name === "string");
+}
+/** 读缓存；不存在、损坏或形状不对返回 undefined（不报错，选择器给提示行）。 */
+export function readDiscoveredCache(dataDir, provider) {
+    let parsed;
+    try {
+        parsed = JSON.parse(readFileSync(discoveredCachePath(dataDir, provider), "utf8"));
+    }
+    catch {
+        return undefined;
+    }
+    if (typeof parsed !== "object" || parsed === null)
+        return undefined;
+    const file = parsed;
+    if (file.provider !== provider || !Array.isArray(file.models))
+        return undefined;
+    return {
+        version: typeof file.version === "number" ? file.version : DISCOVERED_CACHE_VERSION,
+        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 })),
+    };
+}
+/** 写缓存（先写临时文件再改名）；返回路径。 */
+export function writeDiscoveredCache(dataDir, provider, input, now = Date.now()) {
+    const path = discoveredCachePath(dataDir, provider);
+    const file = {
+        version: DISCOVERED_CACHE_VERSION,
+        provider,
+        fetchedAt: new Date(now).toISOString(),
+        ...(input.flavor !== undefined ? { flavor: input.flavor } : {}),
+        models: input.models.map((m) => (m.name ? { id: m.id, name: m.name } : { id: m.id })),
+    };
+    mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+    const tmp = `${path}.${process.pid}.tmp`;
+    writeFileSync(tmp, `${JSON.stringify(file, null, 2)}\n`);
+    renameSync(tmp, path);
+    return path;
+}
+/** 删缓存；删了返回 true。 */
+export function clearDiscoveredCache(dataDir, provider) {
+    const path = discoveredCachePath(dataDir, provider);
+    if (!existsSync(path))
+        return false;
+    rmSync(path, { force: true });
+    return true;
+}
+/** 缓存里的模型 → 注册表模型（models.dev 补元数据，补不到用自定义缺省）。 */
+export 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 model = withCustomDefaults(entry, provider.id, provider.api);
+        // 只挂发现时登录的 flavor 对应的渠道（订阅后端的另一条渠道用不了，不在说明与 `@` 行里出现）；
+        // 缓存没写 flavor 或渠道不存在时用供应商的缺省渠道
+        const names = (provider.channels ?? []).map((c) => c.name);
+        if (names.length > 0) {
+            const own = file.flavor !== undefined && names.includes(file.flavor) ? file.flavor : undefined;
+            model.channels = [own ?? provider.defaultChannel ?? names[0]];
+        }
+        return model;
+    });
+}
+/**
+ * 把缓存并入模型表为空的供应商（本地服务除外：它们每次启动现场探测）。返回并入了的供应商 id。
+ */
+export function mergeDiscoveredModels(registry, dataDir, modelsDev) {
+    const merged = [];
+    for (const provider of registry.list()) {
+        if (provider.models.length > 0 || !provider.requiresApiKey)
+            continue;
+        const file = readDiscoveredCache(dataDir, provider.id);
+        if (file === undefined || file.models.length === 0)
+            continue;
+        registry.addModels(provider.id, discoveredModels(file, provider, modelsDev), "discovered");
+        merged.push(provider.id);
+    }
+    return merged;
+}

package/dist/ai/providers/enrich.js

@@ -7,6 +7,7 @@
  */
 import { catalogInherited } from "./catalog.js";
 import { ENRICHABLE_FIELDS, modelsDevFields, } from "./models-dev.js";
+import { msg } from "../../i18n/index.js";
 /** 惰性取索引：只有真的要补字段时才读缓存（启动时没有自定义模型就不读约 2 MB 的缓存）。 */
 export function lazyIndex(source) {
     if (typeof source !== "function")
@@ -90,12 +91,6 @@ export function catalogMetadata(model) {
     }
     return { sources, looked: false };
 }
-const SOURCE_TEXT = {
-    config: "config",
-    catalog: "目录",
-    "models.dev": "models.dev",
-    default: "缺省",
-};
 export function sourceText(source) {
-    return SOURCE_TEXT[source];
+    return msg().errors.models.source(source);
 }

package/dist/ai/providers/model-visibility.d.ts

@@ -0,0 +1,33 @@
+/**
+ * 模型选择器的可见性规则（`/model`、启动选择器、`/config` 的模型项、`ama models list --enabled` 共用）。
+ *
+ * - 供应商的可用状态：本地（`requiresApiKey: false`）、有 key、OAuth 已登录、OAuth 需重新登录、没配置；
+ *   前三种算「已配置」，缺省只显示它们的模型。
+ * - `models.enabled`（用户级）：`provider/model[@channel]` 或 `provider/*`；设置后只显示清单内的模型。
+ *   清单为空等同不设（写回时删掉这个键）。
+ */
+import type { ProviderData, ProviderRegistryApi } from "../types.js";
+export type ProviderAccess = "local" | "key" | "oauth" | "needsLogin" | "none";
+/** 解析 key 判断供应商的可用状态（OAuth 条目会按需刷新，与发请求前相同）。 */
+export declare function providerAccess(registry: ProviderRegistryApi, provider: ProviderData): Promise<ProviderAccess>;
+export declare function accessReady(access: ProviderAccess): boolean;
+/** `provider/model@channel` → 三段（模型 id 里可以有 `/`）。 */
+export declare function splitEnabledRef(ref: string): {
+    provider: string;
+    model: string;
+    channel?: string;
+} | undefined;
+/**
+ * 清单是否包含该行：`exact` 是逐字列出（`provider/model`，渠道行要 `provider/model@channel`），
+ * `wildcard` 只经 `provider/*` 匹配上。
+ */
+export declare function enabledMatch(list: readonly string[], ref: string): {
+    kind: "exact" | "wildcard";
+    pattern: string;
+} | undefined;
+/** 追加（去重、保持顺序）。 */
+export declare function addEnabled(list: readonly string[] | undefined, refs: readonly string[]): string[];
+/** 移出；移空返回 undefined（删掉键，恢复「显示全部已配置」）。 */
+export declare function removeEnabled(list: readonly string[] | undefined, refs: readonly string[]): string[] | undefined;
+/** 配置里的清单：非数组或空数组视为未设置。 */
+export declare function enabledList(value: unknown): readonly string[] | undefined;

package/dist/ai/providers/model-visibility.js

@@ -0,0 +1,70 @@
+/**
+ * 模型选择器的可见性规则（`/model`、启动选择器、`/config` 的模型项、`ama models list --enabled` 共用）。
+ *
+ * - 供应商的可用状态：本地（`requiresApiKey: false`）、有 key、OAuth 已登录、OAuth 需重新登录、没配置；
+ *   前三种算「已配置」，缺省只显示它们的模型。
+ * - `models.enabled`（用户级）：`provider/model[@channel]` 或 `provider/*`；设置后只显示清单内的模型。
+ *   清单为空等同不设（写回时删掉这个键）。
+ */
+import { liveToken } from "../../auth/oauth/live.js";
+/** 解析 key 判断供应商的可用状态（OAuth 条目会按需刷新，与发请求前相同）。 */
+export async function providerAccess(registry, provider) {
+    if (!provider.requiresApiKey)
+        return "local";
+    const key = await registry
+        .resolveApiKey(provider.id)
+        .catch(() => ({ apiKey: undefined, source: "none" }));
+    if (key.apiKey === undefined)
+        return "none";
+    if (key.source !== "oauth")
+        return "key";
+    return liveToken(key.apiKey)?.needsLogin === true ? "needsLogin" : "oauth";
+}
+export function accessReady(access) {
+    return access === "local" || access === "key" || access === "oauth";
+}
+/** `provider/model@channel` → 三段（模型 id 里可以有 `/`）。 */
+export function splitEnabledRef(ref) {
+    const slash = ref.indexOf("/");
+    if (slash <= 0 || slash === ref.length - 1)
+        return undefined;
+    const provider = ref.slice(0, slash);
+    const rest = ref.slice(slash + 1);
+    const at = rest.lastIndexOf("@");
+    if (at > 0)
+        return { provider, model: rest.slice(0, at), channel: rest.slice(at + 1) };
+    return { provider, model: rest };
+}
+/**
+ * 清单是否包含该行：`exact` 是逐字列出（`provider/model`，渠道行要 `provider/model@channel`），
+ * `wildcard` 只经 `provider/*` 匹配上。
+ */
+export function enabledMatch(list, ref) {
+    if (list.includes(ref))
+        return { kind: "exact", pattern: ref };
+    const parts = splitEnabledRef(ref);
+    if (parts === undefined)
+        return undefined;
+    const wildcard = `${parts.provider}/*`;
+    return list.includes(wildcard) ? { kind: "wildcard", pattern: wildcard } : undefined;
+}
+/** 追加（去重、保持顺序）。 */
+export function addEnabled(list, refs) {
+    const out = [...(list ?? [])];
+    for (const ref of refs)
+        if (!out.includes(ref))
+            out.push(ref);
+    return out;
+}
+/** 移出；移空返回 undefined（删掉键，恢复「显示全部已配置」）。 */
+export function removeEnabled(list, refs) {
+    const out = (list ?? []).filter((ref) => !refs.includes(ref));
+    return out.length > 0 ? out : undefined;
+}
+/** 配置里的清单：非数组或空数组视为未设置。 */
+export function enabledList(value) {
+    if (!Array.isArray(value))
+        return undefined;
+    const list = value.filter((x) => typeof x === "string");
+    return list.length > 0 ? list : undefined;
+}

package/dist/ai/providers/models-dev-cache.js

@@ -12,6 +12,7 @@ import { mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "no
 import { dirname, join } from "node:path";
 import { ModelsDevIndex as Index } from "./models-dev.js";
 import { buildSnapshot, builtinSnapshot, builtinSnapshotIndex, diffSnapshots, mergeSnapshot, snapshotList, snapshotMeta, } from "./models-dev-snapshot.js";
+import { msg } from "../../i18n/index.js";
 export const MODELS_DEV_URL = "https://models.dev/api.json";
 export const MODELS_DEV_URL_ENV = "AMA_MODELS_DEV_URL";
 export const MODELS_DEV_FILE = "models-dev.json";
@@ -79,11 +80,11 @@ export function loadModelsDevIndex(dataDir) {
 export function describeModelsDev(dataDir) {
     const index = loadModelsDevIndex(dataDir);
     const file = readModelsDevCache(dataDir);
-    const size = `${index.providerCount} 家供应商、${index.modelCount} 个模型`;
+    const m = msg().errors.models;
     const via = file !== undefined && overrideApplies(file)
-        ? `快照 ${snapshotMeta().fetchedAt} ⊕ 刷新 ${file.fetchedAt}`
-        : `快照 ${snapshotMeta().fetchedAt}`;
-    return `models.dev：${via}（${size}）`;
+        ? m.viaRefresh(snapshotMeta().fetchedAt, file.fetchedAt)
+        : m.viaSnapshot(snapshotMeta().fetchedAt);
+    return m.describe(via, index.providerCount, index.modelCount);
 }
 /** 显式联网刷新（只被 `ama models refresh` 调用）：拉 api.json、按清单裁剪、写用户级覆盖。 */
 export async function refreshModelsDev(options) {
@@ -94,12 +95,12 @@ export async function refreshModelsDev(options) {
         status: "failed",
         url,
         index: before,
-        warning: `models.dev 刷新失败（${reason}），沿用现有数据`,
+        warning: msg().errors.models.refreshFailed(reason),
     });
     const list = snapshotList();
     const unknown = (options.providers ?? []).filter((p) => !list.providers.includes(p));
     if (unknown.length > 0)
-        return fail(`不在收录清单里：${unknown.join(", ")}；可选 ${list.providers.join(", ")}`);
+        return fail(msg().errors.models.notListed(unknown.join(", "), list.providers.join(", ")));
     let fresh;
     try {
         const response = await (options.fetch ?? fetch)(url, {
@@ -134,28 +135,23 @@ export async function refreshModelsDev(options) {
 }
 /** 刷新结果的说明（命令输出用）：一行状态 + 新增 / 删除 / 变化清单。 */
 export function describeRefresh(result, limit = 20) {
-    const size = `${result.index.providerCount} 家供应商、${result.index.modelCount} 个模型`;
-    const text = {
-        updated: "已刷新",
-        unchanged: "已刷新，无变化",
-        failed: "刷新失败",
-    };
+    const m = msg().errors.models;
     const lines = [
-        `models.dev：${text[result.status]}（${size}${result.fetchedAt ? `，${result.fetchedAt}` : ""}）`,
+        m.refreshStatus(result.status, result.index.providerCount, result.index.modelCount, result.fetchedAt),
     ];
-    const section = (title, items) => {
+    const section = (kind, items) => {
         if (items.length === 0)
             return;
-        lines.push(`${title}（${items.length}）：`);
+        lines.push(m.section(kind, items.length));
         for (const item of items.slice(0, limit))
             lines.push(`  ${item}`);
         if (items.length > limit)
-            lines.push(`  …另 ${items.length - limit} 条`);
+            lines.push(m.more(items.length - limit));
     };
     if (result.diff !== undefined) {
-        section("新增", result.diff.added);
-        section("上游删除（快照里的条目保留）", result.diff.removed);
-        section("变化", result.diff.changed);
+        section("added", result.diff.added);
+        section("removed", result.diff.removed);
+        section("changed", result.diff.changed);
     }
     return lines.join("\n");
 }

package/dist/ai/providers/models-dev-snapshot.js

@@ -7,10 +7,11 @@
  */
 import { MODELS_DEV_SOURCES } from "./models-dev-data.js";
 import { ModelsDevIndex, keepForSnapshot, trimProvider, } from "./models-dev.js";
+import { msg } from "../../i18n/index.js";
 function parse(id) {
     const text = MODELS_DEV_SOURCES[id];
     if (text === undefined)
-        throw new Error(`models.dev 快照缺少 ${id}`);
+        throw new Error(msg().errors.models.snapshotMissing(id));
     return JSON.parse(text);
 }
 let meta;
@@ -69,17 +70,17 @@ function isRecord(value) {
  */
 export function buildSnapshot(raw, snapshot = snapshotList(), only) {
     if (!isRecord(raw))
-        throw new Error("api.json 顶层不是对象");
+        throw new Error(msg().errors.models.apiNotObject);
     const out = {};
     for (const id of only ?? snapshot.providers) {
         const provider = raw[id];
         if (!isRecord(provider))
-            throw new Error(`api.json 缺少供应商 ${id}`);
+            throw new Error(msg().errors.models.apiMissingProvider(id));
         const prefixes = snapshot.prefixes?.[id];
         const trimmed = trimProvider(id, provider, (modelId, model) => keepForSnapshot(model) &&
             (prefixes === undefined || prefixes.some((p) => modelId.startsWith(`${p}/`))));
         if (Object.keys(trimmed.models).length === 0)
-            throw new Error(`${id} 过滤后没有模型`);
+            throw new Error(msg().errors.models.noModelsAfterFilter(id));
         for (const model of Object.values(trimmed.models))
             delete model.tool_call;
         out[id] = trimmed;
@@ -89,7 +90,7 @@ export function buildSnapshot(raw, snapshot = snapshotList(), only) {
 function priceText(model) {
     const c = model.cost;
     return c === undefined
-        ? "无"
+        ? msg().errors.models.none
         : `${c.input}/${c.output}/${c.cache_read ?? "-"}/${c.cache_write ?? "-"}`;
 }
 /** 新旧对比（与脚本摘要同一口径）；只比较 `after` 里出现的供应商。 */
@@ -109,12 +110,12 @@ export function diffSnapshots(before, after) {
             const parts = [];
             for (const key of ["context", "output"]) {
                 if (prev.limit?.[key] !== next.limit?.[key])
-                    parts.push(`${key} ${prev.limit?.[key] ?? "无"} → ${next.limit?.[key] ?? "无"}`);
+                    parts.push(`${key} ${prev.limit?.[key] ?? msg().errors.models.none} → ${next.limit?.[key] ?? msg().errors.models.none}`);
             }
             if (priceText(prev) !== priceText(next))
                 parts.push(`cost ${priceText(prev)} → ${priceText(next)}`);
             if (parts.length > 0)
-                out.changed.push(`${providerId}/${id}：${parts.join("；")}`);
+                out.changed.push(msg().errors.models.changed(`${providerId}/${id}`, parts));
         }
     }
     out.added.sort();

package/dist/ai/providers/models-dev.js

@@ -8,6 +8,7 @@
  *
  * 本模块只做纯计算（不读文件、不联网）；缓存与拉取在 models-dev-cache.ts。
  */
+import { msg } from "../../i18n/index.js";
 /**
  * 原厂供应商（models.dev 的供应商 id，顺序即优先级）。通义在 `alibaba`、Meta 在 `meta`（Llama API
  * 在 `llama`）、智谱国际站在 `zai`、豆包在 `volcengine`、混元在 `tencent-tokenhub`；models.dev 没有
@@ -168,7 +169,7 @@ export function trimProvider(providerId, provider, keep) {
 /** 校验并裁剪 api.json：只留用到的字段；形状不对的供应商 / 模型跳过。整体不是对象抛错。 */
 export function trimModelsDev(raw) {
     if (!isRecord(raw))
-        throw new Error("models.dev 数据不是对象");
+        throw new Error(msg().errors.models.notObject);
     const out = {};
     for (const [providerId, provider] of Object.entries(raw)) {
         if (!isRecord(provider) || !isRecord(provider["models"]))
@@ -322,9 +323,7 @@ export class ModelsDevIndex {
             candidates,
         };
         if (groups.size > 1) {
-            match.warning =
-                `${key}：models.dev 有 ${pool.length} 个条目、${groups.size} 种取值，` +
-                    `取多数（${best.length} 条：${signature(chosen.model)}）`;
+            match.warning = msg().errors.models.consensus(key, pool.length, groups.size, best.length, signature(chosen.model));
         }
         return match;
     }
@@ -394,15 +393,6 @@ export const ENRICHABLE_FIELDS = [
 /** 匹配方式的中文说明（表格与 `models list`）。 */
 export function matchLabel(match) {
     if (match === undefined)
-        return "未匹配";
-    const kind = {
-        explicit: "显式",
-        prefix: "前缀",
-        canonical: "原厂",
-        vendor: "原厂",
-        consensus: "多数",
-        single: "唯一",
-    };
-    const via = match.normalized !== undefined ? `，按 ${match.normalized}` : "";
-    return `${kind[match.kind]} ${match.ref}${via}`;
+        return msg().errors.models.unmatched;
+    return msg().errors.models.match(match.kind, match.ref, match.normalized);
 }

package/dist/ai/providers/registry.d.ts

@@ -63,6 +63,8 @@ export declare class ProviderRegistry implements ProviderRegistryApi {
     private readonly envBaseUrls;
     /** baseUrl 指向非官方主机的内置供应商：接受目录外的 model id。 */
     private readonly relayed;
+    /** 模型表只来自发现缓存的供应商：表外的 id 照样合成（与空表相同）。 */
+    private readonly openTables;
     /** config 里写了自己 `channels` 的供应商（内置渠道不因改 baseUrl 作废）。 */
     private readonly userChannels;
     /** config 里写了供应商级 `api` 的供应商（单渠道回落时目录模型跟它走）。 */