dsh-model 0.21.3 → 0.21.5

package/README.en.md

@@ -2,7 +2,9 @@
 
 # dsh-model
 
-**Many model sources behind one OpenAI-compatible endpoint — for dsh and every other tool you use.**
+**One address for all your models: subscriptions, free tiers and local models, with daily check-in credits claimed for you.**
+
+One OpenAI-compatible endpoint, one key, dozens of models. dsh, Cline, Continue, Cherry Studio, scripts: anything that speaks the OpenAI API just works.
 
 <p>
   <a href="LICENSE"><img src="https://img.shields.io/github/license/AIcivilization/dsh-model" alt="MIT license"></a>
@@ -17,18 +19,22 @@ English · [中文](README.md)
 
 </div>
 
-## What it is
+## Why
 
-You may have several model sources at once: free WorkBuddy credits, an OpenCode Zen key, paid Codex or Kimi subscriptions. Each has its own API and sign-in, and every tool needs its own setup.
+You may have several at once: Codex from ChatGPT Plus, a Kimi coding plan, free WorkBuddy credits, free Gemini and Groq keys, and Ollama on your machine. Each has its own API and sign-in, every tool needs its own setup, and when a quota runs out you switch by hand.
 
 dsh-model turns them into **one address and one kind of key**:
 
-- **In dsh**: the models show up in dsh's model list automatically, grouped by source. Nothing to configure.
-- **Everywhere else**: any editor or script that speaks the OpenAI API uses the same address and key to reach every model.
-- **Low maintenance**: one command to install; a key is always required; uninstall restores dsh's config exactly.
-- **On a server**: runs next to [dsh-vps](https://github.com/AIcivilization/dsh-vps) on the same VPS and opens a public address on dsh's own domain, so your laptop and phone can use it too.
+- 🔌 **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.
+- 🔒 **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.
 
-> A personal tool: one person, one account per provider, not a public service.
+No dsh? It still works: the command line manages everything; dsh just adds a management page.
 
 ## Quick start
 
@@ -54,6 +60,7 @@ On a dsh-vps server, use `sudo dsh-model setup`. On Windows, run it in a normal
 | **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 |
 | **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 |
 | **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) |
 | **API keys** | OpenAI-style, one per device. Requests, success rate, latency and speed over 24 hours; copy, rotate, revoke |
 | **Model stats** | Success rate, latency and speed per model |
@@ -98,6 +105,7 @@ dsh-model only connects; it provides no quota of its own.
 | `sources` | Sources: switch, cost, sign-in state, usage |
 | `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) |
 | `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 |
@@ -127,6 +135,7 @@ See the [design doc](docs/DESIGN.md) (Chinese).
 
 ## Notes
 
+- Meant for personal use: one account of your own per provider; do not use it to serve others.
 - Using subscription and WorkBuddy credentials outside the official clients may break the providers' terms and put the account at risk. Decide for yourself.
 - Windows 10 / 11 (x64, ARM64), macOS and Linux, Node ≥ 20.
 - Windows: the background services start at sign-in with no window. If an antivirus blocks them (the program is gone or will not start), trust `%USERPROFILE%\.dsh-model` and run `dsh-model repair`.

package/README.md

@@ -2,7 +2,9 @@
 
 # dsh-model
 
-**把多家模型汇成一个 OpenAI 兼容地址，dsh 和你的其他软件都能直接用。**
+**一个地址，用上你所有的模型：订阅、免费额度、本机模型，签到积分自动领。**
+
+一个 OpenAI 兼容地址，一把 key，几十个模型。dsh、Cline、Continue、Cherry Studio、脚本……凡是支持 OpenAI 接口的软件都能直接用。
 
 <p>
   <a href="LICENSE"><img src="https://img.shields.io/github/license/AIcivilization/dsh-model" alt="MIT license"></a>
@@ -17,18 +19,22 @@
 
 </div>
 
-## 它是什么
+## 为什么用它
 
-你可能同时有好几个模型来源：WorkBuddy 的免费积分、OpenCode Zen 的 key，还有已经付费的 Codex、Kimi 订阅。它们的接口和登录方式各不相同，每个软件都要分别配置。
+你手上可能有好几样：ChatGPT Plus 带的 Codex、Kimi 的编程套餐、WorkBuddy 的免费积分、Gemini 和 Groq 的免费 key，还有本机的 Ollama。每家接口和登录方式都不一样，每个软件都得分别配置，额度用完了还要手动换。
 
 dsh-model 把它们合成**一个地址、一种 key**：
 
