dsh-model 0.20.0 → 0.20.1

package/dist/commands/self.js

@@ -5,7 +5,7 @@
 // 3. 用新版本执行一次 repair：重写服务文件、重启引擎与守护进程、同步模型。
 import { spawn } from 'node:child_process';
 import { closeSync, openSync } from 'node:fs';
-import { chown, realpath } from 'node:fs/promises';
+import { chown, realpath, writeFile } from 'node:fs/promises';
 import { delimiter, dirname, join } from 'node:path';
 import { requireRootInVps } from '../context.js';
 import { DshModelError, isDshModelError } from '../errors.js';
@@ -120,8 +120,12 @@ export async function selfUpdate(ctx, opts = {}) {
 }
 /** 管理页请求的日志：更新写在 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');
+    if (action === 'uninstall')
+        return join(dirname(ctx.paths.home), 'dsh-model-uninstall.log');
+    return join(ctx.paths.home, action === 'repair' ? 'repair.log' : 'update.log');
 }
+/** admin-run 跑完在日志最后写的一行：页面据此知道结束了、成没成 */
+export const ADMIN_DONE_RE = /^\[dsh-model\] exit (-?\d+)$/m;
 /** 由 dsh-model-admin.service（root）执行：取出管理页的请求单，只做 update / uninstall */
 export async function adminRun(ctx) {
     if (!ctx.isRoot)
@@ -138,7 +142,8 @@ export async function adminRun(ctx) {
     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'] : [])];
+    // repair 就是重跑 setup（幂等，什么缺了补什么；比 repair 命令能修的多）
+    const args = req.action === 'update' ? ['update'] : req.action === 'repair' ? ['setup', '--skip-dsh-plugin'] : ['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],
@@ -149,5 +154,6 @@ export async function adminRun(ctx) {
         child.on('exit', (c) => resolve(c ?? -1));
     });
     closeSync(out);
+    await writeFile(log, `\n[dsh-model] exit ${code}\n`, { flag: 'a' }).catch(() => { });
     return code;
 }

package/dist/commands/uninstall.js

@@ -57,10 +57,15 @@ export async function uninstall(ctx, opts) {
         if (all.state.remote && all.state.remote.mode !== 'off')
             await disableRemote(ctx, all);
     });
