dsh-model 0.15.0 → 0.16.0

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/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,10 @@
 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 { 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';
@@ -642,7 +643,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 +655,17 @@ 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');
+        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()];

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/package.json

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

@@ -565,10 +565,21 @@ window.__ModuleLoader__.load({
       const [err, setErr] = useState('')
       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) => {
         setErr('')