dsh-theone 0.3.9 → 0.3.12

package/dist/client.js

@@ -88,6 +88,17 @@ var zh = {
   "gateway.opening": "\u6B63\u5728\u6253\u5F00 TheOne \u4E3B\u804A\u5929\u2026",
   "gateway.error": "\u4E3B\u804A\u5929\u6682\u65F6\u65E0\u6CD5\u6253\u5F00\uFF0C\u8BF7\u68C0\u67E5 DSH \u8FDE\u63A5\u548C TheOne \u63D2\u4EF6\u72B6\u6001\u3002",
   "retry": "\u91CD\u8BD5",
+  "update.available": "\u66F4\u65B0",
+  "update.installing": "\u66F4\u65B0\u4E2D\u2026",
+  "update.restart": "\u91CD\u542F\u751F\u6548",
+  "update.reloading": "\u6B63\u5728\u91CD\u65B0\u52A0\u8F7D\u2026",
+  "update.reloadingHint": "TheOne \u6B63\u5728\u7528\u65B0\u7248\u672C\u91CD\u65B0\u52A0\u8F7D\uFF0CDSH \u4E0D\u9700\u8981\u91CD\u542F\uFF1B\u5B8C\u6210\u540E\u9875\u9762\u4F1A\u81EA\u52A8\u5237\u65B0\u3002",
+  "update.busy": "\u6709\u56DE\u590D\u6B63\u5728\u8FDB\u884C\uFF0C\u7B49\u5B83\u7ED3\u675F\u540E\u518D\u70B9\u66F4\u65B0\u3002",
+  "update.failed": "\u66F4\u65B0\u5931\u8D25",
+  "update.hint": "\u5F53\u524D {current}\uFF0C\u53EF\u66F4\u65B0\u5230 {latest}\u3002\u70B9\u51FB\u4E00\u952E\u66F4\u65B0\uFF0C\u4E0D\u7528\u91CD\u542F DSH\u3002",
+  "update.manualHint": "\u5F53\u524D {current}\uFF0C\u6700\u65B0 {latest}\u3002\u8FD9\u4EFD\u63D2\u4EF6\u4E0D\u662F\u4ECE GitHub \u6216 npm \u5B89\u88C5\u7684\uFF0C\u8BF7\u5728\u300C\u63D2\u4EF6\u300D\u9875\u9762\u91CD\u65B0\u5B89\u88C5\u3002",
+  "update.restartHint": "\u5DF2\u66F4\u65B0\uFF0C\u91CD\u542F DSH \u540E\u751F\u6548\u3002",
+  "update.failedHint": "\u66F4\u65B0\u6CA1\u6709\u5B8C\u6210\uFF08{error}\uFF09\u3002\u70B9\u51FB\u91CD\u8BD5\uFF0C\u6216\u5728\u300C\u63D2\u4EF6\u300D\u9875\u9762\u91CD\u65B0\u5B89\u88C5\u3002",
   "settings.title": "TheOne \u8BBE\u7F6E",
   "settings.menu": "\u8BBE\u7F6E",
   "settings.subtitle": "\u67E5\u770B\u5F53\u524D\u751F\u6548\u7684\u914D\u7F6E\u548C\u5404\u9879\u7528\u9014\u3002",
@@ -257,6 +268,17 @@ var en = {
   "gateway.opening": "Opening TheOne main chat\u2026",
   "gateway.error": "Main chat could not open. Check your DSH connection and TheOne plugin status.",
   "retry": "Retry",
+  "update.available": "Update",
+  "update.installing": "Updating\u2026",
+  "update.restart": "Restart to apply",
+  "update.reloading": "Reloading\u2026",
+  "update.reloadingHint": "TheOne is reloading with the new version; DSH keeps running, and the page refreshes when it is done.",
+  "update.busy": "A reply is in progress. Update once it finishes.",
+  "update.failed": "Update failed",
+  "update.hint": "You have {current}; {latest} is available. Click to update without restarting DSH.",
+  "update.manualHint": "You have {current}; {latest} is available. This copy was not installed from GitHub or npm, so reinstall it from the Plugins page.",
+  "update.restartHint": "Updated. Restart DSH to apply it.",
+  "update.failedHint": "The update did not finish ({error}). Click to retry, or reinstall from the Plugins page.",
   "settings.title": "TheOne settings",
   "settings.menu": "Settings",
   "settings.subtitle": "Review active configuration and what each option does.",
@@ -497,9 +519,94 @@ function apply(ctx) {
       });
     });
   });