-    await step('dsh-plugin', async () => {
+    // 移除插件只是尽力而为：dsh 的 pnpm 可能因"新版本要等一天"的规则拒绝改动（2026-10-14 实测，连删除也会被拦）。
+    // 这一步失败不该让卸载停在半路：服务、配置照样清掉，home 照样删，插件请用户在 dsh 的插件页手动删。
+    try {
         if (await removeDshPlugin(ctx, all, { force: opts.removePlugin }))
             ok(L('已从 dsh 移除 dsh-model 插件', 'Removed the dsh-model plugin from dsh'));
-    });
+    }
+    catch (error) {
+        warn(L(`没能自动从 dsh 移除 dsh-model 插件（${error.message}）：请在 dsh 的插件页里手动删掉它`, `Could not remove the dsh-model plugin from dsh automatically (${error.message}); remove it on the dsh Plugins page`));
+    }
     await step('workbuddy', async () => {
         if (await removeWorkbuddyPlugin(ctx, all))
             ok(L('已移除上一版安装的 WorkBuddy 插件', 'Removed the WorkBuddy plugin installed by a previous version'));

package/dist/service/admin.js

@@ -2,7 +2,7 @@
 //
 // 守护进程以 dsh 用户运行，而更新（npm 全局目录、系统服务）和卸载（Caddy、防火墙、系统服务）要 root。
 // 所以 setup（root）装一个 systemd path 单元：守护进程在 <home>/admin/request 写一张请求单，
-// systemd 以 root 运行 `dsh-model admin-run`，它只认三件固定的事：更新到 npm 最新版、卸载、重启 dsh（插件更新后要重启才生效）。别的一律拒绝。
+// systemd 以 root 运行 `dsh-model admin-run`，它只认四件固定的事：更新到 npm 最新版、卸载、重启 dsh（插件更新后要重启才生效）、修复（重跑 setup）。别的一律拒绝。
 import { chown, mkdir, readFile, rm } from 'node:fs/promises';
 import { join } from 'node:path';
 import { run } from '../util/exec.js';
@@ -76,7 +76,7 @@ export async function takeAdminRequest(ctx) {
     await rm(file, { force: true });
     try {
         const r = JSON.parse(raw);
-        if (r.action !== 'update' && r.action !== 'uninstall' && r.action !== 'restart-dsh')
+        if (r.action !== 'update' && r.action !== 'uninstall' && r.action !== 'restart-dsh' && r.action !== 'repair')
             return null;
         return { action: r.action, keepAuth: r.keepAuth === true, lang: r.lang === 'en' ? 'en' : 'zh' };
     }

package/package.json

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

@@ -614,7 +614,8 @@ window.__ModuleLoader__.load({
         }
       }
       const cmds = notInstalled ? ['npm install -g dsh-model', 'dsh-model setup'] : ['dsh-model repair']
-      const vpsCmds = notInstalled ? ['sudo npm install -g dsh-model', 'sudo dsh-model setup'] : ['sudo dsh-model repair']
+      // setup 什么缺了补什么（卸载到一半、服务被删了也能救回来），比 repair 稳
+      const vpsCmds = notInstalled ? ['sudo npm install -g dsh-model', 'sudo dsh-model setup'] : ['sudo dsh-model setup']
       const cmdBlock = (list) => h('div', { style: { ...S.card, padding: '8px 12px', marginTop: 8 } }, list.map((c) => h('div', { key: c, style: { ...S.line, minHeight: 30 } }, h('code', { style: { ...S.mono, ...S.grow } }, c), h(CopyButton, { get: c }))))
       return h('div', { style: { color: C.text, maxWidth: 820 } },
         h('div', { style: S.section },
@@ -623,7 +624,7 @@ window.__ModuleLoader__.load({
             ? L('这个页面只是管理界面；模型由 dsh-model 在本机运行的服务提供（统一端点、WorkBuddy bridge、登录与用量）。装好后，来源、key 和模型都在这里管理。', 'This page is only the control panel; models are served by dsh-model\'s local service (the unified endpoint, WorkBuddy bridge, sign-ins and usage). Once it is set up, manage sources, keys and models here.')
             : L('可能是电脑重启后服务没起来，或者刚升级。修复会按记录重新注册并启动服务。', 'The service may not have started after a reboot, or was just upgraded. Repair re-registers and starts it from the saved records.')),
           res?.vps ? h('div', null,
-            h('p', { style: { ...S.note, color: C.text } }, L('这是 dsh-vps 服务器：安装要 root 权限，请在服务器终端里执行：', 'This is a dsh-vps server: setup needs root, so run this in a server terminal:')),
+            h('p', { style: { ...S.note, color: C.text } }, L('这是 dsh-vps 服务器：这一步要 root 权限，而这台机器上还没有 dsh-model 的管理员服务。请在服务器终端里执行一次（之后页面上的按钮就能用）：', 'This is a dsh-vps server: this needs root, and dsh-model\'s admin service is not on this machine yet. Run this once in a server terminal (the page buttons work afterwards):')),
             cmdBlock(vpsCmds),
             h('p', { style: { ...S.note, marginTop: 8 } }, L('装好后刷新本页。', 'Reload this page when done.'))) : h('div', null,
             h('div', { style: S.line },

package/plugin/index.js

@@ -238,7 +238,19 @@ export function apply(ctx) {
           } catch {
             return json(res, 400, { error: { code: 'invalid_json', message: 'invalid JSON' } })
           }
-          if (await exists(VPS_ROOT)) return json(res, 200, { vps: true })
+          if (await exists(VPS_ROOT)) {
+            // dsh-vps：安装要 root。管理员小服务还在（setup 装的）就交给它跑 setup，页面照样看进度；不在就只能给命令
+            if (!(await exists(ADMIN_PATH_UNIT))) return json(res, 200, { vps: true })
+            const log = join(home(), 'repair.log')
+            if (body.poll) {
+              const text = await readFile(log, 'utf8').catch(() => '')
+              const m = /^\[dsh-model\] exit (-?\d+)$/m.exec(text)
+              return json(res, 200, { running: !m, output: text.replace(/\n?\[dsh-model\] exit -?\d+\n?$/, '').replace(/\x1b\[[0-9;]*m/g, ''), code: m ? Number(m[1]) : null, action: 'repair' })
+            }
+            await writeFile(log, '', { mode: 0o600 }).catch(() => {})
+            await writeFile(join(home(), 'admin', 'request'), JSON.stringify({ action: 'repair', lang: body.lang === 'en' ? 'en' : 'zh' }), { mode: 0o600 })
+            return json(res, 200, { running: true, output: '', code: null, action: 'repair' })
+          }
           // { poll: true }：只取进度；否则开始（已经在跑就接着看同一个）
           if (body.poll) return json(res, 200, job ? { running: job.running, output: job.output, code: job.code, action: job.action } : { running: false, output: '', code: null })
           const action = body.action === 'repair' ? 'repair' : 'setup'