@goodandready/dsh-ollama-cloud-provider 0.1.10 → 0.1.11

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.1.11 — 2026-10-29
+
+- Compatibility declarations now use the same-channel range
+  `0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0` in `engines.dsh`,
+  `compatibility.dsh` and all DSH peer dependencies. Future `0.2.1-rc.*`
+  releases are admitted without a new plugin release; `dshReleases` remains the
+  tested engine matrix. A compatibility test guards the range, release list and
+  devDependency versions.
+- The model catalog is stale-while-revalidate: a cached catalog is returned
+  immediately after its TTL and refreshed in the background; only the first
+  load waits for the network. A failed background refresh keeps the cached rows.
+- Tool schema normalization is memoized per `parameters` object with a
+  `WeakMap`, so large MCP tool lists are not re-normalized on every request.
+
 ## 0.1.10 — 2026-10-28
 
 - Stabilized the native stream parser tests: a referenced keep-alive holds the

package/README.md

@@ -103,17 +103,17 @@ npm pack
 Install the published package:
 
 ```bash
-dsh plugin --profile web add @goodandready/dsh-ollama-cloud-provider@0.1.10
+dsh plugin --profile web add @goodandready/dsh-ollama-cloud-provider@0.1.11
 # DSH Desktop:
-dsh plugin --profile desktop add @goodandready/dsh-ollama-cloud-provider@0.1.10
+dsh plugin --profile desktop add @goodandready/dsh-ollama-cloud-provider@0.1.11
 ```
 
 Or install the packed tarball into a profile:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.10.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.11.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.10.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.11.tgz
 ```
 
 Restart dsh (or DSH Desktop), then pick **Ollama Cloud** in the model picker.

package/README.ru.md

@@ -103,17 +103,17 @@ npm pack
 Установка опубликованного пакета из npm:
 
 ```bash
-dsh plugin --profile web add @goodandready/dsh-ollama-cloud-provider@0.1.10
+dsh plugin --profile web add @goodandready/dsh-ollama-cloud-provider@0.1.11
 # DSH Desktop:
-dsh plugin --profile desktop add @goodandready/dsh-ollama-cloud-provider@0.1.10
+dsh plugin --profile desktop add @goodandready/dsh-ollama-cloud-provider@0.1.11
 ```
 
 Либо установка из упакованного tarball:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.10.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.11.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.10.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.11.tgz
 ```
 
 После установки перезапустите dsh (или DSH Desktop) и выберите **Ollama Cloud** в списке моделей.

package/README.zh.md

