dsh-model 0.22.3 → 0.23.0

package/README.en.md

@@ -48,7 +48,7 @@ On a dsh-vps server, use `sudo dsh-model setup`. On Windows, run it in a normal
 `setup` is safe to re-run. It:
 
 1. downloads and verifies the engine and runs it on `127.0.0.1:8317/v1`, with key auth enforced;
-2. connects WorkBuddy (dsh-model's own bridge). Setup asks for no keys: turn on OpenCode Zen and other key-based sources from the management page when you need them;
+2. starts dsh-model's daemon (the management page, check-in and sign-ins run on it). Setup asks for no keys: for a free source we suggest **SiliconFlow** (reachable from China) or **Gemini** (if you can reach Google), added from the management page. WorkBuddy is used for check-in only; its models are not connected to dsh by default;
 3. installs the management page into dsh and syncs the models into dsh;
 4. on a VPS, also opens a public address `https://<dsh's domain>:9443/v1` (or `<IP>.sslip.io` when there is no domain).
 

package/README.md

@@ -48,7 +48,7 @@ dsh-model setup
 `setup` 可以重复执行，它会依次：
 
 1. 下载并校验引擎，在本机 `127.0.0.1:8317/v1` 上运行，强制 key 鉴权；
-2. 接入 WorkBuddy（dsh-model 自己的 bridge）。安装时不问任何 key，OpenCode Zen 等要 key 的来源，需要时在管理页里打开；
+2. 启动 dsh-model 的守护进程（管理页、签到、登录都靠它）。安装时不问任何 key：免费来源推荐**硅基流动**（国内直连）或 **Gemini**（能上外网），装好后在管理页里填 key。WorkBuddy 只用来签到，模型默认不接进 dsh；
 3. 把管理页装进 dsh，把模型同步进 dsh；
 4. 在 VPS 上，额外开通对外地址 `https://<dsh 的域名>:9443/v1`（没有域名时用 `<IP>.sslip.io`）。
 

package/dist/daemon/core.js

@@ -30,7 +30,7 @@ import { Mgmt } from '../engine/mgmt.js';
 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 { blockedNotice as workbuddyBlockedNotice, riskNotice as workbuddyRiskNotice } from '../integrations/workbuddy.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';
@@ -301,6 +301,9 @@ export class Daemon {
                 return { enabled: false, riskNotice: upstreamRiskNotice(getUpstream(def.id)) };
             return { enabled: false, login: await this.startLogin(def) };
         }
+        // WorkBuddy 会拦 dsh 的对话：从关着打开时先提醒一次
+        if (def.kind === 'workbuddy' && !state.enabled && !opts.acceptRisk)
+            return { enabled: false, riskNotice: workbuddyBlockedNotice() };
         if (def.kind === 'engine') {
             const m = await this.mgmt();
             for (const c of credsFor(await m.credentials(), def))

package/dist/integrations/workbuddy.js

@@ -37,7 +37,31 @@ async function waitCatalogs(ctx, since, expected, timeoutMs = 45_000) {
     return cats;
 }
 /** 检测 App → 首次打印说明 → bridge 配置与服务 → 等目录。返回目录（调用方随后 syncAll） */
+export const WORKBUDDY_SOURCES = ['workbuddy', 'workbuddy-ai'];
+/** WorkBuddy 会拦 dsh 发出的对话时的提醒（新装默认关、从页面打开前都显示） */
+export function blockedNotice() {
+    return L('WorkBuddy 现在会认出 dsh 发出的对话并拦下（「请求被拦截」），在 dsh 里基本用不了；「测一下」能通也不代表能用。dsh-model 不会去绕开这个限制，继续调用有封号风险。签到不受影响。仍要把它的模型接进 dsh 吗？', 'WorkBuddy now recognises conversations sent by dsh and blocks them ("请求被拦截"), so it barely works in dsh; a passing Test does not mean it works. dsh-model will not try to get around this, and continuing risks the account. Check-in is not affected. Connect its models to dsh anyway?');
+}
+/**
+ * 只签到（设计 §14.18）：第一次装时把 WorkBuddy 的模型关掉，签到照常（签到不看来源开关）。
+ * 以前装过的（已有 riskNoticeAt）保持原样；只做一次，之后用户自己打开的不改回去。
+ */
+export function applyWorkbuddyDefault(all) {
+    if (all.config.workbuddyDefault)
+        return;
+    if (all.config.bridge?.riskNoticeAt) {
+        all.config.workbuddyDefault = 'kept';
+        return;
+    }
+    const off = new Set(all.config.disabledSources ?? []);
+    for (const id of WORKBUDDY_SOURCES)
+        off.add(id);
+    all.config.disabledSources = [...off];
+    all.config.workbuddyDefault = 'checkin-only';
+    info(L('WorkBuddy 只用来签到：它现在会拦 dsh 的对话，所以模型默认不接进 dsh（要用可在「来源」里打开）', 'WorkBuddy is used for check-in only: it now blocks conversations from dsh, so its models are not connected by default (turn it on under Sources if you want)'));
+}
 export async function enableWorkbuddy(ctx, all) {
+    applyWorkbuddyDefault(all);
     const variants = await availableVariants(ctx.paths.home);
     if (!variants.length) {
         skip(ctx.platform === 'darwin'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model",
-  "version": "0.22.3",
+  "version": "0.23.0",
   "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

@@ -1089,9 +1089,15 @@ window.__ModuleLoader__.load({
     /** 刚装好、接入的来源少于两个时显示：先接一个免费来源 → 模型已经挑好 → 去 dsh 里用 */
     function Guide({ sources, onConnect }) {
       const [done, setDone] = useState(readGuideDone)
-      const connected = sources.filter((s) => s.loggedIn && s.enabled)
-      if (done || connected.length >= 2) return null
-      const free = sources.filter((s) => !s.risky && !(s.loggedIn && s.enabled) && s.pricing && s.pricing.tier !== 'paid')
+      // WorkBuddy 只签到（它拦 dsh 的对话），不算"已接入"
+      const connected = sources.filter((s) => s.loggedIn && s.enabled && s.kind !== 'workbuddy')
+      if (done || connected.length >= 1) return null
+      // 只推两家：国内直连的硅基流动、能上外网的 Gemini
+      const PICKS = [
+        { id: 'siliconflow', why: () => L('国内直连，不用代理；实名认证后部分模型免费', 'Reachable from China without a proxy; some models are free after identity verification') },
+        { id: 'gemini', why: () => L('能上外网就选它：免费模型里质量最好，每天有次数上限', 'If you can reach Google: the best free models, with a daily limit') },
+      ]
+      const picks = PICKS.map((p) => ({ ...p, s: sources.find((s) => s.id === p.id) })).filter((p) => p.s)
       const hide = () => {
         setDone(true)
         try { window.localStorage.setItem(GUIDE_KEY, '1') } catch { /* 无痕模式：只在本次生效 */ }
@@ -1106,9 +1112,11 @@ window.__ModuleLoader__.load({
             h('button', { type: 'button', style: S.btn, onClick: hide }, L('我知道了，不再显示', 'Got it, hide this'))),
           step(1, L('接入一个免费来源', 'Connect a free source'),
             h('div', null,
-              h('div', { style: S.meta }, L('先接一个就能用。标「免费·额度少」的要先去对方网站拿一把免费 key。', 'One is enough to start. "Free · limited" ones need a free key from their website first.')),
-              h('div', { style: { display: 'flex', flexWrap: 'wrap', gap: 6, marginTop: 6 } },
-                free.slice(0, 8).map((s) => h('button', { key: s.id, type: 'button', style: S.btn, onClick: () => onConnect(s) }, `${s.label}${s.pricing.tier === 'free' ? L(' · 免费', ' · free') : ''}`))))),
+              h('div', { style: S.meta }, L('接一个就能用：去对方网站领一把免费 key，点下面的按钮粘贴进来。', 'One is enough: get a free key from their website, then click below and paste it.')),
+              picks.map((p) => h('div', { key: p.id, style: { ...S.line, marginTop: 6, flexWrap: 'wrap' } },
+                h('button', { type: 'button', style: S.btn, onClick: () => onConnect(p.s) }, p.s.label),
+                h('span', { style: { ...S.meta, ...S.grow } }, p.why()),
+                p.s.subscribeUrl ? h('a', { href: p.s.subscribeUrl, target: '_blank', rel: 'noopener noreferrer', style: { color: C.accent, fontSize: 12 } }, L('去领 key ↗', 'Get a key ↗')) : null)))),
           step(2, L('模型已经替你挑好', 'Models are picked for you'),
             h('div', { style: S.meta }, L('每个来源默认挑 5 个放进 dsh（免费的优先）。想换就在下面「来源」里点「选模型」。', 'Each source puts 5 suggested models into dsh (free ones first). Change them with "Models" under Sources below.'))),
           step(3, L('去用', 'Use it'),