dsh-connect-modelscope-token-plan 0.1.0 → 0.3.0

package/lib/{llm-adapter-CpcQ3gC5.js → llm-adapter.js}

@@ -1,4 +1,4 @@
-import { C as redactSecrets, _ as reclassifyStream, c as LLM_PROVIDER_ID, i as name, l as buildDescriptors, m as CODE, o as LLM_API_KEY_NAME, s as LLM_DISPLAY_NAME } from "./host-config-DBCiZOBW.js";
+import { T as redactSecrets, c as LLM_PROVIDER_ID, g as CODE, i as name, l as buildDescriptors, o as LLM_API_KEY_NAME, s as LLM_DISPLAY_NAME, y 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";
@@ -16,8 +16,9 @@ import { resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/d
 * shape without importing that peer.
 *
 * The peer classifies a ModelScope 429 into two codes (`isQuotaExceededError` →
-* `rate.?limit` inside `classifyPiAiError`, pinned against the real source by
-* `test/peer-contract.test.mjs`):
+* `rate.?limit` inside `classifyPiAiError`). That classification ORDER is not
+* pinned by any test — verifying it needs the runtime peer, which is not
+* vendored here (see docs/ROADMAP.md Backlog). Read on with that in mind:
 *
 *   - `QUOTA` / `ACCOUNT_QUOTA` — the Token Plan pool is depleted. Retrying
 *     cannot refill it, and the pool is SHARED across every model on this key,
@@ -85,10 +86,11 @@ function retryableCodes() {
 * accepts (`mode: "normal"` → `{ mode, maxRetries, retryableCodes, backoff }`).
 * We pin it explicitly rather than passing `undefined` so a future change to
 * the peer's default policy cannot silently alter this provider's behaviour.
-* This module's shape is pinned by `test/retry.test.mjs`; the live peer's
-* `resolveRetryPolicy` contract is covered by `test/peer-contract.test.mjs`,
-* which needs the runtime peer (not vendored here) and is outside the offline
-* `npm test` gate.
+* This module's shape is pinned by `test/retry.test.mjs`. The live peer's
+* `resolveRetryPolicy` contract is NOT covered by any test: verifying it needs
+* the runtime peer, which is not vendored here and so cannot run inside the
+* offline `npm test` gate (docs/ROADMAP.md Backlog). If the peer ever changes
+* its policy shape, this provider fails silently at runtime — no gate turns red.
 *
 * Tuned for ModelScope's daytime rate ceiling (rpm/tpm), which the peer mislabels
 * as `QUOTA` — `llm-error-fix.ts` pulls those back to `RATE_LIMIT` so they
@@ -129,7 +131,9 @@ function buildRetryPolicyConfig() {
 * 读取的凭据解析器——那是真正的领域差异。
 *
 * peer-dependent：import `pi-ai` / `dsh-llm` / `dsh-llm-pi-ai`，它们随 Host
-* 发行。与适配器本身一样，不能由离线单测套件导入，由 wiring/e2e 检查来测。
+* 发行。装配链由 `test/llm-adapter.test.mjs` 用记录式假 peer 钉住调用形状
+* （见 `llm-adapter.ts` 文件头的诚实边界：peer 真身漂移仍需 ROADMAP Backlog
+* 的 e2e / 真机冒烟去抓，本套件只钉我们自己这一侧）。
 *
 * @module dsh-connect-modelscope-token-plan/llm-adapter-core
 */
@@ -187,7 +191,7 @@ function withReclassifiedStream(inner) {
 		const value = Reflect.get(target, prop, receiver);
 		if (prop === "stream") {
 			const stream = target.stream;
-			return (options) => reclassifyStream(stream(options));
+			return (options) => reclassifyStream(stream.call(target, options));
 		}
 		if (typeof value === "function" && prop === "prepareCall") {
 			const prepare = target.prepareCall;
@@ -274,10 +278,11 @@ function assemblePiAiAdapter({ providerId, displayName, apiKeyName, models, reso
 * usage-store 的天桶/单模型计数与 429 事件流。
 *
 * 为什么不是「在 adapter 里随便挂个钩子」，而是独立一层：M4 之前
-* `usageStore.recordCall` 的唯一调用者是 `routes/probe.ts`，而面板的 usage
-* 试调按钮已随目录表删除、validity 探针按设计不记调用——于是本地计数层在
-* 接入 provider 之后**没有任何生产者**，「今日次数 / 单模型分布 / 趋势 /
-* 429 事件流」四块面板恒为 0 与空。本模块补上这条缺失的生产者。
+* `usageStore.recordCall` 的唯一生产者是 `routes/probe.ts` 的 usage 试调，而那个
+* 按钮已随目录表删除、validity 探针按设计不记调用——于是本地计数层在接入
+* provider 之后**没有任何生产者**，「今日次数 / 单模型分布 / 趋势 /
+* 429 事件流」四块面板恒为 0 与空。本模块补上这条缺失的生产者，也就成了**唯一**
+* 的常驻写入侧（`probe` 路由的 `kind:"usage"` 分支随后一并删除，见 probe.ts）。
 *
 * ## 与 harness 自己的账本的分工（别再造第二本账）
 *
@@ -315,8 +320,13 @@ function assemblePiAiAdapter({ providerId, displayName, apiKeyName, models, reso
 * 一次被打上限频的请求同样是一次上游调用。token 数在上游给出时带上，给不出
 * 时传 `null`（wire 语义基线：null 是「上游没给」，绝不写成 0）。
 *
-* 已知偏差（方向是少记，不是多记）：peer 的重试在同一条流**内部**重发 HTTP，
-* 观察器只看到一条流，于是重试掉的那些次不单独计。宁可少记也不虚增。
+* 已知偏差（不是「少记」，是「按流计次」）：重试不在一条流内部发生，而在
+* `dsh-agent-loop` 消费完流之后由 `agent/request-error` 瀑布决定
+* （`dsh-agent-loop/lib/index.js:1116-1134`），`dsh-llm-retry` 据此**重新发起一次
+* 请求**、产生**新的流**。观察器套在流出口上，于是**每次重试各记一次 call**——
+* 按「魔搭按次数计费」的口径这反而是对的（每次重发都真打了一次上游），但它与
+* 早先本文件「重试掉的那些次不单独计」的说法相反，故此处一并更正。
+* 2026-10-05 读 peer 源码（`@deepseek-ai/dsh-llm-retry`、`dsh-agent-loop`）核实。
 *
 * peer-free：只 import 本仓库的 peer-free 模块（`llm-error-fix` / `util`）与
 * `shared/wire` 的类型，离线可测——与 `llm-error-fix` 同一纪律。
@@ -460,7 +470,7 @@ function withUsageObserver(inner, sinks) {
 		const value = Reflect.get(target, prop, receiver);
 		if (prop === "stream") {
 			const stream = target.stream;
-			return typeof stream === "function" ? (options) => wrapStream(stream, options) : value;
+			return typeof stream === "function" ? (options) => wrapStream(stream.bind(target), options) : value;
 		}
 		if (typeof value === "function" && prop === "prepareCall") {
 			const prepare = target.prepareCall;
@@ -491,8 +501,13 @@ function withUsageObserver(inner, sinks) {
 * 魔搭 provider 注册的 peer-dependent 半边。
 *
 * 这里的一切都跑在 Host 发行的 peer 上（`pi-ai`、`dsh-llm`、`dsh-llm-pi-ai`）——这
-* 正是 descriptor 映射要住在 peer-free 的 `llm-models.ts` 的原因：本模块不能被离线
-* 单测套件导入，所以它只装对运行时的装配，由 wiring/e2e 检查来测。
+* 正是 descriptor 映射要住在 peer-free 的 `llm-models.ts` 的原因。本模块的装配链
+* 由 `test/llm-adapter.test.mjs` 用**记录式假 peer**（`test/helpers/peer-stub-loader.mjs`，
+* Node module customization hooks 拦截四个 peer 入口）钉住——断言的是「我们对 peer
+* 的调用形状」：descriptor 契约、retryPolicy 传参、PiAiAdapter 构造、usage 观察层
+* 包装与重分类顺序。**诚实边界**：假 peer 是我们写的，钉不住 peer 真身的漂移——peer
+* 升级改形状仍由 docs/ROADMAP.md Backlog 的 e2e / 真机冒烟去抓，本套件只保证
+* 这一侧不再静默改坏。
 *
 * 形状对齐已知可用的 qoder 适配器：
 *

package/locale/en.json

@@ -1,5 +1,6 @@
 {
   "meta": {
-    "title": "ModelScope Quota Connect"
+    "title": "ModelScope Quota Connect",
+    "description": "ModelScope API-Inference free-quota panel: official Magicube balance, local call counts and trends, rate-limit event stream, auth-free model catalog and zero-quota token validation, plus optional registration of ModelScope as an OpenAI-compatible DSH provider (roadmap)."
   }
 }

package/package.json

@@ -2,13 +2,13 @@
   "name": "dsh-connect-modelscope-token-plan",
   "displayName": "DSH Connect ModelScope Token Plan",
   "icon": "./icon.svg",
-  "version": "0.1.0",
+  "version": "0.3.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: a local-usage quota panel for the free API-Inference tier (daily call budget, per-model caps, 429 events, local trend) plus optional provider registration that brings ModelScope models into DSH conversation.",
+  "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",
@@ -41,7 +41,8 @@
     "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/wire.test.mjs && node test/config.test.mjs && node test/state-store.test.mjs && node test/usage-store.test.mjs && node test/routes.test.mjs && node test/provider.test.mjs && node test/inference-vision.test.mjs && node test/provider-routes.test.mjs && node test/provider-publish.test.mjs && node test/panel.test.mjs && node test/doctor.test.mjs && node test/catalog.test.mjs && node test/switch-precedence.test.mjs && node test/credentials.test.mjs && node test/codes.test.mjs && node test/retry.test.mjs && node test/error-fix.test.mjs && node test/usage-observer.test.mjs && node test/release.test.mjs && node test/build-gate.mjs",
+    "test": "node test/wire.test.mjs && node test/config.test.mjs && node test/docs.test.mjs && node test/env-hermetic.test.mjs && node test/deps-wiring.test.mjs && node test/state-store.test.mjs && node test/usage-store.test.mjs && node test/routes.test.mjs && node test/provider.test.mjs && node test/inference-vision.test.mjs && node test/context-catalog.test.mjs && node test/provider-routes.test.mjs && node test/provider-publish.test.mjs && node test/llm-adapter.test.mjs && node test/panel.test.mjs && node test/composer-pill.test.mjs && node test/dom-render.test.mjs && node test/dom-render-react.test.mjs && node test/snapshot.test.mjs && node test/doctor.test.mjs && node test/catalog.test.mjs && node test/switch-precedence.test.mjs && node test/credentials.test.mjs && node test/codes.test.mjs && node test/retry.test.mjs && node test/error-fix.test.mjs && node test/draw.test.mjs && node test/draw-runtime.test.mjs && node test/draw-routes.test.mjs && node test/usage-observer.test.mjs && node test/release.test.mjs && node test/build-gate.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",
@@ -99,9 +100,16 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^26.6.3",
+    "@types/node": "^22.19.0",
     "jscpd": "^5.4.0",
-    "tsdown": "^0.23.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"
   }
 }