dsh-multi-router 0.5.3 → 0.5.5

package/lib/{chunk-EJWYFWIT.js → chunk-PQETKUGT.js}

@@ -3,20 +3,20 @@ import {
   jsonCredential,
   qoderPluginDataDir,
   supportsCheckin
-} from "./chunk-RPW6DI6O.js";
+} from "./chunk-EGLF4CWD.js";
 import {
   discoverLocalAccounts,
   importAccount,
   localAccountKey,
   readPortableCredential
-} from "./chunk-4H6ZXK75.js";
+} from "./chunk-OFFVP6YN.js";
 import {
   hostIsLoopback
 } from "./chunk-DNQPZMPF.js";
 import {
   Telemetry,
   matchModel
-} from "./chunk-XA3V2DGT.js";
+} from "./chunk-J3XO7RTF.js";
 import {
   PROVIDERS,
   PROVIDER_NAMES,
@@ -27,7 +27,7 @@ import {
   routeReasoning,
   validateConfig,
   writePrivateJson
-} from "./chunk-U7J4ABAM.js";
+} from "./chunk-MCHV2R25.js";
 import {
   modelWithCurrentPromotion
 } from "./chunk-TEZ2FMEO.js";
@@ -36,7 +36,7 @@ import {
 import { createHash, randomBytes as randomBytes2, timingSafeEqual } from "node:crypto";
 
 // package.json
-var version = "0.5.3";
+var version = "0.5.5";
 
 // src/manager.mjs
 import { readFile as readFile2, mkdir as mkdir2, mkdtemp as mkdtemp2, rm as rm3 } from "node:fs/promises";
@@ -98,7 +98,7 @@ var derive = promisify(scrypt);
 var FORMAT = "dsh-multi-router";
 var MAX_BYTES = 512 * 1024;
 var pick = (value, keys) => Object.fromEntries(keys.filter((k) => Object.hasOwn(value ?? {}, k)).map((k) => [k, value[k]]));
-var options = ["cooldownMs", "requestTimeoutMs", "catalogTtlMs", "retryServerErrors", "modelVisibility", "usageRetentionDays"];
+var options = ["cooldownMs", "requestTimeoutMs", "catalogTtlMs", "retryServerErrors", "modelVisibility", "usageRetentionDays", "checkinSchedule"];
 function settings(config) {
   return {
     ...pick(config, options),
@@ -414,7 +414,12 @@ 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 } = {}) {
+  constructor({ service = () => void 0, profile = () => void 0, fetchImpl = (...args) => fetch(...args), lookup = registryVersion, refreshGit = refreshGitPlugin, stateFile, now = Date.now } = {}) {
+    this.stateFile = stateFile;
+    this.now = now;
+    this.dismissed = {};
+    this.lastAttempt = 0;
+    this.saveQueue = Promise.resolve();
     this.service = service;
     this.profile = profile;
     this.fetchImpl = fetchImpl;
@@ -423,10 +428,47 @@ var PluginUpdates = class {
     this.lookup = lookup;
     this.refreshGit = refreshGit;
   }
+  async load() {
+    const saved = this.stateFile && await jsonFile(this.stateFile);
+    if (saved?.version === 1) {
+      this.lastAttempt = Number.isFinite(saved.lastAttempt) ? saved.lastAttempt : 0;
+      this.checkedAt = saved.checkedAt;
+      this.dismissed = saved.dismissed && typeof saved.dismissed === "object" && !Array.isArray(saved.dismissed) ? saved.dismissed : {};
+      this.rows = Array.isArray(saved.rows) ? saved.rows.filter((r) => ["github", "npm"].includes(r.source?.kind)) : [];
+    }
+  }
+  persist() {
+    if (!this.stateFile) return Promise.resolve();
+    const saved = structuredClone({ version: 1, lastAttempt: this.lastAttempt, checkedAt: this.checkedAt, dismissed: this.dismissed, rows: this.rows.filter((r) => ["github", "npm"].includes(r.source.kind)) });
+    this.saveQueue = this.saveQueue.catch(() => {
+    }).then(() => writePrivateJson(this.stateFile, saved));
+    return this.saveQueue;
+  }
+  reminderKey(row) {
+    return JSON.stringify([row.name, row.source, row.version, row.latestVersion ?? row.latestCommit]);
+  }
+  reminders() {
+    return this.rows.filter((r) => r.status === "available" && (!Object.hasOwn(this.dismissed, r.name) || this.dismissed[r.name] !== this.reminderKey(r))).map((r) => ({ key: this.reminderKey(r), name: r.name, version: r.version, latestVersion: r.latestVersion, latestCommit: r.latestCommit }));
+  }
+  async dismiss(keys) {
+    if (!Array.isArray(keys) || keys.length > 200 || keys.some((k) => typeof k !== "string")) throw Error("\u65E0\u6548\u7684\u63D0\u9192\u5217\u8868");
+    for (const row of this.reminders()) if (keys.includes(row.key)) Object.defineProperty(this.dismissed, row.name, { value: row.key, enumerable: true, configurable: true, writable: true });
+    await this.persist();
+  }
+  async tick() {
+    if (this.flight || !this.state().available) return;
+    await this.list();
+    if (this.flight || this.now() >= this.lastAttempt && this.now() - this.lastAttempt < 864e5) return;
+    this.lastAttempt = this.now();
+    await this.persist();
+    if (!this.flight && !this.abort.signal.aborted) this.check();
+  }
   state() {
     return {
       available: !!this.service()?.listBundles && !!this.profile()?.dir,
       checkedAt: this.checkedAt,
+      reminders: this.reminders(),
+      autoCheckHours: 24,
       rows: this.rows.map(({ spec, ...row }) => ({ ...row, source: row.source.kind === "unsupported" ? { kind: "unsupported" } : row.source })),
       job: this.job,
       error: this.error
@@ -440,9 +482,9 @@ var PluginUpdates = class {
     }
     const [manifest, bundles, lock] = await Promise.all([jsonFile(join3(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).map((b) => {
+    this.rows = bundles.filter((b) => (b.installed || b.version) && manifest.dependencies?.[b.name] && b.removable !== false).map((b) => {
       const spec = manifest.dependencies?.[b.name];
-      const source = !spec || b.removable === false && !b.readOnlyReason ? { kind: "builtin" } : parsePluginSource(b.name, spec);
+      const source = parsePluginSource(b.name, spec);
       const npm = lock.npm?.packages?.[`node_modules/${b.name}`]?.resolved;
       const pnpm = lock.pnpm?.importers?.["."]?.dependencies?.[b.name]?.version;
       const installed = lock.preferNpm ? npm ?? pnpm : pnpm ?? npm;
@@ -455,8 +497,7 @@ var PluginUpdates = class {
         spec,
         source,
         commit: githubCommit(installed),
-        status: previous?.status ?? (source.kind === "builtin" ? "builtin" : source.kind === "unsupported" ? "unsupported" : "unchecked"),
-        ...source.kind === "builtin" ? { message: "DSH \u81EA\u5E26 / \u53D7\u4FDD\u62A4\u7EC4\u4EF6\uFF0C\u8BF7\u901A\u8FC7\u66F4\u65B0 DeepSeek Harness \u5347\u7EA7" } : {},
+        status: previous?.status ?? (source.kind === "unsupported" ? "unsupported" : "unchecked"),
         ...source.kind === "unsupported" ? { message: "\u672C\u5730\u6587\u4EF6 / \u94FE\u63A5\u6765\u6E90\uFF0C\u8BF7\u901A\u8FC7\u539F\u5B89\u88C5\u65B9\u5F0F\u66F4\u65B0" } : {}
       };
     });
@@ -503,13 +544,20 @@ var PluginUpdates = class {
     }, (e) => {
       this.job.state = this.job.cancelRequested ? "cancelled" : "failed";
       this.job.message = e.message;
-    }).finally(() => {
+    }).finally(async () => {
       this.job.finishedAt = Date.now();
+      try {
+        await this.persist();
+      } catch {
+        this.error = "\u66F4\u65B0\u68C0\u67E5\u8BB0\u5F55\u672A\u80FD\u4FDD\u5B58\uFF0C\u8BF7\u68C0\u67E5\u672C\u5730\u76EE\u5F55\u6743\u9650";
+      }
       this.flight = void 0;
     });
   }
   check() {
     this.start("check", async (job) => {
+      this.lastAttempt = this.now();
+      await this.persist();
       await this.list();
       const rows = this.rows.filter((r) => ["npm", "github"].includes(r.source.kind));
       job.total = rows.length;
@@ -618,7 +666,8 @@ var PluginUpdates = class {
     if (input.registry && !["https://registry.npmjs.org/", "https://registry.npmmirror.com/"].includes(input.registry)) throw Error("\u65E0\u6548\u7684 npm \u6765\u6E90");
     if (input.action === "plugins.list") {
       if (!this.flight) await this.list();
-    } else if (input.action === "plugins.check") this.check();
+    } else if (input.action === "plugins.dismiss") await this.dismiss(input.keys);
+    else if (input.action === "plugins.check") this.check();
     else if (input.action === "plugins.update") this.update(input.names, input.registry);
     else if (input.action === "plugins.install") this.install(input.spec, input.registry);
     else if (input.action === "plugins.cancel") {
@@ -682,7 +731,7 @@ var Manager = class {
     this.monitorFlights = /* @__PURE__ */ new Map();
     this.loginInfo = /* @__PURE__ */ new Map();
     this.telemetry = new Telemetry(join4(dirname3(file), "usage.json"));
-    this.plugins = new PluginUpdates(pluginAccess);
+    this.plugins = new PluginUpdates({ ...pluginAccess, stateFile: join4(dirname3(file), "plugin-updates.json") });
     this.checkins = new Checkins(join4(dirname3(file), "checkins.json"), this);
     this.setupFile = join4(dirname3(file), "initial-setup.json");
     router.telemetry = this.telemetry;
@@ -699,6 +748,10 @@ var Manager = class {
     }
     this.config = validateConfig(this.raw, this.file);
     await this.checkins.load();
+    await this.plugins.load();
+    if (this.plugins.state().available) await this.plugins.list().catch(() => {
+      this.plugins.rows = [];
+    });
     try {
       const saved = JSON.parse(await readFile2(this.catalogFile, "utf8"));
       for (const account of this.config.accounts) {
@@ -1264,6 +1317,9 @@ var Manager = class {
           }
           if (input.name !== void 0) account.name = input.name;
           if (input.enabled !== void 0) account.enabled = input.enabled;
+        } else if (input.action === "accounts.enabled") {
+          if (input.provider !== void 0 && !PROVIDERS.includes(input.provider) || typeof input.enabled !== "boolean") bad("\u4F9B\u5E94\u5546\u6216\u8DEF\u7531\u53C2\u4E0E\u5F00\u5173\u65E0\u6548");
+          for (const a of raw.accounts.filter((a2) => !input.provider || a2.provider === input.provider)) a.enabled = input.enabled;
         } else if (input.action === "account.move") {
           if (!account || ![-1, 1].includes(input.direction)) bad("\u8D26\u53F7\u6216\u987A\u5E8F\u65E0\u6548");
           const group = raw.accounts.filter((a) => a.provider === account.provider), position = group.indexOf(account) + input.direction;
@@ -1334,6 +1390,10 @@ var Manager = class {
           raw.routes[id] = structuredClone(ROUTE_PRESETS[id]);
         } else if (input.action === "preset.add-all") {
           for (const [id, route] of Object.entries(ROUTE_PRESETS)) if (!Object.hasOwn(raw.routes, id)) raw.routes[id] = structuredClone(route);
+        } else if (input.action === "checkins.settings") {
+          if (this.checkins.flight) bad("\u8BF7\u7B49\u5F85\u5F53\u524D\u7B7E\u5230\u5B8C\u6210\u540E\u4FEE\u6539\u8BA1\u5212");
+          if (!input.schedule) bad("\u8BF7\u586B\u5199\u7B7E\u5230\u8BA1\u5212");
+          raw.checkinSchedule = input.schedule;
         } else if (input.action === "options.save") {
           for (const key of ["cooldownMs", "requestTimeoutMs", "retryServerErrors", "usageRetentionDays"]) if (input[key] !== void 0) raw[key] = input[key];
         } else bad("\u672A\u77E5\u64CD\u4F5C");
@@ -1452,4 +1512,4 @@ export {
   Manager,
   managementHandler
 };
-//# sourceMappingURL=chunk-EJWYFWIT.js.map
+//# sourceMappingURL=chunk-PQETKUGT.js.map