dsh-multi-router 0.5.8 → 0.5.9

package/lib/{chunk-ILRW3ELD.js → chunk-I4EW5TI7.js}

@@ -11,8 +11,9 @@ import {
   discoverLocalAccounts,
   importAccount,
   localAccountKey,
+  normalizeLocalAccountKey,
   readPortableCredential
-} from "./chunk-OFFVP6YN.js";
+} from "./chunk-S6ZQ45SS.js";
 import {
   hostIsLoopback
 } from "./chunk-DNQPZMPF.js";
@@ -39,12 +40,12 @@ import {
 import { createHash, randomBytes as randomBytes3, timingSafeEqual } from "node:crypto";
 
 // package.json
-var version = "0.5.8";
+var version = "0.5.9";
 
 // src/manager.mjs
-import { readFile as readFile3, mkdir as mkdir2, mkdtemp as mkdtemp2, rm as rm3 } from "node:fs/promises";
-import { watch } from "node:fs";
-import { dirname as dirname3, join as join4, relative as relative2, resolve } from "node:path";
+import { readFile as readFile4, mkdir as mkdir2, mkdtemp as mkdtemp2, rm as rm3 } from "node:fs/promises";
+import { watch as watch2 } from "node:fs";
+import { dirname as dirname3, join as join5, relative as relative2, resolve } from "node:path";
 import { withFileLock as withFileLock3 } from "@deepseek-ai/dsh-atomic-write";
 
 // upstream/qoder/src/status-paths.ts
@@ -239,14 +240,140 @@ async function prepareMigration(manager, raw, portable, mode) {
 }
 
 // src/plugin-updates.mjs
-import { readFile, stat, rm as rm2 } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { readFile as readFile2, stat, rm as rm2 } from "node:fs/promises";
+import { join as join4 } from "node:path";
 import { randomUUID } from "node:crypto";
 import { createRequire } from "node:module";
 import { pathToFileURL } from "node:url";
 import { parse as parseYaml } from "yaml";
 import { withFileLock, writeFileAtomic as writeFileAtomic2 } from "@deepseek-ai/dsh-atomic-write";
 
+// src/plugin-reload.mjs
+import { readFile } from "node:fs/promises";
+import { watch } from "node:fs";
+import { join as join3 } from "node:path";
+import { parse } from "yaml";
+function outsideActivation(hmr, operation) {
+  const scope = hmr?.executing;
+  return typeof scope?.exit === "function" ? scope.exit(operation) : operation();
+}
+var PluginReload = class {
+  constructor({ service, profile, canReload, hmr = () => void 0, busy = () => false, now = Date.now, runningVersion }) {
+    Object.assign(this, { service, profile, canReload, hmr, busy, now, runningVersion });
+    this.phase = "current";
+    this.installedVersion = runningVersion;
+    this.retryAt = 0;
+  }
+  state() {
+    return { runningVersion: this.runningVersion, installedVersion: this.installedVersion, phase: this.phase, canReload: !!this.canReload(), message: this.message };
+  }
+  start() {
+    const dir = this.profile()?.dir;
+    this.watchers = [];
+    if (dir) for (const target of [dir, join3(dir, "node_modules")]) try {
+      const watcher = watch(target, () => this.schedule());
+      watcher.unref();
+      this.watchers.push(watcher);
+    } catch {
+    }
+    this.schedule();
+  }
+  schedule(delay = 500) {
+    if (this.closed) return;
+    clearTimeout(this.timer);
+    this.timer = setTimeout(() => {
+      void this.check().catch(() => {
+      });
+    }, delay);
+    this.timer.unref();
+  }
+  stop() {
+    this.closed = true;
+    clearTimeout(this.timer);
+    for (const watcher of this.watchers ?? []) watcher.close();
+  }
+  check() {
+    if (this.closed) return Promise.resolve();
+    if (this.flight) return this.flight;
+    this.flight = this.inspect().finally(() => {
+      this.flight = void 0;
+    });
+    return this.flight;
+  }
+  async inspect() {
+    const dir = this.profile()?.dir;
+    if (!dir) return;
+    let manifest, installed;
+    try {
+      manifest = JSON.parse(await readFile(join3(dir, "package.json"), "utf8"));
+      installed = JSON.parse(await readFile(join3(dir, "node_modules/dsh-multi-router/package.json"), "utf8"));
+    } catch {
+      return;
+    }
+    if (this.closed || !manifest.dsh?.profile?.bundles?.includes("dsh-multi-router")) return;
+    if (installed.name !== "dsh-multi-router" || !/^\d+\.\d+\.\d+(?:-[\w.-]+)?$/.test(installed.version)) return;
+    this.installedVersion = installed.version;
+    if (installed.version === this.runningVersion) {
+      this.phase = "current";
+      this.message = void 0;
+      return;
+    }
+    const declared = manifest.dependencies?.["dsh-multi-router"];
+    const exact = typeof declared === "string" && /^(?:npm:dsh-multi-router@)?(\d+\.\d+\.\d+(?:-[\w.-]+)?)$/.exec(declared)?.[1];
+    let installing = false;
+    const pid = Number(await readFile(join3(dir, "package.json.lock"), "utf8").catch(() => ""));
+    if (Number.isInteger(pid) && pid > 0) try {
+      process.kill(pid, 0);
+      installing = true;
+    } catch (e) {
+      installing = e.code !== "ESRCH";
+    }
+    if (installing || exact && exact !== installed.version) {
+      this.phase = "waiting";
+      this.message = "\u5B89\u88C5\u4E8B\u52A1\u5C1A\u672A\u5B8C\u6210\uFF0C\u6216\u5B89\u88C5\u5931\u8D25\u5DF2\u56DE\u6EDA\uFF1B\u7B49\u5F85\u914D\u7F6E\u4E0E\u6587\u4EF6\u7248\u672C\u4E00\u81F4\u540E\u518D\u52A0\u8F7D\u3002";
+      if (installing) this.schedule(1e3);
+      return;
+    }
+    if (!this.canReload() || !this.service()?.setBundleEnabled) {
+      this.phase = "restart-required";
+      this.message = "\u5F53\u524D DSH \u672A\u63D0\u4F9B\u8FD0\u884C\u4E2D\u91CD\u8F7D\uFF0C\u8BF7\u5347\u7EA7 DSH \u6216\u91CD\u542F\u5E94\u7528\u3002";
+      return;
+    }
+    if (this.busy()) {
+      this.phase = "waiting";
+      this.message = "\u65B0\u7248\u672C\u5DF2\u5B89\u88C5\uFF0C\u7B49\u5F85\u5F53\u524D\u8BF7\u6C42\u548C\u8D26\u53F7\u64CD\u4F5C\u7ED3\u675F\u540E\u81EA\u52A8\u751F\u6548\u3002";
+      this.schedule(1e3);
+      return;
+    }
+    const root = join3(dir, "node_modules/dsh-multi-router");
+    try {
+      const patch = parse(await readFile(join3(root, "cordis.patch.yml"), "utf8"));
+      const row = Array.isArray(patch) && patch.flatMap((p) => p?.insert ?? []).find((e) => e?.id === `llm-multi-router-v2-${installed.version}`);
+      if (row?.name !== `./lib/host-v${installed.version}.js` || row.disabled) throw Error("legacy entry");
+      await readFile(join3(root, `lib/host-v${installed.version}.js`));
+    } catch {
+      this.phase = "restart-required";
+      this.message = "\u5B89\u88C5\u7248\u672C\u7F3A\u5C11\u7248\u672C\u5316\u5165\u53E3\uFF0C\u91CD\u65B0\u5B89\u88C5\u6700\u65B0\u7248\u540E\u518D\u8BD5\u3002";
+      return;
+    }
+    if (this.now() < this.retryAt) return;
+    this.phase = "reloading";
+    this.message = "\u6B63\u5728\u91CD\u65B0\u52A0\u8F7D\u63D2\u4EF6\u4E0E\u914D\u7F6E\u9762\u677F\u2026";
+    this.retryAt = this.now() + 6e4;
+    try {
+      const result = await outsideActivation(this.hmr(), () => this.service().setBundleEnabled("dsh-multi-router", true));
+      if (this.closed) return;
+      this.phase = "restart-required";
+      this.message = result.application === "applied" ? "DSH \u5C1A\u672A\u5207\u6362\u5230\u65B0\u7248\u672C\uFF0C\u8BF7\u91CD\u65B0\u52A0\u8F7D\u63D2\u4EF6\u6216\u67E5\u770B\u7EC4\u4EF6\u9519\u8BEF\u3002" : "DSH \u672A\u80FD\u91CD\u8F7D\u63D2\u4EF6\uFF0C\u8BF7\u5347\u7EA7 DSH \u6216\u91CD\u542F\u5E94\u7528\u3002";
+    } catch {
+      if (!this.closed) {
+        this.phase = "failed";
+        this.message = "\u63D2\u4EF6\u91CD\u8F7D\u672A\u5B8C\u6210\uFF0C\u53EF\u7A0D\u540E\u91CD\u8BD5\uFF1B\u5DF2\u4FDD\u5B58\u7684\u914D\u7F6E\u4FDD\u6301\u4E0D\u53D8\u3002";
+      }
+    }
+  }
+};
+
 // upstream/workbuddy/src/update.ts
 var WORKBUDDY_REPOSITORY_URL = "https://github.com/corrinehu/dsh-workbuddy-connect";
 var WORKBUDDY_UPDATE_PACKAGE_NAME = "dsh-workbuddy-connect";
@@ -322,7 +449,7 @@ function githubCommit(value) {
 }
 async function jsonFile(file) {
   try {
-    return JSON.parse(await readFile(file, "utf8"));
+    return JSON.parse(await readFile2(file, "utf8"));
   } catch {
     return void 0;
   }
@@ -330,11 +457,11 @@ async function jsonFile(file) {
 async function locks(dir) {
   let pnpm;
   try {
-    pnpm = parseYaml(await readFile(join3(dir, "pnpm-lock.yaml"), "utf8"), { maxAliasCount: 20 });
+    pnpm = parseYaml(await readFile2(join4(dir, "pnpm-lock.yaml"), "utf8"), { maxAliasCount: 20 });
   } catch {
   }
-  const npm = await jsonFile(join3(dir, "package-lock.json"));
-  const times = await Promise.all(["pnpm-lock.yaml", "package-lock.json"].map((name) => stat(join3(dir, name)).then((s) => s.mtimeMs).catch(() => 0)));
+  const npm = await jsonFile(join4(dir, "package-lock.json"));
+  const times = await Promise.all(["pnpm-lock.yaml", "package-lock.json"].map((name) => stat(join4(dir, name)).then((s) => s.mtimeMs).catch(() => 0)));
   return { pnpm, npm, preferNpm: times[1] > times[0] };
 }
 async function publicJson(url, fetchImpl, signal) {
@@ -355,11 +482,46 @@ async function publicJson(url, fetchImpl, signal) {
   return /^[a-f0-9]{40}$/i.test(text) ? { sha: text } : JSON.parse(text);
 }
 var short = (sha) => sha?.slice(0, 8);
-async function registryVersion(service, profile, spec, signal) {
+var installFailed = (r) => !!(r.error || ["failed", "cancelled"].includes(r.application) || r.packageResult && r.packageResult.exitCode !== 0);
+function installFailure(result) {
+  const text = [result.error?.diagnostic, result.packageResult?.output, result.packageResult?.kind].filter((v) => typeof v === "string").join("\n");
+  let reason = "unknown", message = "\u5B89\u88C5\u672A\u5B8C\u6210\uFF1B\u8BF7\u5728 DSH \u539F\u751F\u63D2\u4EF6\u9875\u67E5\u770B\u5B89\u88C5\u65E5\u5FD7\uFF0C\u6216\u590D\u5236\u4E0B\u65B9\u8BCA\u65AD\u4FE1\u606F\u3002";
+  if (result.application === "cancelled") {
+    reason = "cancelled";
+    message = "\u5B89\u88C5\u5DF2\u53D6\u6D88\uFF0C\u53EF\u91CD\u65B0\u68C0\u67E5\u540E\u91CD\u8BD5\u3002";
+  } else if (/ERR_PNPM_(?:MINIMUM_RELEASE_AGE_VIOLATION|NO_MATURE_MATCHING_VERSION)|minimumReleaseAge/i.test(text)) {
+    reason = "release-age";
+    message = "\u65B0\u7248\u672C\u5C1A\u5728\u5B89\u88C5\u5668\u7684\u65B0\u5305\u7B49\u5F85\u671F\u5185\u3002\u8F93\u5165\u5305\u540D\u53EF\u80FD\u9009\u4E2D\u65E7\u7248\uFF0C\u6307\u5B9A\u65B0\u7248\u672C\u53EF\u80FD\u88AB\u62D2\u7EDD\uFF1B\u8BF7\u7B49\u5F85\u7B56\u7565\u89C4\u5B9A\u7684\u65F6\u95F4\u540E\u91CD\u8BD5\uFF0C\u6216\u7531\u7528\u6237\u660E\u786E\u4E3A\u8BE5\u7248\u672C\u8BBE\u7F6E\u4F8B\u5916\u3002\u6362\u955C\u50CF\u6216\u91CD\u542F\u4E0D\u4F1A\u89E3\u9664\u6B64\u9650\u5236\u3002";
+  } else if (result.pendingBuilds?.length) {
+    reason = "build";
+    message = "\u4F9D\u8D56\u6784\u5EFA\u811A\u672C\u9700\u8981\u6388\u6743\uFF0C\u8BF7\u5230 DSH \u63D2\u4EF6\u5B89\u88C5\u9875\u5141\u8BB8\u8FD9\u4E9B\u811A\u672C\u540E\u91CD\u8BD5\u3002";
+  } else if (result.error?.code === "incompatible-version") {
+    reason = "compatibility";
+    message = "\u63D2\u4EF6\u4E0E\u5F53\u524D DSH \u4E0D\u517C\u5BB9\uFF0C\u8BF7\u5148\u5347\u7EA7 DSH \u6216\u9009\u62E9\u517C\u5BB9\u7248\u672C\u3002";
+  } else if (/\b(?:EPERM|EBUSY|EACCES)\b|resource busy|file.*(?:locked|in use)/i.test(text)) {
+    reason = "files";
+    message = "\u63D2\u4EF6\u6587\u4EF6\u88AB\u5360\u7528\u6216\u76EE\u5F55\u6743\u9650\u4E0D\u8DB3\uFF0C\u5B89\u88C5\u672A\u5B8C\u6210\u3002\u8BF7\u5148\u5728 DSH \u505C\u7528\u8BE5\u63D2\u4EF6\u540E\u91CD\u8BD5\uFF0C\u5E76\u68C0\u67E5\u5B89\u88C5\u76EE\u5F55\u6743\u9650\uFF1B\u4ECD\u88AB\u5360\u7528\u65F6\u9700\u9000\u51FA\u6258\u76D8\u5E94\u7528\u3002";
+  } else if (/HMR transactions cannot be nested|activation|did not activate|entry.*activate/i.test(text)) {
+    reason = "activation";
+    message = "\u63D2\u4EF6\u52A0\u8F7D\u5931\u8D25\u3002\u8BF7\u68C0\u67E5 DSH \u63D2\u4EF6\u9875\u7684\u7EC4\u4EF6\u9519\u8BEF\uFF0C\u518D\u5173\u95ED\u5E76\u91CD\u65B0\u542F\u7528\uFF1B\u5B89\u88C5\u4E0E\u52A0\u8F7D\u662F\u4E24\u4E2A\u72EC\u7ACB\u6B65\u9AA4\u3002";
+  } else if (result.packageResult?.timedOut || /\b(?:ETIMEDOUT|ECONNRESET|ENOTFOUND|EAI_AGAIN|ECONNREFUSED)\b|network|fetch|download/i.test(text)) {
+    reason = "network";
+    message = "\u63D2\u4EF6\u4E0B\u8F7D\u6216\u7F51\u7EDC\u8BF7\u6C42\u5931\u8D25\uFF0C\u5B89\u88C5\u672A\u5B8C\u6210\u3002npm \u6765\u6E90\u53EF\u5207\u6362\u5230\u300Cnpm \u5B98\u65B9\u300D\u540E\u91CD\u8BD5\uFF1BGitHub \u6765\u6E90\u8BF7\u68C0\u67E5 GitHub \u7F51\u7EDC\u8FDE\u63A5\u3002";
+  }
+  const code = /\b(?:ERR_PNPM_MINIMUM_RELEASE_AGE_VIOLATION|ERR_PNPM_NO_MATURE_MATCHING_VERSION|EPERM|EBUSY|EACCES|ETIMEDOUT|ECONNRESET|ENOTFOUND|EAI_AGAIN|ECONNREFUSED)\b/.exec(text)?.[0] ?? (["operation-error", "incompatible-version"].includes(result.error?.code) ? result.error.code : "unknown");
+  return { status: "failed", application: result.application, message, diagnostic: {
+    reason,
+    code,
+    platform: process.platform,
+    stage: reason === "activation" ? "activation" : "install",
+    ...Number.isInteger(result.packageResult?.exitCode) ? { exitCode: result.packageResult.exitCode } : {}
+  } };
+}
+async function registryVersion(service, profile, spec, signal, requestedRegistry) {
   const require2 = createRequire(profile.installAnchor);
   const { viewProfilePackage } = await import(pathToFileURL(require2.resolve("@deepseek-ai/dsh-plugin-manager/operations")).href);
   const { registryPlan } = await import(pathToFileURL(require2.resolve("@deepseek-ai/dsh-plugin-manager/registry")).href);
-  for (const registry of registryPlan(void 0, await service.registries())) {
+  for (const registry of registryPlan(requestedRegistry, await service.registries())) {
     const answer = await viewProfilePackage(profile.dir, spec, { ...profile.packageManager, registry, timeoutMs: 12e3, signal });
     if (signal.aborted) throw Error("\u68C0\u67E5\u5DF2\u53D6\u6D88");
     if (answer.exitCode !== 0) continue;
@@ -374,11 +536,11 @@ async function refreshGitPlugin(service, profile, row, options2, signal) {
   const { registryPlan, attributeFailure } = await import(pathToFileURL(require2.resolve("@deepseek-ai/dsh-plugin-manager/registry")).href);
   const { classifyInstallFailure } = await import(pathToFileURL(require2.resolve("@deepseek-ai/dsh-plugin-manager")).href);
   const plan = registryPlan(options2.registry, await service.registries());
-  return withFileLock(join3(profile.dir, "package.json"), async () => {
+  return withFileLock(join4(profile.dir, "package.json"), async () => {
     const files = await Promise.all(["package.json", "pnpm-lock.yaml"].map(async (name) => {
-      const path = join3(profile.dir, name);
+      const path = join4(profile.dir, name);
       try {
-        return { path, content: await readFile(path, "utf8") };
+        return { path, content: await readFile2(path, "utf8") };
       } catch (e) {
         if (e.code !== "ENOENT") throw e;
         return { path };
@@ -417,7 +579,7 @@ async function refreshGitPlugin(service, profile, row, options2, signal) {
   }, { waitMs: 12e4 });
 }
 var PluginUpdates = class {
-  constructor({ service = () => void 0, profile = () => void 0, fetchImpl = (...args) => fetch(...args), lookup = registryVersion, refreshGit = refreshGitPlugin, onInstalled, stateFile, now = Date.now } = {}) {
+  constructor({ service = () => void 0, profile = () => void 0, hmr = () => void 0, fetchImpl = (...args) => fetch(...args), lookup = registryVersion, refreshGit = refreshGitPlugin, onInstalled, stateFile, now = Date.now } = {}) {
     this.stateFile = stateFile;
     this.now = now;
     this.dismissed = {};
@@ -425,6 +587,7 @@ var PluginUpdates = class {
     this.saveQueue = Promise.resolve();
     this.service = service;
     this.profile = profile;
+    this.hmr = hmr;
     this.fetchImpl = fetchImpl;
     this.rows = [];
     this.abort = new AbortController();
@@ -485,7 +648,7 @@ var PluginUpdates = class {
       this.rows = [];
       return;
     }
-    const [manifest, bundles, lock] = await Promise.all([jsonFile(join3(profile.dir, "package.json")), service.listBundles(), locks(profile.dir)]);
+    const [manifest, bundles, lock] = await Promise.all([jsonFile(join4(profile.dir, "package.json")), service.listBundles(), locks(profile.dir)]);
     if (!manifest) throw Error("\u5F53\u524D DSH \u914D\u7F6E\u7684\u63D2\u4EF6\u6E05\u5355\u65E0\u6CD5\u8BFB\u53D6");
     this.rows = bundles.filter((b) => (b.installed || b.version) && manifest.dependencies?.[b.name] && b.removable !== false).map((b) => {
       const spec = manifest.dependencies?.[b.name];
@@ -578,7 +741,7 @@ var PluginUpdates = class {
     });
   }
   async installRow(row, registry) {
-    const original = await jsonFile(join3(this.profile().dir, "package.json"));
+    const original = await jsonFile(join4(this.profile().dir, "package.json"));
     if (original?.dependencies?.[row.name] !== row.spec) throw Error("\u5B89\u88C5\u6765\u6E90\u5DF2\u6539\u53D8\uFF0C\u8BF7\u91CD\u65B0\u68C0\u67E5");
     const current = (await this.service().listBundles()).find((b) => b.name === row.name);
     if (!current || current.enabled !== row.checkedEnabled || current.version !== row.version) throw Error("\u63D2\u4EF6\u7248\u672C\u6216\u542F\u7528\u72B6\u6001\u5DF2\u6539\u53D8\uFF0C\u8BF7\u91CD\u65B0\u68C0\u67E5");
@@ -591,17 +754,8 @@ var PluginUpdates = class {
       } finally {
         this.gitAbort = void 0;
       }
-    } else result = await this.service().installBundle(row.target, options2);
-    if (result.packageResult && result.packageResult.exitCode !== 0 || ["failed", "cancelled"].includes(result.application) || result.error) {
-      return {
-        name: row.name,
-        status: "failed",
-        application: result.application,
-        message: result.pendingBuilds?.length ? "\u4F9D\u8D56\u6784\u5EFA\u811A\u672C\u9700\u8981\u6388\u6743\uFF0C\u8BF7\u5230 DSH \u63D2\u4EF6\u5B89\u88C5\u9875\u5141\u8BB8\u8FD9\u4E9B\u811A\u672C\u540E\u91CD\u8BD5" : result.error?.code === "incompatible-version" ? "\u63D2\u4EF6\u4E0E\u5F53\u524D DSH \u4E0D\u517C\u5BB9\uFF0C\u8BF7\u5148\u5347\u7EA7 DSH \u6216\u9009\u62E9\u517C\u5BB9\u7248\u672C" : `\u5B89\u88C5\u672A\u5B8C\u6210\uFF08${result.error?.code ?? result.packageResult?.kind ?? "unknown"}\uFF09\uFF1B\u8BF7\u5230 DSH \u63D2\u4EF6\u9875\u67E5\u770B\u5B89\u88C5\u65E5\u5FD7`,
-        pendingBuilds: result.pendingBuilds ?? [],
-        logPath: result.packageResult?.logPath
-      };
-    }
+    } else result = await outsideActivation(this.hmr(), () => this.service().installBundle(row.target, options2));
+    if (installFailed(result)) return { name: row.name, ...installFailure(result), expectedVersion: row.latestVersion };
     const installed = (await this.service().listBundles()).find((b) => b.name === row.name);
     if (row.source.kind === "npm" && installed?.version !== row.latestVersion) return {
       name: row.name,
@@ -654,7 +808,32 @@ var PluginUpdates = class {
     this.start("install", async (job) => {
       job.total = 1;
       job.current = spec;
-      const result = await this.service().installBundle(spec, { requestId: job.id, ...registry ? { registry } : {} });
+      let expected;
+      if (npm?.kind === "npm" && github.kind !== "github") {
+        const found = await this.lookup(this.service(), this.profile(), `${npm.package}@${named[2] || "latest"}`, this.abort.signal, registry);
+        if (!parseWorkBuddyVersion(found.version)) throw Error("npm \u672A\u8FD4\u56DE\u6709\u6548\u7248\u672C\uFF0C\u8BF7\u68C0\u67E5\u5B89\u88C5\u6E90\u540E\u91CD\u8BD5");
+        expected = found.version;
+      }
+      const result = await outsideActivation(this.hmr(), () => this.service().installBundle(spec, { requestId: job.id, ...registry ? { registry } : {} }));
+      if (installFailed(result)) {
+        job.results.push({ name: result.bundle ?? spec, ...installFailure(result), expectedVersion: expected });
+        delete job.current;
+        await this.list();
+        return;
+      }
+      const installed = (await this.service().listBundles()).find((b) => b.name === (result.bundle ?? named?.[1]));
+      if (expected && installed?.version !== expected) {
+        job.results.push({
+          name: result.bundle ?? named[1],
+          status: "failed",
+          expectedVersion: expected,
+          installedVersion: installed?.version,
+          message: `\u5B9E\u9645\u5B89\u88C5\u7248\u672C ${installed?.version ?? "\u672A\u77E5"} \u4E0E\u68C0\u67E5\u7248\u672C ${expected} \u4E0D\u540C\uFF1B\u8BF7\u5207\u6362\u300Cnpm \u5B98\u65B9\u300D\u540E\u91CD\u65B0\u68C0\u67E5\u5E76\u5B89\u88C5\u6307\u5B9A\u7248\u672C\u3002`
+        });
+        delete job.current;
+        await this.list();
+        return;
+      }
       const reloadPending = !result.error && result.packageResult?.exitCode === 0 && result.application === "restart-required" && this.onInstalled?.(result.bundle) === true;
       job.results.push({
         name: result.bundle ?? spec,
@@ -689,7 +868,7 @@ var PluginUpdates = class {
 
 // src/workbuddy-login.mjs
 import { randomBytes as randomBytes2 } from "node:crypto";
-import { readFile as readFile2 } from "node:fs/promises";
+import { readFile as readFile3 } from "node:fs/promises";
 import { withFileLock as withFileLock2 } from "@deepseek-ai/dsh-atomic-write";
 var WorkBuddyLogin = class {
   constructor(file, { fetchImpl = (...args) => fetch(...args), now = Date.now } = {}) {
@@ -703,7 +882,7 @@ var WorkBuddyLogin = class {
     await withFileLock2(this.file, async () => {
       let state = {};
       try {
-        state = JSON.parse(await readFile2(this.file, "utf8"));
+        state = JSON.parse(await readFile3(this.file, "utf8"));
       } catch (e) {
         if (e.code !== "ENOENT") throw Error("\u767B\u5F55\u51B7\u5374\u8BB0\u5F55\u4E0D\u53EF\u8BFB\uFF0C\u8BF7\u68C0\u67E5\u672C\u673A\u6587\u4EF6");
       }
@@ -715,7 +894,7 @@ var WorkBuddyLogin = class {
   async pause() {
     this.pending = void 0;
     await withFileLock2(this.file, async () => {
-      const state = JSON.parse(await readFile2(this.file, "utf8"));
+      const state = JSON.parse(await readFile3(this.file, "utf8"));
       state.pausedUntil = this.now() + 15 * 6e4;
       await writePrivateJson(this.file, state);
     });
@@ -865,31 +1044,31 @@ var Manager = class {
     this.file = file;
     this.router = router;
     this.onChange = onChange;
-    this.catalogFile = join4(dirname3(file), "catalogs.json");
+    this.catalogFile = join5(dirname3(file), "catalogs.json");
     this.catalogs = /* @__PURE__ */ new Map();
     this.catalogErrors = /* @__PURE__ */ new Map();
     this.refreshes = /* @__PURE__ */ new Map();
     this.closed = false;
     this.monitorFlights = /* @__PURE__ */ new Map();
     this.loginInfo = /* @__PURE__ */ new Map();
-    this.telemetry = new Telemetry(join4(dirname3(file), "usage.json"));
-    this.plugins = new PluginUpdates({ ...pluginAccess, stateFile: join4(dirname3(file), "plugin-updates.json"), onInstalled: (name) => {
+    this.telemetry = new Telemetry(join5(dirname3(file), "usage.json"));
+    this.plugins = new PluginUpdates({ ...pluginAccess, stateFile: join5(dirname3(file), "plugin-updates.json"), onInstalled: (name) => {
       if (name !== "dsh-multi-router" || !this.runtime?.canReload()) return false;
       this.runtime.schedule();
       return true;
     } });
-    this.checkins = new Checkins(join4(dirname3(file), "checkins.json"), this);
-    this.workbuddyLogin = new WorkBuddyLogin(join4(dirname3(file), "workbuddy-login.json"), { fetchImpl: pluginAccess.fetchImpl });
-    this.setupFile = join4(dirname3(file), "initial-setup.json");
+    this.checkins = new Checkins(join5(dirname3(file), "checkins.json"), this);
+    this.workbuddyLogin = new WorkBuddyLogin(join5(dirname3(file), "workbuddy-login.json"), { fetchImpl: pluginAccess.fetchImpl });
+    this.setupFile = join5(dirname3(file), "initial-setup.json");
     router.telemetry = this.telemetry;
-    router.monitor = (a) => this.monitorAccount(a);
+    router.monitor = (a) => this.monitorAccount(a, { maxAgeMs: 6e4 });
     router.prepareFree = () => this.checkFreeModels(true);
     router.freeModels = (account) => this.freeModels(account);
   }
   async load() {
-    this.raw = JSON.parse(await readFile3(this.file, "utf8"));
+    this.raw = JSON.parse(await readFile4(this.file, "utf8"));
     try {
-      this.setup = JSON.parse(await readFile3(this.setupFile, "utf8"));
+      this.setup = JSON.parse(await readFile4(this.setupFile, "utf8"));
     } catch {
       this.setup = void 0;
     }
@@ -897,7 +1076,7 @@ var Manager = class {
     await this.checkins.load();
     await this.plugins.load();
     try {
-      const saved = JSON.parse(await readFile3(this.catalogFile, "utf8"));
+      const saved = JSON.parse(await readFile4(this.catalogFile, "utf8"));
       for (const account of this.config.accounts) {
         const item = saved[account.id];
         if (item?.credentialFile === account.credentialFile && Array.isArray(item.models)) {
@@ -939,12 +1118,12 @@ var Manager = class {
       if (this.closed || !discovered.accounts.length) return;
       await withFileLock3(this.file, async () => {
         if (this.closed) return;
-        let raw = JSON.parse(await readFile3(this.file, "utf8"));
+        let raw = JSON.parse(await readFile4(this.file, "utf8"));
         let changed = false;
         const saved = /* @__PURE__ */ new Map();
         for (const item of discovered.accounts) {
           const key = localAccountKey(item.provider, item.document);
-          if (!force && raw.ignoredLocalAccounts?.includes(key)) continue;
+          if (!force && raw.ignoredLocalAccounts?.some((k) => normalizeLocalAccountKey(k) === key)) continue;
           const config = validateConfig(raw, this.file);
           let existing, current;
           for (const a of config.accounts.filter((a2) => a2.provider === item.provider)) {
@@ -976,11 +1155,11 @@ var Manager = class {
             recordSaved();
             continue;
           }
-          const base = join4(dirname3(this.file), "accounts");
+          const base = join5(dirname3(this.file), "accounts");
           await mkdir2(base, { recursive: true, mode: 448 });
-          const staging = await mkdtemp2(join4(base, `${id}-`));
+          const staging = await mkdtemp2(join5(base, `${id}-`));
           try {
-            const credentialFile = join4(staging, "credential.json"), identityFile = join4(staging, "identity.json");
+            const credentialFile = join5(staging, "credential.json"), identityFile = join5(staging, "identity.json");
             await importAccount({ ...item, credentialFile, identityFile });
             const paths = {
               credentialFile: relative2(dirname3(this.file), credentialFile),
@@ -994,7 +1173,7 @@ var Manager = class {
               name: item.document.credential.nickname || item.document.credential.accountName || item.document.credential.uid || item.document.credential.userId,
               ...paths
             });
-            next.ignoredLocalAccounts = (raw.ignoredLocalAccounts ?? []).filter((k) => k !== key);
+            next.ignoredLocalAccounts = (raw.ignoredLocalAccounts ?? []).filter((k) => normalizeLocalAccountKey(k) !== key);
             validateConfig(next, this.file);
             await writePrivateJson(this.file, next);
             raw = next;
@@ -1025,7 +1204,7 @@ var Manager = class {
     if (this.setup?.completedAt) return;
     await withFileLock3(this.setupFile, async () => {
       try {
-        this.setup = JSON.parse(await readFile3(this.setupFile, "utf8"));
+        this.setup = JSON.parse(await readFile4(this.setupFile, "utf8"));
       } catch {
       }
       if (this.setup?.completedAt) return;
@@ -1033,8 +1212,12 @@ var Manager = class {
       await writePrivateJson(this.setupFile, this.setup);
     });
   }
-  async monitorAccount(account) {
+  async monitorAccount(account, { force = false, maxAgeMs = 3e5 } = {}) {
     if (this.monitorFlights.has(account.id)) return this.monitorFlights.get(account.id);
+    const cached = this.telemetry.row("accounts", account.id).balance;
+    const last = cached?.error ? cached.attemptedAt : cached?.fetchedAt;
+    const ttl = cached?.error ? 3e5 : maxAgeMs;
+    if (!force && Number.isFinite(last) && Date.now() >= last && Date.now() - last < ttl) return;
     const promise = (async () => {
       try {
         const client = await this.router.client(account);
@@ -1053,8 +1236,8 @@ var Manager = class {
     this.monitorFlights.set(account.id, promise);
     return promise;
   }
-  async monitorAll(provider) {
-    await Promise.all(this.config.accounts.filter((a) => !provider || a.provider === provider).map((a) => this.monitorAccount(a)));
+  async monitorAll(provider, options2) {
+    await Promise.all(this.config.accounts.filter((a) => (!provider || a.provider === provider) && (options2?.force || a.enabled !== false)).map((a) => this.monitorAccount(a, options2)));
   }
   freeAccounts() {
     const targets = Object.values(this.config.routes).filter((r) => r.freeOnly).flatMap((r) => r.targets);
@@ -1277,7 +1460,7 @@ var Manager = class {
       }
     }
     if (input.action === "workbuddy.login") {
-      if (input.revision !== revisionOf(JSON.parse(await readFile3(this.file, "utf8")))) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u65B0\u63D0\u4EA4\u767B\u5F55");
+      if (input.revision !== revisionOf(JSON.parse(await readFile4(this.file, "utf8")))) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u65B0\u63D0\u4EA4\u767B\u5F55");
       let login;
       try {
         login = await this.workbuddyLogin.complete(input.challenge, input.code, input.verify ?? true);
@@ -1357,7 +1540,7 @@ var Manager = class {
       return this.state();
     }
     if (input.action === "account.export") {
-      if (input.revision !== revisionOf(JSON.parse(await readFile3(this.file, "utf8")))) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u63D0\u53D6\u51ED\u8BC1");
+      if (input.revision !== revisionOf(JSON.parse(await readFile4(this.file, "utf8")))) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u63D0\u53D6\u51ED\u8BC1");
       const account = this.config.accounts.find((a) => a.id === input.id);
       if (!account) bad("\u8D26\u53F7\u4E0D\u5B58\u5728");
       let credential;
@@ -1379,7 +1562,7 @@ var Manager = class {
       } };
     }
     if (input.action === "config.export") {
-      if (input.revision !== revisionOf(JSON.parse(await readFile3(this.file, "utf8")))) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u5BFC\u51FA");
+      if (input.revision !== revisionOf(JSON.parse(await readFile4(this.file, "utf8")))) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u5BFC\u51FA");
       try {
         return { ...this.state(), exported: { filename: `dsh-multi-router-${input.includeCredentials ? "encrypted" : "settings"}-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}.json`, document: await exportConfiguration(this, input) } };
       } catch (e) {
@@ -1400,10 +1583,10 @@ var Manager = class {
         const account = this.config.accounts.find((a) => a.id === input.id);
         if (!account) bad("\u8D26\u53F7\u4E0D\u5B58\u5728");
         this.router.clients.delete(account.id);
-        await this.monitorAccount(account);
+        await this.monitorAccount(account, { force: true });
       } else {
         await this.syncLocalAccounts(input.provider);
-        await this.monitorAll(input.provider);
+        await this.monitorAll(input.provider, { force: true });
       }
       return this.state();
     }
@@ -1427,7 +1610,7 @@ var Manager = class {
       return this.state();
     }
     return withFileLock3(this.file, async () => {
-      let raw = JSON.parse(await readFile3(this.file, "utf8"));
+      let raw = JSON.parse(await readFile4(this.file, "utf8"));
       if (input.revision !== revisionOf(raw)) throw new ManagementError(409, "\u914D\u7F6E\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u540E\u518D\u4FDD\u5B58");
       raw.routes ??= structuredClone(this.config.routes);
       let staging;
@@ -1450,10 +1633,10 @@ var Manager = class {
           }
           if (!/^[a-zA-Z0-9_-]{1,64}$/.test(input.id ?? "") || !PROVIDERS.includes(input.provider)) bad("\u8D26\u53F7 ID \u6216\u4F9B\u5E94\u5546\u65E0\u6548");
           if (account && !replacing) bad("\u8D26\u53F7 ID \u5DF2\u5B58\u5728\uFF0C\u8BF7\u4F7F\u7528\u4E0D\u540C ID");
-          const base = join4(dirname3(this.file), "accounts");
+          const base = join5(dirname3(this.file), "accounts");
           await mkdir2(base, { recursive: true, mode: 448 });
-          staging = await mkdtemp2(join4(base, `${input.id}-`));
-          const credentialFile = join4(staging, "credential.json"), identityFile = join4(staging, "identity.json");
+          staging = await mkdtemp2(join5(base, `${input.id}-`));
+          const credentialFile = join5(staging, "credential.json"), identityFile = join5(staging, "identity.json");
           const added = {
             id: input.id,
             name: input.name || account?.name || input.id,
@@ -1649,12 +1832,12 @@ var Manager = class {
   }
   watch(onError) {
     let timer;
-    const watcher = watch(dirname3(this.file), (_, filename) => {
+    const watcher = watch2(dirname3(this.file), (_, filename) => {
       if (filename && String(filename) !== this.file.split(/[\\/]/).pop()) return;
       clearTimeout(timer);
       timer = setTimeout(() => {
         void withFileLock3(this.file, async () => {
-          const raw = JSON.parse(await readFile3(this.file, "utf8"));
+          const raw = JSON.parse(await readFile4(this.file, "utf8"));
           if (this.closed || revisionOf(raw) === this.revision) return;
           const config = validateConfig(raw, this.file);
           this.raw = raw;
@@ -1719,10 +1902,11 @@ function managementHandler(manager) {
 
 export {
   version,
+  PluginReload,
   MANAGEMENT_PATH,
   ManagementError,
   modelInfo,
   Manager,
   managementHandler
 };
-//# sourceMappingURL=chunk-ILRW3ELD.js.map
+//# sourceMappingURL=chunk-I4EW5TI7.js.map