dsh-model 0.21.3 → 0.21.4

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