-- **dsh 里**：装好后自动出现在 dsh 的模型列表里，按来源分组，不用手动配置。
-- **其他软件**：编辑器、脚本，凡是支持 OpenAI 接口的，填上同一个地址和 key 就能用全部模型。
-- **省心**：一条命令装好；始终要求 key，不会出现谁都能用的情况；卸载时把 dsh 的配置原样还原。
-- **服务器上**：可以和 [dsh-vps](https://github.com/AIcivilization/dsh-vps) 装在同一台 VPS 上，自动用 dsh 的域名开一个对外地址，你的电脑、手机都能访问。
+- 🔌 **一处接入，处处可用**：dsh 里自动出现全部模型，按来源分组；其他软件填上同一个地址和 key 就行。
+- 🆓 **把免费的用足**：WorkBuddy 积分、Gemini / Groq / OpenRouter 免费 key、本机模型都能接；每个来源标出「免费 / 免费·额度少 / 需付费」。
+- 📅 **每日签到，自动领积分**：WorkBuddy 国内版、Qoder、Trae 每天自动签到，不用记。
+- 🔁 **不怕限流**：同一个模型在几个来源都有时自动切换，一个限流就换另一个。
+- 📊 **心里有数**：套餐用量、剩余积分、每个模型的成功率和速度、最近失败的原因和建议；额度快用完时提醒。
+- 🔒 **默认安全**：始终要求 key，每台设备一把，可随时吊销；登录全在本机完成，不经过第三方。
+- 🖥️ **电脑和服务器都行**：Windows、macOS、Linux；装在 VPS 上（配合 [dsh-vps](https://github.com/AIcivilization/dsh-vps)）自动开一个 https 地址，电脑、手机随处用。
+- 🧹 **装得上，卸得净**：一条命令安装；卸载时把 dsh 的配置逐字节还原。
 
-> 个人自用工具：一个人、每家一个账号，不对外提供服务。
+没有 dsh 也能用：命令行就能管理全部功能，dsh 里多一个图形管理页而已。
 
 ## 快速开始
 
@@ -54,6 +60,7 @@ dsh-model setup
 | **来源** | 每家一个开关：打开就接入（没登录会弹出登录框），关闭只停用、保留登录。每行标出「免费 / 免费·额度少 / 需付费」，下面显示套餐用量或剩余积分 |
 | **选模型** | 每个来源选哪些模型显示在 dsh 里，默认每家推荐 5 个，其余的经统一地址照样可用；每个模型旁边有「测一下」 |
 | **自动切换** | 同一个模型在几个来源都有时，dsh 里多一组「自动切换（多来源）」，一个来源限流或出错就自动换另一个 |
+| **每日签到** | WorkBuddy 国内版、Qoder、Trae 每天自动签到（也可一键签到），卡片显示今天领了多少 |
 | **最近失败** | 最近 24 小时失败的请求：哪个模型、为什么、该怎么办（不记录对话内容） |
 | **API key** | OpenAI 格式，每台设备一把。显示 24 小时内的请求数、成功率、延迟和速度，可复制、轮换、吊销 |
 | **模型统计** | 按模型显示成功率、延迟和速度 |
@@ -98,6 +105,7 @@ dsh-model 只负责转接，不提供额度。
 | `sources` | 来源列表：开关、费用、登录状态、用量 |
 | `source enable\|disable\|logout <来源>` | 打开（需要时登录）/ 关闭 / 退出登录 |
 | `key list\|add\|revoke\|rotate <名称>` | 访问 key，每台设备一把 |
+| `checkin` | 现在签到一次（WorkBuddy 国内版、Qoder、Trae；默认每天自动签） |
 | `failures` | 最近 24 小时失败的请求和建议 |
 | `stats` | 按 key、来源、模型的成功率、延迟和速度 |
 | `status` / `doctor [--e2e]` | 总览 / 逐项自检 |
@@ -127,6 +135,7 @@ dsh · 编辑器 · 脚本 ──Bearer key──▶ 引擎 127.0.0.1:8317/v1（
 
 ## 注意
 
+- 适合个人使用：每家用自己的一个账号，不要拿来对外提供服务。
 - 订阅和 WorkBuddy 的凭据在官方客户端之外使用，可能不符合服务商的条款，账号有风险，请自行判断。
 - 支持 Windows 10 / 11（x64、ARM64）、macOS、Linux，需要 Node ≥ 20。
 - Windows：后台服务登录后自动运行、不弹窗口。如果被杀毒软件拦下（程序不见了或启动不了），把 `%USERPROFILE%\.dsh-model` 加入信任，再执行 `dsh-model repair`。

package/dist/cli.js

@@ -69,7 +69,7 @@ function help() {
   login <来源> / logout <来源>          同 source enable / source logout
   stats                                按 key / 来源 / 模型的成功率、延迟、速度
   failures                             最近 24 小时失败的请求，以及该怎么办
-  checkin                              现在签到一次（WorkBuddy 国内版、Qoder；默认每天自动签）
+  checkin                              现在签到一次（WorkBuddy 国内版、Qoder、Trae；默认每天自动签）
   status                               一屏总览
   doctor [--e2e] [--all] [--model M]   逐项自检；--e2e 实测流式与工具调用
   connect-dsh [--dry-run] [--force]    写入 / 刷新 dsh 配置
@@ -102,7 +102,7 @@ Usage: dsh-model <command> [options]
   login <source> / logout <source>     Same as source enable / source logout
   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; automatic daily by default)
+  checkin                              Check in now (WorkBuddy China, Qoder, Trae; automatic daily by default)
   status                               Overview
   doctor [--e2e] [--all] [--model M]   Health checks; --e2e tests streaming and tool calls
   connect-dsh [--dry-run] [--force]    Write / refresh dsh config

package/dist/commands/key.js

@@ -2,8 +2,8 @@
 import { requireRootInVps } from '../context.js';
 import { DshModelError } from '../errors.js';
 import { L } from '../i18n.js';
-import { DSH_KEY_NAME, addKey, revokeKey, rotateKey, saveKeys } from '../keys.js';
-import { applyEngineConfig, dshKey, loadAll, syncModels } from '../ops.js';
+import { DSH_KEY_NAME, addKey, findActive, revokeKey, rotateKey, saveKeys } from '../keys.js';
+import { applyKeyChange, dshKey, loadAll, syncModels } from '../ops.js';
 import { withLock } from '../state.js';
 import { baseUrl } from '../engine/client.js';
 import { bold, info, isJsonMode, ok, printJson, table, warn } from '../util/output.js';
@@ -20,7 +20,7 @@ export async function key(ctx, sub, name) {
         if (sub === 'add') {
             const entry = addKey(all.keys, name);
             await saveKeys(ctx, all.keys);
-            await applyEngineConfig(ctx, all);
+            await applyKeyChange(ctx, all, { accepts: entry.key });
             if (isJsonMode())
                 printJson({ ok: true, name, key: entry.key, baseURL: `${baseUrl(all.config.port)}/v1` });
             ok(L(`已新增 key：${name}（只显示这一次，请妥善保存）`, `Key added: ${name} (shown only once; keep it safe)`));
@@ -32,19 +32,19 @@ export async function key(ctx, sub, name) {
             if (name === DSH_KEY_NAME) {
                 throw new DshModelError('cannot_revoke_dsh', L('dsh 用的 key 不能吊销，只能轮换', 'The dsh key cannot be revoked, only rotated'), L('dsh-model key rotate dsh', 'dsh-model key rotate dsh'));
             }
+            const old = findActive(all.keys, name)?.key;
             revokeKey(all.keys, name);
             await saveKeys(ctx, all.keys);
-            await applyEngineConfig(ctx, all);
+            await applyKeyChange(ctx, all, { rejects: old });
             ok(L(`已吊销 key：${name}`, `Key revoked: ${name}`));
             return 0;
         }
         if (sub === 'rotate') {
             const entry = rotateKey(all.keys, name);
             await saveKeys(ctx, all.keys);
-            await applyEngineConfig(ctx, all);
+            // 等新 key 在引擎里生效后再改 dsh
+            await applyKeyChange(ctx, all, { accepts: entry.key });
             if (name === DSH_KEY_NAME) {
-                // 引擎热重载约 1s：等新 key 生效后再改 dsh
-                await new Promise((r) => setTimeout(r, 1500));
                 await syncModels(ctx, all, { quiet: true });
                 ok(L('已轮换 dsh 用的 key，并同步到 dsh', 'Rotated the dsh key and updated dsh'));
             }

package/dist/daemon/core.js

@@ -31,8 +31,8 @@ import { DshModelError, isDshModelError } from '../errors.js';
 import { L } from '../i18n.js';
 import { refreshOpencodeModels, removeOpencodeKey, saveOpencodeKey, validateKeyShape, verifyOpencodeKey } from '../integrations/opencode.js';
 import { riskNotice as workbuddyRiskNotice } from '../integrations/workbuddy.js';
-import { DSH_KEY_NAME, addKey, loadKeys, revokeKey, rotateKey, saveKeys } from '../keys.js';
-import { applyEngineConfig, dshCandidates, dshKey, loadAll, saveAll, syncAll } from '../ops.js';
+import { DSH_KEY_NAME, addKey, findActive, loadKeys, revokeKey, rotateKey, saveKeys } from '../keys.js';
+import { applyKeyChange, dshCandidates, dshKey, loadAll, saveAll, syncAll } from '../ops.js';
 import { defaultPick, pickedFor } from '../dsh/pick.js';
 import { loadSecrets, saveSecrets } from '../secrets.js';
 import { SOURCES, credsFor, findSource, paymentRequired } from '../sources.js';
@@ -929,7 +929,7 @@ export class Daemon {
             const all = await loadAll(this.ctx);
             const entry = addKey(all.keys, name);
             await saveKeys(this.ctx, all.keys);
-            await applyEngineConfig(this.ctx, all);
+            await applyKeyChange(this.ctx, all, { accepts: entry.key });
             await this.reloadKeyNames();
             return { name: entry.name, key: entry.key };
         });
@@ -939,9 +939,10 @@ export class Daemon {
             throw new DshModelError('cannot_revoke_dsh', L('dsh 用的 key 不能吊销，只能轮换', 'The dsh key cannot be revoked, only rotated'));
         await withLock(this.ctx, async () => {
             const all = await loadAll(this.ctx);
+            const old = findActive(all.keys, name)?.key;
             revokeKey(all.keys, name);
             await saveKeys(this.ctx, all.keys);
-            await applyEngineConfig(this.ctx, all);
+            await applyKeyChange(this.ctx, all, { rejects: old });
         });
         await this.reloadKeyNames();
     }
@@ -950,7 +951,7 @@ export class Daemon {
             const all = await loadAll(this.ctx);
             const e = rotateKey(all.keys, name);
             await saveKeys(this.ctx, all.keys);
-            await applyEngineConfig(this.ctx, all);
+            await applyKeyChange(this.ctx, all, { accepts: e.key });
             return e;
         });
         await this.reloadKeyNames();

package/dist/ops.js

@@ -12,6 +12,7 @@ import { DSH_KEY_NAME, findActive, loadKeys } from './keys.js';
 import { serviceFor } from './service/index.js';
 import { loadConfig, loadState, saveConfig, saveState } from './state.js';
 import { ok, skip, warn } from './util/output.js';
+import { readText, writeInPlace } from './util/fs.js';
 export async function loadAll(ctx) {
     const [config, state, keys] = await Promise.all([loadConfig(ctx), loadState(ctx), loadKeys(ctx)]);
     return { config, state, keys };
@@ -34,6 +35,37 @@ export function dshKey(keys) {
 export async function applyEngineConfig(ctx, all) {
     return writeEngineConfig(ctx, all.config, all.keys);
 }
+/**
+ * 改 key 后确认引擎真的换上了：热重载偶尔会漏掉一次变化（CI 上 macOS、Windows 都见过等 15 秒仍没生效）。
+ * 没生效就原样再写一次配置文件，还不行就重启引擎。引擎没在运行时只写文件。
+ */
+export async function applyKeyChange(ctx, all, probe) {
+    await writeEngineConfig(ctx, all.config, all.keys);
+    const port = all.config.port;
+    if (!(await waitHealthy(port, 1000)))
+        return;
+    const works = (key) => listModels(port, key).then(() => true, () => false);
+    const effective = async () => (!probe.accepts || (await works(probe.accepts))) && (!probe.rejects || !(await works(probe.rejects)));
+    const wait = async (ms) => {
+        const deadline = Date.now() + ms;
+        while (Date.now() < deadline) {
+            if (await effective())
+                return true;
+            await new Promise((r) => setTimeout(r, 250));
+        }
+        return effective();
+    };
+    if (await wait(5000))
+        return;
+    const text = await readText(ctx.paths.engineYaml);
+    if (text !== null)
+        await writeInPlace(ctx.paths.engineYaml, text, { owner: ctx.owner });
+    if (await wait(5000))
+        return;
+    if ((await restartEngineBestEffort(ctx, all)) && (await wait(5000)))
+        return;
+    warn(L('引擎还没换上这次的 key 改动；稍后执行 dsh-model repair', 'The engine has not picked up this key change yet; run dsh-model repair later'));
+}
 /**
  * 兜底重启：热重载没生效时用。vps 模式下 bridge 以 dsh 用户运行，没有权限重启系统服务——
  * 这时只记警告不失败（实测：bridge 写完配置后 systemctl restart 被拒）。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-model",
-  "version": "0.21.3",
-  "description": "Many model sources behind one authenticated OpenAI-compatible endpoint for DeepSeek Harness (dsh) and your tools: WorkBuddy, OpenCode Zen and your CLI subscriptions (Codex, Kimi…), with a management page inside dsh. 多家模型汇成一个 OpenAI 兼容地址，dsh 和其他软件都能直接用。",
+  "version": "0.21.5",
+  "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",
     "dsh-plugins",
@@ -21,7 +21,20 @@
     "opencode",
     "cliproxyapi",
     "self-hosted",
-    "llm-tools"
+    "llm-tools",
+    "ai-gateway",
+    "llm-router",
+    "openai-proxy",
+    "free-llm",
+    "gemini",
+    "groq",
+    "openrouter",
+    "ollama",
+    "lm-studio",
+    "qoder",
+    "trae",
+    "daily-checkin",
+    "failover"
   ],
   "license": "MIT",
   "type": "module",