@nvae/llmswitch 1.2.0 → 1.3.0

package/dist/commands/tool.js

@@ -1,35 +1,145 @@
 import * as p from "@clack/prompts";
+import { API_FORMATS, isApiFormat, supportsSmallModel } from "../types.js";
 import { applyProfile, deactivateProfile } from "../adapters/index.js";
 import { formatLabel } from "../formats/compatibility.js";
+import { PRESET_IDS } from "../presets/index.js";
 import { deleteProfile, ensureDefaultProvider, getActiveProfile, getDefaultProfile, listProfiles, publicProfileView, requireProfile, resolveProfileOrThrow, saveProfile, setDefaultProfile, } from "../store/profiles.js";
 import { formatProxySummary } from "../utils/proxy.js";
 import { runToolFlow } from "./setup-cmd.js";
 import { launchTool } from "./launch.js";
-import { exitOnCancel, formatProfileListLabel, promptEditProfile, promptProfileDraft, resolveModelsInteractive, } from "./prompts.js";
+import { exitOnCancel, formatProfileListLabel, promptEditProfile, promptProfileDraft, requireInteractive, resolveModelsInteractive, } from "./prompts.js";
 export function registerToolCommand(program, tool) {
     const cmd = program
         .command(tool)
         .description(`管理 ${tool} 的供应商与模型配置`);
     // llms <tool>（无子命令）：连贯启动，未配置时自动引导
     cmd.action(() => runToolFlow(tool));
-    cmd
+    const provider = cmd
         .command("provider")
         .description("管理模型供应商：添加 / 默认 / 启用禁用 / 查看 / 编辑 / 删除")
         .option("--json", "以 JSON 列出全部供应商后退出")
         .action(async (opts) => {
         ensureDefaultProvider(tool);
         if (opts.json) {
-            const active = getActiveProfile(tool)?.name ?? null;
-            const defaultName = getDefaultProfile(tool)?.name ?? null;
-            console.log(JSON.stringify(listProfiles(tool).map((profile) => ({
-                ...publicProfileView(profile),
-                active: profile.name === active,
-                default: profile.name === defaultName,
-            })), null, 2));
+            printProviderList(tool);
             return;
         }
         await runProviderManager(tool);
     });
+    // 非交互入口：脚本 / CI 里也要能增删查，不必走菜单。
+    provider
+        .command("list")
+        .description("列出全部供应商")
+        .option("--json", "JSON 输出")
+        .action((opts) => {
+        ensureDefaultProvider(tool);
+        if (opts.json) {
+            printProviderList(tool);
+            return;
+        }
+        const profiles = listProfiles(tool);
+        if (profiles.length === 0) {
+            console.log(`当前没有 ${tool} 供应商。添加：llms ${tool} provider add --help`);
+            return;
+        }
+        const active = getActiveProfile(tool)?.name ?? null;
+        const defaultName = getDefaultProfile(tool)?.name ?? null;
+        for (const profile of profiles) {
+            console.log(formatProfileListLabel(profile, { defaultName, activeName: active }) +
+                `  ${formatLabel(profile.apiFormat)}  ${profile.models.default}`);
+        }
+    });
+    provider
+        .command("add")
+        .description("非交互添加供应商（参数齐全时不会进入任何提示）")
+        .option("--preset <id>", `预设：${PRESET_IDS.join(" | ")}`, "custom")
+        .option("--base-url <url>", "API Base URL")
+        .option("--api-key <key>", "API Key（可留空）")
+        .option("--name <name>", "供应商标识（省略则自动生成 5 位随机名）")
+        .option("--display-name <name>", "显示名称")
+        .option("--format <format>", `接口格式：${API_FORMATS.join(" | ")}（省略则自动探测）`)
+        .option("--model <id>", "默认模型 ID")
+        .option("--models <list>", "启用模型列表，逗号分隔（省略则取上游全部）")
+        .option("--small <model>", "轻量小模型（仅 claude / opencode 支持）")
+        .option("--proxy <url>", "上游代理地址")
+        .option("--no-enable", "只保存，不写入工具配置")
+        .option("--json", "JSON 输出")
+        .action(async (opts) => {
+        if (opts.format && !isApiFormat(opts.format)) {
+            throw new Error(`无效的 --format「${opts.format}」。可选：${API_FORMATS.join("、")}`);
+        }
+        if (!process.stdin.isTTY) {
+            if (!opts.baseUrl) {
+                throw new Error("非交互模式下必须提供 --base-url");
+            }
+            if (!opts.model) {
+                throw new Error("非交互模式下必须提供 --model");
+            }
+        }
+        if (opts.small && !supportsSmallModel(tool)) {
+            throw new Error(`${tool} 不支持小模型配置`);
+        }
+        const created = await promptProfileDraft(tool, {
+            preset: opts.preset,
+            baseUrl: opts.baseUrl,
+            apiKey: opts.apiKey ?? (process.stdin.isTTY ? undefined : ""),
+            name: opts.name,
+            displayName: opts.displayName,
+            apiFormat: opts.format && isApiFormat(opts.format) ? opts.format : undefined,
+            model: opts.model,
+            models: opts.models ? splitCommaList(opts.models) : undefined,
+            smallModel: opts.small ?? (process.stdin.isTTY ? undefined : null),
+            proxy: opts.proxy ?? (process.stdin.isTTY ? undefined : ""),
+        });
+        ensureDefaultProvider(tool);
+        let configPath;
+        if (opts.enable !== false) {
+            const result = await applyProfile(tool, created);
+            configPath = result.configPath;
+        }
+        if (opts.json) {
+            console.log(JSON.stringify({
+                ...publicProfileView(created),
+                enabled: opts.enable !== false,
+                configPath: configPath ?? null,
+            }, null, 2));
+            return;
+        }
+        console.log(`已添加 ${tool}/${created.name}（${created.displayName}）`);
+        if (configPath)
+            console.log(`已启用，配置文件：${configPath}`);
+        else
+            console.log(`未启用。启用：llms ${tool} use ${created.name}`);
+    });
+    provider
+        .command("rm")
+        .alias("remove")
+        .description("删除供应商（若已启用会先禁用）")
+        .argument("<name>", "供应商名称或显示名称")
+        .option("--yes", "跳过确认")
+        .action(async (name, opts) => {
+        const profile = resolveProfileOrThrow(tool, name);
+        if (!opts.yes) {
+            requireInteractive("删除确认", `确认无误可加 --yes：llms ${tool} provider rm ${profile.name} --yes`);
+            const ok = await p.confirm({
+                message: `确认删除供应商「${profile.name}」？此操作不可恢复`,
+                initialValue: false,
+            });
+            if (p.isCancel(ok)) {
+                p.cancel("已取消");
+                process.exit(0);
+            }
+            if (!ok) {
+                console.log("已取消");
+                return;
+            }
+        }
+        if (getActiveProfile(tool)?.name === profile.name) {
+            await deactivateProfile(tool, profile.name);
+        }
+        deleteProfile(tool, profile.name);
+        console.log(`已删除 ${tool}/${profile.name}`);
+    });
     cmd
         .command("use")
         .description("启用已有供应商（写入对应工具配置）")
@@ -98,6 +208,8 @@ export function registerToolCommand(program, tool) {
     registerModelCommands(cmd, tool);
 }
 async function runProviderManager(tool) {
+    requireInteractive(`llms ${tool} provider 的管理菜单`, `请在终端中运行，或改用：llms ${tool} provider --json 列出、` +
+        `llms ${tool} provider add --base-url … 添加、llms ${tool} use <name> 启用。`);
     p.intro(`${tool} 模型供应商`);
     while (true) {
         ensureDefaultProvider(tool);
@@ -138,131 +250,161 @@ async function runProviderManager(tool) {
             p.outro("添加完成");
             return;
         }
-        await handleProviderActions(tool, selected);
+        // 任一增删改查动作执行完即结束；仅「返回列表」会回到上面的列表
+        const outro = await handleProviderActions(tool, selected);
+        if (outro !== BACK_TO_LIST) {
+            p.outro(outro);
+            return;
+        }
     }
 }
-async function handleProviderAdd(tool) {
-    const created = await promptProfileDraft(tool);
-    ensureDefaultProvider(tool);
-    // 静默启用：不再询问，用户可在 provider 菜单中关闭
-    const result = await applyProfile(tool, created);
-    p.log.success(`已启用 ${tool}/${created.name}（${created.displayName || created.name}）`);
-    p.log.info(`配置文件：${result.configPath}`);
-    p.log.info(result.restartHint);
-}
+/** handleProviderActions 的哨兵返回值：回到供应商列表而不是退出。 */
+const BACK_TO_LIST = Symbol("back-to-list");
+/**
+ * 单个供应商的动作菜单。执行完一个动作即返回 outro 文案由调用方结束流程；
+ * 只有显式「返回列表」或供应商已不存在时才返回 BACK_TO_LIST。
+ */
 async function handleProviderActions(tool, profileName) {
-    while (true) {
-        ensureDefaultProvider(tool);
-        let profile;
-        try {
-            profile = requireProfile(tool, profileName);
-        }
-        catch {
-            p.log.warn(`「${profileName}」已不存在`);
-            return;
-        }
-        const isActive = getActiveProfile(tool)?.name === profile.name;
-        const isDefault = getDefaultProfile(tool)?.name === profile.name;
-        const action = await p.select({
-            message: `${profile.displayName || profile.name}`,
-            options: [
-                {
-                    value: "default",
-                    label: "设置为默认供应商",
-                    hint: isDefault ? "当前已是默认" : undefined,
-                },
-                {
-                    value: "toggle",
-                    label: isActive ? "禁用" : "启用",
-                    hint: isActive ? "清除写入工具的配置" : "写入对应工具配置",
-                },
-                {
-                    value: "view",
-                    label: "查看配置",
-                },
-                {
-                    value: "edit",
-                    label: "编辑配置",
-                    hint: "显示名 / 地址 / 密钥 / 代理 / 格式",
-                },
-                {
-                    value: "delete",
-                    label: "删除配置",
-                    hint: isActive ? "将先禁用再删除" : undefined,
-                },
-                {
-                    value: "back",
-                    label: "返回列表",
-                },
-            ],
-        });
-        exitOnCancel(action);
-        if (action === "back")
-            return;
-        if (action === "default") {
-            setDefaultProfile(tool, profile.name);
-            p.log.success(`已将「${profile.name}」设为默认供应商`);
-            continue;
-        }
-        if (action === "toggle") {
-            if (isActive) {
-                const result = await deactivateProfile(tool, profile.name);
-                p.log.success(`已禁用「${profile.name}」`);
-                p.log.info(`配置文件：${result.configPath}`);
-                p.log.info(result.restartHint);
-            }
-            else {
-                const result = await applyProfile(tool, profile);
-                p.log.success(`已启用「${profile.name}」`);
-                p.log.info(`配置文件：${result.configPath}`);
-                if (result.backupPath)
-                    p.log.info(`备份：${result.backupPath}`);
-                p.log.info(result.restartHint);
-            }
-            continue;
-        }
-        if (action === "view") {
-            printProfileDetails(tool, profile, { isActive, isDefault });
-            continue;
-        }
-        if (action === "edit") {
-            const updated = await promptEditProfile(tool, profile);
-            if (getActiveProfile(tool)?.name === updated.name) {
-                const sync = await p.confirm({
-                    message: "该供应商当前已启用，是否立即写回工具配置？",
-                    initialValue: true,
-                });
-                if (p.isCancel(sync)) {
-                    p.cancel("已取消");
-                    process.exit(0);
-                }
-                if (sync) {
-                    const result = await applyProfile(tool, updated);
-                    p.log.success("已同步写入工具配置");
-                    p.log.info(result.restartHint);
-                }
-            }
-            continue;
+    ensureDefaultProvider(tool);
+    let profile;
+    try {
+        profile = requireProfile(tool, profileName);
+    }
+    catch {
+        p.log.warn(`「${profileName}」已不存在`);
+        return BACK_TO_LIST;
+    }
+    const isActive = getActiveProfile(tool)?.name === profile.name;
+    const isDefault = getDefaultProfile(tool)?.name === profile.name;
+    const action = await p.select({
+        message: `${profile.displayName || profile.name}`,
+        options: [
+            {
+                value: "default",
+                label: "设置为默认供应商",
+                hint: isDefault ? "当前已是默认" : undefined,
+            },
+            {
+                value: "toggle",
+                label: isActive ? "禁用" : "启用",
+                hint: isActive ? "清除写入工具的配置" : "写入对应工具配置",
+            },
+            {
+                value: "view",
+                label: "查看配置",
+            },
+            {
+                value: "edit",
+                label: "编辑配置",
+                hint: "显示名 / 地址 / 密钥 / 代理 / 格式",
+            },
+            {
+                value: "delete",
+                label: "删除配置",
+                hint: isActive ? "将先禁用再删除" : undefined,
+            },
+            {
+                value: "back",
+                label: "返回列表",
+            },
+        ],
+    });
+    exitOnCancel(action);
+    if (action === "back")
+        return BACK_TO_LIST;
+    if (action === "default") {
+        setDefaultProfile(tool, profile.name);
+        p.log.success(`已将「${profile.name}」设为默认供应商`);
+        return "已设置默认供应商";
+    }
+    if (action === "toggle") {
+        if (isActive) {
+            const result = await deactivateProfile(tool, profile.name);
+            p.log.success(`已禁用「${profile.name}」`);
+            p.log.info(`配置文件：${result.configPath}`);
+            p.log.info(result.restartHint);
+            return "已禁用供应商";
         }
-        if (action === "delete") {
-            const ok = await p.confirm({
-                message: `确认删除供应商「${profile.name}」？此操作不可恢复`,
-                initialValue: false,
+        const result = await applyProfile(tool, profile);
+        p.log.success(`已启用「${profile.name}」`);
+        p.log.info(`配置文件：${result.configPath}`);
+        if (result.backupPath)
+            p.log.info(`备份：${result.backupPath}`);
+        p.log.info(result.restartHint);
+        return "已启用供应商";
+    }
+    if (action === "view") {
+        printProfileDetails(tool, profile, { isActive, isDefault });
+        return "已退出供应商管理";
+    }
+    if (action === "edit") {
+        const updated = await promptEditProfile(tool, profile);
+        if (getActiveProfile(tool)?.name === updated.name) {
+            const sync = await p.confirm({
+                message: "该供应商当前已启用，是否立即写回工具配置？",
+                initialValue: true,
             });
-            if (p.isCancel(ok)) {
+            if (p.isCancel(sync)) {
                 p.cancel("已取消");
                 process.exit(0);
             }
-            if (!ok)
-                continue;
-            if (isActive) {
-                await deactivateProfile(tool, profile.name);
+            if (sync) {
+                const result = await applyProfile(tool, updated);
+                p.log.success("已同步写入工具配置");
+                p.log.info(result.restartHint);
             }
-            deleteProfile(tool, profile.name);
-            p.log.success(`已删除「${profile.name}」`);
-            return;
         }
+        return "编辑完成";
+    }
+    if (action === "delete") {
+        const ok = await p.confirm({
+            message: `确认删除供应商「${profile.name}」？此操作不可恢复`,
+            initialValue: false,
+        });
+        if (p.isCancel(ok)) {
+            p.cancel("已取消");
+            process.exit(0);
+        }
+        // 放弃删除：回到该供应商的动作菜单，而不是直接退出
+        if (!ok)
+            return handleProviderActions(tool, profileName);
+        if (isActive) {
+            await deactivateProfile(tool, profile.name);
+        }
+        deleteProfile(tool, profile.name);
+        p.log.success(`已删除「${profile.name}」`);
+        return "已删除供应商";
     }
+    return BACK_TO_LIST;
+}
+async function handleProviderAdd(tool) {
+    const previous = getActiveProfile(tool)?.name ?? null;
+    const created = await promptProfileDraft(tool);
+    ensureDefaultProvider(tool);
+    // 静默启用：不再询问，用户可在 provider 菜单中关闭
+    const result = await applyProfile(tool, created);
+    p.log.success(`已启用 ${tool}/${created.name}（${created.displayName || created.name}）`);
+    // 添加即启用会覆盖工具当前生效的供应商，必须说清楚被换掉的是哪个。
+    if (previous && previous !== created.name) {
+        p.log.warn(`${tool} 原先启用的是「${previous}」，已被替换。恢复：llms ${tool} use ${previous}`);
+    }
+    p.log.info(`配置文件：${result.configPath}`);
+    p.log.info(result.restartHint);
+}
+function splitCommaList(value) {
+    return value
+        .split(",")
+        .map((s) => s.trim())
+        .filter(Boolean);
+}
+function printProviderList(tool) {
+    const active = getActiveProfile(tool)?.name ?? null;
+    const defaultName = getDefaultProfile(tool)?.name ?? null;
+    console.log(JSON.stringify(listProfiles(tool).map((profile) => ({
+        ...publicProfileView(profile),
+        active: profile.name === active,
+        default: profile.name === defaultName,
+    })), null, 2));
 }
 function printProfileDetails(tool, profile, flags) {
     const view = publicProfileView(profile);
@@ -273,7 +415,9 @@ function printProfileDetails(tool, profile, flags) {
         status.push("已启用");
     if (status.length === 0)
         status.push("未启用");
-    p.note([
+    // 纯文本而不是 clack 的方框：一是这里的输出经常被管道/重定向消费，
+    // 二是方框宽度按码点算，中文行会把右边框顶歪。
+    const lines = [
         `标识：${view.name}`,
         `显示名：${view.displayName}`,
         `状态：${status.join(" · ")}`,
@@ -281,6 +425,9 @@ function printProfileDetails(tool, profile, flags) {
         `Base URL：${view.baseUrl}`,
         `API Key：${view.apiKey}`,
         `默认模型：${view.models.default}`,
+        supportsSmallModel(tool)
+            ? `小模型：${view.models.smallModel || "（未设置，沿用默认模型）"}`
+            : null,
         `模型列表：${view.models.list.join(", ") || "（空）"}`,
         `代理：${formatProxySummary(profile.proxy)}`,
         profile.bridgeMode === "completions"
@@ -289,9 +436,10 @@ function printProfileDetails(tool, profile, flags) {
                 ? "上游接口：Chat Completions"
                 : null,
         `更新时间：${view.updatedAt}`,
-    ]
-        .filter(Boolean)
-        .join("\n"), flags.title || `${tool} / ${profile.name}`);
+    ].filter((line) => Boolean(line));
+    console.log(`[${flags.title || `${tool} / ${profile.name}`}]`);
+    for (const line of lines)
+        console.log(`  ${line}`);
 }
 /**
  * 启用供应商前：若模型列表内有多个候选，交互选择默认模型；
@@ -364,7 +512,7 @@ async function maybeLaunchNow(tool, profile) {
         p.log.warn(`未能启动。稍后可用：llms launch ${tool}，或设置 ${tool.toUpperCase()}_BIN 指定可执行文件。`);
     }
 }
-async function configureProfileModels(tool, profile) {
+async function configureProfileModels(tool, profile, opts = {}) {
     p.log.step(`配置 ${profile.displayName || profile.name} 的模型`);
     const resolved = await resolveModelsInteractive({
         apiFormat: profile.apiFormat,
@@ -373,8 +521,12 @@ async function configureProfileModels(tool, profile) {
         proxy: profile.proxy,
         preferredDefault: profile.models.default,
         preferredList: profile.models.list,
+        supportsSmall: supportsSmallModel(tool),
+        preferredSmall: profile.models.smallModel,
+        fixedSmall: opts.fixedSmall,
     });
     profile.models.default = resolved.defaultModel;
+    profile.models.smallModel = resolved.smallModel;
     profile.models.list = resolved.modelList;
     profile.models.meta = resolved.modelMeta;
     if (resolved.resolvedBaseUrl &&
@@ -383,13 +535,16 @@ async function configureProfileModels(tool, profile) {
         profile.baseUrl = resolved.resolvedBaseUrl;
     }
     saveProfile(tool, profile);
+    const smallNote = resolved.smallModel
+        ? `，小模型「${resolved.smallModel}」`
+        : "";
     const active = getActiveProfile(tool);
     if (active?.name === profile.name) {
         await applyProfile(tool, requireProfile(tool, profile.name));
-        p.log.success(`已更新模型并写入工具配置：默认「${resolved.defaultModel}」，共 ${resolved.modelList.length} 个`);
+        p.log.success(`已更新模型并写入工具配置：默认「${resolved.defaultModel}」${smallNote}，共 ${resolved.modelList.length} 个`);
     }
     else {
-        p.log.success(`已更新模型：默认「${resolved.defaultModel}」，共 ${resolved.modelList.length} 个。启用：llms ${tool} use ${profile.name}`);
+        p.log.success(`已更新模型：默认「${resolved.defaultModel}」${smallNote}，共 ${resolved.modelList.length} 个。启用：llms ${tool} use ${profile.name}`);
     }
 }
 async function resolveProfileName(tool, name) {
@@ -401,6 +556,7 @@ async function resolveProfileName(tool, name) {
     if (profiles.length === 0) {
         throw new Error(`暂无 ${tool} 供应商。请先：llms ${tool} provider`);
     }
+    requireInteractive("选择供应商", `请改用 llms ${tool} use <name>（现有：${profiles.map((x) => x.name).join(", ")}）。`);
     const active = getActiveProfile(tool)?.name;
     const defaultName = getDefaultProfile(tool)?.name;
     const selected = await p.select({
@@ -419,22 +575,30 @@ async function resolveProfileName(tool, name) {
     return selected;
 }
 function registerModelCommands(parent, tool) {
-    parent
+    const cmd = parent
         .command("model")
         .description("先选供应商，再拉取并选择要启用的模型（空格多选，回车确认）")
         .option("--profile <name>", "指定供应商，跳过列表选择")
-        .option("--json", "JSON 输出")
-        .action(async (opts) => {
+        .option("--json", "JSON 输出");
+    if (supportsSmallModel(tool)) {
+        cmd.option("--small <model>", "轻量小模型（标题生成等低成本任务）；跳过交互选择，传空字符串则清除");
+    }
+    cmd.action(async (opts) => {
+        requireInteractive(`llms ${tool} model 的模型选择`, `请在终端中运行，或用 llms ${tool} provider add --model <id> 直接指定。`);
         p.intro(`配置 ${tool} 模型`);
         const profile = opts.profile
             ? resolveProfileOrThrow(tool, opts.profile)
             : requireProfile(tool, await resolveProfileName(tool));
-        await configureProfileModels(tool, profile);
+        await configureProfileModels(tool, profile, {
+            // undefined → 交互询问；"" → 清除；其他 → 直接采用
+            fixedSmall: opts.small === undefined ? undefined : opts.small || null,
+        });
         if (opts.json) {
             const latest = requireProfile(tool, profile.name);
             console.log(JSON.stringify({
                 profile: latest.name,
                 default: latest.models.default,
+                small: latest.models.smallModel ?? null,
                 models: latest.models.list,
                 applied: getActiveProfile(tool)?.name === latest.name,
             }, null, 2));

package/dist/gateway/keys.js

@@ -150,6 +150,15 @@ function writeGatewayKeys(keys) {
     }
     atomicWriteFile(getGatewayKeysPath(), JSON.stringify({ version: 1, keys }, null, 2) + "\n");
 }
+/**
+ * Display hint for a key. The id alone already identifies the key, so only the
+ * last 4 characters of the secret are shown — the previous form leaked both the
+ * first and last 4 characters into `key list`, `status --json` and the keys file,
+ * which sits badly with the "only the hash is stored" promise.
+ */
+function keyHint(id, secret) {
+    return `${KEY_PREFIX}-${id}-…${secret.slice(-4)}`;
+}
 export function createGatewayKey(options = {}) {
     assertValidFormats(options.formats);
     const id = randomBytes(KEY_ID_BYTES).toString("hex");
@@ -168,7 +177,7 @@ export function createGatewayKey(options = {}) {
         name: options.name?.trim() || `key-${id.slice(0, 4)}`,
         hash: hashSecret(secret, salt),
         salt,
-        hint: `${KEY_PREFIX}-${id}-${secret.slice(0, 4)}…${secret.slice(-4)}`,
+        hint: keyHint(id, secret),
         createdAt: new Date().toISOString(),
         expiresAt,
         revokedAt: null,
@@ -254,7 +263,7 @@ export function rotateGatewayKey(idOrName) {
         id,
         hash: hashSecret(secret, salt),
         salt,
-        hint: `${KEY_PREFIX}-${id}-${secret.slice(0, 4)}…${secret.slice(-4)}`,
+        hint: keyHint(id, secret),
         createdAt: new Date().toISOString(),
         lastUsedAt: null,
     };