+  let update;
+  const updateListeners = /* @__PURE__ */ new Set();
+  const setUpdate = (value) => {
+    update = value;
+    for (const listener of updateListeners) listener();
+  };
+  const subscribeUpdate = (listener) => {
+    updateListeners.add(listener);
+    return () => {
+      updateListeners.delete(listener);
+    };
+  };
+  const readUpdate = async (method = "GET") => {
+    try {
+      const response = await fetch("/api/theone/update", { method, signal: lifetime.signal, cache: "no-store" });
+      if (response.ok || response.status === 409) setUpdate(await response.json());
+      if (update?.state === "reloading") void awaitReload(update.current);
+    } catch {
+    }
+  };
+  async function awaitReload(previous) {
+    for (const started = Date.now(); Date.now() - started < 12e4; ) {
+      await new Promise((resolve) => setTimeout(resolve, 1500));
+      try {
+        const response = await fetch("/api/theone/update", { cache: "no-store" });
+        if (response.ok && (await response.json()).current !== previous) {
+          window.location.reload();
+          return;
+        }
+      } catch {
+      }
+    }
+    if (update) setUpdate({ ...update, state: "restart" });
+  }
+  ctx.effect(() => {
+    void readUpdate();
+    const timer = setInterval(() => {
+      void readUpdate();
+    }, 6 * 36e5);
+    return () => clearInterval(timer);
+  });
+  function UpdateButton() {
+    const t2 = useText();
+    const status = (0, import_react.useSyncExternalStore)(subscribeUpdate, () => update);
+    if (!status || !status.available && !status.state) return null;
+    const label = status.state === "installing" ? t2("update.installing") : status.state === "reloading" ? t2("update.reloading") : status.state === "restart" ? t2("update.restart") : status.state === "failed" ? t2("update.failed") : t2("update.available");
+    const title = status.error === "GATEWAY_BUSY" ? t2("update.busy") : status.state === "reloading" ? t2("update.reloadingHint") : status.state === "restart" ? t2("update.restartHint") : status.state === "failed" ? t2("update.failedHint", { error: status.error ?? "" }) : status.installable ? t2("update.hint", { current: status.current, latest: status.latest ?? "" }) : t2("update.manualHint", { current: status.current, latest: status.latest ?? "" });
+    const act = (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+      if (status.state === "installing" || status.state === "reloading" || status.state === "restart") return;
+      if (!status.installable) {
+        window.open("https://github.com/YunongDai2005/dsh-theone#readme", "_blank", "noopener");
+        return;
+      }
+      setUpdate({ ...status, state: "installing" });
+      void readUpdate("POST");
+    };
+    return (0, import_react.createElement)(
+      "span",
+      {
+        className: "theone-update",
+        role: "button",
+        tabIndex: 0,
+        title,
+        "aria-label": title,
+        "data-state": status.state ?? "available",
+        onClick: act,
+        onPointerDown: (event) => event.stopPropagation(),
+        onKeyDown: (event) => {
+          if (event.key === "Enter" || event.key === " ") act(event);
+        }
+      },
+      status.state === "installing" || status.state === "reloading" ? (0, import_react.createElement)("span", { className: "theone-update-spin", "aria-hidden": true }) : null,
+      label,
+      !status.state && status.latest ? (0, import_react.createElement)("small", null, `v${status.latest}`) : null
+    );
+  }
+  const symbol = () => (0, import_react.createElement)(
+    "svg",
+    { className: "theone-symbol", viewBox: "0 0 20 20", width: 20, height: 20, "aria-hidden": true, focusable: false },
+    (0, import_react.createElement)("circle", { cx: 10, cy: 10, r: 8.6, fill: "none", stroke: "currentColor", strokeWidth: 1.4 }),
+    (0, import_react.createElement)("circle", { cx: 10, cy: 10, r: 2.4, fill: "currentColor" })
+  );
   function SidebarEntry({ size }) {
     const t2 = useText();
     const marker = (0, import_react.useRef)(null);
+    const pending = (0, import_react.useSyncExternalStore)(subscribeUpdate, () => !!update?.available && !update.state);
     const id = (0, import_react.useSyncExternalStore)(navigation.subscribe, navigation.getSnapshot);
     const sessions = (0, import_react.useSyncExternalStore)(ctx.sessions.list.subscribe, ctx.sessions.list.getSnapshot);
     const panel = (0, import_react.useSyncExternalStore)(ctx.layout.panelInfo.subscribe, ctx.layout.panelInfo.getSnapshot);
@@ -606,7 +713,7 @@ function apply(ctx) {
     return (0, import_react.createElement)(
       "span",
       { ref: marker, className: "theone-nav", translate: "no", "data-wide": size === 16, "data-active": active },
-      (0, import_react.createElement)("span", { className: "theone-symbol" }),
+      (0, import_react.createElement)("span", { className: "theone-symbol-wrap" }, symbol(), size !== 16 && pending ? (0, import_react.createElement)("span", { className: "theone-update-dot", "aria-hidden": true }) : null),
       size === 16 && (0, import_react.createElement)(
         "span",
         { className: "theone-entry-copy" },
@@ -622,7 +729,8 @@ function apply(ctx) {
           (0, import_react.createElement)("span", { className: "theone-entry-label" }, t2("gateway.label"))
         ),
         (0, import_react.createElement)("span", { className: "theone-entry-sub" }, t2("gateway.subtitle"))
-      )
+      ),
+      size === 16 && (0, import_react.createElement)(UpdateButton)
     );
   }
   function GatewayPanel() {
@@ -1317,17 +1425,17 @@ function apply(ctx) {
   ctx.effect(() => {
     const style = document.createElement("style");
     style.dataset.plugin = "dsh-theone-gateway-row";
-    const update = () => {
+    const update2 = () => {
       const id = navigation.getSnapshot();
       style.textContent = id ? `[role="treeitem"][data-row-key="${CSS.escape(`session:${id}`)}"]{display:none!important}` : "";
     };
-    update();
-    const unsubscribe = navigation.subscribe(update);
-    window.addEventListener("storage", update);
+    update2();
+    const unsubscribe = navigation.subscribe(update2);
+    window.addEventListener("storage", update2);
     document.head.append(style);
     return () => {
       unsubscribe();
-      window.removeEventListener("storage", update);
+      window.removeEventListener("storage", update2);
       style.remove();
     };
   });
@@ -1355,9 +1463,21 @@ button:has(.theone-nav[data-wide=true])>span:not(:has(.theone-nav)){display:none
 button:has(.theone-nav):hover{background:var(--one-tint);border-color:color-mix(in srgb,var(--one-accent) 40%,var(--one-line))}
 button:has(.theone-nav[data-active=true]){border-color:color-mix(in srgb,var(--one-accent) 40%,var(--one-line))}
 .theone-nav{display:flex;align-items:center;gap:10px;color:var(--one-accent);font-family:inherit;position:relative;z-index:1}
-.theone-symbol{width:18px;height:18px;border:1px solid currentColor;border-radius:50%;display:inline-flex;align-items:center;justify-content:center;flex:none}
-.theone-symbol:after{content:'';width:4px;height:4px;border-radius:50%;background:currentColor}
-.theone-nav[data-wide=true] .theone-symbol{margin:0 3px}
+.theone-symbol-wrap{position:relative;display:inline-flex;flex:none;width:20px;height:20px}
+.theone-nav .theone-symbol{display:block;width:20px;height:20px;flex:none;overflow:visible;border:0;border-radius:0;background:none}
+.theone-nav[data-wide=true] .theone-symbol-wrap{margin:0 2px}
+.theone-update-dot{position:absolute;top:-2px;right:-2px;width:7px;height:7px;border-radius:50%;background:#e8590c;box-shadow:0 0 0 2px var(--one-tint)}
+button:has(.theone-nav[data-wide=true])>span:has(.theone-nav){flex:1;min-width:0}
+.theone-nav[data-wide=true]{width:100%}
+.theone-update{margin-left:auto;align-self:center;display:inline-flex;align-items:center;gap:5px;padding:5px 10px;border-radius:999px;border:1px solid color-mix(in srgb,var(--one-accent) 45%,transparent);background:color-mix(in srgb,var(--one-accent) 12%,transparent);color:var(--one-accent);font-size:12px;line-height:16px;white-space:nowrap;cursor:pointer;transition:background 150ms ease}
+.theone-update:hover{background:color-mix(in srgb,var(--one-accent) 22%,transparent)}
+.theone-update:focus-visible{outline:2px solid var(--one-accent);outline-offset:2px}
+.theone-update small{font-size:11px;opacity:.75}
+.theone-update[data-state=installing],.theone-update[data-state=reloading],.theone-update[data-state=restart]{cursor:default}
+.theone-update[data-state=failed]{color:#d9480f;border-color:#d9480f66;background:#d9480f14}
+.theone-update-spin{width:10px;height:10px;border-radius:50%;border:1.5px solid currentColor;border-right-color:transparent;animation:theone-spin 800ms linear infinite}
+@keyframes theone-spin{to{transform:rotate(360deg)}}
+@media(prefers-reduced-motion:reduce){.theone-update-spin{animation:none}}
 .theone-entry-copy{display:flex;flex-direction:column;align-items:flex-start;gap:2px}
 .theone-entry-title{display:flex;align-items:center;gap:9px;line-height:22px}
 .theone-wordmark{display:inline-flex;align-items:baseline;gap:1px;white-space:nowrap}

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Context, Service } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
-import type { GenerateOptions, LlmResolvedModelInfo, StreamChunk } from '@deepseek-ai/dsh-llm';
+import type { GenerateOptions, LlmModelInfo, LlmResolvedModelInfo, StreamChunk } from '@deepseek-ai/dsh-llm';
+import type { ModelSelection } from '@deepseek-ai/dsh-agent';
 import type { SessionEventWindow } from '@deepseek-ai/dsh-session-query';
 import { HistoryCatalog } from './history-catalog.ts';
 import { ContextStore } from './store.ts';
@@ -8,6 +9,7 @@ import type { RouterReceipt } from './llm-router.ts';
 import type { LinkageSnapshot } from './catalog-types.ts';
 import { type SettingsSnapshot } from './settings-types.ts';
 import { type LinkScope } from './linkage.ts';
+import { Updater } from './update.ts';
 export interface Config {
     databasePath?: string;
     contextsPath?: string;
@@ -54,6 +56,8 @@ declare module '@deepseek-ai/dsh-llm' {
         };
     }
 }
+export declare function viaModel(selection: ModelSelection): string;
+export declare function parseVia(id: string | undefined): ModelSelection | undefined;
 export default class TheOne extends Service {
     private config;
     static inject: string[];
@@ -72,6 +76,8 @@ export default class TheOne extends Service {
     private readonly closing;
     /** A model the user picked in main chat's own model selector; it answers through the Workers. */
     private pickedModel?;
+    /** Update checks and one-click install through DSH's plugin manager. */
+    readonly updater: Updater;
     /** Sessions whose current step answers through TheOne; only these refuse to run tools themselves. */
     private readonly throughTheOne;
     constructor(ctx: Context, config: Config);
@@ -89,8 +95,12 @@ export default class TheOne extends Service {
     /** Capture before Web saves the gateway itself as DSH's new default. */
     captureDefaultModel(): void;
     private backingModel;
-    /** The entry has exactly the configured backing model's capacity, including DSH overrides. */
-    gatewayModelInfo(provider?: string, signal?: AbortSignal): Promise<LlmResolvedModelInfo>;
+    /** Every model DSH offers besides TheOne; a provider that cannot list its models in time offers none. */
+    private offeredModels;
+    /** Main chat's model menu: plain TheOne (follow DSH), then "TheOne · <model>" for every model DSH offers. */
+    gatewayModels(provider: string): Promise<LlmModelInfo[]>;
+    /** The entry has exactly the backing model's capacity, including DSH overrides. */
+    gatewayModelInfo(provider?: string, signal?: AbortSignal, model?: string): Promise<LlmResolvedModelInfo>;
     /** This main chat's recent text turns, each attributed to the topic it was routed to. */
     private recentMainChat;
     /** Recover bounded routing context from DSH references after the Gateway is rebuilt. */

package/dist/index.js

@@ -19,10 +19,26 @@ import { EDITABLE_SETTINGS_KEYS, RESTART_SETTINGS_KEYS } from "./settings-types.
 import { validateSettings } from "./settings.js";
 import { RESTART_CODE, WorkerRun } from "./run.js";
 import { buildBriefing, LINK_SIGNAL, relatedTopics } from "./linkage.js";
+import { PACKAGE_NAME, Updater } from "./update.js";
 function redactDescriptor(text) {
     return text.replace(/\bsk-[a-zA-Z0-9_-]{16,}|\bBearer\s+\S+/gi, '[REDACTED]')
         .replace(/((?:api[_ -]?key|password|密码|密钥)\s*[:=：]\s*)\S+/gi, '$1[REDACTED]');
 }
+/**
+ * Main chat's model entries besides plain "TheOne": "TheOne · <model>" still answers through TheOne,
+ * with that model doing the routing and the background work.
+ */
+const VIA = 'via:';
+export function viaModel(selection) { return `${VIA}${selection.provider}/${selection.model}`; }
+export function parseVia(id) {
+    if (!id?.startsWith(VIA))
+        return undefined;
+    const rest = id.slice(VIA.length);
+    const slash = rest.indexOf('/');
+    if (slash <= 0 || slash === rest.length - 1 || rest.slice(0, slash) === 'theone')
+        return undefined;
+    return { provider: rest.slice(0, slash), model: rest.slice(slash + 1) };
+}
 /** Gateway provider delegates each accepted input to its context's DSH worker. */
 class GatewayAdapter extends LlmAdapter {
     service;
@@ -31,15 +47,11 @@ class GatewayAdapter extends LlmAdapter {
         this.service = service;
     }
     providerInfo(provider) { return { id: provider, name: 'TheOne' }; }
-    async listModels(provider) {
-        // The entry accepts whatever the backing model accepts (e.g. images).
-        const info = await this.service.gatewayModelInfo(provider).catch(() => undefined);
-        return [{ provider, id: 'gateway', name: 'TheOne', inputModalities: [...(info?.inputModalities ?? ['text'])] }];
-    }
+    listModels(provider) { return this.service.gatewayModels(provider); }
     resolveModel(provider, model, signal) {
-        if (model !== 'gateway')
-            throw new Error('TheOne only exposes the gateway model');
-        return this.service.gatewayModelInfo(provider, signal);
+        if (model !== 'gateway' && !parseVia(model))
+            throw new Error('TheOne only exposes its gateway models');
+        return this.service.gatewayModelInfo(provider, signal, model);
     }
     providerRetryPolicy() { return resolveRetryPolicy({ mode: 'normal', maxRetries: 0 }, 'theone.retry'); }
     stream(options) { return this.service.answer(options); }
@@ -85,6 +97,28 @@ function reasonLabel(reason) {
 function settingsConfig(values) {
     return { ...values, workerProvider: values.workerProvider ?? undefined, workerModel: values.workerModel ?? undefined, contextsPath: values.contextsPath ?? undefined };
 }
+/**
+ * Switch an installed bundle off and on so DSH loads its new version. This disposes the running
+ * TheOne, so it runs after the current request has answered and outlives this instance.
+ */
+function reloadBundle(manager, bundle) {
+    setTimeout(() => {
+        void (async () => {
+            const off = await manager.setBundleEnabled(bundle, false);
+            if (off.application === 'failed' || off.application === 'cancelled')
+                return;
+            await manager.setBundleEnabled(bundle, true);
+        })().catch(error => console.warn('TheOne could not reload itself after updating; restart DSH to apply the update.', error));
+    }, 300);
+}
+function readOwnVersion() {
+    try {
+        return String(JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version ?? '0.0.0');
+    }
+    catch {
+        return '0.0.0';
+    }
+}
 function readDescriptors(path) {
     const value = JSON.parse(readFileSync(path, 'utf8'));
     if (!Array.isArray(value))
@@ -132,6 +166,8 @@ export default class TheOne extends Service {
     closing = new Map();
     /** A model the user picked in main chat's own model selector; it answers through the Workers. */
     pickedModel;
+    /** Update checks and one-click install through DSH's plugin manager. */
+    updater;
     /** Sessions whose current step answers through TheOne; only these refuse to run tools themselves. */
     throughTheOne = new WeakMap();
     constructor(ctx, config) {
@@ -164,6 +200,18 @@ export default class TheOne extends Service {
         }
         descriptors ??= config.contextsPath ? readDescriptors(config.contextsPath) : [];
         this.gatewayDirectory = resolve(dirname(databasePath), 'gateway');
+        this.updater = new Updater(readOwnVersion(), () => {
+            // The profile's package.json records how this plugin was installed (GitHub, npm or a local path).
+            const dir = ctx.profileContext?.dir;
+            if (!dir)
+                return undefined;
+            try {
+                return JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8')).dependencies?.[PACKAGE_NAME];
+            }
+            catch {
+                return undefined;
+            }
+        });
         ctx.effect(() => async () => {
             try {
                 await Promise.all([...this.workers.values()].map(handle => handle.dispose()));
@@ -264,8 +312,8 @@ export default class TheOne extends Service {
                 return config;
             }
             this.throughTheOne.set(payload.agent, true);
-            // The resolved selection is authoritative; TheOne itself means "follow DSH's selected model".
-            this.pickedModel = config.provider === 'theone' ? undefined : { provider: config.provider, model: config.model };
+            // The resolved selection is authoritative; plain TheOne means "follow DSH's selected model".
+            this.pickedModel = config.provider === 'theone' ? parseVia(config.model) : { provider: config.provider, model: config.model };
             return config.provider === 'theone' ? config : { ...config, provider: 'theone', model: 'gateway' };
         }, { prepend: true });
         ctx.on('agent/pre-step', async ({ agent, signal }, next) => {
@@ -278,7 +326,7 @@ export default class TheOne extends Service {
             // Know main chat's model choice before routing, so this very message is classified with it.
             const pickedNow = selected?.signal === signal ? selected.model : undefined;
             if (provider === 'theone')
-                this.pickedModel = undefined;
+                this.pickedModel = parseVia(pickedNow ?? agent.options.model);
             else if (provider && pickedNow)
                 this.pickedModel = { provider, model: pickedNow };
             const users = decision.messages.filter(message => message.source.kind === 'user');
@@ -566,6 +614,18 @@ export default class TheOne extends Service {
                         return Response.json({ error: code }, { status: code === 'GATEWAY_BUSY' ? 409 : 400 });
                     }
                 } }));
+            // Is a newer TheOne out, and install it with DSH's plugin manager (it loads after a restart).
+            child.effect(() => connection.fetch.register({ path: '/api/theone/update', methods: ['GET', 'POST'], requestBody: 'buffered', fetch: async (request) => {
+                    if (request.method === 'POST' && (this.active || this.reservedGateway))
+                        return Response.json({ ...await this.updater.status(), error: 'GATEWAY_BUSY' }, { status: 409 });
+                    const manager = this.ctx.get('pluginManager');
+                    // With DSH's hot reload, switching the bundle off and on loads the new version without a DSH restart.
+                    const live = !!this.ctx.get('hmr') && typeof manager?.setBundleEnabled === 'function';
+                    const status = request.method === 'POST'
+                        ? await this.updater.install(manager, live ? bundle => reloadBundle(manager, bundle) : undefined)
+                        : await this.updater.status(new URL(request.url).searchParams.has('force'));
+                    return Response.json(status, { headers: { 'cache-control': 'no-store' } });
+                } }));
             child.effect(() => connection.fetch.register({ path: '/api/theone/sessions', methods: ['GET'], requestBody: 'buffered', fetch: async () => Response.json({ sessions: await this.attachableSessions() }, { headers: { 'cache-control': 'no-store' } }) }));
             // The user's corrections to topic linking always take precedence over what was learned.
             child.effect(() => connection.fetch.register({ path: '/api/theone/links', methods: ['POST'], requestBody: 'buffered', fetch: async (request) => {
@@ -701,7 +761,7 @@ export default class TheOne extends Service {
         const defaultSelection = this.ctx.agentDefaultModel.currentSelection();
         const selection = c.workerProvider && c.workerModel
             ? { provider: c.workerProvider, model: c.workerModel }
-            : defaultSelection.provider !== 'theone' ? defaultSelection : this.store.rememberedModel(c.gatewayKey);
+            : defaultSelection.provider !== 'theone' ? defaultSelection : parseVia(defaultSelection.model) ?? this.store.rememberedModel(c.gatewayKey);
         let model = selection ? { provider: selection.provider, model: selection.model } : null;
         let modelUnavailable = !model;
         if (selection) {
@@ -729,10 +789,7 @@ export default class TheOne extends Service {
                 savedValues = validateSettings(saved.values, { contextsPath: c.contextsPath ?? null });
         }
         catch { /* Keep the current usable form. */ }
-        // A provider that cannot list its models in time offers none here.
-        const listed = await Promise.all(this.ctx.llm.listProviders().filter(provider => provider.id !== 'theone').map(provider => Promise.race([this.ctx.llm.listModels(provider.id), new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), 5000).unref())])
-            .then(models => models.map(model => ({ provider: provider.id, id: model.id, name: model.name })), () => [])));
-        const models = listed.flat();
+        const models = (await this.offeredModels()).map(model => ({ provider: model.provider, id: model.id, name: model.name }));
         return { values, model, models, modelUnavailable, savedValues, revision: saved?.revision ?? 0,
             restartRequired: RESTART_SETTINGS_KEYS.some(key => savedValues[key] !== activeEditable[key]) };
     }
@@ -749,8 +806,9 @@ export default class TheOne extends Service {
     }
     /** Capture before Web saves the gateway itself as DSH's new default. */
     captureDefaultModel() {
-        const selection = this.ctx.agentDefaultModel.currentSelection();
-        if (selection.provider && selection.model && selection.provider !== 'theone')
+        const current = this.ctx.agentDefaultModel.currentSelection();
+        const selection = current.provider === 'theone' ? parseVia(current.model) : current;
+        if (selection?.provider && selection.model)
             this.store.rememberModel(this.config.gatewayKey, selection);
     }
     backingModel() {
@@ -764,12 +822,32 @@ export default class TheOne extends Service {
             throw new RouterFailure('ROUTER_MODEL_MISSING');
         return selection;
     }
-    /** The entry has exactly the configured backing model's capacity, including DSH overrides. */
-    async gatewayModelInfo(provider = 'theone', signal) {
-        const info = { provider, id: 'gateway', name: 'TheOne Gateway', inputModalities: ['text'] };
+    /** Every model DSH offers besides TheOne; a provider that cannot list its models in time offers none. */
+    async offeredModels() {
+        const listed = await Promise.all(this.ctx.llm.listProviders().filter(provider => provider.id !== 'theone').map(provider => Promise.race([this.ctx.llm.listModels(provider.id), new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), 5000).unref())])
+            .catch(() => [])));
+        return listed.flat();
+    }
+    /** Main chat's model menu: plain TheOne (follow DSH), then "TheOne · <model>" for every model DSH offers. */
+    async gatewayModels(provider) {
+        // The entry accepts whatever the backing model accepts (e.g. images).
+        const info = await this.gatewayModelInfo(provider).catch(() => undefined);
+        const models = [{ provider, id: 'gateway', name: 'TheOne', inputModalities: [...(info?.inputModalities ?? ['text'])] }];
+        // A model pinned in TheOne's settings decides for the Workers, so choices here would do nothing.
+        if (this.config.workerProvider && this.config.workerModel)
+            return models;
+        for (const model of await this.offeredModels())
+            models.push({ provider, id: viaModel({ provider: model.provider, model: model.id }), name: `TheOne · ${model.name}`,
+                ...(model.description ? { description: model.description } : {}), ...(model.inputModalities ? { inputModalities: [...model.inputModalities] } : {}) });
+        return models;
+    }
+    /** The entry has exactly the backing model's capacity, including DSH overrides. */
+    async gatewayModelInfo(provider = 'theone', signal, model = 'gateway') {
+        const chosen = parseVia(model);
+        const info = { provider, id: model, name: 'TheOne Gateway', inputModalities: ['text'] };
         let selection;
         try {
-            selection = this.backingModel();
+            selection = chosen ?? this.backingModel();
         }
         catch (error) {
             if (error instanceof RouterFailure && error.code === 'ROUTER_MODEL_MISSING')
@@ -777,6 +855,8 @@ export default class TheOne extends Service {
             throw error;
         }
         const backing = await this.ctx.llm.resolveModelInfo(selection.provider, selection.model, signal);
+        if (chosen)
+            info.name = `TheOne · ${backing.name}`;
         // Image input and the thinking-effort choices are the backing model's, so main chat offers the same controls.
         return { ...info, ...(backing.inputModalities ? { inputModalities: [...backing.inputModalities] } : {}),
             ...(backing.reasoning ? { reasoning: backing.reasoning } : {}),

package/dist/update.d.ts

@@ -0,0 +1,55 @@
+export declare const REPOSITORY = "YunongDai2005/dsh-theone";
+export declare const PACKAGE_NAME = "dsh-theone";
+/** Where this copy was installed from, which decides where its updates come from. */
+export type UpdateSource = 'github' | 'npm' | 'other';
+export interface UpdateStatus {
+    current: string;
+    latest?: string;
+    /** A newer version exists. */
+    available: boolean;
+    /** It can be installed from here (otherwise reinstall by hand). */
+    installable: boolean;
+    source: UpdateSource;
+    /** installing → reloading (TheOne restarts itself; DSH keeps running), restart (applies after DSH restarts) or failed. */
+    state?: 'installing' | 'reloading' | 'restart' | 'failed';
+    error?: string;
+}
+/** The DSH plugin manager's install call, as TheOne uses it. */
+export interface PluginInstaller {
+    installBundle(spec: string, options?: {
+        enabled?: boolean;
+    }): Promise<{
+        application: string;
+        bundle?: string;
+        error?: {
+            code?: string;
+            message?: string;
+        } | unknown;
+    }>;
+}
+/** Compare dotted versions numerically; a pre-release sorts before its release. */
+export declare function compareVersions(a: string, b: string): number;
+/** Read the dependency spec DSH saved for this plugin: GitHub, npm, or something else (a local path, a tarball). */
+export declare function installSource(spec: string | undefined): UpdateSource;
+/** Checks for a newer TheOne and installs it through DSH's own plugin manager. */
+export declare class Updater {
+    readonly current: string;
+    private readonly spec;
+    private readonly fetcher;
+    private readonly now;
+    private checked?;
+    private state?;
+    private error?;
+    private pending?;
+    constructor(current: string, spec: () => string | undefined, fetcher?: typeof fetch, now?: () => number);
+    get source(): UpdateSource;
+    /** The latest known status; checks again at most every six hours (or now, when forced). */
+    status(force?: boolean): Promise<UpdateStatus>;
+    /**
+     * Install the newer version. With `reload`, TheOne then restarts itself so the new version runs
+     * without restarting DSH; otherwise it is loaded the next time DSH starts.
+     */
+    install(installer: PluginInstaller | undefined, reload?: (bundle: string) => void): Promise<UpdateStatus>;
+    private snapshot;
+    private check;
+}