dsh-model 0.15.0 → 0.17.0

package/README.en.md

@@ -73,6 +73,7 @@ If a source is signed in but has no usable plan (say, a Kimi account without Kim
 | Source | Cost | Notes |
 |---|---|---|
 | WorkBuddy / WorkBuddy AI | Free | Credits come with the account |
+| Ollama / LM Studio | Free | Models running on this machine; they appear once installed and started, no sign-in |
 | Codex | Paid | ChatGPT Plus / Pro |
 | Kimi | Paid | Kimi Code plan |
 | Grok | Paid | SuperGrok / X Premium+ |

package/README.md

@@ -73,6 +73,7 @@ dsh-model setup
 | 来源 | 费用 | 说明 |
 |---|---|---|
 | WorkBuddy / WorkBuddy AI | 免费 | 账号自带积分 |
+| Ollama / LM Studio | 免费 | 本机运行的模型。装好并启动后自动出现，不用登录 |
 | Codex | 需付费 | ChatGPT Plus / Pro |
 | Kimi | 需付费 | Kimi Code 套餐 |
 | Grok | 需付费 | SuperGrok / X Premium+ |

package/dist/cli.js

@@ -9,7 +9,7 @@ import { repair, service } from './commands/service.js';
 import { setup } from './commands/setup.js';
 import { doctor, status } from './commands/status.js';
 import { uninstall } from './commands/uninstall.js';
-import { selfUpdate } from './commands/self.js';
+import { adminRun, selfUpdate } from './commands/self.js';
 import { opencode } from './commands/opencode.js';
 import { workbuddy } from './commands/workbuddy.js';
 import { bridge } from './commands/bridge.js';
@@ -190,6 +190,8 @@ export async function main(argv) {
                 return await logs(ctx, o.lines ? Number(o.lines) : undefined, o.bridge ? 'bridge' : 'engine');
             case 'uninstall':
                 return await uninstall(ctx, { yes: o.yes, keepAuth: o['keep-auth'], removePlugin: o['remove-plugin'] });
+            case 'admin-run':
+                return await adminRun(ctx);
             case 'self-update':
             case 'update':
                 return await selfUpdate(ctx, { to: o.to });

package/dist/commands/self.js

@@ -3,7 +3,9 @@
 // 1. 新版本装到原来的位置：npm 全局装的就 npm install -g；从 dsh 管理页一键安装的（程序就在插件目录里）跳过这步；
 // 2. dsh 里的插件换成同一版本（插件页的新代码要重启一次 dsh 才生效）；
 // 3. 用新版本执行一次 repair：重写服务文件、重启引擎与守护进程、同步模型。
-import { realpath } from 'node:fs/promises';
+import { spawn } from 'node:child_process';
+import { closeSync, openSync } from 'node:fs';
+import { chown, realpath } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { requireRootInVps } from '../context.js';
 import { DshModelError, isDshModelError } from '../errors.js';
@@ -15,6 +17,7 @@ import { run, runInherit } from '../util/exec.js';
 import { exists } from '../util/fs.js';
 import { info, next, ok, skip, warn } from '../util/output.js';
 import { PKG_ROOT, pkgVersion } from '../util/pkg.js';
+import { takeAdminRequest } from '../service/admin.js';
 const REGISTRY = 'https://registry.npmjs.org/dsh-model';
 /** a 比 b 新（只比 major.minor.patch） */
 export function isNewer(a, b) {
@@ -114,3 +117,30 @@ export async function selfUpdate(ctx, opts = {}) {
     next(L('重启一次 dsh，管理页的新代码才会生效', 'Restart dsh once so the management page picks up the new code'));
     return 0;
 }
+/** 管理页请求的日志：更新写在 home 里；卸载会删 home，写在它外面 */
+export function selfJobLog(ctx, action) {
+    return action === 'uninstall' ? join(dirname(ctx.paths.home), 'dsh-model-uninstall.log') : join(ctx.paths.home, 'update.log');
+}
+/** 由 dsh-model-admin.service（root）执行：取出管理页的请求单，只做 update / uninstall */
+export async function adminRun(ctx) {
+    if (!ctx.isRoot)
+        throw new DshModelError('needs_root', L('admin-run 只由 dsh-model-admin 服务以 root 执行', 'admin-run is run by the dsh-model-admin service as root'));
+    const req = await takeAdminRequest(ctx);
+    if (!req)
+        return 0;
+    const log = selfJobLog(ctx, req.action);
+    const out = openSync(log, 'w', 0o600);
+    if (ctx.owner)
+        await chown(log, ctx.owner.uid, ctx.owner.gid).catch(() => { });
+    const args = req.action === 'update' ? ['update'] : ['uninstall', '--yes', '--remove-plugin', ...(req.keepAuth ? ['--keep-auth'] : [])];
+    const code = await new Promise((resolve) => {
+        const child = spawn(process.execPath, [join(PKG_ROOT, 'bin', 'dsh-model.js'), ...args, '--lang', req.lang ?? 'zh'], {
+            stdio: ['ignore', out, out],
+            env: { ...process.env, NO_COLOR: '1', NODE_NO_WARNINGS: '1' },
+        });
+        child.on('error', () => resolve(-1));
+        child.on('exit', (c) => resolve(c ?? -1));
+    });
+    closeSync(out);
+    return code;
+}

package/dist/commands/service.js

@@ -1,4 +1,5 @@
 // commands/service.ts — service install|start|stop|restart|status|uninstall，以及 repair
+import { installAdmin } from '../service/admin.js';
 import { requireRootInVps } from '../context.js';
 import { DshModelError } from '../errors.js';
 import { L } from '../i18n.js';
@@ -65,6 +66,8 @@ export async function repair(ctx) {
                 throw new DshModelError('engine_unhealthy', L('引擎没有启动，查看 dsh-model logs', 'Engine did not start; see dsh-model logs'));
             ok(L('服务已重装并重启', 'Service reinstalled and restarted'));
             await ensureDaemon(ctx, all);
+            if (ctx.mode === 'vps')
+                await installAdmin(ctx);
         }
         await syncAll(ctx, all);
         return 0;

package/dist/commands/setup.js

@@ -22,6 +22,7 @@ import { opencodeConfigured } from '../integrations/opencode.js';
 import { ensureDaemon } from '../daemon/service.js';
 import { installDshPlugin } from '../integrations/dshplugin.js';
 import { enableCaddy } from './remote.js';
+import { installAdmin } from '../service/admin.js';
 import { DEFAULT_PUBLIC_PORT, publicHost } from '../remote/public.js';
 export async function setup(ctx, opts) {
     requireRootInVps(ctx);
@@ -91,6 +92,9 @@ export async function setup(ctx, opts) {
             skip(L('已跳过（--skip-dsh-plugin）', 'Skipped (--skip-dsh-plugin)'));
         else
             await step('dsh-plugin', () => installDshPlugin(ctx, all));
+        // vps：让 dsh 管理页能直接点「更新 / 卸载」（root 执行，只认这两件事）
+        if (ctx.mode === 'vps' && !ctx.serviceDisabled)
+            await step('admin', () => installAdmin(ctx));
         // vps：自动在 dsh 的域名上开对外端点（没有域名就用 IP），自己的其他设备直接能用
         if (ctx.mode === 'vps') {
             info('');

package/dist/commands/sources.js

@@ -69,7 +69,7 @@ export async function sources(ctx, opts = {}) {
             s.enabled ? green('●') : dim('○'),
             s.id,
             pricingTag(s),
-            s.loggedIn ? (s.usage?.noAccess ? yellow(L('已登录·无订阅', 'signed in · no plan')) : s.enabled ? green(L('已接入', 'connected')) : yellow(L('已登录·关闭', 'signed in · off'))) : dim(L('未登录', 'signed out')),
+            s.loggedIn ? (s.usage?.noAccess ? yellow(L('已登录·无订阅', 'signed in · no plan')) : s.enabled ? green(L('已接入', 'connected')) : yellow(L('已登录·关闭', 'signed in · off'))) : dim(s.kind === 'local' ? L('未运行', 'not running') : L('未登录', 'signed out')),
             s.account ?? (s.detail ? dim(s.detail.slice(0, 40)) : '-'),
             s.models ? String(s.models) : '-',
         ]),

package/dist/commands/uninstall.js

@@ -14,6 +14,7 @@ import { fail, info, ok, warn } from '../util/output.js';
 import { disable as disableRemote } from './remote.js';
 import { disableWorkbuddy, removeWorkbuddyPlugin } from '../integrations/workbuddy.js';
 import { removeDshPlugin } from '../integrations/dshplugin.js';
+import { removeAdmin } from '../service/admin.js';
 async function confirm(question) {
     if (!process.stdin.isTTY)
         return false;
@@ -73,6 +74,10 @@ export async function uninstall(ctx, opts) {
         ok(L(`dsh 配置已还原（patch：${r.patch}，凭据：${r.cred}）`, `dsh config restored (patch: ${r.patch}, credentials: ${r.cred})`));
     });
     await saveAll(ctx, all).catch(() => { });
+    await step('admin', async () => {
+        if (ctx.mode === 'vps')
+            await removeAdmin();
+    });
     await step('service', async () => {
         if (ctx.serviceDisabled)
             return;

package/dist/daemon/core.js

@@ -7,9 +7,11 @@
 import { spawn } from 'node:child_process';
 import { closeSync, openSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { latestVersion } from '../commands/self.js';
+import { latestVersion, selfJobLog } from '../commands/self.js';
+import { LOCAL_SERVERS, loadLocalCatalog, refreshLocalCatalog } from '../integrations/local.js';
+import { adminInstalled, adminRequestPath } from '../service/admin.js';
+import { atomicWrite } from '../util/fs.js';
 import { lang } from '../i18n.js';
 import { which } from '../util/exec.js';
 import { PKG_ROOT, pkgVersion } from '../util/pkg.js';
@@ -46,6 +48,16 @@ const USAGE_REFRESH_MS = 5 * 60 * 1000;
 /** 查不了用量的来源多久重新实测一次 */
 const PROBE_MS = 6 * 60 * 60 * 1000;
 const log_ = (m) => log(m);
+/** 进程还在不在（signal 0 只做检查） */
+const alive = (pid) => {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
 const log = (m) => console.error(`[${new Date().toISOString()}] ${m}`);
 export class Daemon {
     ctx;
@@ -70,6 +82,8 @@ export class Daemon {
         if (await this.refreshCatalogs())
             void this.resync();
         this.timers.push(setInterval(() => void this.refreshCatalogs().then((c) => (c ? this.resync() : undefined)), CATALOG_REFRESH_MS));
+        // 本机模型服务（Ollama、LM Studio）随时可能启动或退出：两分钟问一次，变了就同步
+        this.timers.push(setInterval(() => void refreshLocalCatalog(this.ctx.paths.home, this.ctx.owner).then((c) => (c ? this.resync() : undefined), () => { }), 2 * 60 * 1000));
         this.timers.push(setInterval(() => void this.pollUsage(), USAGE_POLL_MS));
         this.timers.push(setInterval(() => void this.stats.save().catch(() => { }), STATS_SAVE_MS));
         this.timers.push(setInterval(() => void this.reloadKeyNames(), STATS_SAVE_MS));
@@ -104,7 +118,7 @@ export class Daemon {
         }
     }
     async refreshCatalogs() {
-        let changed = false;
+        let changed = await refreshLocalCatalog(this.ctx.paths.home, this.ctx.owner).catch(() => false);
         for (const rt of this.runtimes) {
             try {
                 if (await refreshCatalog(this.ctx.paths.home, rt, this.ctx.owner))
@@ -140,7 +154,7 @@ export class Daemon {
             const u = this.usageCache.get(s.id);
             // 引擎来源：实测结果出来前不显示用量行；OpenCode 的 key 设置时已实测
             if (USAGE_UNSUPPORTED.has(s.id) && s.loggedIn) {
-                const stub = s.kind === 'engine' ? undefined : { source: s.id, windows: [], fetchedAt: new Date().toISOString(), unsupported: true };
+                const stub = s.kind !== 'opencode' ? undefined : { source: s.id, windows: [], fetchedAt: new Date().toISOString(), unsupported: true };
                 const usage = u ?? stub;
                 return usage ? { ...s, usage } : s;
             }
@@ -162,6 +176,7 @@ export class Daemon {
         }
         const cats = await loadCatalogs(this.ctx.paths.home);
         const secrets = await loadSecrets(this.ctx);
+        const local = await loadLocalCatalog(this.ctx.paths.home);
         // 订阅来源能服务的模型数：管理接口按凭据列模型（只数没停用的）
         const engineModels = new Map();
         try {
@@ -207,6 +222,19 @@ export class Daemon {
                     models: c?.signedIn ? c.models.length : 0,
                 };
             }
+            if (def.kind === 'local') {
+                const st = local[def.id];
+                const srv = LOCAL_SERVERS.find((x) => x.id === def.id);
+                const up = Boolean(st?.reachable);
+                return {
+                    ...base,
+                    loggedIn: up,
+                    enabled: up && (st?.models.length ?? 0) > 0 && !disabled.has(def.id),
+                    ...(up ? { account: srv.base.replace(/\/v1$/, '') } : { detail: L(`没检测到 ${srv.label} 在运行（${srv.base.replace(/\/v1$/, '')}）`, `${srv.label} is not running (${srv.base.replace(/\/v1$/, '')})`) }),
+                    ...(up && !st?.models.length ? { detail: L('在运行，但还没有模型', 'Running, but has no models yet') } : {}),
+                    models: st?.models.length ?? 0,
+                };
+            }
             const has = Boolean(secrets.opencode?.key);
             return { ...base, loggedIn: has, enabled: has && !disabled.has('opencode'), models: has ? modelCount('opencode') : 0 };
         });
@@ -230,6 +258,12 @@ export class Daemon {
     async enable(id, opts = {}) {
         const def = mustSource(id);
         const state = (await this.sources()).find((s) => s.id === def.id);
+        if (def.kind === 'local') {
+            await refreshLocalCatalog(this.ctx.paths.home, this.ctx.owner);
+            const now = (await this.sourcesRaw()).find((s) => s.id === def.id);
+            if (!now.loggedIn || !now.models)
+                throw new DshModelError('local_not_running', now.detail ?? L(`${def.label} 没在运行`, `${def.label} is not running`), L(`先装好并启动它：${def.subscribeUrl}`, `Install and start it first: ${def.subscribeUrl}`));
+        }
         if (def.kind === 'opencode' && !state.loggedIn) {
             throw new DshModelError('needs_key', L('OpenCode Zen 需要 API key：用 opencode/key 提交', 'OpenCode Zen needs an API key: submit it via opencode/key'));
         }
@@ -274,6 +308,9 @@ export class Daemon {
             for (const c of credsFor(await m.credentials(), def))
                 await m.deleteCredential(c.name);
         }
+        else if (def.kind === 'local') {
+            throw new DshModelError('no_logout', L(`${def.label} 不需要登录；不想用就关掉开关`, `${def.label} has no sign-in; turn the switch off instead`));
+        }
         else if (def.kind === 'workbuddy') {
             const v = WORKBUDDY_VARIANTS.find((x) => x.id === def.variant);
             await workbuddyLogout(v, this.ctx.paths.home);
@@ -642,7 +679,7 @@ export class Daemon {
         return {
             version: pkgVersion(),
             latest: await latestVersion(),
-            canManage: !vps,
+            canManage: !vps || (await adminInstalled()),
             ...(this.selfJob ? { job: { action: this.selfJob.action, startedAt: this.selfJob.startedAt, log: log.replace(/\x1b\[[0-9;]*m/g, '').slice(-6000) } } : {}),
             commands: vps
                 ? { update: 'sudo npm install -g dsh-model@latest && sudo dsh-model setup', uninstall: 'sudo dsh-model uninstall' }
@@ -654,10 +691,24 @@ export class Daemon {
      * 用 detached 让它脱离守护进程的进程组（launchd 重启服务时不会被一起杀掉）。
      */
     async startSelfJob(action, opts = {}) {
-        if (this.ctx.mode === 'vps')
-            throw new DshModelError('needs_root', L('服务器上要 root 权限，请在终端里执行命令', 'On the server this needs root; run the command in a terminal'));
-        // 卸载会删掉 home，日志放在外面
-        const log = action === 'uninstall' ? join(homedir(), 'dsh-model-uninstall.log') : join(this.ctx.paths.home, 'update.log');
+        // 同一时间只跑一个（实测：连点两次会起两个更新、日志互相覆盖）
+        if (this.selfJob && Date.now() - Date.parse(this.selfJob.startedAt) < 10 * 60 * 1000) {
+            if (this.selfJob.pid && !alive(this.selfJob.pid))
+                this.selfJob = undefined;
+            else
+                return { started: false, log: this.selfJob.log };
+        }
+        const log = selfJobLog(this.ctx, action);
+        if (this.ctx.mode === 'vps') {
+            // 守护进程是 dsh 用户：写请求单，由 dsh-model-admin（root）执行
+            if (!(await adminInstalled()))
+                throw new DshModelError('needs_root', L('服务器上要 root 权限，请在终端里执行命令（重跑一次 sudo dsh-model setup 之后就能在页面上点）', 'On the server this needs root; run the command in a terminal (after re-running sudo dsh-model setup, the buttons work here)'));
+            const req = { action, keepAuth: opts.keepAuth === true, lang: lang() };
+            await atomicWrite(adminRequestPath(this.ctx), JSON.stringify(req), { mode: 0o600 });
+            this.selfJob = { action, startedAt: new Date().toISOString(), log };
+            log_(`daemon: requested ${action} from dsh-model-admin`);
+            return { started: true, log };
+        }
         const args = action === 'update' ? ['update'] : ['uninstall', '--yes', '--remove-plugin', ...(opts.keepAuth ? ['--keep-auth'] : [])];
         const out = openSync(log, 'w', 0o600);
         const cmd = [process.execPath, join(PKG_ROOT, 'bin', 'dsh-model.js'), ...args, '--lang', lang()];
@@ -672,7 +723,7 @@ export class Daemon {
         });
         child.unref();
         closeSync(out);
-        this.selfJob = { action, startedAt: new Date().toISOString(), log };
+        this.selfJob = { action, startedAt: new Date().toISOString(), log, ...(child.pid ? { pid: child.pid } : {}) };
         log_(`daemon: started ${action} (pid ${child.pid})`);
         return { started: true, log };
     }
@@ -765,8 +816,12 @@ export class Daemon {
                 return ok({ sources: await this.sources(), keys: await this.keys(), stats: this.statsSnapshot(), endpoints: await this.endpoints() });
             }
             if (method === 'GET' && path === '/sources') {
-                if (query.get('refresh') === '1')
+                if (query.get('refresh') === '1') {
+                    // 本机模型服务开没开：页面打开时顺手问一下（1.5 秒超时），变了就同步进 dsh
+                    if (await refreshLocalCatalog(this.ctx.paths.home, this.ctx.owner).catch(() => false))
+                        void this.resync();
                     await this.refreshUsage();
+                }
                 return ok(await this.sources());
             }
             if (seg[0] === 'sources' && seg[1] && method === 'POST') {

package/dist/daemon/usage.js

@@ -12,7 +12,7 @@ import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 const TIMEOUT_MS = 15_000;
 /** 这几家暂不支持（见设计 §14.6） */
-export const USAGE_UNSUPPORTED = new Set(['antigravity', 'devin', 'meta', 'opencode']);
+export const USAGE_UNSUPPORTED = new Set(['antigravity', 'devin', 'meta', 'opencode', 'ollama', 'lmstudio']);
 async function getJson(url, headers) {
     const res = await fetch(url, { headers: { Accept: 'application/json', ...headers }, signal: AbortSignal.timeout(TIMEOUT_MS) });
     const text = await res.text();

package/dist/dsh/pick.js

@@ -5,7 +5,7 @@
 //   去掉画图 / 审查 / 自动路由这类不是对话用的 → 免费的先放（最多 2 个）→ 各系列轮流取最新版本，凑满 5 个。
 export const DEFAULT_PICK = 5;
 const MAX_FREE = 2;
-const NON_CHAT = /image|embed|tts|whisper|audio|review|(^|\/)(auto|default-model)$/i;
+const NON_CHAT = /image|embed|bge-|rerank|tts|whisper|audio|review|(^|\/)(auto|default-model)$/i;
 /** 系列的先后：常用的大模型在前 */
 const FAMILY_ORDER = ['gpt', 'claude', 'gemini', 'grok', 'kimi', 'glm', 'deepseek', 'qwen', 'minimax', 'hy'];
 const bare = (id) => id.slice(id.lastIndexOf('/') + 1).toLowerCase();

package/dist/engine/compat.js

@@ -6,6 +6,7 @@ import { join } from 'node:path';
 import { bridgeConfigPath, loadCatalogs } from '../bridge/runtime.js';
 import { loadSecrets } from '../secrets.js';
 import { readJson } from '../util/fs.js';
+import { LOCAL_SERVERS, loadLocalCatalog } from '../integrations/local.js';
 export const OPENCODE_BASE = 'https://opencode.ai/zen/v1';
 export const OPENCODE_PREFIX = 'opencode';
 export function opencodeModelsPath(ctx) {
@@ -67,6 +68,21 @@ export async function loadCompatUpstreams(ctx) {
             });
         }
     }
+    // 本机模型服务（Ollama、LM Studio）：在运行、有模型、没被关掉就接进来
+    const local = await loadLocalCatalog(ctx.paths.home);
+    for (const s of LOCAL_SERVERS) {
+        const st = local[s.id];
+        if (!st?.reachable || !st.models.length || disabled.has(s.id))
+            continue;
+        out.push({
+            name: s.id,
+            label: s.label,
+            baseUrl: s.base,
+            apiKey: 'local',
+            direct: true,
+            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 out;
 }
 /** 渲染成引擎 v8 的 api-keys.openai-compatibility 段 */

package/dist/integrations/local.js

@@ -0,0 +1,50 @@
+// integrations/local.ts — 本机模型服务（Ollama、LM Studio）作为来源（设计 §14.10）
+//
+// 两者都自带 OpenAI 兼容接口（/v1/models、/v1/chat/completions），本机运行、免费、不用登录。
+// 检测到在运行就当作"已接入"，模型清单直接问它；引擎把它们作为 openai-compatibility 上游，前缀 ollama/ 与 lmstudio/。
+// 思路来自 dsh-plugin-cli-hub 的 ollama adapter（那边是调命令行，这里直接走它的 HTTP 接口）。
+import { join } from 'node:path';
+import { readJson, writeJson } from '../util/fs.js';
+export const LOCAL_SERVERS = [
+    { id: 'ollama', label: 'Ollama', base: `${(process.env.OLLAMA_HOST ? normalizeHost(process.env.OLLAMA_HOST) : 'http://127.0.0.1:11434')}/v1` },
+    { id: 'lmstudio', label: 'LM Studio', base: 'http://127.0.0.1:1234/v1' },
+];
+/** OLLAMA_HOST 可能写成 0.0.0.0:11434 / localhost / http://host:port */
+function normalizeHost(h) {
+    let s = h.trim().replace(/\/+$/, '');
+    if (!/^https?:\/\//.test(s))
+        s = `http://${s}`;
+    s = s.replace('://0.0.0.0', '://127.0.0.1');
+    return /:\d+$/.test(s) ? s : `${s}:11434`;
+}
+export const localCatalogPath = (home) => join(home, 'local-models.json');
+export async function loadLocalCatalog(home) {
+    return (await readJson(localCatalogPath(home))) ?? {};
+}
+async function probe(s) {
+    const updatedAt = new Date().toISOString();
+    // 测试环境不看本机真装了什么（与不发现桌面 App 同一个开关）
+    if (process.env.DSH_MODEL_NO_APP_DISCOVERY)
+        return { reachable: false, models: [], updatedAt };
+    try {
+        const r = await fetch(`${s.base}/models`, { signal: AbortSignal.timeout(1500) });
+        if (!r.ok)
+            return { reachable: false, models: [], updatedAt };
+        const data = (await r.json()).data ?? [];
+        return { reachable: true, models: data.map((m) => String(m.id ?? '')).filter(Boolean).sort(), updatedAt };
+    }
+    catch {
+        return { reachable: false, models: [], updatedAt };
+    }
+}
+/** 问一遍本机的模型服务；在不在运行、模型有没有变，变了返回 true */
+export async function refreshLocalCatalog(home, owner) {
+    const before = await loadLocalCatalog(home);
+    const next = {};
+    for (const s of LOCAL_SERVERS)
+        next[s.id] = await probe(s);
+    const key = (c) => JSON.stringify(LOCAL_SERVERS.map((s) => [c[s.id]?.reachable ?? false, c[s.id]?.models ?? []]));
+    const changed = key(before) !== key(next);
+    await writeJson(localCatalogPath(home), next, { owner });
+    return changed;
+}

package/dist/ops.js

@@ -140,7 +140,7 @@ export async function dshCandidates(ctx, all, ids) {
 /** 引擎里带前缀（opencode/ workbuddy/ workbuddy-ai/）的模型是否正好等于期望：不能缺，也不能多（关掉的来源要消失） */
 function aliasesMatch(models, expected) {
     const want = new Set(expected);
-    const prefixes = ['opencode/', 'workbuddy/', 'workbuddy-ai/'];
+    const prefixes = ['opencode/', 'workbuddy/', 'workbuddy-ai/', 'ollama/', 'lmstudio/'];
     const have = models.map((m) => m.id).filter((id) => prefixes.some((p) => id.startsWith(p)));
     return have.length === want.size && have.every((id) => want.has(id));
 }

package/dist/service/admin.js

@@ -0,0 +1,86 @@
+// service/admin.ts — VPS 上让 dsh 管理页能「更新 / 卸载」（设计 §14.9）
+//
+// 守护进程以 dsh 用户运行，而更新（npm 全局目录、系统服务）和卸载（Caddy、防火墙、系统服务）要 root。
+// 所以 setup（root）装一个 systemd path 单元：守护进程在 <home>/admin/request 写一张请求单，
+// systemd 以 root 运行 `dsh-model admin-run`，它只认两件固定的事：更新到 npm 最新版、卸载。别的一律拒绝。
+import { chown, mkdir, readFile, rm } from 'node:fs/promises';
+import { join } from 'node:path';
+import { run } from '../util/exec.js';
+import { atomicWrite, exists } from '../util/fs.js';
+import { PKG_ROOT } from '../util/pkg.js';
+export const ADMIN_PATH_UNIT = '/etc/systemd/system/dsh-model-admin.path';
+export const ADMIN_SERVICE_UNIT = '/etc/systemd/system/dsh-model-admin.service';
+export const adminDir = (ctx) => join(ctx.paths.home, 'admin');
+export const adminRequestPath = (ctx) => join(adminDir(ctx), 'request');
+export async function adminInstalled() {
+    return exists(ADMIN_PATH_UNIT);
+}
+/** setup / repair（root）时装上；幂等 */
+export async function installAdmin(ctx) {
+    const dir = adminDir(ctx);
+    await mkdir(dir, { recursive: true, mode: 0o700 });
+    if (ctx.owner)
+        await chown(dir, ctx.owner.uid, ctx.owner.gid);
+    const path = [
+        '# Generated by dsh-model. 由 dsh-model 生成：dsh 管理页的「更新 / 卸载」请求',
+        '[Unit]',
+        'Description=dsh-model admin requests from the dsh page',
+        '',
+        '[Path]',
+        `PathExists=${adminRequestPath(ctx)}`,
+        'Unit=dsh-model-admin.service',
+        '',
+        '[Install]',
+        'WantedBy=multi-user.target',
+        '',
+    ].join('\n');
+    const service = [
+        '# Generated by dsh-model. 由 dsh-model 生成：以 root 执行管理页的请求（只认 update / uninstall）',
+        '[Unit]',
+        'Description=dsh-model admin (update / uninstall from the dsh page)',
+        '',
+        '[Service]',
+        'Type=oneshot',
+        `ExecStart=${process.execPath} ${join(PKG_ROOT, 'bin', 'dsh-model.js')} admin-run`,
+        `Environment=DSH_MODEL_HOME=${ctx.paths.home}`,
+        // 系统服务默认没有 HOME，npm 要用它放缓存
+        'Environment=HOME=/root',
+        '',
+    ].join('\n');
+    const before = (await readFile(ADMIN_PATH_UNIT, 'utf8').catch(() => '')) + (await readFile(ADMIN_SERVICE_UNIT, 'utf8').catch(() => ''));
+    if (before === path + service)
+        return;
+    await atomicWrite(ADMIN_PATH_UNIT, path, { mode: 0o644 });
+    await atomicWrite(ADMIN_SERVICE_UNIT, service, { mode: 0o644 });
+    await run('systemctl', ['daemon-reload']);
+    await run('systemctl', ['enable', '--now', 'dsh-model-admin.path']);
+}
+export async function removeAdmin() {
+    if (!(await exists(ADMIN_PATH_UNIT)) && !(await exists(ADMIN_SERVICE_UNIT)))
+        return;
+    await run('systemctl', ['disable', '--now', 'dsh-model-admin.path']);
+    await rm(ADMIN_PATH_UNIT, { force: true });
+    await rm(ADMIN_SERVICE_UNIT, { force: true });
+    await run('systemctl', ['daemon-reload']);
+}
+/** 读并删掉请求单（先删，免得 path 单元反复触发）；不合规的返回 null */
+export async function takeAdminRequest(ctx) {
+    const file = adminRequestPath(ctx);
+    let raw = '';
+    try {
+        raw = await readFile(file, 'utf8');
+    }
+    catch {
+        return null;
+    }
+    await rm(file, { force: true });
+    try {
+        const r = JSON.parse(raw);
+        if (r.action !== 'update' && r.action !== 'uninstall')
+            return null;
+        return { action: r.action, keepAuth: r.keepAuth === true, lang: r.lang === 'en' ? 'en' : 'zh' };
+    }
+    catch {
+        return null;
+    }
+}

package/dist/sources.js

@@ -13,6 +13,8 @@ export const SOURCES = [
     { id: 'meta', label: 'Muse (Meta)', kind: 'engine', login: 'device', engineProvider: 'meta', filePrefix: 'meta-', pricing: { tier: 'paid', zh: '需要 Muse Code 套餐（$5 / 月起），meta.ai 的免费版接不进来', en: 'Needs a Muse Code plan (from $5/mo); the free meta.ai tier cannot be used here' } },
     { id: 'antigravity', label: 'Antigravity', kind: 'engine', login: 'paste', engineProvider: 'antigravity', filePrefix: 'antigravity-', riskAck: true, risky: true, pricing: { tier: 'limited', zh: 'Google 账号有免费额度，额度有限', en: 'Free quota with a Google account, limited' } },
     { id: 'devin', label: 'Devin', kind: 'engine', login: 'paste', engineProvider: 'devin', filePrefix: 'devin-', subscribeUrl: 'https://devin.ai/pricing', probeModel: 'devin/swe-1-7-lightning', pricing: { tier: 'paid', zh: '需要 Devin Pro（$20 / 月）；免费档实测调用被拒（insufficient_quota）', en: 'Needs Devin Pro ($20/mo); the free tier is refused in testing (insufficient_quota)' } },
+    { id: 'ollama', label: 'Ollama（本地）', kind: 'local', login: 'none', subscribeUrl: 'https://ollama.com/download', pricing: { tier: 'free', zh: '本机运行，免费；装好并启动 Ollama、拉一个模型后自动出现', en: 'Runs on this machine, free; appears once Ollama is installed, running and has a model' } },
+    { id: 'lmstudio', label: 'LM Studio（本地）', kind: 'local', login: 'none', subscribeUrl: 'https://lmstudio.ai', pricing: { tier: 'free', zh: '本机运行，免费；在 LM Studio 里打开本地服务（Developer → Start Server）后自动出现', en: 'Runs on this machine, free; appears once the LM Studio local server is started (Developer → Start Server)' } },
     { id: 'opencode', label: 'OpenCode Zen', kind: 'opencode', login: 'key', subscribeUrl: 'https://opencode.ai/zen', pricing: { tier: 'paid', zh: '要先充值拿 key 按量计费；它的免费模型只能在 OpenCode 软件里用', en: 'Top up for a pay-as-you-go key; its free models only work inside the OpenCode app' } },
 ];
 const ALIASES = { grok: 'xai', muse: 'meta', chatgpt: 'codex', openai: 'codex', 'workbuddy-cn': 'workbuddy', wb: 'workbuddy', 'wb-ai': 'workbuddy-ai' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "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 和其他软件都能直接用。",
   "keywords": [
     "dsh-plugin",

package/plugin/client.js

@@ -416,15 +416,16 @@ window.__ModuleLoader__.load({
               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,
               h('span', { style: { ...S.meta, marginLeft: 8 } },
-                s.loggedIn ? (s.account || '') : L('未登录', 'Signed out'),
+                s.loggedIn ? (s.account || '') : s.kind === 'local' ? L('未运行', 'Not running') : L('未登录', 'Signed out'),
                 s.models ? ` · ${L(`${s.models} 个模型`, `${s.models} models`)}` : '')),
             s.loggedIn && s.enabled && s.models && !s.usage?.noAccess ? h('button', { type: 'button', style: S.btn, onClick: () => setPicking(picking === s.id ? '' : s.id) }, L('选模型', 'Models')) : null,
-            s.loggedIn && s.kind !== 'opencode' ? h('button', { type: 'button', style: S.btn, onClick: () => logout(s) }, L('退出登录', 'Sign out')) : null,
+            s.loggedIn && s.kind !== 'opencode' && s.kind !== 'local' ? h('button', { type: 'button', style: S.btn, onClick: () => logout(s) }, L('退出登录', 'Sign out')) : null,
             s.kind === 'opencode' && s.loggedIn ? h('button', { type: 'button', style: S.btn, onClick: onKey }, L('换 key', 'Change key')) : null),
           picking === s.id ? h(ModelPicker, { source: s, onClose: (saved) => { setPicking(''); if (saved) void reload() } }) : null,
           s.enabled ? h(Usage, { usage: s.usage, subscribeUrl: s.subscribeUrl }) : null,
           !s.loggedIn && s.pricing ? h('div', { style: { ...S.meta, paddingLeft: 46, marginTop: 4 } },
             L(s.pricing.zh, s.pricing.en),
+            s.subscribeUrl && s.kind === 'local' ? h('a', { href: s.subscribeUrl, target: '_blank', rel: 'noopener noreferrer', style: { color: C.accent, marginLeft: 8 } }, L('去下载 ↗', 'Download ↗')) : null,
             s.subscribeUrl && s.pricing.tier !== 'free' ? h('a', { href: s.subscribeUrl, target: '_blank', rel: 'noopener noreferrer', style: { color: C.accent, marginLeft: 8 } }, s.kind === 'opencode' ? L('去充值 ↗', 'Top up ↗') : L('看套餐 ↗', 'Plans ↗')) : null) : null,
           !s.loggedIn && s.detail ? h('div', { style: { ...S.meta, paddingLeft: 46, marginTop: 4 } }, s.detail) : null))))
     }
@@ -563,20 +564,38 @@ window.__ModuleLoader__.load({
       const [confirming, setConfirming] = useState(false)
       const [keepAuth, setKeepAuth] = useState(false)
       const [err, setErr] = useState('')
+      const [starting, setStarting] = useState(false)
       useEffect(() => {
         let alive = true
-        api('GET', '/self').then((r) => alive && setInfo(r), () => {})
+        // 服务比页面旧（没有 /self）：也要给出办法，不能整块不显示
+        api('GET', '/self').then((r) => alive && setInfo(r), (e) => alive && setInfo({ old: e.code === 'not_found' }))
         return () => { alive = false }
       }, [])
       if (!info) return null
+      if (!info.version) {
+        const cmd = 'npm install -g dsh-model && dsh-model setup'
+        return h('div', { style: S.section },
+          h('div', { style: S.h }, L('关于', 'About')),
+          h('div', { style: { ...S.card, padding: '12px 14px' } },
+            h('div', { style: S.meta }, info.old
+              ? L('这台机器上的 dsh-model 服务比这个页面旧，不支持在页面上更新。在终端执行一次（服务器上加 sudo），之后就能在这里更新和卸载：', 'The dsh-model service on this machine is older than this page and cannot update from here. Run this once in a terminal (with sudo on a server); after that you can update and uninstall here:')
+              : L('暂时查不到版本信息。可以在终端执行（服务器上加 sudo）：', 'Version info is unavailable right now. You can run in a terminal (with sudo on a server):')),
+            h('div', { style: { ...S.line, minHeight: 30, marginTop: 6 } }, h('code', { style: { ...S.mono, ...S.grow } }, cmd), h(CopyButton, { get: cmd }))))
+      }
       const hasUpdate = info.latest && newer(info.latest, info.version)
       const start = async (action) => {
+        if (starting) return
         setErr('')
+        setStarting(true)
         try {
           await api('POST', `/self/${action}`, action === 'uninstall' ? { keepAuth } : {})
           onJob({ action, from: info.version, target: info.latest })
         } catch (e) {
-          setErr(e.message)
+          // 连不上守护进程多半是它已经开始重启（任务已经在跑）：照样进进度页，等它回来
+          if (e.code === 'daemon_unreachable') onJob({ action, from: info.version, target: info.latest })
+          else setErr(e.message)
+        } finally {
+          setStarting(false)
         }
       }
       return h('div', { style: S.section },
@@ -585,7 +604,7 @@ window.__ModuleLoader__.load({
           h('div', { style: S.line },
             h('span', { style: { ...S.label, ...S.grow } }, `dsh-model ${info.version}`,
               h('span', { style: { ...S.meta, marginLeft: 8 } }, info.latest ? (hasUpdate ? L(`有新版本 ${info.latest}`, `${info.latest} available`) : L('已是最新', 'Up to date')) : L('查不到最新版本', 'Latest version unknown'))),
-            info.canManage && hasUpdate ? h('button', { type: 'button', style: S.btnPrimary, onClick: () => void start('update') }, L(`更新到 ${info.latest}`, `Update to ${info.latest}`)) : null,
+            info.canManage && hasUpdate ? h('button', { type: 'button', style: S.btnPrimary, disabled: starting, onClick: () => void start('update') }, starting ? L('正在开始…', 'Starting…') : L(`更新到 ${info.latest}`, `Update to ${info.latest}`)) : null,
             info.canManage ? h('button', { type: 'button', style: { ...S.btn, color: C.err }, onClick: () => setConfirming(true) }, L('卸载', 'Uninstall')) : null),
           !info.canManage ? h('div', { style: { marginTop: 8 } },
             h('div', { style: S.meta }, L('服务器上更新和卸载要 root 权限，请在服务器终端里执行：', 'On the server, update and uninstall need root; run in a server terminal:')),
@@ -597,7 +616,7 @@ window.__ModuleLoader__.load({
               h('input', { type: 'checkbox', checked: keepAuth, onChange: (e) => setKeepAuth(e.target.checked) }),
               L('先把各家登录凭据备份到主目录（以后重装可以拷回来）', 'Back up provider sign-ins to the home folder first (to reuse after reinstalling)')),
             h('div', { style: { ...S.line, marginTop: 8 } },
-              h('button', { type: 'button', style: { ...S.btnPrimary, background: C.err }, onClick: () => void start('uninstall') }, L('确认卸载', 'Uninstall')),
+              h('button', { type: 'button', style: { ...S.btnPrimary, background: C.err }, disabled: starting, onClick: () => void start('uninstall') }, starting ? L('正在开始…', 'Starting…') : L('确认卸载', 'Uninstall')),
               h('button', { type: 'button', style: S.btn, onClick: () => setConfirming(false) }, L('取消', 'Cancel')))) : null,
           err ? h('div', { style: { fontSize: 12, color: C.err, marginTop: 6 } }, err) : null))
     }