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

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));
@@ -545,9 +562,12 @@ function withUsageObserver(inner, sinks) {
 *   方法）。**这是面板「今日次数 / 模型分布 / 趋势 / 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 = [], usage, onError }) {
 	const models = buildDescriptors(entries, {
 		providerId: LLM_PROVIDER_ID,
 		baseUrl,
@@ -563,7 +583,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

@@ -2,7 +2,7 @@
   "name": "dsh-connect-modelscope-token-plan",
   "displayName": "DSH Connect ModelScope Token Plan",
   "icon": "./icon.svg",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "homepage": "https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan",
   "bugs": {
     "url": "https://github.com/eghrhegpe/dsh-connect-modelscope-token-plan/issues"

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"
 ]