dsh-model 0.21.5 → 0.22.1

package/README.en.md

@@ -28,8 +28,8 @@ dsh-model turns them into **one address and one kind of key**:
 - 🔌 **Connect once, use everywhere**: every model shows up in dsh, grouped by source; any other tool uses the same address and key.
 - 🆓 **Get the most from free tiers**: WorkBuddy credits, free Gemini / Groq / OpenRouter keys and local models; every source is tagged Free / Free · limited / Paid.
 - 📅 **Daily check-in, credits claimed for you**: WorkBuddy (China), Qoder and Trae are checked in automatically every day.
-- 🔁 **Rate limits are not the end**: when a model is offered by several sources, requests move to another one when the first is limited.
-- 📊 **Know where you stand**: plan usage, remaining credits, success rate and speed per model, recent failures with advice, and a notice when quota runs low.
+- 🔁 **Rate limits are not the end**: build a combo (say Codex → Kimi → WorkBuddy) and requests move to the next model on a rate limit or used-up quota; a model offered by several sources also switches automatically.
+- 📊 **Know where you stand**: plan usage with reset countdowns, remaining credits and when they expire, success rate and speed per model, recent failures with advice, and a notice when quota runs low.
 - 🔒 **Secure by default**: a key is always required, one per device, revocable at any time; every sign-in happens on your own machine.
 - 🖥️ **Laptop or server**: Windows, macOS, Linux; on a VPS (with [dsh-vps](https://github.com/AIcivilization/dsh-vps)) it opens an https address you can use from anywhere.
 - 🧹 **Installs in one command, uninstalls cleanly**: dsh's config is restored byte for byte.
@@ -57,8 +57,9 @@ On a dsh-vps server, use `sudo dsh-model setup`. On Windows, run it in a normal
 | Section | What it holds |
 |---|---|
 | **Endpoint** | Local and public addresses, each with a Copy button |
-| **Sources** | One switch per provider: on connects (and signs in if needed), off pauses and keeps the sign-in. Each row is tagged Free / Free · limited / Paid and shows plan usage or remaining credits |
+| **Sources** | One switch per provider: on connects (and signs in if needed), off pauses and keeps the sign-in. Each row is tagged Free / Free · limited / Paid and shows plan usage with reset countdowns, or remaining credits and the next batch to expire; a used-up plan shows when it comes back |
 | **Models** | Pick which models of each source appear in dsh (5 suggested per source by default); the rest stay available through the endpoint; a "Test" button per model |
+| **Combos** | Put several models in order and it becomes one model in dsh: the first is used, and the next takes over on a rate limit, used-up quota or error. Other tools use the model name `combo/<id>` |
 | **Auto switch** | When a model is offered by several sources, dsh gets an "Auto switch (multiple sources)" group that moves to another source when one is rate-limited or failing |
 | **Daily check-in** | WorkBuddy (China), Qoder and Trae are checked in automatically every day (or with one click); the card shows what you got today |
 | **Recent failures** | Failed requests in the last 24 hours: which model, why, and what to do (no conversation content kept) |
@@ -106,6 +107,7 @@ dsh-model only connects; it provides no quota of its own.
 | `source enable\|disable\|logout <source>` | Turn on (signing in if needed) / off / sign out |
 | `key list\|add\|revoke\|rotate <name>` | Access keys, one per device |
 | `checkin` | Check in now (WorkBuddy China, Qoder, Trae; automatic daily by default) |
+| `combo list\|add <name> <model…>\|remove <id>` | Combos: try several models in order |
 | `failures` | Failed requests in the last 24 hours, with advice |
 | `stats` | Success rate, latency and speed by key, source and model |
 | `status` / `doctor [--e2e]` | Overview / health checks |

package/README.md

@@ -28,8 +28,8 @@ dsh-model 把它们合成**一个地址、一种 key**：
 - 🔌 **一处接入，处处可用**：dsh 里自动出现全部模型，按来源分组；其他软件填上同一个地址和 key 就行。
 - 🆓 **把免费的用足**：WorkBuddy 积分、Gemini / Groq / OpenRouter 免费 key、本机模型都能接；每个来源标出「免费 / 免费·额度少 / 需付费」。
 - 📅 **每日签到，自动领积分**：WorkBuddy 国内版、Qoder、Trae 每天自动签到，不用记。
-- 🔁 **不怕限流**：同一个模型在几个来源都有时自动切换，一个限流就换另一个。
-- 📊 **心里有数**：套餐用量、剩余积分、每个模型的成功率和速度、最近失败的原因和建议；额度快用完时提醒。
+- 🔁 **不怕限流**：自己排一个组合（如 Codex → Kimi → WorkBuddy），一个限流或额度用完就自动换下一个；同一个模型在几个来源都有时也会自动切换。
+- 📊 **心里有数**：套餐用量和重置倒计时、剩余积分和到期时间、每个模型的成功率和速度、最近失败的原因和建议；额度快用完时提醒。
 - 🔒 **默认安全**：始终要求 key，每台设备一把，可随时吊销；登录全在本机完成，不经过第三方。
 - 🖥️ **电脑和服务器都行**：Windows、macOS、Linux；装在 VPS 上（配合 [dsh-vps](https://github.com/AIcivilization/dsh-vps)）自动开一个 https 地址，电脑、手机随处用。
 - 🧹 **装得上，卸得净**：一条命令安装；卸载时把 dsh 的配置逐字节还原。
@@ -57,8 +57,9 @@ dsh-model setup
 | 区块 | 内容 |
 |---|---|
 | **访问地址** | 本机地址和外网地址，各带「复制」按钮 |
-| **来源** | 每家一个开关：打开就接入（没登录会弹出登录框），关闭只停用、保留登录。每行标出「免费 / 免费·额度少 / 需付费」，下面显示套餐用量或剩余积分 |
+| **来源** | 每家一个开关：打开就接入（没登录会弹出登录框），关闭只停用、保留登录。每行标出「免费 / 免费·额度少 / 需付费」，下面显示套餐用量和重置倒计时，或剩余积分和最近到期的一批；额度用完会标出多久后恢复 |
 | **选模型** | 每个来源选哪些模型显示在 dsh 里，默认每家推荐 5 个，其余的经统一地址照样可用；每个模型旁边有「测一下」 |
+| **组合切换** | 把几个模型按顺序排成一个组合，在 dsh 里就是一个模型：先用第一个，限流、额度用完或出错就换下一个。其他软件用模型名 `combo/<id>` |
 | **自动切换** | 同一个模型在几个来源都有时，dsh 里多一组「自动切换（多来源）」，一个来源限流或出错就自动换另一个 |
 | **每日签到** | WorkBuddy 国内版、Qoder、Trae 每天自动签到（也可一键签到），卡片显示今天领了多少 |
 | **最近失败** | 最近 24 小时失败的请求：哪个模型、为什么、该怎么办（不记录对话内容） |
@@ -106,6 +107,7 @@ dsh-model 只负责转接，不提供额度。
 | `source enable\|disable\|logout <来源>` | 打开（需要时登录）/ 关闭 / 退出登录 |
 | `key list\|add\|revoke\|rotate <名称>` | 访问 key，每台设备一把 |
 | `checkin` | 现在签到一次（WorkBuddy 国内版、Qoder、Trae；默认每天自动签） |
+| `combo list\|add <名称> <模型…>\|remove <id>` | 组合切换：按顺序试几个模型 |
 | `failures` | 最近 24 小时失败的请求和建议 |
 | `stats` | 按 key、来源、模型的成功率、延迟和速度 |
 | `status` / `doctor [--e2e]` | 总览 / 逐项自检 |

package/dist/bridge/server.js

@@ -106,6 +106,28 @@ export function createBridge(options) {
                 return oaiError(res, 404, 'not_found', 'refresh not supported');
             return json(res, 200, { ok: true, result: await options.onRefresh() });
         }
+        if (url.startsWith('/combo/v1/') && options.onCombo) {
+            if (req.method === 'GET' && url === '/combo/v1/models') {
+                const ids = (await options.comboIds?.()) ?? [];
+                return json(res, 200, { object: 'list', data: ids.map((id) => ({ id, object: 'model', created: 0, owned_by: 'dsh-model-combo' })) });
+            }
+            if (req.method === 'POST' && url === '/combo/v1/chat/completions') {
+                const raw = (await readBody(req)).toString('utf8');
+                let id = '';
+                try {
+                    id = String(JSON.parse(raw).model ?? '');
+                }
+                catch {
+                    return oaiError(res, 400, 'invalid_json', 'request body is not JSON');
+                }
+                const controller = new AbortController();
+                res.on('close', () => controller.abort());
+                if (!(await options.onCombo(id.replace(/^combo\//, ''), raw, res, controller.signal)))
+                    return oaiError(res, 404, 'no_combo', `no such combo: ${id}`);
+                return;
+            }
+            return oaiError(res, 404, 'not_found', `no such route: ${req.method} ${url}`);
+        }
         const m = /^\/([a-z]+)\/v1\/(models|chat\/completions)$/.exec(url);
         const variant = m ? options.variants.find((v) => v.key === m[1]) : undefined;
         if (!m || !variant)

package/dist/bridge/workbuddy/upstream.js

@@ -12,6 +12,16 @@
 import { appUserAgent, resolveAppVersion } from './app-version.js';
 import { chatUserAgent, fallbackChatIdentity, resolveChatIdentity } from './client-identity.js';
 import { PROBE_MAX_TOKENS, PROBE_PROMPT } from './probe.js';
+/** "2026-10-18 01:24:08"（北京时间）→ ISO；认不出就 undefined */
+export function beijingTimeToIso(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const m = /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2}):(\d{2})$/.exec(value.trim());
+    if (!m)
+        return undefined;
+    const t = Date.parse(`${m[1]}-${m[2]}-${m[3]}T${m[4]}:${m[5]}:${m[6]}+08:00`);
+    return Number.isFinite(t) ? new Date(t).toISOString() : undefined;
+}
 const CN_CHAT_BASE = 'https://copilot.tencent.com';
 const CN_BILLING_BASE = 'https://www.codebuddy.cn';
 const GLOBAL_BASE = 'https://www.workbuddy.ai';
@@ -724,10 +734,12 @@ export class WorkBuddyUpstreamClient {
             if (remain < 0)
                 remain = 0;
             total += remain;
+            const cycleEndAt = beijingTimeToIso(account['CycleEndTime']);
             accounts.push({
                 packageName: typeof account['PackageName'] === 'string' ? account['PackageName'] : '(unnamed)',
                 remain,
                 size: size > 0 ? size : numberField('CapacitySize'),
+                ...(cycleEndAt ? { cycleEndAt, renews: numberField('RemainCycles') > 0 } : {}),
             });
         }
         return { total, accounts };

package/dist/cli.js

@@ -14,6 +14,7 @@ import { supervise } from './service/windows.js';
 import { opencode } from './commands/opencode.js';
 import { workbuddy } from './commands/workbuddy.js';
 import { bridge } from './commands/bridge.js';
+import { combo } from './commands/combo.js';
 import { checkin, enableInteractive, failures, source, sources, stats } from './commands/sources.js';
 import { createContext } from './context.js';
 import { isDshModelError } from './errors.js';
@@ -70,6 +71,7 @@ function help() {
   stats                                按 key / 来源 / 模型的成功率、延迟、速度
   failures                             最近 24 小时失败的请求，以及该怎么办
   checkin                              现在签到一次（WorkBuddy 国内版、Qoder、Trae；默认每天自动签）
+  combo [list|add <名称> <模型…>|remove <id>]  组合切换：按顺序试几个模型，一个不行换下一个
   status                               一屏总览
   doctor [--e2e] [--all] [--model M]   逐项自检；--e2e 实测流式与工具调用
   connect-dsh [--dry-run] [--force]    写入 / 刷新 dsh 配置
@@ -103,6 +105,7 @@ Usage: dsh-model <command> [options]
   stats                                Success rate, latency and speed by key / source / model
   failures                             Failed requests in the last 24 hours, and what to do
   checkin                              Check in now (WorkBuddy China, Qoder, Trae; automatic daily by default)
+  combo [list|add <name> <model…>|remove <id>]  Combos: try several models in order, moving on when one fails
   status                               Overview
   doctor [--e2e] [--all] [--model M]   Health checks; --e2e tests streaming and tool calls
   connect-dsh [--dry-run] [--force]    Write / refresh dsh config
@@ -131,7 +134,7 @@ export async function main(argv) {
         fail(String(error.message));
         return 2;
     }
-    const { values: o, positionals: [cmd, a1, a2] } = parsed;
+    const { values: o, positionals: [cmd, a1, a2, ...rest] } = parsed;
     initLang(o.lang);
     setJsonMode(Boolean(o.json));
     if (o.version) {
@@ -175,6 +178,8 @@ export async function main(argv) {
                 return await failures(ctx);
             case 'checkin':
                 return await checkin(ctx);
+            case 'combo':
+                return await combo(ctx, a1, [a2, ...rest].filter((x) => x !== undefined));
             case 'status':
                 return await status(ctx);
             case 'doctor':

package/dist/combo.js

@@ -0,0 +1,121 @@
+// combo.ts — 自定义组合切换（设计 §14.16）
+//
+// 一个组合 = 按顺序排好的几个模型（任意来源，订阅也行）。在 dsh 和其他软件里它就是一个模型 combo/<id>：
+// 请求先发给第一个；限流、额度用完、出错就换下一个，直到有一个成功。已经开始输出之后不再切换。
+// 引擎把 combo/<id> 转给守护进程（openai-compatibility 上游），守护进程再逐个调引擎里的真实模型。
+import { Readable } from 'node:stream';
+import { DshModelError } from './errors.js';
+import { L } from './i18n.js';
+export const COMBO_PREFIX = 'combo';
+export const MAX_COMBO_MODELS = 8;
+/** 名字 → id：英文数字保留，其余去掉；剩不下就用 c1、c2… */
+export function comboId(name, taken) {
+    const base = name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 32);
+    if (base && !taken.includes(base))
+        return base;
+    for (let i = 1;; i++) {
+        const id = base ? `${base}-${i}` : `c${i}`;
+        if (!taken.includes(id))
+            return id;
+    }
+}
+/** 校验并规整一个组合；available 给了就检查模型都还在 */
+export function normalizeCombo(input, available) {
+    const name = String(input.name ?? '').trim();
+    if (!name || name.length > 30)
+        throw new DshModelError('bad_combo', L('组合要有名字（最多 30 个字）', 'A combo needs a name (up to 30 characters)'));
+    const raw = Array.isArray(input.models) ? input.models.map((m) => String(m).trim()).filter(Boolean) : [];
+    const models = [...new Set(raw)];
+    if (models.length < 2)
+        throw new DshModelError('bad_combo', L('组合至少要两个模型', 'A combo needs at least two models'));
+    if (models.length > MAX_COMBO_MODELS)
+        throw new DshModelError('bad_combo', L(`组合最多 ${MAX_COMBO_MODELS} 个模型`, `A combo holds up to ${MAX_COMBO_MODELS} models`));
+    const nested = models.find((m) => m.startsWith(`${COMBO_PREFIX}/`));
+    if (nested)
+        throw new DshModelError('bad_combo', L(`组合里不能再放组合（${nested}）`, `A combo cannot contain another combo (${nested})`));
+    if (available) {
+        const have = new Set(available);
+        const missing = models.filter((m) => !have.has(m));
+        if (missing.length)
+            throw new DshModelError('bad_combo', L(`这些模型现在用不了：${missing.join('、')}`, `These models are not available now: ${missing.join(', ')}`));
+    }
+    return { name, models };
+}
+/** 这次失败值得换下一个吗：请求本身写错了（400 且不是额度/长度问题）换了也一样，直接返回 */
+export function shouldFallBack(status, text) {
+    if (status !== 400 && status !== 422)
+        return true;
+    return /quota|rate|limit|credit|context|too long|too many tokens|maximum|exceed|overload|unavailable|not supported|unsupported/i.test(text);
+}
+/** 按顺序试组合里的模型，把第一个成功的响应原样转回客户端 */
+export async function runCombo(run) {
+    const { res, combo } = run;
+    const log = run.log ?? (() => { });
+    let body;
+    try {
+        body = JSON.parse(run.raw);
+    }
+    catch {
+        return reply(res, 400, { error: { message: 'request body is not JSON', type: 'invalid_json', code: 'invalid_json' } });
+    }
+    const tried = [];
+    let last;
+    for (const model of combo.models) {
+        if (run.signal.aborted)
+            return;
+        let upstream;
+        try {
+            upstream = await fetch(`http://127.0.0.1:${run.port}/v1/chat/completions`, {
+                method: 'POST',
+                headers: { Authorization: `Bearer ${run.key}`, 'Content-Type': 'application/json' },
+                body: JSON.stringify({ ...body, model }),
+                signal: run.signal,
+            });
+        }
+        catch (error) {
+            if (run.signal.aborted)
+                return;
+            last = { status: 502, text: String(error.message ?? error) };
+            tried.push(`${model}: ${last.text.slice(0, 120)}`);
+            continue;
+        }
+        if (upstream.ok && upstream.body) {
+            if (tried.length)
+                log(`combo ${combo.id}: ${model} answered after ${tried.length} failed (${tried.join(' | ')})`);
+            res.writeHead(upstream.status, {
+                'Content-Type': upstream.headers.get('content-type') ?? 'application/json',
+                'Cache-Control': 'no-cache',
+                'X-Dsh-Model-Combo-Model': model,
+            });
+            const stream = Readable.fromWeb(upstream.body);
+            stream.on('error', (error) => {
+                log(`combo ${combo.id}: ${model} stream failed mid-flight: ${String(error)}`);
+                if (res.writable)
+                    res.end();
+            });
+            stream.pipe(res);
+            return;
+        }
+        const text = await upstream.text().catch(() => '');
+        last = { status: upstream.status, text };
+        tried.push(`${model}: HTTP ${upstream.status}`);
+        if (!shouldFallBack(upstream.status, text))
+            break;
+    }
+    log(`combo ${combo.id}: all failed (${tried.join(' | ')})`);
+    const message = L(`组合「${combo.name}」里的模型都失败了：${tried.join('；')}`, `Every model in combo "${combo.name}" failed: ${tried.join('; ')}`);
+    let detail;
+    try {
+        detail = last ? JSON.parse(last.text) : undefined;
+    }
+    catch {
+        detail = undefined;
+    }
+    const upstreamError = detail?.error;
+    reply(res, last?.status && last.status >= 400 ? last.status : 502, { error: { message, type: 'combo_failed', code: 'combo_failed', ...(upstreamError ? { last: upstreamError } : {}) } });
+}
+function reply(res, status, body) {
+    const payload = JSON.stringify(body);
+    res.writeHead(status, { 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(payload) });
+    res.end(payload);
+}

package/dist/commands/bridge.js

@@ -4,6 +4,7 @@
 import { createBridge } from '../bridge/server.js';
 import { loadBridgeConfig } from '../bridge/runtime.js';
 import { Daemon } from '../daemon/core.js';
+import { loadConfig } from '../state.js';
 import { DshModelError } from '../errors.js';
 import { L } from '../i18n.js';
 import { info, isJsonMode, printJson } from '../util/output.js';
@@ -54,6 +55,8 @@ async function run(ctx) {
             return { changed };
         },
         onControl: (method, path, body, query) => daemon.handle(method, path, body, query),
+        onCombo: (id, raw, res, signal) => daemon.runCombo(id, raw, res, signal, log),
+        comboIds: async () => ((await loadConfig(ctx)).combos ?? []).map((c) => c.id),
     });
     await server.ready;
     log(`daemon: listening on 127.0.0.1:${cfg.port}`);

package/dist/commands/combo.js

@@ -0,0 +1,41 @@
+// commands/combo.ts — dsh-model combo：自定义组合切换（按顺序试几个模型，一个不行换下一个）
+import { control } from '../daemon/client.js';
+import { DshModelError } from '../errors.js';
+import { L } from '../i18n.js';
+import { bold, dim, info, isJsonMode, ok, printJson } from '../util/output.js';
+export async function combo(ctx, sub, args) {
+    if (!sub || sub === 'list') {
+        const r = await control(ctx, 'GET', '/combos');
+        if (isJsonMode()) {
+            printJson(r.combos);
+            return 0;
+        }
+        if (!r.combos.length) {
+            info(L('还没有组合。例：dsh-model combo add 主力 <模型1> <模型2> …（模型名见 dsh-model models）', 'No combos yet. Example: dsh-model combo add main <model1> <model2> … (model names: dsh-model models)'));
+            return 0;
+        }
+        for (const c of r.combos)
+            info(`${bold(`combo/${c.id}`)}  ${c.name}\n  ${dim(c.models.join(' → '))}`);
+        return 0;
+    }
+    if (sub === 'add') {
+        const [name, ...models] = args;
+        if (!name || models.length < 2)
+            throw new DshModelError('missing_arg', L('用法：dsh-model combo add <名称> <模型1> <模型2> …', 'Usage: dsh-model combo add <name> <model1> <model2> …'));
+        const c = await control(ctx, 'POST', '/combos', { name, models });
+        if (isJsonMode())
+            printJson(c);
+        else
+            ok(L(`已建组合 combo/${c.id}：${c.models.join(' → ')}`, `Combo combo/${c.id} created: ${c.models.join(' → ')}`));
+        return 0;
+    }
+    if (sub === 'remove') {
+        const id = args[0]?.replace(/^combo\//, '');
+        if (!id)
+            throw new DshModelError('missing_arg', L('用法：dsh-model combo remove <组合 id>', 'Usage: dsh-model combo remove <combo id>'));
+        await control(ctx, 'DELETE', `/combos/${encodeURIComponent(id)}`);
+        ok(L(`已删除组合 combo/${id}`, `Combo combo/${id} removed`));
+        return 0;
+    }
+    throw new DshModelError('unknown_command', L(`未知子命令：combo ${sub}`, `Unknown subcommand: combo ${sub}`));
+}

package/dist/daemon/core.js

@@ -43,6 +43,7 @@ import { redactKey } from '../util/redact.js';
 import { Stats } from './stats.js';
 import { USAGE_UNSUPPORTED, probeEngineSource, fetchEngineUsage, fetchWorkbuddyUsage, usageFilePath } from './usage.js';
 import { writeJson } from '../util/fs.js';
+import { comboId, normalizeCombo, runCombo } from '../combo.js';
 const LOGIN_POLL_MS = 2000;
 const LOGIN_TIMEOUT_MS = 15 * 60 * 1000;
 const USAGE_POLL_MS = 5000;
@@ -910,6 +911,61 @@ export class Daemon {
         await this.resync();
         return { selected: models === null ? -1 : new Set(models).size };
     }
+    /** 组合切换：现有组合，以及能放进组合的模型（按来源分组，顺序同 dsh 下拉框） */
+    async combos() {
+        const all = await loadAll(this.ctx);
+        const cands = await dshCandidates(this.ctx, all);
+        const models = [...cands.values()]
+            .filter((c) => c.source !== 'combo')
+            .flatMap((c) => c.models.map((m) => ({ id: m.id, name: m.name, group: c.source, groupLabel: c.label })));
+        return { combos: all.config.combos ?? [], models };
+    }
+    /** 新建（id 为 null）或修改一个组合 */
+    async saveCombo(id, input) {
+        const { models: avail } = await this.combos();
+        const c = normalizeCombo(input, avail.map((m) => m.id));
+        const saved = await withLock(this.ctx, async () => {
+            const all = await loadAll(this.ctx);
+            const list = [...(all.config.combos ?? [])];
+            let combo;
+            if (id) {
+                const i = list.findIndex((x) => x.id === id);
+                if (i < 0)
+                    throw new DshModelError('no_combo', L(`没有这个组合：${id}`, `No such combo: ${id}`));
+                combo = { id, ...c };
+                list[i] = combo;
+            }
+            else {
+                combo = { id: comboId(c.name, list.map((x) => x.id)), ...c };
+                list.push(combo);
+            }
+            all.config.combos = list;
+            await saveAll(this.ctx, all);
+            return combo;
+        });
+        await this.resync();
+        return saved;
+    }
+    async deleteCombo(id) {
+        await withLock(this.ctx, async () => {
+            const all = await loadAll(this.ctx);
+            const list = (all.config.combos ?? []).filter((x) => x.id !== id);
+            if (list.length === (all.config.combos ?? []).length)
+                throw new DshModelError('no_combo', L(`没有这个组合：${id}`, `No such combo: ${id}`));
+            all.config.combos = list.length ? list : undefined;
+            await saveAll(this.ctx, all);
+        });
+        await this.resync();
+    }
+    /** 引擎转来的 combo/<id> 请求：按顺序逐个试 */
+    async runCombo(id, raw, res, signal, log) {
+        const all = await loadAll(this.ctx);
+        const combo = all.config.combos?.find((c) => c.id === id);
+        if (!combo)
+            return false;
+        await runCombo({ port: all.config.port, key: dshKey(all.keys), combo, raw, res, signal, ...(log ? { log } : {}) });
+        return true;
+    }
     /** 管理页"复制"用：取一把未吊销 key 的完整值（只经同源、带页面 token 的插件路由转发） */
     async revealKey(name) {
         const entry = (await loadKeys(this.ctx)).keys.find((k) => k.name === name && !k.revokedAt);
@@ -978,6 +1034,14 @@ export class Daemon {
                 }
                 return ok(await this.sources());
             }
+            if (method === 'GET' && path === '/combos')
+                return ok(await this.combos());
+            if (method === 'POST' && path === '/combos')
+                return ok(await this.saveCombo(null, b));
+            if (seg[0] === 'combos' && seg[1] && method === 'PUT')
+                return ok(await this.saveCombo(seg[1], b));
+            if (seg[0] === 'combos' && seg[1] && method === 'DELETE')
+                return ok(await this.deleteCombo(seg[1]).then(() => ({ deleted: true })));
             if (seg[0] === 'sources' && seg[1] && method === 'POST') {
                 if (seg[2] === 'enable')
                     return ok(await this.enable(seg[1], { acceptRisk: b.acceptRisk === true }));

package/dist/daemon/usage.js

@@ -10,6 +10,7 @@
 // 一律只读：不刷新、不改写任何凭据文件。查询失败只在那一行显示"用量暂不可用"。
 import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
+import { beijingTimeToIso } from '../bridge/workbuddy/upstream.js';
 const TIMEOUT_MS = 15_000;
 /** 这几家暂不支持（见设计 §14.6） */
 export const USAGE_UNSUPPORTED = new Set(['antigravity', 'devin', 'meta', 'opencode', 'ollama', 'lmstudio', 'gemini', 'groq', 'openrouter', 'siliconflow', 'deepseek', 'custom']);
@@ -165,12 +166,35 @@ export async function fetchWorkbuddyUsage(rt) {
     const credits = await rt.wbClient.fetchCredits(credential);
     const unlimited = credits.accounts.some((a) => a.unlimited);
     const size = credits.accounts.reduce((s, a) => s + (Number.isFinite(a.size) ? a.size : 0), 0);
+    const next = nextCreditChange(credits.accounts, credits.cycleResetTime);
     return {
         windows: [],
-        credits: { remaining: credits.total, ...(size > 0 ? { total: size } : {}), ...(unlimited ? { unlimited: true } : {}), label: 'credits' },
+        credits: { remaining: credits.total, ...(size > 0 ? { total: size } : {}), ...(unlimited ? { unlimited: true } : {}), label: 'credits', ...(next ? { next } : {}) },
         ...(credits.accounts.length ? { plan: packageSummary(credits.accounts.map((a) => a.packageName)) } : {}),
     };
 }
+/**
+ * 最近一批要变动的积分：还有剩余的包里，周期最早结束的那个时间点；同一天（24 小时内）结束的合在一起算。
+ * 作废的优先于重置的提醒（作废了就真没了）。企业版只有一个周期重置时间。
+ */
+export function nextCreditChange(accounts, cycleResetTime, now = Date.now()) {
+    const live = accounts.filter((a) => a.remain > 0 && a.cycleEndAt && Date.parse(a.cycleEndAt) > now);
+    const pick = (list) => {
+        if (!list.length)
+            return undefined;
+        const first = Math.min(...list.map((a) => Date.parse(a.cycleEndAt)));
+        const amount = list.filter((a) => Date.parse(a.cycleEndAt) - first < 86_400_000).reduce((s, a) => s + a.remain, 0);
+        return { amount: Math.round(amount * 100) / 100, at: new Date(first).toISOString() };
+    };
+    const expiring = pick(live.filter((a) => !a.renews));
+    if (expiring)
+        return { ...expiring, renews: false };
+    const renewing = pick(live.filter((a) => a.renews));
+    if (renewing)
+        return { ...renewing, renews: true };
+    const reset = cycleResetTime ? (beijingTimeToIso(cycleResetTime) ?? (Number.isFinite(Date.parse(cycleResetTime)) ? new Date(Date.parse(cycleResetTime)).toISOString() : undefined)) : undefined;
+    return reset && Date.parse(reset) > now ? { amount: 0, at: reset, renews: true } : undefined;
+}
 /** 套餐名去重计数："个人版 + 加量包 ×38"（账号下常有几十个同名加量包，实测） */
 export function packageSummary(names) {
     const counts = new Map();

package/dist/dsh/connect.js

@@ -52,6 +52,12 @@ async function checkLocation(state, location, force) {
     return warnings;
 }
 /** 写入 / 移除一组项。所有权记在 state.dsh.ownedProviders / ownedRefs */
+/**
+ * 上次安装留下的东西（台账丢了，例如卸载没走完、或手动删过 ~/.dsh-model）：
+ * dsh-model 格式的 key（dshm_ + 43 位），或指向 DSH_MODEL_API_KEY 的 dsh-model* provider。直接接管，不让用户去手动删。
+ */
+export const isLeftoverKey = (value) => /^dshm_[A-Za-z0-9_-]{43}$/.test(value);
+const isLeftoverProvider = (id, spec) => id.startsWith('dsh-model') && spec?.apiKeyEnv === KEY_REF;
 export async function applyDsh(ctx, state, items, opts) {
     const location = await locateDsh(ctx, opts.profile);
     const warnings = await checkLocation(state, location, opts.force);
@@ -72,7 +78,12 @@ export async function applyDsh(ctx, state, items, opts) {
             continue;
         }
         if (existing !== undefined && !ownedRefs.has(name) && !opts.isOwnRef?.(name, existing)) {
-            throw new DshModelError('credential_ref_conflict', L(`dsh 凭据里已有 ${name}，且不是 dsh-model 写的`, `dsh credentials already contain ${name}, not written by dsh-model`), L('不会覆盖它。要让 dsh-model 接管，请先在 dsh 设置里删掉它再重试', 'It will not be overwritten. To let dsh-model manage it, remove it in dsh settings and retry'));
+            if (name === KEY_REF && isLeftoverKey(existing)) {
+                warnings.push(L(`接管了上次安装留下的 ${name}（换成这次的 key）`, `Took over ${name} left by an earlier install (replaced with this install's key)`));
+            }
+            else {
+                throw new DshModelError('credential_ref_conflict', L(`dsh 凭据里已有 ${name}，且不是 dsh-model 写的`, `dsh credentials already contain ${name}, not written by dsh-model`), L('不会覆盖它。要让 dsh-model 接管，请先在 dsh 设置里删掉它再重试', 'It will not be overwritten. To let dsh-model manage it, remove it in dsh settings and retry'));
+            }
         }
         credAfter = upsertRef(credAfter === '' ? null : credAfter, value, name);
         ownedRefs.add(name);
@@ -88,7 +99,11 @@ export async function applyDsh(ctx, state, items, opts) {
             }
             continue;
         }
-        if (!ownedProviders.has(id) && readProvider(patchAfter === '' ? null : patchAfter, id)) {
+        const existingProvider = ownedProviders.has(id) ? null : readProvider(patchAfter === '' ? null : patchAfter, id);
+        if (existingProvider && isLeftoverProvider(id, existingProvider)) {
+            warnings.push(L(`接管了上次安装留下的 provider ${id}`, `Took over provider ${id} left by an earlier install`));
+        }
+        else if (existingProvider) {
             throw new DshModelError('provider_conflict', L(`dsh 里已有 provider ${id}，且不是 dsh-model 写的`, `dsh already has a provider ${id}, not written by dsh-model`), L('不会覆盖它', 'It will not be overwritten'));
         }
         const r = upsertProvider(patchAfter === '' ? null : patchAfter, id, spec);

package/dist/engine/compat.js

@@ -8,6 +8,7 @@ import { loadSecrets } from '../secrets.js';
 import { readJson } from '../util/fs.js';
 import { LOCAL_SERVERS, loadLocalCatalog } from '../integrations/local.js';
 import { keyProvider, loadKeyCatalog } from '../integrations/apikeys.js';
+import { COMBO_PREFIX } from '../combo.js';
 export const OPENCODE_BASE = 'https://opencode.ai/zen/v1';
 export const OPENCODE_PREFIX = 'opencode';
 export function opencodeModelsPath(ctx) {
@@ -16,7 +17,8 @@ export function opencodeModelsPath(ctx) {
 export async function loadCompatUpstreams(ctx) {
     const out = [];
     const secrets = await loadSecrets(ctx);
-    const disabled = new Set((await readJson(join(ctx.paths.home, 'config.json')))?.disabledSources ?? []);
+    const cfg = await readJson(join(ctx.paths.home, 'config.json'));
+    const disabled = new Set(cfg?.disabledSources ?? []);
     if (secrets.opencode?.key && !disabled.has('opencode')) {
         const list = await readJson(opencodeModelsPath(ctx));
         const models = (list?.models ?? []).map((m) => ({
@@ -99,7 +101,34 @@ export async function loadCompatUpstreams(ctx) {
             models: st.models.map((id) => ({ name: id, alias: `${s.id}/${id}`, displayName: `${s.label} · ${id}`, dshName: `${id} · 本地免费`, rate: 0, group: s.id, groupLabel: `${s.label}（本地）` })),
         });
     }
-    return addAutoModels(out);
+    addAutoModels(out);
+    // 组合切换：守护进程按顺序逐个调引擎里的真实模型
+    if (bridge && cfg?.combos?.length)
+        out.push(comboUpstream(cfg.combos, bridge, compatModelIndex(out)));
+    return out;
+}
+export function comboUpstream(combos, bridge, meta) {
+    return {
+        name: COMBO_PREFIX,
+        label: '组合切换',
+        baseUrl: `http://127.0.0.1:${bridge.port}/${COMBO_PREFIX}/v1`,
+        apiKey: bridge.secret,
+        direct: true,
+        models: combos.map((c) => {
+            // 上下文取成员里最小的（知道的才算），免得 dsh 按大的塞内容、换到小的就超长
+            const ctxs = c.models.map((m) => meta.get(m)?.contextWindow).filter((n) => typeof n === 'number' && n > 0);
+            return {
+                name: c.id,
+                alias: `${COMBO_PREFIX}/${c.id}`,
+                displayName: `${c.name}（${c.models.join(' → ')}）`,
+                dshName: `${c.name} · ${c.models.length} 个模型轮换`,
+                group: COMBO_PREFIX,
+                groupLabel: '组合切换',
+                ...(ctxs.length ? { contextWindow: Math.min(...ctxs) } : {}),
+                image: c.models.every((m) => meta.get(m)?.image === true),
+            };
+        }),
+    };
 }
 export const AUTO_PREFIX = 'auto';
 /**

package/dist/ops.js

@@ -94,7 +94,8 @@ export async function syncModels(ctx, all, opts = {}) {
     // 每个来源只把挑中的模型写进 dsh（管理页勾选，或默认挑选）；统一端点照常提供全部
     const groups = [];
     for (const c of candidates.values()) {
-        const picked = new Set(pickedFor(c.models.map((m) => ({ id: m.id, name: m.name, rate: m.rate })), all.config.dshModels?.[c.source]));
+        // 组合是自己建的：全部显示
+        const picked = new Set(c.source === 'combo' ? c.models.map((m) => m.id) : pickedFor(c.models.map((m) => ({ id: m.id, name: m.name, rate: m.rate })), all.config.dshModels?.[c.source]));
         const models = c.models.filter((m) => picked.has(m.id)).map(({ rate: _r, ...m }) => m);
         if (models.length)
             groups.push({ providerId: c.providerId, displayName: c.label, models });

package/dist/sources.js

@@ -44,4 +44,4 @@ export function paymentRequired(cred) {
     return Array.isArray(cooldowns) && cooldowns.some((c) => c?.reason === 'payment_required');
 }
 /** 引擎里作为 openai-compatibility 上游的来源：模型名前缀就是来源 id（同步时据此核对引擎是否已热重载） */
-export const COMPAT_PREFIXES = [...SOURCES.filter((s) => s.kind !== 'engine').map((s) => `${s.variant ?? s.id}/`), 'auto/'];
+export const COMPAT_PREFIXES = [...SOURCES.filter((s) => s.kind !== 'engine').map((s) => `${s.variant ?? s.id}/`), 'auto/', 'combo/'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model",
-  "version": "0.21.5",
+  "version": "0.22.1",
   "description": "One OpenAI-compatible address for all your models: subscriptions (Codex, Kimi…), free tiers (WorkBuddy, Gemini, Groq, OpenRouter), local models (Ollama, LM Studio), daily check-in credits, auto failover. Works with DeepSeek Harness (dsh) and any OpenAI-compatible tool. 一个地址用上你所有的模型。",
   "keywords": [
     "dsh-plugin",

package/plugin/client.js

@@ -106,16 +106,32 @@ window.__ModuleLoader__.load({
         h('span', { style: { display: 'block', width: `${p}%`, height: '100%', background: color } }))
     }
 
-    const until = (iso) => {
-      if (!iso) return ''
-      const ms = Date.parse(iso) - Date.now()
-      if (!(ms > 0)) return L('即将重置', 'resetting')
-      const m = Math.round(ms / 60000)
+    /** 距离 iso 还有多久："2 天 3 小时" / "3 小时 5 分" / "12 分"；已过去返回 '' */
+    const dur = (iso) => {
+      const ms = iso ? Date.parse(iso) - Date.now() : NaN
+      if (!(ms > 0)) return ''
+      const m = Math.max(1, Math.round(ms / 60000))
       const d = Math.floor(m / 1440)
       const hh = Math.floor((m % 1440) / 60)
       const mm = m % 60
-      const t = d ? L(`${d} 天 ${hh} 小时`, `${d}d ${hh}h`) : hh ? L(`${hh} 小时 ${mm} 分`, `${hh}h ${mm}m`) : L(`${mm} 分`, `${mm}m`)
-      return L(`${t}后重置`, `resets in ${t}`)
+      return d ? L(`${d} 天 ${hh} 小时`, `${d}d ${hh}h`) : hh ? L(`${hh} 小时 ${mm} 分`, `${hh}h ${mm}m`) : L(`${mm} 分`, `${mm}m`)
+    }
+    const until = (iso) => {
+      if (!iso) return ''
+      const t = dur(iso)
+      return t ? L(`${t}后重置`, `resets in ${t}`) : L('即将重置', 'resetting')
+    }
+    /** 额度用完了吗：用完的窗口里最晚恢复的那个时间（全部恢复才能用）；积分用完也算 */
+    const exhausted = (usage) => {
+      if (!usage || usage.noAccess) return null
+      const full = (usage.windows || []).filter((w) => w.usedPercent != null && w.usedPercent >= 100)
+      if (full.length) {
+        const at = full.map((w) => w.resetAt).filter(Boolean).sort().pop()
+        return { at }
+      }
+      const c = usage.credits
+      if (c && !c.unlimited && c.remaining <= 0) return { at: c.next && c.next.renews ? c.next.at : undefined }
+      return null
     }
     const winLabel = (w) => ({ '5h': L('5 小时', '5 hours'), '7d': L('每周', 'Weekly'), '30d': L('每月', 'Monthly'), quota: L('总额度', 'Quota'), 'Opus 7d': L('Opus 每周', 'Opus weekly'), 'Sonnet 7d': L('Sonnet 每周', 'Sonnet weekly') }[w.label] || w.label)
     const pct = (x) => (x == null ? '-' : `${Math.round(x * 100)}%`)
@@ -150,7 +166,11 @@ window.__ModuleLoader__.load({
         lines.push(h('div', { key: 'credits', style: { ...S.line, minHeight: 22, fontSize: 12 } },
           h('span', { style: { width: 72, color: C.sub } }, L('积分', 'Credits')),
           c.total ? h(Bar, { pct: 100 - (c.remaining / c.total) * 100 }) : null,
-          h('span', null, c.unlimited ? L('不限量', 'Unlimited') : L(`剩余 ${c.remaining.toLocaleString()}${c.total ? ` / ${c.total.toLocaleString()}` : ''}`, `${c.remaining.toLocaleString()} left${c.total ? ` of ${c.total.toLocaleString()}` : ''}`))))
+          h('span', null, c.unlimited ? L('不限量', 'Unlimited') : L(`剩余 ${c.remaining.toLocaleString()}${c.total ? ` / ${c.total.toLocaleString()}` : ''}`, `${c.remaining.toLocaleString()} left${c.total ? ` of ${c.total.toLocaleString()}` : ''}`)),
+          c.next && dur(c.next.at) ? h('span', { style: { color: !c.next.renews && Date.parse(c.next.at) - Date.now() < 3 * 86400000 ? C.warn : C.faint } },
+            c.next.renews
+              ? (c.next.amount ? L(`${c.next.amount.toLocaleString()} 积分 ${dur(c.next.at)}后重置`, `${c.next.amount.toLocaleString()} reset in ${dur(c.next.at)}`) : L(`${dur(c.next.at)}后重置`, `resets in ${dur(c.next.at)}`))
+              : L(`${c.next.amount.toLocaleString()} 积分 ${dur(c.next.at)}后到期，先用这些`, `${c.next.amount.toLocaleString()} expire in ${dur(c.next.at)}; use them first`)) : null))
       }
       if (usage.error) lines.push(h('div', { key: 'err', style: { fontSize: 12, color: C.warn, marginTop: 4 } }, `${L('用量暂不可用', 'Usage unavailable')}：${usage.error}`))
       return h('div', { style: { marginTop: 4, paddingLeft: 46 } }, lines)
@@ -456,6 +476,12 @@ window.__ModuleLoader__.load({
               h('span', { style: S.label }, s.label),
               h(PriceTag, { pricing: s.pricing }),
               s.risky ? h('span', { style: { fontSize: 11, color: C.err, marginLeft: 6, border: `1px solid ${C.err}`, borderRadius: 4, padding: '0 4px' } }, L('高风险', 'High risk')) : null,
+              (() => {
+                const x = s.enabled ? exhausted(s.usage) : null
+                if (!x) return null
+                const t = dur(x.at)
+                return h('span', { style: { fontSize: 11, color: C.err, marginLeft: 6, border: `1px solid ${C.err}`, borderRadius: 4, padding: '0 4px' } }, t ? L(`已用完 · ${t}后恢复`, `Used up · back in ${t}`) : L('已用完', 'Used up'))
+              })(),
               h('span', { style: { ...S.meta, marginLeft: 8 } },
                 s.loggedIn ? (s.account || '') : s.kind === 'local' ? L('未运行', 'Not running') : L('未登录', 'Signed out'),
                 s.models ? ` · ${L(`${s.models} 个模型`, `${s.models} models`)}` : '',
@@ -556,6 +582,90 @@ window.__ModuleLoader__.load({
       upstream: () => L('上游或网络问题', 'upstream or network'),
       other: () => L('其他原因', 'other causes'),
     }
+    /** 组合切换：几个模型按顺序排好，在 dsh 里就是一个模型；一个不行自动换下一个 */
+    function CombosCard() {
+      const [data, setData] = useState(null)
+      const [editing, setEditing] = useState(null)
+      const [err, setErr] = useState('')
+      const load = useCallback(() => api('GET', '/combos').then((d) => { setData(d); setErr('') }, (e) => setErr(e.message)), [])
+      useEffect(() => { void load() }, [load])
+      if (!data) return err ? h('div', { style: S.section }, h('div', { style: { ...S.h } }, L('组合切换', 'Combos')), h('div', { style: { fontSize: 12, color: C.err } }, err)) : null
+      const byId = new Map(data.models.map((m) => [m.id, m]))
+      const pretty = (id) => { const m = byId.get(id); return m ? `${m.groupLabel} · ${m.name.split(' · ')[0]}` : id }
+      const remove = async (c) => {
+        if (!window.confirm(L(`删除组合「${c.name}」？（它会从 dsh 里消失）`, `Delete combo "${c.name}"? (it disappears from dsh)`))) return
+        try { await api('DELETE', `/combos/${c.id}`); await load() } catch (e) { setErr(e.message) }
+      }
+      const canBuild = data.models.length >= 2
+      return h('div', { style: S.section },
+        h('div', { style: S.line },
+          h('div', { style: { ...S.h, ...S.grow, margin: 0 } }, L('组合切换', 'Combos')),
+          canBuild ? h('button', { type: 'button', style: S.btn, onClick: () => setEditing('new') }, L('新建组合', 'New combo')) : null),
+        h('p', { style: S.note }, L('把几个模型按顺序排好，它在 dsh 里就是一个模型（「组合切换」分组）：先用第一个，限流、额度用完或出错就自动换下一个；已经开始回答后不再换。其他软件用模型名 combo/<id>。', 'Put a few models in order and it becomes one model in dsh (the "Combos" group): the first one is used, and on a rate limit, used-up quota or error the next one takes over; once an answer has started it stays put. Other tools use the model name combo/<id>.')),
+        err ? h('div', { style: { fontSize: 12, color: C.err, margin: '0 0 8px' } }, err) : null,
+        data.combos.length
+          ? h('div', { style: S.card }, data.combos.map((c, i) => h('div', { key: c.id, style: i ? S.row : S.rowFirst },
+              h('div', { style: S.line },
+                h('div', { style: S.grow },
+                  h('span', { style: S.label }, c.name),
+                  h('span', { style: { ...S.meta, ...S.mono, marginLeft: 8 } }, `combo/${c.id}`)),
+                h(CopyButton, { get: `combo/${c.id}`, label: L('复制模型名', 'Copy name') }),
+                h('button', { type: 'button', style: S.btn, onClick: () => setEditing(c) }, L('编辑', 'Edit')),
+                h('button', { type: 'button', style: S.btn, onClick: () => void remove(c) }, L('删除', 'Delete'))),
+              h('div', { style: { ...S.meta, marginTop: 4, lineHeight: 1.7 } }, c.models.map((m, j) => h('span', { key: m },
+                j ? ' → ' : '',
+                h('span', { title: byId.has(m) ? m : L(`${m}：现在用不了（来源关了或没登录），会被跳过`, `${m}: not available now (source off or signed out); it is skipped`), style: byId.has(m) ? undefined : { color: C.err, textDecoration: 'line-through' } }, pretty(m))))))))
+          : h('div', { style: S.meta }, canBuild ? L('还没有组合。例如「主力」：Codex → Kimi → WorkBuddy，订阅额度用完自动换到免费的。', 'No combos yet. For example "Main": Codex → Kimi → WorkBuddy, moving to a free source when the subscription quota runs out.') : L('至少接入两个模型后才能建组合。', 'Connect at least two models to build a combo.')),
+        editing ? h(ComboDialog, { combo: editing === 'new' ? null : editing, models: data.models, onClose: (saved) => { setEditing(null); if (saved) void load() } }) : null)
+    }
+
+    function ComboDialog({ combo, models, onClose }) {
+      const [name, setName] = useState(combo ? combo.name : '')
+      const [list, setList] = useState(combo ? combo.models : [])
+      const [busy, setBusy] = useState(false)
+      const [msg, setMsg] = useState('')
+      const byId = new Map(models.map((m) => [m.id, m]))
+      const groups = []
+      for (const m of models) {
+        let g = groups.find((x) => x.label === m.groupLabel)
+        if (!g) groups.push((g = { label: m.groupLabel, models: [] }))
+        g.models.push(m)
+      }
+      const MAX = 8
+      const move = (i, d) => { const n = [...list]; const [x] = n.splice(i, 1); n.splice(i + d, 0, x); setList(n) }
+      const save = async () => {
+        setBusy(true)
+        setMsg('')
+        try {
+          if (combo) await api('PUT', `/combos/${combo.id}`, { name: name.trim(), models: list })
+          else await api('POST', '/combos', { name: name.trim(), models: list })
+          onClose(true)
+        } catch (e) {
+          setMsg(e.message)
+          setBusy(false)
+        }
+      }
+      return h(Modal, { title: combo ? L('编辑组合', 'Edit combo') : L('新建组合', 'New combo'), onClose: () => onClose(false) },
+        h('div', { style: { ...S.line, marginBottom: 10 } },
+          h('input', { style: { ...S.input, ...S.grow }, placeholder: L('名字，如：主力', 'Name, e.g. Main'), maxLength: 30, value: name, onChange: (e) => setName(e.target.value), 'aria-label': L('组合名字', 'Combo name') })),
+        h('div', { style: { ...S.meta, marginBottom: 6 } }, L(`按尝试顺序排（第一个最先用），2–${MAX} 个：`, `In the order to try (the first goes first), 2–${MAX} models:`)),
+        list.length ? h('div', { style: { ...S.card, marginBottom: 10 } }, list.map((id, i) => h('div', { key: id, style: { ...(i ? S.row : S.rowFirst), padding: '6px 10px' } },
+          h('div', { style: S.line },
+            h('span', { style: { ...S.meta, width: 18 } }, `${i + 1}.`),
+            h('span', { style: { ...S.grow, fontSize: 13 } }, byId.has(id) ? `${byId.get(id).groupLabel} · ${byId.get(id).name}` : id),
+            h('button', { type: 'button', style: S.btn, disabled: i === 0, onClick: () => move(i, -1), 'aria-label': L('上移', 'Move up') }, '↑'),
+            h('button', { type: 'button', style: S.btn, disabled: i === list.length - 1, onClick: () => move(i, 1), 'aria-label': L('下移', 'Move down') }, '↓'),
+            h('button', { type: 'button', style: S.btn, onClick: () => setList(list.filter((x) => x !== id)), 'aria-label': L('移除', 'Remove') }, '✕'))))) : null,
+        list.length < MAX ? h('div', { style: { ...S.line, marginBottom: 12 } },
+          h('select', { style: { ...S.input, ...S.grow }, value: '', 'aria-label': L('加一个模型', 'Add a model'), onChange: (e) => { const v = e.target.value; if (v && !list.includes(v)) setList([...list, v]) } },
+            h('option', { value: '' }, L('加一个模型…', 'Add a model…')),
+            groups.map((g) => h('optgroup', { key: g.label, label: g.label }, g.models.filter((m) => !list.includes(m.id)).map((m) => h('option', { key: m.id, value: m.id }, m.name)))))) : null,
+        h('div', { style: S.line },
+          msg ? h('span', { style: { ...S.grow, fontSize: 12, color: C.err } }, msg) : h('span', { style: S.grow }),
+          h('button', { type: 'button', style: S.btn, onClick: () => onClose(false) }, L('取消', 'Cancel')),
+          h('button', { type: 'button', style: S.btnPrimary, disabled: busy || !name.trim() || list.length < 2, onClick: () => void save() }, busy ? L('保存中…', 'Saving…') : L('保存', 'Save'))))
+    }
+
     function FailuresCard({ failures }) {
       const [open, setOpen] = useState(false)
       const [ack, setAck] = useState(readAck)
@@ -883,7 +993,7 @@ window.__ModuleLoader__.load({
       }
       return h(Modal, { title: L('添加 Qoder 签到', 'Add Qoder check-in'), onClose },
         h('p', { style: S.note },
-          L('登录 Qoder 后，在「账号 → 集成」里创建一个个人访问令牌（Personal Access Token，以 pt- 开头，只在创建时显示一次），粘贴到这里。只用来每天领签到积分，保存在本机。', 'Sign in to Qoder and create a Personal Access Token under Account → Integrations (it starts with pt- and is shown only once), then paste it here. It is only used to claim the daily credits, and stays on this machine.'),
+          L('登录 Qoder 网站，在「设置 → API 令牌」（有的版本叫「账号 → 集成」）里点「创建令牌」，复制生成的个人访问令牌（以 pt- 开头，只显示一次），粘贴到这里。只用来每天领签到积分，保存在本机。', 'Sign in on the Qoder website, open Settings → API Tokens (Account → Integrations in some versions), click Create token, then paste the personal access token here (it starts with pt- and is shown only once). It is only used to claim the daily credits, and stays on this machine.'),
           h('a', { href: region === 'cn' ? 'https://qoder.com.cn/account/integrations' : 'https://qoder.com/account/integrations', target: '_blank', rel: 'noopener noreferrer', style: { color: C.accent, marginLeft: 6 } }, region === 'cn' ? L('去 Qoder 国内版创建 ↗', 'Create on Qoder China ↗') : L('去 Qoder 国际版创建 ↗', 'Create on Qoder ↗'))),
         h('div', { style: { ...S.line, marginBottom: 8 } },
           ['cn', 'intl'].map((r) => h('label', { key: r, style: { ...S.meta, display: 'flex', alignItems: 'center', gap: 4, cursor: 'pointer' } },
@@ -1060,6 +1170,7 @@ window.__ModuleLoader__.load({
         err ? h('div', { style: { fontSize: 12, color: C.err, marginBottom: 12 } }, err) : null,
         h(EndpointCard, { endpoints: data.endpoints }),
         h(SourcesCard, { sources: data.sources, reload: () => load(false), onLogin: (s, session) => setLogin({ source: s, session }), onKey: (s) => setKeyDialog(s || true) }),
+        h(CombosCard, null),
         h(KeysCard, { keys: data.keys, reload: () => load(false) }),
         h(ModelsCard, { stats: data.stats }),
         h(FailuresCard, { failures: data.failures }),

package/plugin/index.js

@@ -66,6 +66,10 @@ const ALLOWED = [
   ['POST', /^\/checkin(\/auto|\/qoder)?$/],
   ['DELETE', /^\/checkin\/qoder$/],
   ['POST', /^\/models\/test$/],
+  ['GET', /^\/combos$/],
+  ['POST', /^\/combos$/],
+  ['PUT', /^\/combos\/[a-z0-9-]{1,40}$/],
+  ['DELETE', /^\/combos\/[a-z0-9-]{1,40}$/],
   ['POST', /^\/self\/(update|uninstall)$/],
   ['GET', /^\/sources\/[a-z-]{2,20}\/models$/],
   ['POST', /^\/sources\/[a-z-]{2,20}\/models$/],