@armadra/agent 0.2.1 → 0.4.0

package/dist/cli/subcommands/config.js

@@ -3,23 +3,78 @@
  * 每一项标出来自哪一层（default / user / profile / project），并给出将使用的模型与原因
  * （`config.defaultModel` 或零配置选择）。只读；config 里的字面量 apiKey 只显示种类。[B6]
  *
+ * 缺省值来自 config/key-docs.ts 的 DISPLAY_DEFAULTS（含 DEFAULT_CONFIG 不写的 cache / codemode 等段），
+ * `codemode.mode` 不写时显示跟随预设的结果与原因；`--tools-preset` / `--codemode` 作为 cli 层叠加；
+ * 预设写的是旧名（codemode）时显示规范名并提示。
+ *
  * [W3-B12] 「供应商」节：config 里出现的供应商与 baseUrl 来自环境变量（`OPENAI_BASE_URL` /
  * `ANTHROPIC_BASE_URL`）的内置供应商，列出协议、生效 baseUrl 与来源、config 里每个模型的协议
  * （模型级 `api` 生效后的值）。
  */
+import { metadataOf, modelFlags, sourcesLine } from "./model-meta.js";
 import { loadConfigFile } from "../../config/load.js";
-import { DEFAULT_CONFIG, PROFILE_DEFAULTS, mergeProjectAndCli } from "../../config/merge.js";
-import { CONFIG_FILE, projectFile } from "../../config/paths.js";
+import { PROFILE_DEFAULTS, cliOverridesToConfig, mergeConfig, mergeProjectAndCli, } from "../../config/merge.js";
+import { DISPLAY_DEFAULTS } from "../../config/key-docs.js";
+import { AUTH_FILE, CONFIG_FILE, HOOKS_FILE, projectFile, resolveConfigDir, resolveDataDir, } from "../../config/paths.js";
+import { spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { modelsDevCachePath } from "../../ai/providers/models-dev-cache.js";
+import { initConfigDir } from "../../config/init.js";
+import { CONFIG_SCHEMA_FILE } from "../../config/json-schema.js";
+import { CODEMODE_MODES, TOOLS_PRESET_ALIASES, TOOLS_PRESET_INPUTS, canonicalPreset, } from "../../config/types.js";
+import { codemodeAvailability, detectSandboxCapability } from "../../codemode/capability.js";
 import { baseUrlEnvOf } from "../../ai/providers/registry.js";
 import { classifyKeyValue } from "../../config/auth-file.js";
-import { effectiveCodemodeMode, resolvePreset } from "../../tools/presets.js";
+import { CODEMODE_TOOL, resolveCodemodeMode, resolvePreset } from "../../tools/presets.js";
 import { builtinTools } from "../../tools/registry.js";
 import { parseSubArgs, UsageError } from "../args.js";
-import { pickDefaultModel } from "../default-model.js";
+import { noModelGuidance, pickDefaultModel } from "../default-model.js";
 import { ExitCode } from "../exit-codes.js";
 import { buildRegistry, loadUserLevel } from "./context.js";
 export const CONFIG_USAGE = `用法：ama config show [--json] [--profile <文件>] [--auth-file <文件>]
+                        [--tools-preset <名>] [--codemode off|on|only]
+      ama config path    配置目录、数据目录与各文件路径
+      ama config edit    用 $VISUAL / $EDITOR 打开 config.json（没有编辑器时打印路径）
 `;
+/** `ama config path`：目录与文件路径，标出是否存在。 */
+function showPaths(io) {
+    const configDir = resolveConfigDir({ env: io.env });
+    const dataDir = resolveDataDir({ env: io.env });
+    const mark = (path) => `${path}${existsSync(path) ? "" : "  （不存在）"}`;
+    const lines = [
+        `配置目录  ${mark(configDir)}`,
+        `  config.json         ${mark(join(configDir, CONFIG_FILE))}`,
+        `  config.schema.json  ${mark(join(configDir, CONFIG_SCHEMA_FILE))}`,
+        `  auth.json           ${mark(join(configDir, AUTH_FILE))}`,
+        `  hooks.json          ${mark(join(configDir, HOOKS_FILE))}`,
+        `数据目录  ${mark(dataDir)}`,
+        `  sessions/           ${mark(join(dataDir, "sessions"))}`,
+        `  models-dev.json     ${mark(modelsDevCachePath(dataDir))}`,
+        `项目级    ${mark(projectFile(io.cwd, CONFIG_FILE))}`,
+    ];
+    io.stdout(`${lines.join("\n")}\n`);
+    return ExitCode.Ok;
+}
+/** `ama config edit`：不存在先 init；`$VISUAL` / `$EDITOR`（可带参数）打开，没有就打印路径。 */
+function editConfig(io) {
+    const configDir = resolveConfigDir({ env: io.env });
+    const path = join(configDir, CONFIG_FILE);
+    if (!existsSync(path))
+        initConfigDir(configDir);
+    const editor = (io.env["VISUAL"] ?? io.env["EDITOR"] ?? "").trim();
+    if (editor === "") {
+        io.stdout(`${path}\n（没有设置 $VISUAL / $EDITOR，请用编辑器打开上面的文件）\n`);
+        return ExitCode.Ok;
+    }
+    const quoted = process.platform === "win32" ? `"${path}"` : `'${path.replace(/'/g, `'\\''`)}'`;
+    const result = spawnSync(`${editor} ${quoted}`, { stdio: "inherit", shell: true });
+    if (result.error !== undefined || result.status !== 0) {
+        io.stderr(`ama: 编辑器退出异常（${editor}）；文件在 ${path}\n`);
+        return ExitCode.RuntimeError;
+    }
+    return ExitCode.Ok;
+}
 function isObject(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -58,13 +113,16 @@ export async function describeModel(config, registry) {
         return { ref: undefined, reason: "注册表未装配" };
     const picked = await pickDefaultModel(registry);
     if (picked === undefined)
-        return { ref: undefined, reason: "没有可用模型：ama auth set <provider> 或设置对应环境变量" };
+        return { ref: undefined, reason: noModelGuidance(registry) };
     const ref = `${picked.provider.id}/${picked.model.id}`;
     if (picked.via === "local")
-        return { ref, reason: `零配置：本地 ${picked.provider.id} 可达` };
+        return { ref, reason: `零配置：本地 ${picked.provider.id} 可达；${picked.rule}` };
     const key = await registry.resolveApiKey(picked.provider.id);
     const origin = key.origin !== undefined ? ` ${key.origin}` : "";
-    return { ref, reason: `零配置：${picked.provider.id} 有 key（${key.source}${origin}）` };
+    return {
+        ref,
+        reason: `零配置：${picked.provider.id} 有 key（${key.source}${origin}）；${picked.rule}`,
+    };
 }
 /** config 里出现的供应商 + baseUrl 来自环境变量的内置供应商。 */
 export function describeProviders(config, registry) {
@@ -82,7 +140,27 @@ export function describeProviders(config, registry) {
             api: provider.api,
             baseUrl: provider.baseUrl,
             ...(env !== undefined ? { baseUrlEnv: env } : {}),
-            models: provider.models.filter((m) => ids.has(m.id)).map((m) => ({ id: m.id, api: m.api })),
+            ...(provider.channels !== undefined
+                ? {
+                    channels: provider.channels.map((c) => ({
+                        name: c.name,
+                        api: c.api,
+                        baseUrl: c.baseUrl,
+                    })),
+                }
+                : {}),
+            models: provider.models
+                .filter((m) => ids.has(m.id))
+                .map((m) => {
+                const sources = sourcesLine(metadataOf(registry, provider.id, m.id));
+                return {
+                    id: m.id,
+                    api: m.api,
+                    ...(m.channels !== undefined ? { channels: [...m.channels] } : {}),
+                    flags: modelFlags(m),
+                    ...(sources !== undefined ? { sources } : {}),
+                };
+            }),
         });
     }
     return out;
@@ -94,13 +172,18 @@ function providerLines(providers) {
     for (const p of providers) {
         const env = p.baseUrlEnv !== undefined ? `（baseUrl 来自环境变量 ${p.baseUrlEnv}）` : "";
         lines.push(`  ${p.id}  ${p.api}  ${p.baseUrl}${env}`);
-        for (const m of p.models)
-            lines.push(`    ${p.id}/${m.id}  ${m.api}`);
+        for (const c of p.channels ?? [])
+            lines.push(`    @${c.name}  ${c.api}  ${c.baseUrl}`);
+        for (const m of p.models) {
+            lines.push(`    ${p.id}/${m.id}  ${m.api}  ${m.flags}`);
+            if (m.sources !== undefined)
+                lines.push(`      ${m.sources}`);
+        }
     }
     return lines;
 }
-function layersOf(level, project, effective) {
-    const layers = [{ name: "default", label: "内置缺省", value: DEFAULT_CONFIG }];
+function layersOf(level, project, effective, cli) {
+    const layers = [{ name: "default", label: "内置缺省", value: DISPLAY_DEFAULTS }];
     const user = loadConfigFile("config", level.userConfigPath)?.value;
     if (user !== undefined)
         layers.push({ name: "user", label: level.userConfigPath, value: user });
@@ -123,6 +206,8 @@ function layersOf(level, project, effective) {
         }
         layers.push({ name: "project", label: ".ama/config.json", value: unflatten(accepted) });
     }
+    if (cli !== undefined && Object.keys(cli).length > 0)
+        layers.push({ name: "cli", label: "命令行", value: cli });
     return layers;
 }
 function unflatten(flat) {
@@ -149,51 +234,129 @@ export function sourcesOf(effective, layers) {
     }
     return sources;
 }
+/** codemode 生效模式与原因（跟随预设时写明预设与运行时 Node 是否隔离网络）。 */
+export function describeCodemode(config, nodeVersion) {
+    const capability = detectSandboxCapability(nodeVersion);
+    const resolved = resolveCodemodeMode(config, capability.strict);
+    const sandbox = capability.strict
+        ? `Node ${capability.nodeMajor} 网络已隔离`
+        : `Node ${capability.nodeMajor} < 25 网络未隔离`;
+    const reason = resolved.source === "config"
+        ? `codemode.mode 显式设置（${sandbox}）`
+        : `跟随预设 ${resolved.preset}（${sandbox}）`;
+    const out = {
+        mode: resolved.mode,
+        source: resolved.source,
+        reason,
+        strict: capability.strict,
+    };
+    if (resolved.mode !== "off") {
+        const availability = codemodeAvailability(config.codemode?.requireStrict, capability);
+        if (!availability.available)
+            out.unavailable = availability.warning;
+    }
+    return out;
+}
+/** 各层里把 tools.preset 写成旧名（别名）的：`user（写的是旧名 codemode）`。 */
+function presetAliasNotes(layers) {
+    const notes = [];
+    for (const layer of layers) {
+        const preset = layer.value?.tools?.preset;
+        if (preset !== undefined && Object.hasOwn(TOOLS_PRESET_ALIASES, preset))
+            notes.push(`${layer.name}（${layer.label}）的 tools.preset 写的是旧名 ${preset}，规范名 ${canonicalPreset(preset)}`);
+    }
+    return notes;
+}
+function choice(name, value, all) {
+    if (value === undefined)
+        return undefined;
+    if (all.includes(value))
+        return value;
+    throw new UsageError(`--${name} 的取值应为 ${all.join(" | ")}（收到 ${value}）`);
+}
 export async function runConfig(argv, io, deps) {
-    const { positionals, values, flags } = parseSubArgs(argv, ["profile", "auth-file"], ["json"]);
+    const { positionals, values, flags } = parseSubArgs(argv, ["profile", "auth-file", "tools-preset", "codemode"], ["json"]);
     const action = positionals[0] ?? "show";
     if (flags.has("help")) {
         io.stdout(CONFIG_USAGE);
         return ExitCode.Ok;
     }
+    if (action === "path")
+        return showPaths(io);
+    if (action === "edit")
+        return editConfig(io);
     if (action !== "show")
         throw new UsageError(`未知的 config 子命令：${action}`);
+    const cli = {};
+    const presetFlag = choice("tools-preset", values.get("tools-preset"), TOOLS_PRESET_INPUTS);
+    if (presetFlag !== undefined)
+        cli.toolsPreset = presetFlag;
+    const codemodeFlag = choice("codemode", values.get("codemode"), CODEMODE_MODES);
+    if (codemodeFlag !== undefined)
+        cli.codemode = codemodeFlag;
     const level = loadUserLevel(io, {
         profile: values.get("profile"),
         authFile: values.get("auth-file"),
     });
     const project = loadConfigFile("config", projectFile(io.cwd, CONFIG_FILE))?.value;
-    const merged = mergeProjectAndCli(level.merged, project, undefined);
+    const merged = mergeProjectAndCli(level.merged, project, cli);
     const config = merged.config;
-    const layers = layersOf(level, project, config);
-    const sources = sourcesOf(config, layers);
+    const layers = layersOf(level, project, config, cliOverridesToConfig(cli));
+    // 展示：生效配置补上 DEFAULT_CONFIG 不写的缺省（cache、codemode.inlineBudget 等），来源 default
+    const shown = mergeConfig(DISPLAY_DEFAULTS, config);
+    const sources = sourcesOf(shown, layers);
     const registry = deps === undefined ? undefined : await buildRegistry(level, io, deps);
     const model = await describeModel(config, registry);
     const providers = describeProviders(config, registry);
+    const codemode = describeCodemode(config);
     const builtin = new Set(builtinTools().map((tool) => tool.name));
-    const preset = resolvePreset({ config, available: (name) => builtin.has(name) });
+    if (codemode.mode !== "off" && codemode.unavailable === undefined)
+        builtin.add(CODEMODE_TOOL);
+    const preset = resolvePreset({
+        config,
+        available: (name) => builtin.has(name),
+        strict: codemode.strict,
+    });
+    const notes = presetAliasNotes(layers);
     const warnings = [...level.warnings, ...merged.warnings];
+    const rows = [...flatten(shown)].map(([path, value]) => ({
+        path,
+        value,
+        source: sources.get(path) ?? "default",
+    }));
+    if (config.codemode?.mode === undefined)
+        rows.push({
+            path: "codemode.mode",
+            value: codemode.mode,
+            source: `default（${codemode.reason}）`,
+        });
+    rows.sort((a, b) => (a.path < b.path ? -1 : a.path > b.path ? 1 : 0));
     if (flags.has("json")) {
-        const entries = [...flatten(config)].map(([path, value]) => ({
+        const entries = rows.map(({ path, value, source }) => ({
             path,
             value: path.endsWith(".apiKey") ? display(path, value) : value,
-            source: sources.get(path),
+            source,
         }));
-        io.stdout(`${JSON.stringify({ model, providers, tools: preset.builtin, codemode: effectiveCodemodeMode(config), entries, layers: layers.map((l) => ({ name: l.name, file: l.label })), warnings }, null, 2)}\n`);
+        io.stdout(`${JSON.stringify({ model, providers, tools: preset.builtin, preset: preset.preset, codemode, entries, layers: layers.map((l) => ({ name: l.name, file: l.label })), notes, warnings }, null, 2)}\n`);
         return ExitCode.Ok;
     }
-    const lines = ["生效配置（来源：default 内置 ← user ← profile ← project 只能收紧）"];
+    const lines = ["生效配置（来源：default 内置 ← user ← profile ← project 只能收紧 ← cli）"];
     for (const layer of layers.slice(1))
         lines.push(`  ${layer.name}：${layer.label}`);
     lines.push("");
-    const rows = [...flatten(config)].map(([path, value]) => [`${path} = ${display(path, value)}`, sources.get(path) ?? "default"]);
-    const width = Math.min(60, Math.max(...rows.map(([text]) => text.length)));
-    for (const [text, source] of rows)
-        lines.push(`  ${text.padEnd(width)}  ${source}`);
+    const texts = rows.map((row) => [`${row.path} = ${display(row.path, row.value)}`, row.source]);
+    const width = Math.min(60, Math.max(...texts.map(([text]) => (text ?? "").length)));
+    for (const [text, source] of texts)
+        lines.push(`  ${(text ?? "").padEnd(width)}  ${source}`);
     lines.push(...providerLines(providers));
     lines.push("");
     lines.push(`模型：${model.ref ?? "（无）"}  ${model.reason}`);
     lines.push(`工具：${preset.builtin.join(", ")}（预设 ${preset.preset}，codemode ${preset.codemode}）`);
+    lines.push(`codemode：${codemode.mode}  ${codemode.reason}`);
+    if (codemode.unavailable !== undefined)
+        lines.push(`  ${codemode.unavailable}`);
+    for (const note of notes)
+        lines.push(`提示：${note}`);
     for (const warning of [...warnings, ...preset.warnings])
         lines.push(`警告：${warning}`);
     io.stdout(`${lines.join("\n")}\n`);

package/dist/cli/subcommands/context.js

@@ -7,6 +7,7 @@ import { loadConfigFile } from "../../config/load.js";
 import { mergeBaseLayers } from "../../config/merge.js";
 import { CONFIG_FILE, resolveConfigDir, resolveDataDir, userFile } from "../../config/paths.js";
 import { loadProfile } from "../../config/profile.js";
+import { hideFakeProvider } from "../fake-visibility.js";
 export function loadUserLevel(io, options = {}) {
     const configDir = resolveConfigDir({ env: io.env });
     const dataDir = resolveDataDir({ env: io.env });
@@ -32,10 +33,13 @@ export function loadUserLevel(io, options = {}) {
     return result;
 }
 export async function buildRegistry(level, io, deps) {
-    return deps.providers.create({
+    // 列表类子命令（doctor / models list / providers list / config show）缺省不列 fake
+    const registry = await deps.providers.create({
         config: level.merged.config,
         cwd: io.cwd,
         authFile: level.authFile,
         authEnv: level.profile?.authEnv ?? true,
+        dataDir: level.dataDir,
     });
+    return hideFakeProvider(registry, io.env);
 }

package/dist/cli/subcommands/doctor.js

@@ -18,7 +18,8 @@ import { loadHookConfigs } from "../../hooks/config.js";
 import { AMA_VERSION } from "../../version.js";
 import { parseSubArgs } from "../args.js";
 import { ExitCode } from "../exit-codes.js";
-import { describeModel } from "./config.js";
+import { describeProxy, inspectProxy } from "../proxy.js";
+import { describeCodemode, describeModel } from "./config.js";
 import { buildRegistry, loadUserLevel } from "./context.js";
 export const DOCTOR_USAGE = `用法：ama doctor [--profile <文件>] [--auth-file <文件>] [--trust | --no-trust]
 `;
@@ -184,6 +185,11 @@ function terminalSection(report, io) {
     const tui = io.stdinIsTTY && io.stdoutIsTTY && env["TERM"] !== "dumb";
     report.item(`缺省界面：${tui ? "终端界面" : "行式（--no-tui 等价）"}`);
 }
+function proxySection(report, io) {
+    report.section("代理");
+    for (const line of describeProxy(inspectProxy(io.env)))
+        report.item(line);
+}
 export async function runDoctor(argv, io, deps) {
     const { values, flags } = parseSubArgs(argv, ["profile", "auth-file"], ["trust", "no-trust"]);
     if (flags.has("help")) {
@@ -223,6 +229,10 @@ export async function runDoctor(argv, io, deps) {
         for (const warning of merged.warnings)
             report.item(`  收紧：${warning}`);
         report.item(`有效权限模式：${merged.config.permission?.mode ?? "default"}`);
+        const codemode = describeCodemode(merged.config);
+        report.item(`codemode：${codemode.mode}（${codemode.reason}）`);
+        if (codemode.unavailable !== undefined)
+            report.item(`  ${codemode.unavailable}`);
     }
     catch {
         // probeLine 已报告
@@ -240,6 +250,7 @@ export async function runDoctor(argv, io, deps) {
     await keySection(report, io, level, deps);
     hookSection(report, io, level, trusted);
     report.item(`用户级 hooks.json：${userFile(level, HOOKS_FILE)}`);
+    proxySection(report, io);
     terminalSection(report, io);
     io.stdout(report.text());
     return report.problems > 0 ? ExitCode.Config : ExitCode.Ok;

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

@@ -0,0 +1,6 @@
+/**
+ * `ama init [--force]`（docs/providers.md「配置目录」）：建配置目录与缺省文件，逐个报告状态。
+ */
+import type { CliIo } from "../deps.js";
+export declare const INIT_USAGE = "\u7528\u6CD5\uFF1Aama init [--force]   \u5EFA\u914D\u7F6E\u76EE\u5F55\uFF080700\uFF09\u4E0E config.json\u3001config.schema.json\n                          \u5DF2\u6709\u7684 config.json \u4E0D\u8986\u76D6\uFF08--force \u5148\u5907\u4EFD\u4E3A .bak \u518D\u91CD\u5199\uFF09\uFF1B\u4E0D\u521B\u5EFA auth.json\n";
+export declare function runInit(argv: readonly string[], io: CliIo): number;

package/dist/cli/subcommands/init.js

@@ -0,0 +1,23 @@
+/**
+ * `ama init [--force]`（docs/providers.md「配置目录」）：建配置目录与缺省文件，逐个报告状态。
+ */
+import { INIT_NEXT_STEPS, describeInit, initConfigDir } from "../../config/init.js";
+import { resolveConfigDir } from "../../config/paths.js";
+import { parseSubArgs, UsageError } from "../args.js";
+import { ExitCode } from "../exit-codes.js";
+export const INIT_USAGE = `用法：ama init [--force]   建配置目录（0700）与 config.json、config.schema.json
+                          已有的 config.json 不覆盖（--force 先备份为 .bak 再重写）；不创建 auth.json
+`;
+export function runInit(argv, io) {
+    const { positionals, flags } = parseSubArgs(argv, [], ["force"]);
+    if (flags.has("help")) {
+        io.stdout(INIT_USAGE);
+        return ExitCode.Ok;
+    }
+    if (positionals.length > 0)
+        throw new UsageError(`多余的参数：${positionals.join(" ")}`);
+    const result = initConfigDir(resolveConfigDir({ env: io.env }), { force: flags.has("force") });
+    io.stdout(describeInit(result));
+    io.stdout(`\n${INIT_NEXT_STEPS.join("\n")}\n`);
+    return ExitCode.Ok;
+}

package/dist/cli/subcommands/model-meta.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 模型元数据的一行描述（`ama models list`、`ama config show`、`ama providers`）：上下文、输出、思考、
+ * 图片、渠道，以及每个字段来自哪里（config / 目录 / models.dev / 缺省）与 models.dev 匹配。
+ */
+import { type ModelMetadata } from "../../ai/providers/enrich.js";
+import type { Model, ProviderRegistryApi } from "../../ai/types.js";
+export declare function compactTokens(n: number | undefined): string;
+/** 注册表若是 ProviderRegistry（或同形状），取模型元数据来源；否则 undefined。 */
+export declare function metadataOf(registry: ProviderRegistryApi, providerId: string, modelId: string): ModelMetadata | undefined;
+/** `ctx 262k · out 64k · 思考 · 图片 · 渠道 chat,messages`。 */
+export declare function modelFlags(model: Model): string;
+/**
+ * 来源说明：全部来自内置目录时返回 undefined（不刷屏）；否则
+ * `来源 ctx models.dev · out config · 图片 models.dev · …；models.dev 原厂 moonshotai/kimi-k2.5`。
+ */
+export declare function sourcesLine(metadata: ModelMetadata | undefined): string | undefined;

package/dist/cli/subcommands/model-meta.js

@@ -0,0 +1,54 @@
+/**
+ * 模型元数据的一行描述（`ama models list`、`ama config show`、`ama providers`）：上下文、输出、思考、
+ * 图片、渠道，以及每个字段来自哪里（config / 目录 / models.dev / 缺省）与 models.dev 匹配。
+ */
+import { sourceText } from "../../ai/providers/enrich.js";
+import { matchLabel } from "../../ai/providers/models-dev.js";
+export function compactTokens(n) {
+    if (n === undefined)
+        return "?";
+    if (n >= 1_000_000)
+        return `${Math.round(n / 100_000) / 10}M`;
+    if (n >= 1000)
+        return `${Math.round(n / 1000)}k`;
+    return String(n);
+}
+/** 注册表若是 ProviderRegistry（或同形状），取模型元数据来源；否则 undefined。 */
+export function metadataOf(registry, providerId, modelId) {
+    const r = registry;
+    return typeof r.modelMetadata === "function" ? r.modelMetadata(providerId, modelId) : undefined;
+}
+/** `ctx 262k · out 64k · 思考 · 图片 · 渠道 chat,messages`。 */
+export function modelFlags(model) {
+    return [
+        `ctx ${compactTokens(model.contextWindow)}`,
+        `out ${compactTokens(model.maxTokens)}`,
+        model.reasoning ? "思考" : undefined,
+        model.input.includes("image") ? "图片" : undefined,
+        model.channels !== undefined ? `渠道 ${model.channels.join(",")}` : undefined,
+    ]
+        .filter((x) => x !== undefined)
+        .join(" · ");
+}
+/**
+ * 来源说明：全部来自内置目录时返回 undefined（不刷屏）；否则
+ * `来源 ctx models.dev · out config · 图片 models.dev · …；models.dev 原厂 moonshotai/kimi-k2.5`。
+ */
+export function sourcesLine(metadata) {
+    if (metadata === undefined)
+        return undefined;
+    const values = Object.values(metadata.sources);
+    if (values.every((s) => s === "catalog" || s === "default") && !metadata.looked)
+        return undefined;
+    const label = {
+        contextWindow: "ctx",
+        maxTokens: "out",
+        input: "图片",
+        reasoning: "思考",
+        cost: "价格",
+    };
+    const parts = Object.keys(label).map((field) => `${label[field]} ${sourceText(metadata.sources[field])}`);
+    const match = metadata.looked ? `；models.dev ${matchLabel(metadata.match)}` : "";
+    const tools = metadata.toolCall === false ? "；不支持工具调用" : "";
+    return `来源 ${parts.join(" · ")}${match}${tools}`;
+}

package/dist/cli/subcommands/models-cache-probe.js

@@ -103,7 +103,7 @@ async function run(ctx) {
         return ExitCode.NoModel;
     }
     const { model, provider } = found;
-    const key = await registry.resolveApiKey(provider.id);
+    const key = await registry.resolveApiKey(provider.id, model.channel);
     if (key.apiKey === undefined && provider.requiresApiKey) {
         io.stderr(`ama: ${provider.id} 没有 API key（ama auth set ${provider.id}）\n`);
         return ExitCode.NoModel;

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

@@ -5,18 +5,21 @@
  * 带供应商的鉴权头，打印 id 列表并标出已配置的条目。
  *
  * `--probe`：同一中转下不同模型支持的协议不同，对每个 id 依次试供应商协议 → completions →
- * responses → messages（去重），各发一次最小请求（`ama models check` 同款，maxTokens 16），
- * 记第一个成功的协议；每模型最多 3 次请求，`--limit`（缺省 30）限制探测的模型数，执行前打印
- * 预估；401 / 403 / 429 立即停止（key 无效或被限流，继续只会浪费请求）。
+ * responses → messages（去重），各发一次最小请求（maxTokens 16，见到首个流事件即判可用并断开），
+ * 记第一个成功的协议；模型之间并发（`--concurrency`，缺省 6），单次超时 `--probe-timeout`（缺省
+ * 15 s）。每模型最多 3 次请求，`--limit`（缺省 30）限制探测的模型数，执行前打印预估；401 / 403 立即
+ * 停止，429 降并发并重试一次、仍 429 停止（见 probe-runner.ts）。
  *
  * `--write`：新条目合并进用户级 config.json 的 `providers.<id>.models`——已有同 id 不覆盖；只写
  * `id` 与探到的 `api`（与供应商协议相同时省略）；带 `--probe` 时只写探测成功的模型。不猜
  * `contextWindow`（自动压缩随之关闭，输出 warning）。写前备份为 `config.json.bak`。
+ *
+ * models.dev：列表之后按需刷新缓存（24 小时内不重拉），每个模型标出上下文、输出、图片、工具调用与
+ * 匹配结果；`--write` 跳过 models.dev 标明不支持工具调用的模型。元数据不写进配置——运行时从缓存补。
  */
 import type { Api, Model, ProviderData, ProviderRegistryApi } from "../../ai/types.js";
 import type { ModelsAction } from "./models.js";
 export declare const DISCOVER_TIMEOUT_MS = 15000;
-export declare const PROBE_TIMEOUT_MS = 30000;
 export declare const DEFAULT_PROBE_LIMIT = 30;
 /** 中转常见的三种协议，按此顺序探测（供应商协议排最前）。 */
 export declare const PROBE_APIS: readonly Api[];
@@ -28,13 +31,22 @@ export declare function discoverModels(provider: ProviderData, apiKey: string |
 export declare function probeOrder(provider: ProviderData): Api[];
 export interface ProbeOptions {
     timeoutMs?: number;
+    /** 同时在途的模型数（每个模型内按协议顺序依次试）；缺省 6。 */
+    concurrency?: number;
+    /** 测试用：429 重试前的退避。 */
+    retryDelayMs?: number;
     /** 每次请求后回调。 */
     onAttempt?: (id: string, api: Api, error: string | undefined) => void;
-    /** 每个模型探完回调（进度输出）。 */
+    /** 每个模型探完立即回调（按完成顺序，进度用）。 */
+    onSettled?: () => void;
+    /** 每个模型探完回调，按模型顺序（不按完成顺序）。 */
     onResult?: (id: string, api: Api | undefined) => void;
     /** 因鉴权失败或限流提前停止时回调。 */
     onStop?: (reason: string) => void;
 }
-/** 返回已探测模型 → 第一个成功的协议（都失败为 undefined）；超出 `limit` 或提前停止的不在表里。 */
+/**
+ * 返回已探测模型 → 第一个成功的协议（都失败为 undefined）；超出 `limit` 或因提前停止没探完的不在表里。
+ * 模型之间并发（有界），同一模型内按协议顺序依次试，第一个成功即停。
+ */
 export declare function probeModelApis(registry: ProviderRegistryApi, provider: ProviderData, ids: string[], limit: number, options?: ProbeOptions): Promise<Map<string, Api | undefined>>;
 export declare const DISCOVER_ACTION: ModelsAction;