dsh-connect-modelscope-token-plan 0.4.0 → 0.6.1

package/lib/llm-adapter.js

@@ -1,4 +1,4 @@
-import { E as redactSecrets, _ as CODE, b as reclassifyStream, c as LLM_PROVIDER_ID, i as name, l as buildDescriptors, o as LLM_API_KEY_NAME, s as LLM_DISPLAY_NAME } from "./host-config.js";
+import { D as redactSecrets, c as LLM_PROVIDER_ID, i as name, l as buildDescriptors, o as LLM_API_KEY_NAME, s as LLM_DISPLAY_NAME, v as CODE, x as reclassifyStream } from "./host-config.js";
 import { createProvider } from "@earendil-works/pi-ai";
 import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
@@ -396,14 +396,15 @@ function eventOfChunk(chunk) {
 * 2. **失败也记账，但 token 为 null**。429/错误没有 usage chunk，计数照记、
 *    事件另记；「没有 token 数」与「token 是 0」在 wire 里是两件事。
 * 3. **写 sinks 永不抛**。`safe()` 把同步抛与异步拒一并吞掉：观测层不能成为
-*    对话失败的原因。
+*    对话失败的原因。但失败会通过 `onError` 回调留痕（如果提供了）。
 *
 * @param {AsyncIterableIterator<unknown>} source - 内层流。
 * @param {string} modelId - 本次调用的模型 id（由出口处的 options 捕获）。
 * @param {UsageSinks} sinks - 写入口。
+* @param {(error: unknown) => void} [onError] - 写入失败时的回调（如 logger.warn）。
 * @returns {AsyncGenerator<unknown>} 透传后的流。
 */
-async function* observeStream(source, modelId, sinks) {
+async function* observeStream(source, modelId, sinks, onError) {
 	let tokens = null;
 	try {
 		for await (const chunk of source) {
@@ -414,22 +415,36 @@ async function* observeStream(source, modelId, sinks) {
 				modelId,
 				kind: event.kind,
 				message: event.message
-			}));
+			}), onError);
 			yield chunk;
 		}
 	} finally {
 		safe(() => sinks.recordCall({
 			modelId,
 			tokens
-		}));
+		}), onError);
 	}
 }
-/** 调一个 sink 并吞掉它的任何失败（同步抛与异步拒都吞）。 */
-function safe(run) {
+/**
+* 调一个 sink 并吞掉它的任何失败（同步抛与异步拒都吞）。
+*
+* `onError` 是可选的失败回调：观测层不能成为对话失败的原因，但「观测层在丢数据」
+* 这件事应该可见——否则用户发现计数不对时没有任何线索。index.ts 装配时传
+* `ctx.logger.warn`，让写入失败（磁盘满、权限问题、版本守卫）在日志里留痕。
+*/
+function safe(run, onError) {
 	try {
 		const result = run();
-		if (result !== null && typeof result === "object" && typeof result.then === "function") result.then(void 0, () => {});
-	} catch {}
+		if (result !== null && typeof result === "object" && typeof result.then === "function") result.then(void 0, (error) => {
+			try {
+				onError?.(error);
+			} catch {}
+		});
+	} catch (error) {
+		try {
+			onError?.(error);
+		} catch {}
+	}
 }
 /**
 * 读一条调用参数里的模型 id（`GenerateOptions.model`）。
@@ -457,14 +472,15 @@ function modelIdOfOptions(options) {
 *
 * @param {object} inner - 适配器实例。
 * @param {UsageSinks} sinks - 写入口。
+* @param {(error: unknown) => void} [onError] - 写入失败时的回调（如 logger.warn）。
 * @returns {object} 套好观察层的适配器。
 */
