dsh-gateway-provider 1.0.12 → 1.1.1

package/README.md

@@ -84,9 +84,11 @@ Everything lives in **Settings → Gateway Models**:
 
 ## Configuration reference
 
-Optional — everything below has a working default. Config lives in the
-`llm-newapi:` section of `~/.dsh/settings.yaml` (the settings page edits
-the same keys). The frequently used ones:
+Optional — everything below has a working default. With dsh ≥ 0.2 config
+lives in the `llm-newapi` entry of the profile
+(`~/.dsh/profiles/<name>/cordis.patch.yml`; the settings page edits the same
+data). A pre-0.2 `~/.dsh/settings.yaml` section is imported automatically on
+the first start where the plugin loads. The frequently used ones:
 
 | Key | Default | Meaning |
 | --- | --- | --- |

package/docs/README.zh.md

@@ -52,7 +52,7 @@ dsh --profile web
 
 ## 配置参考
 
-全部可选 —— 下表每项都有可用默认值。配置写在 `~/.dsh/settings.yaml` 的 `llm-newapi:` 段（设置页改的就是同一批键）。常用项：
+全部可选 —— 下表每项都有可用默认值。dsh ≥ 0.2 配置存在 profile 的 `llm-newapi` entry（`~/.dsh/profiles/<name>/cordis.patch.yml`，设置页改的就是同一份数据）；旧版 `~/.dsh/settings.yaml` 的 `llm-newapi:` 段会在插件可加载后的首次启动自动迁入。常用项：
 
 | 键 | 默认值 | 含义 |
 | --- | --- | --- |

package/index.js

@@ -39,7 +39,11 @@ import { DEFAULT_ENDPOINT_PRIORITY, deriveProtocolURLs } from "./lib/protocols.j
 export const name = "llm-newapi";
 export const inject = ["llm"];
 
-/** User-settings namespace whose section overrides this entry. */
+/**
+ * Settings namespace this plugin serves. dsh 0.2 keys settings (and model
+ * discovery) by the loader entry id; cordis.patch.yml declares the entry as
+ * `llm-newapi`, so the ids coincide and this remains the fallback name.
+ */
 const NS = "llm-newapi";
 /** The legacy single provider route (kept for backwards compatibility). */
 export const PROVIDER = "newapi";
@@ -60,7 +64,8 @@ const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 600_000;
 const DEFAULT_CATALOG_TTL_MS = 30 * 60 * 1000;
 
 /**
- * String field tolerant of hand-edited YAML scalars. `settings.yaml` is a
+ * String field tolerant of hand-edited YAML scalars. The profile patch
+ * (`cordis.patch.yml`, and pre-0.2 `settings.yaml` imports) is a
  * user-editable document parsed with YAML 1.2 core semantics: an unquoted
  * `true` / `false` / `True` / `FALSE` round-trips as a boolean and an
  * unquoted digit run as a number, long before the value reaches a strict
@@ -183,7 +188,7 @@ export const Config = z.object({
   // ---- Additional gateways ----
   /** Additional gateways; each becomes a `gateway:<id>` provider route. */
   gateways: z.array(GatewaySchema).default([]),
-});
+}).volatile();
 
 /**
  * Normalize one gateway entry into the connection facts the adapter needs.
@@ -306,7 +311,12 @@ export function resolveGateways(config, environment) {
 }
 
 export function apply(ctx, config) {
-  let current = () => config;
+  /** Settings namespace this entry serves: the loader entry id, else the legacy name. */
+  const settingsNs = ctx.fiber.entry?.options.id ?? NS;
+  // dsh 0.2 hands apply() a volatile config reference (a frozen { get } whose
+  // snapshot updates after every settings write); plain objects from older
+  // harnesses pass through unchanged.
+  const current = () => (typeof config?.get === "function" ? config.get() : config);
   let lastRaw;
   let resolved = null;
   /** Resolve (and cache) the gateway list from the current config snapshot. */
@@ -376,7 +386,7 @@ export function apply(ctx, config) {
     const entries = gateways.map((g, i) => ({
       provider: g.provider,
       displayName: g.label,
-      settingsNs: NS,
+      settingsNs,
       settingsPath: i === 0 ? [] : ["gateways", String(g.id)],
       declared: i > 0,
     }));
@@ -390,7 +400,7 @@ export function apply(ctx, config) {
   ensureRegistration();
 
   /** Expose model discovery so the web UI can fetch a gateway's model list. */
-  ctx.llm.registerModelDiscovery(NS, async (request) => {
+  ctx.llm.registerModelDiscovery(settingsNs, async (request) => {
     const env = launchEnvironmentOf(ctx);
     const gateways = resolve();
     const gw = request.provider !== undefined ? gateways.find((g) => g.provider === request.provider) : gateways[0];
@@ -412,12 +422,18 @@ export function apply(ctx, config) {
     }
   });
 
-  ctx.inject(["settings"], (settingsCtx) => {
-    settingsCtx.settings.installSection(ctx, NS, Config, config, {
-      setSource: (source) => {
-        current = source;
-      },
-      onChange: ensureRegistration,
-    });
+  // dsh 0.2 settings contract: the volatile-marked Config schema is picked
+  // up by the settings service automatically (installSection is gone). Settings
+  // writes land in the profile and the loader emits loader/volatile-update;
+  // re-resolve and re-register then. resolve() holds the last good snapshot
+  // when an update arrives invalid, so the catch only guards registration
+  // races (e.g. a provider-route conflict on a mid-flight update).
+  ctx.on("loader/volatile-update", () => {
+    try {
+      ensureRegistration();
+    } catch (error) {
+      ctx.logger.error("llm-newapi: keeping the last good configuration after a settings update");
+      ctx.logger.error(error);
+    }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gateway-provider",
-  "version": "1.0.12",
+  "version": "1.1.1",
   "description": "Generic LLM gateway model provider plugin for DeepSeek Harness: mounts newapi / LiteLLM / Higress / any OpenAI-compatible gateway as provider routes, auto-discovers the model list, enriches every model with models.dev parameters, and dispatches each model over its native wire protocol (OpenAI / Anthropic / Gemini) via the pi-ai SDK",
   "repository": {
     "type": "git",
@@ -70,10 +70,10 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-credentials": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-launch-environment": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-timeout": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-credentials": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-timeout": "0.2.1-rc.2",
     "@deepseek-ai/schemastery": "^3.18.1"
   }
 }