@@ -102,17 +102,17 @@ npm pack
 从 npm 安装已发布版本：
 
 ```bash
-dsh plugin --profile web add @goodandready/dsh-ollama-cloud-provider@0.1.10
+dsh plugin --profile web add @goodandready/dsh-ollama-cloud-provider@0.1.11
 # DSH 桌面端：
-dsh plugin --profile desktop add @goodandready/dsh-ollama-cloud-provider@0.1.10
+dsh plugin --profile desktop add @goodandready/dsh-ollama-cloud-provider@0.1.11
 ```
 
 或通过打包文件安装：
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.10.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.11.tgz
 # DSH 桌面端：
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.10.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-ollama-cloud-provider-0.1.11.tgz
 ```
 
 安装完成后重启 dsh 或 DSH 桌面端，在模型列表中选择 **Ollama Cloud** 即可。

package/lib/index.js

@@ -49,7 +49,7 @@ const DEFAULT_API_BASE = "https://ollama.com";
 const DEFAULT_OPENAI_BASE = "https://ollama.com/v1";
 const DEFAULT_USAGE_URL = "https://ollama.com/api/usage";
 const DEFAULT_BALANCE_URL = "https://ollama.com/api/balance";
-const DEFAULT_USER_AGENT = "dsh-ollama-cloud-provider/0.1.10";
+const DEFAULT_USER_AGENT = "dsh-ollama-cloud-provider/0.1.11";
 const DEFAULT_CONTEXT_WINDOW = 131072;
 const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_GENERATE_MAX_TOKENS = 131072;
@@ -772,6 +772,7 @@ const CATALOG_TTL_MS = 6e5;
 const CATALOG_TIMEOUT_MS = 15e3;
 const liveMeta = /* @__PURE__ */ new Map();
 const cache$1 = /* @__PURE__ */ new Map();
+const inflight = /* @__PURE__ */ new Map();
 const FALLBACK_META = {
 	id: "",
 	name: "",
@@ -872,11 +873,21 @@ async function fetchJson(url, config, fetchImpl, signal) {
 * Refresh the live catalog (public, no key required) and return its ids.
 * Network failures keep the previous live metadata and fall back to the
 * generated snapshot, so the picker always has something to show.
+*
+* A cached catalog is served immediately, even after its TTL: the network
+* refresh runs in the background so the picker never blocks on a stale entry.
+* Only the first load (no cache) waits for the network.
 */
 async function refreshCatalog(config, fetchImpl = fetch, force = false) {
 	const key = config.apiBase;
 	const cached = cache$1.get(key);
-	if (!force && cached !== void 0 && Date.now() - cached.at < CATALOG_TTL_MS) return cached.ids;
+	if (!force && cached !== void 0) {
+		if (Date.now() - cached.at >= CATALOG_TTL_MS) refreshInBackground(config, fetchImpl, key);
+		return cached.ids;
+	}
+	return refreshNow(config, fetchImpl, key, cached !== void 0);
+}
+async function refreshNow(config, fetchImpl, key, keepOnFailure) {
 	const signal = AbortSignal.timeout(CATALOG_TIMEOUT_MS);
 	const [modelsResult, tagsResult] = await Promise.allSettled([fetchJson(modelsUrlFor(config), config, fetchImpl, signal), fetchJson(tagsUrlFor(config), config, fetchImpl, signal)]);
 	if (modelsResult.status === "fulfilled") {
@@ -902,6 +913,10 @@ async function refreshCatalog(config, fetchImpl = fetch, force = false) {
 			return fromData;
 		}
 	}
+	if (keepOnFailure) {
+		const stale = cache$1.get(key);
+		if (stale !== void 0) return stale.ids;
+	}
 	const fallback = Object.keys(GENERATED_MODELS);
 	cache$1.set(key, {
 		at: Date.now(),
@@ -909,8 +924,16 @@ async function refreshCatalog(config, fetchImpl = fetch, force = false) {
 	});
 	return fallback;
 }
+function refreshInBackground(config, fetchImpl, key) {
+	if (inflight.has(key)) return;
+	const task = refreshNow(config, fetchImpl, key, true).catch(() => cache$1.get(key)?.ids ?? Object.keys(GENERATED_MODELS)).finally(() => {
+		inflight.delete(key);
+	});
+	inflight.set(key, task);
+}
 function clearCatalogCache() {
 	cache$1.clear();
+	inflight.clear();
 }
 function baseMeta(id) {
 	const meta = liveMeta.get(id) ?? GENERATED_MODELS[id];
@@ -1245,6 +1268,15 @@ function toolArguments(raw) {
 		return {};
 	}
 }
+const normalizedParameterCache = /* @__PURE__ */ new WeakMap();
+function normalizedParameters(parameters) {
+	if (typeof parameters !== "object" || parameters === null) return normalizeToolParameters(parameters);
+	const cached = normalizedParameterCache.get(parameters);
+	if (cached !== void 0) return cached.value;
+	const value = normalizeToolParameters(parameters);
+	normalizedParameterCache.set(parameters, { value });
+	return value;
+}
 function buildTools(tools) {
 	if (tools === void 0 || tools.length === 0) return void 0;
 	return tools.map((tool) => ({
@@ -1252,7 +1284,7 @@ function buildTools(tools) {
 		function: {
 			name: tool.name,
 			description: tool.description,
-			parameters: normalizeToolParameters(tool.parameters)
+			parameters: normalizedParameters(tool.parameters)
 		}
 	}));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-ollama-cloud-provider",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Ollama Cloud LLM provider plugin for DeepSeek Harness (dsh).",
   "license": "MIT",
   "type": "module",
@@ -59,18 +59,18 @@
         "0.2.1-rc.3": "compatible",
         "0.2.1-rc.4": "compatible"
       },
-      "dsh": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4"
+      "dsh": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0"
     }
   },
   "engines": {
     "node": ">=22",
-    "dsh": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4"
+    "dsh": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0"
   },
   "scripts": {
     "build": "tsdown",
     "prepare": "tsdown 1>&2",
     "typecheck": "tsc --noEmit",
-    "test": "node --import tsx --test tests/core.test.ts tests/usage.test.ts tests/adapter.test.ts tests/routes.test.ts tests/native.test.ts tests/commands.test.ts tests/tui-settings.test.ts tests/analytics.test.ts tests/apply.test.ts tests/account-rules.test.ts tests/request-log.test.ts tests/image-budget.test.ts tests/tool-schema.test.ts tests/tools.test.ts tests/plugin-updater.test.ts",
+    "test": "node --import tsx --test tests/core.test.ts tests/usage.test.ts tests/adapter.test.ts tests/routes.test.ts tests/native.test.ts tests/commands.test.ts tests/tui-settings.test.ts tests/analytics.test.ts tests/apply.test.ts tests/account-rules.test.ts tests/request-log.test.ts tests/image-budget.test.ts tests/tool-schema.test.ts tests/tools.test.ts tests/plugin-updater.test.ts tests/compat.test.ts",
     "check": "npm run typecheck && npm test && npm run build",
     "release": "npm run check && npm pack",
     "sync:models": "node scripts/sync-models.mjs"
@@ -85,17 +85,17 @@
   ],
   "peerDependencies": {
     "@deepseek-ai/cordis": "~4.0.4 || ~4.0.5",
-    "@deepseek-ai/dsh-attachment": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-commands": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-credentials": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-launch-environment": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-llm": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
-    "@deepseek-ai/dsh-settings": "0.2.0-rc.2 || 0.2.1-rc.2 || 0.2.1-rc.3 || 0.2.1-rc.4",
+    "@deepseek-ai/dsh-attachment": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-commands": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-credentials": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-launch-environment": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-llm": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
+    "@deepseek-ai/dsh-settings": "0.2.0-rc.2 || >=0.2.1-rc.2 <0.2.2-0",
     "@deepseek-ai/schemastery": "~3.18.4 || ~3.18.5",
     "react": "^18.2.0"
   },