-function withUsageObserver(inner, sinks) {
+function withUsageObserver(inner, sinks, onError) {
 	const wrapStream = (stream, options) => {
 		const modelId = modelIdOfOptions(options);
 		const source = stream(options);
 		if (modelId === "") return source;
-		return observeStream(source, modelId, sinks);
+		return observeStream(source, modelId, sinks, onError);
 	};
 	return new Proxy(inner, { get(target, prop, receiver) {
 		const value = Reflect.get(target, prop, receiver);
@@ -480,11 +496,12 @@ function withUsageObserver(inner, sinks) {
 				const wrap = (handle) => {
 					if (handle === null || typeof handle !== "object" || modelId === "") return handle;
 					const inner = handle;
-					if (typeof inner.stream !== "function") return handle;
-					return {
-						...inner,
-						stream: (o) => observeStream(inner.stream(o), modelId, sinks)
-					};
+					const innerStream = inner.stream;
+					if (typeof innerStream !== "function") return handle;
+					return new Proxy(inner, { get(target, prop, receiver) {
+						if (prop === "stream") return (o) => observeStream(innerStream.call(target, o), modelId, sinks, onError);
+						return Reflect.get(target, prop, receiver);
+					} });
 				};
 				const promise = prepared;
 				if (promise !== null && typeof promise.then === "function") return promise.then((p) => wrap(p));
@@ -541,18 +558,27 @@ function withUsageObserver(inner, sinks) {
 *   `fs`）的服务解析器。
 * @param {string[]} [options.unavailableModelIds] - 额度耗尽的模型 id，从 offer 里
 *   排除，避免发出注定 429 的请求。
+* @param {object} [options.maxTokensOverrides] - 逐模型输出上限覆盖（id → tokens），
+*   归一后的 `ResolvedSettings.maxTokensOverrides`。**构造期读入**（apply 时随
+*   wiring 一次性 `resolveSettings`，与 `apiBase` 同理）：改 patch 要 reload
+*   （apply 重跑）才生效，不是下一轮目录轮询。魔搭目录从不声明该字段，所以这是
+*   输出上限唯一的真值来源（见 llm-models.ts 的 `maxTokensFor`）。
 * @param {UsageSinks} [options.usage] - 本地计数的写入口（usage-store 的两条
 *   方法）。**这是面板「今日次数 / 模型分布 / 趋势 / 429 事件流」唯一的生产
 *   者**——probe 那条写入路径已随目录表删除，缺了它四块面板恒为 0 与空。
 *   缺省不套观察层（零开销，见 `usage-observer.ts`）。
+* @param {(error: unknown) => void} [options.onError] - 写入失败时的回调（如
+*   logger.warn）。观测层不能成为对话失败的原因，但「观测层在丢数据」这件事
+*   应该可见——否则用户发现计数不对时没有任何线索。
 * @returns {{adapter: object, providerIds: string[]}} 适配器与它拥有的 ids。
 */
-function createModelScopeAdapter({ entries, enabledIds = [], baseUrl, resolveApiKey, get, unavailableModelIds = [], usage }) {
+function createModelScopeAdapter({ entries, enabledIds = [], baseUrl, resolveApiKey, get, unavailableModelIds = [], maxTokensOverrides = {}, usage, onError }) {
 	const models = buildDescriptors(entries, {
 		providerId: LLM_PROVIDER_ID,
 		baseUrl,
 		enabledIds,
-		unavailableModelIds
+		unavailableModelIds,
+		maxTokensOverrides
 	});
 	const built = assemblePiAiAdapter({
 		providerId: LLM_PROVIDER_ID,
@@ -563,7 +589,7 @@ function createModelScopeAdapter({ entries, enabledIds = [], baseUrl, resolveApi
 		...get !== void 0 ? { get } : {}
 	});
 	return {
-		adapter: usage === void 0 ? built.adapter : withUsageObserver(built.adapter, usage),
+		adapter: usage === void 0 ? built.adapter : withUsageObserver(built.adapter, usage, onError),
 		providerIds: built.providerIds
 	};
 }

package/package.json

@@ -1,115 +1,115 @@
-{
-  "name": "dsh-connect-modelscope-token-plan",
-  "displayName": "DSH Connect ModelScope Token Plan",
-  "icon": "./icon.svg",
-  "version": "0.4.0",
-  "homepage": "https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan",
-  "bugs": {
-    "url": "https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan/issues"
-  },
-  "author": "eghrhegpe",
-  "description": "ModelScope (modelscope.cn) connect bundle for the Harness Web UI: the official Magicube balance plus, for calls made through this plugin, per-model counts, a daily trend, and a 429 error event list on the Plugins-page panel, plus a default-off switch that registers ModelScope models as a DSH LLM provider.",
-  "keywords": [
-    "dsh-plugin",
-    "deepseek-harness",
-    "modelscope",
-    "token-plan",
-    "quota",
-    "api-inference"
-  ],
-  "type": "module",
-  "main": "./lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./client.js",
-    "./locale/*.json": "./locale/*.json",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "client.js",
-    "icon.svg",
-    "locale",
-    "assets",
-    "cordis.patch.yml",
-    "README.md",
-    "CHANGELOG.md",
-    "LICENSE",
-    "screenshots.json"
-  ],
-  "scripts": {
-    "typecheck": "tsc -p tsconfig.json",
-    "build:client": "tsdown -c tsdown.config.mjs",
-    "duplicate-check": "jscpd src --min-tokens 70 --reporters console-full",
-    "test": "node test/run-all.mjs",
-    "test:mutate": "node tools/dev/mutate.mjs tools/dev/mutate-spec.json",
-    "doctor": "node tools/doctor.mjs",
-    "doctor:json": "node tools/doctor.mjs --json",
-    "build": "tsdown -c tsdown.config.mjs",
-    "prepack": "npm run build"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "immediately": true,
-      "inject": [
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-renderer"
-      ]
-    }
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.2 <5.0.0",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-client-ui-layout": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-client-ui-renderer": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-credentials": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-home-paths": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-host-webserver": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-llm": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-llm-pi-ai": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-settings": ">=0.1.5 <0.3",
-    "@deepseek-ai/dsh-tools": ">=0.1.5 <0.3",
-    "@deepseek-ai/schemastery": "^3.18.2",
-    "@earendil-works/pi-ai": "^0.85.1"
-  },
-  "peerDependenciesMeta": {
-    "@deepseek-ai/cordis": { "optional": true },
-    "@deepseek-ai/dsh-client-locale": { "optional": true },
-    "@deepseek-ai/dsh-client-ui-layout": { "optional": true },
-    "@deepseek-ai/dsh-client-ui-renderer": { "optional": true },
-    "@deepseek-ai/dsh-credentials": { "optional": true },
-    "@deepseek-ai/dsh-home-paths": { "optional": true },
-    "@deepseek-ai/dsh-host-webserver": { "optional": true },
-    "@deepseek-ai/dsh-llm": { "optional": true },
-    "@deepseek-ai/dsh-llm-pi-ai": { "optional": true },
-    "@deepseek-ai/dsh-settings": { "optional": true },
-    "@deepseek-ai/dsh-tools": { "optional": true },
-    "@deepseek-ai/schemastery": { "optional": true },
-    "@earendil-works/pi-ai": { "optional": true }
-  },
-  "engines": {
-    "node": "^22.19.0 || >=24.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan.git"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^22.19.0",
-    "jscpd": "^5.4.0",
-    "jsdom": "^30.1.3",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "tsdown": "0.23.0",
-    "typescript": "5.9.3"
-  },
-  "overrides": {
-    "rolldown": "1.2.12",
-    "rolldown-plugin-dts": "0.28.6"
-  }
-}
+{
+  "name": "dsh-connect-modelscope-token-plan",
+  "displayName": "DSH Connect ModelScope Token Plan",
+  "icon": "./icon.svg",
+  "version": "0.6.1",
+  "homepage": "https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan",
+  "bugs": {
+    "url": "https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan/issues"
+  },
+  "author": "eghrhegpe",
+  "description": "ModelScope (modelscope.cn) connect bundle for the Harness Web UI: the official Magicube balance plus, for calls made through this plugin, per-model counts, a daily trend, and a 429 error event list on the Plugins-page panel, plus a default-off switch that registers ModelScope models as a DSH LLM provider.",
+  "keywords": [
+    "dsh-plugin",
+    "deepseek-harness",
+    "modelscope",
+    "token-plan",
+    "quota",
+    "api-inference"
+  ],
+  "type": "module",
+  "main": "./lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./client.js",
+    "./locale/*.json": "./locale/*.json",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "client.js",
+    "icon.svg",
+    "locale",
+    "assets",
+    "cordis.patch.yml",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE",
+    "screenshots.json"
+  ],
+  "scripts": {
+    "typecheck": "tsc -p tsconfig.json",
+    "build:client": "tsdown -c tsdown.config.mjs",
+    "duplicate-check": "jscpd src --min-tokens 70 --reporters console-full",
+    "test": "node test/run-all.mjs",
+    "test:mutate": "node tools/dev/mutate.mjs tools/dev/mutate-spec.json",
+    "doctor": "node tools/doctor.mjs",
+    "doctor:json": "node tools/doctor.mjs --json",
+    "build": "tsdown -c tsdown.config.mjs",
+    "prepack": "npm run build"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "immediately": true,
+      "inject": [
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-renderer"
+      ]
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": ">=4.0.2 <5.0.0",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-client-ui-layout": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-client-ui-renderer": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-credentials": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-home-paths": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-host-webserver": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-llm": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-llm-pi-ai": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-settings": ">=0.1.5 <0.3",
+    "@deepseek-ai/dsh-tools": ">=0.1.5 <0.3",
+    "@deepseek-ai/schemastery": "^3.18.2",
+    "@earendil-works/pi-ai": "^0.85.1"
+  },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/cordis": { "optional": true },
+    "@deepseek-ai/dsh-client-locale": { "optional": true },
+    "@deepseek-ai/dsh-client-ui-layout": { "optional": true },
+    "@deepseek-ai/dsh-client-ui-renderer": { "optional": true },
+    "@deepseek-ai/dsh-credentials": { "optional": true },
+    "@deepseek-ai/dsh-home-paths": { "optional": true },
+    "@deepseek-ai/dsh-host-webserver": { "optional": true },
+    "@deepseek-ai/dsh-llm": { "optional": true },
+    "@deepseek-ai/dsh-llm-pi-ai": { "optional": true },
+    "@deepseek-ai/dsh-settings": { "optional": true },
+    "@deepseek-ai/dsh-tools": { "optional": true },
+    "@deepseek-ai/schemastery": { "optional": true },
+    "@earendil-works/pi-ai": { "optional": true }
+  },
+  "engines": {
+    "node": "^22.19.0 || >=24.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan.git"
+  },
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^22.19.0",
+    "jscpd": "^5.4.0",
+    "jsdom": "^30.1.3",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "tsdown": "0.23.0",
+    "typescript": "5.9.3"
+  },
+  "overrides": {
+    "rolldown": "1.2.12",
+    "rolldown-plugin-dts": "0.28.6"
+  }
+}

package/screenshots.json

@@ -1,4 +1,5 @@
 [
   "assets/tab-account-and-usage.png",
-  "assets/tab-model-list.png"
+  "assets/tab-model-list.png",
+  "assets/tab-model-draw.png"
 ]