dsh-usage-state 0.4.0 → 0.4.2

package/README.en.md

@@ -1,11 +1,11 @@
 # dsh-usage-state
 
-See your **account balance** or **coding-plan quota** at a glance in [DSH (DeepSeek Harness)](https://github.com/deepseek-ai) — right under the composer stats row.
+See your **account balance** or **coding-plan quota** at a glance in [DSH (DeepSeek Harness)](https://github.com/deepseek-ai) — on its own line above the composer input, as wide as the input card.
 
 > 中文说明见 [README.md](README.md)。
 
 ```
-below the composer stats:   z.ai / GLM · 5h 12% (4h0m) ▓▓▓░░░░░ · 7d 59% (3d17h) ▓▓▓▓▓░░░
+its own line above the composer input:   z.ai / GLM · 5h 12% (4h0m) ▓▓▓░░░░░ · 7d 59% (3d17h) ▓▓▓▓▓░░░
                              DeepSeek · ¥58.13
 hover any segment:           Source DeepSeek · Mode API balance · Granted 0 · Topped up 58.13
 ```
@@ -14,7 +14,7 @@ hover any segment:           Source DeepSeek · Mode API balance · Granted 0 ·
 
 - **Works with zero configuration**: the plugin figures out which data source and mode a provider needs, and reuses the API key DSH already has.
 - **Configured per provider, not per model** — readings are account-level, so each provider gets one setting: `Auto` / `API` / `Coding Plan` / `Hidden`. The model list is informational.
-- **One line, always visible**: directly below the composer's stats row (the native stats row and its popover are left untouched, not replaced) — no hover, no click.
+- **One line, always visible**: its own line above the composer input (DSH 0.2 mounts it at `conversation.input.dock`, width-matched to the input card; the native stats row and context meter are left untouched, not replaced) — no hover, no click.
 - **Never invents data**: a failed refresh keeps the last good value and marks it stale (`12m ago ⚠`); rejected keys, endpoint errors and network problems each get a readable reason.
 - **Hover details**: source and mode, the window's absolute reset time, the granted/topped-up split of a balance, the failure reason with the provider's own message.
 - **Bilingual** (zh / en), following the DSH locale setting.
@@ -55,7 +55,7 @@ Nothing showing up after installing? See the troubleshooting table at the end of
 
 1. Open **Settings → Usage state**: one row per provider configured in DSH.
 2. Leave it on **Auto** (it detects the data source and its primary mode), or pick `API` / `Coding Plan` / `Hidden`; use ↑↓ to reorder.
-3. The reading appears directly below the composer's stats row.
+3. The reading appears on its own line above the composer input, as wide as the input card.
 
 If a source needs an endpoint or a key (a self-hosted Sub2API, or a provider without a credential yet), expand that row's **Advanced** block to override the source, set the endpoint, name the credential, or paste a key (written to the DSH credential store).
 
@@ -101,6 +101,8 @@ Expanding **Advanced** lets you override the source and endpoint, name a credent
 
 - **0.2 line only**: `engines.dsh` = `>=0.2.0-rc.2 <0.3.0-0` (this is what dsh-market's badge and install gate read). On an earlier host, install `0.3.2`.
 - `peerDependencies` carry `@deepseek-ai/dsh-settings` (`^0.2.0-rc.2`) and `@deepseek-ai/schemastery` (`^3.18.2`). The first one is deliberate: the runtime install gate only reads `@deepseek-ai/dsh*` peers, so declaring it makes a 0.1.x host **refuse the install** instead of accepting it and then failing to boot. Both are platform-provided; pnpm may print a `missing peer` warning for them, which is expected.
+- Version `0.4.2` moves the status line to `conversation.input.dock`, giving it **its own line above the composer input** — DSH 0.2 turned the old below-the-input position into a shared row of pills next to the platform's stats and context meter (revisions 19/20).
+- Version `0.4.1` fixes `0.4.0`'s missing readings: the browser half's RPC contribution lacked the `create()` factory 0.2 requires, so `remote.usageState` never mounted — the UI showed **no readings at all** and mislabelled the cause as `Mode not supported`. The same release stops swallowing a rejected mount, says "reading" while the catalog is absent, and adds **real 0.2 registry contract tests** (revision 18). **Use `0.4.1`, not `0.4.0`.**
 - Version `0.4.0` migrates to the 0.2 settings model (`Config` + `configForms`, with cross-entry config read through `configEditor`). Verification and results: [`docs/implementation.md`](docs/implementation.md) §10; rationale: [`docs/design-consensus.md`](docs/design-consensus.md) revision 17.
 - Version `0.3.2` (last of the 0.1 line) only widened `engines.dsh`; **its claimed 0.2 compatibility was wrong** — on `0.2.0-rc.2` it fails the entire web boot because `settingsScope` does not exist there.
 - Published to npm as [`dsh-usage-state`](https://www.npmjs.com/package/dsh-usage-state); GitHub installs work too.

package/README.md

@@ -2,12 +2,12 @@
 
 **中文** | [English](README.en.md)
 
-在 [DSH（DeepSeek Harness）](https://github.com/deepseek-ai) 里一眼看到你的**账户余额**或**套餐额度**——就在输入框统计行的正下方。
+在 [DSH（DeepSeek Harness）](https://github.com/deepseek-ai) 里一眼看到你的**账户余额**或**套餐额度**——就在输入框上方、与输入卡片同宽的一行（原生统计行与其弹窗原样保留、不做替换）。
 
 > A minimal DSH plugin that shows your account **balance** (API mode) or **coding-plan quota** (5h / 7d / 30d) for the model you are using, right under the composer.
 
 ```
-输入框统计行下方：      z.ai / GLM · 5h 12% (4h0m) ▓▓▓░░░░░ · 7d 59% (3d17h) ▓▓▓▓▓░░░
+输入框上方独立一行：      z.ai / GLM · 5h 12% (4h0m) ▓▓▓░░░░░ · 7d 59% (3d17h) ▓▓▓▓▓░░░
                         DeepSeek · ¥58.13
 悬停任意一段：          Source DeepSeek · Mode API balance · Granted 0 · Topped up 58.13
 ```
@@ -16,7 +16,7 @@
 
 - **零配置可用**：按 provider 自动识别该用哪个数据源与模式，DSH 里配过的密钥会被自动复用，不填任何东西就能看到读数。
 - **账户级配置**：余额与额度是账户级的，所以每个供应商只配一次（`自动` / `API` / `Coding Plan` / `隐藏`），模型清单只作展示。
-- **始终可见一行**：固定在输入框统计行的正下方（原生统计行与其弹窗原样保留、不做替换），不需要悬停或点击。
+- **始终可见一行**：独占一行、位于输入框上方（DSH 0.2 把它挂在 `conversation.input.dock`，与输入卡片同宽居中；原生统计行与上下文计量器原样保留、不做替换），不需要悬停或点击。
 - **失败不撒谎**：请求失败时保留上次成功值并标明「多久之前 + ⚠」，**绝不显示 0 或伪造数据**；密钥无效、接口报错、网络不可达会分别给出可读原因。
 - **悬浮提示**：每段文字悬停显示一行放不下的信息——数据源与模式、窗口的绝对重置时刻、余额的赠送/充值构成、失败原因与原始消息。
 - **中英双语**：跟随 DSH 的语言设置（`locale.preference`），设置页与状态行都不含硬编码文案。
@@ -57,7 +57,7 @@ dsh plugin --profile web add /path/to/dsh-usage-state
 
 1. 打开 **设置 → 用量状态**：DSH 里配置的每个供应商一行。
 2. 保持默认的 **自动** 即可（它会识别数据源与主模式）；需要时改成 `API` / `Coding Plan` / `隐藏`，或用 ↑↓ 调整顺序。
-3. 该供应商的账户读数会出现在输入框统计行的正下方。
+3. 该供应商的账户读数会出现在输入框上方、与输入卡片同宽的一行。
 
 若某个数据源需要端点或密钥（例如自建的 Sub2API、或尚未配置的 z.ai），展开该行的 **高级**：可覆盖数据源、填接口地址、指定凭据名、粘贴密钥（写入 DSH 凭据库）。
 
@@ -65,7 +65,7 @@ dsh plugin --profile web add /path/to/dsh-usage-state
 
 ## 截图
 
-输入框统计行正下方的账户读数（图示为 OpenCode Zen Go 的三个窗口，悬停任意一段可看数据源、模式与绝对重置时刻）：
+输入框上方独占一行的账户读数（图示为 OpenCode Zen Go 的三个窗口，悬停任意一段可看数据源、模式与绝对重置时刻）：
 
 ![输入框下方的账户读数](https://raw.githubusercontent.com/takboo/dsh-usage-state/main/assets/screenshots/status-line.webp)
 
@@ -125,6 +125,8 @@ dsh plugin --profile web add /path/to/dsh-usage-state
 
 - **只支持 DSH 0.2 线**：`engines.dsh` = `>=0.2.0-rc.2 <0.3.0-0`（市场读它做徽标与"可安装"判定）。0.2 之前的宿主请装 `0.3.2`。
 - `peerDependencies` 里有 `@deepseek-ai/dsh-settings`（`^0.2.0-rc.2`）与 `@deepseek-ai/schemastery`（`^3.18.2`）：前者是**故意的**——平台的运行时安装闸门只读 `@deepseek-ai/dsh*` 的 peer，声明它可以让 0.1.x 宿主在**安装时**就拒绝，而不是装上之后把启动搞崩；两者都由平台提供，pnpm 可能为此打一行 `missing peer` 警告，属预期。
+- 版本 `0.4.2`：状态行迁到 `conversation.input.dock`，成为**输入框上方的独立一行**（0.1 时代它在输入框之下，而 0.2 把那个位置改成了与平台统计、上下文计量器共排的一排 pill——见修订 19/20）。
+- 版本 `0.4.1`：修 `0.4.0` 的读数缺失——客户端 RPC contribution 的参数 codec 少了 0.2 要求的 `create()`，`remote.usageState` 因此从未挂载，界面表现为**没有任何读数**并误报 `Mode not supported`。同一轮还让挂载失败不再被静默吞掉、catalog 未到时改说「读取中」，并把**真实 0.2 registry 契约测试**写进单测（修订 18）。**请用 `0.4.1`，不要用 `0.4.0`。**
 - 版本 `0.4.0`：迁到 0.2 原生设置模型（`Config` + `configForms`，宿主侧 `configEditor` 读跨条目配置）。验证方式与结论见 [`docs/implementation.md`](docs/implementation.md) §10、决策见 [`docs/design-consensus.md`](docs/design-consensus.md) 修订 17。
 - 版本 `0.3.2`（0.1 线末版）：仅放宽 `engines.dsh`；**它声称的 0.2 兼容是错的**（0.3.2 在 0.2.0-rc.2 上会因 `settingsScope` 不存在而让整个 web 启动失败）。
 - 同名发布在 npm（[`dsh-usage-state`](https://www.npmjs.com/package/dsh-usage-state)），也可从 GitHub 直接安装。

package/lib/client.js

@@ -7,6 +7,47 @@ window.__ModuleLoader__.load({
 		let react = require("react");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		let react_jsx_runtime = require("react/jsx-runtime");
+		//#region src/client/contribution.ts
+		/** Absent or boolean — the one parameter this plugin's RPC takes. */
+		const forceSchema = { parse: (value) => value === void 0 ? void 0 : value === true };
+		/**
+		* A strict codec built without zod: `schema` is what the wire decodes through, and
+		* `create()` is the factory the platform's registry calls to obtain it.
+		*/
+		const booleanOrUndefined = {
+			mode: "strict",
+			typeSymbol: "dsh-usage-state#Force",
+			create: () => forceSchema
+		};
+		const srcJson = { mode: "src-json" };
+		/** Must mirror `src/host/typert.ts`: the wire endpoint is `<namespace>/<method>`. */
+		const CONTRIBUTION = {
+			package: "dsh-usage-state",
+			descriptors: [{
+				id: "dsh-usage-state#usageState/getState",
+				service: "usageState",
+				namespace: "usageState",
+				method: "getState",
+				invocation: { kind: "direct" },
+				parameters: [{
+					name: "force",
+					wire: "force",
+					source: "json",
+					acceptsUndefined: true,
+					codec: booleanOrUndefined
+				}],
+				result: srcJson
+			}, {
+				id: "dsh-usage-state#usageState/describeCredentials",
+				service: "usageState",
+				namespace: "usageState",
+				method: "describeCredentials",
+				invocation: { kind: "direct" },
+				parameters: [],
+				result: srcJson
+			}]
+		};
+		//#endregion
 		//#region src/shared/config.ts
 		const DEFAULT_CONFIG = {
 			models: [],
@@ -1067,6 +1108,10 @@ window.__ModuleLoader__.load({
 		function describeStatus(input) {
 			const { status, snapshot, display, now } = input;
 			if (status.kind === "hidden") return [];
+			if (status.kind === "loading") return [{
+				kind: "state",
+				state: "loading"
+			}];
 			if (status.kind === "unconfigured") return [{
 				kind: "state",
 				state: "unconfigured"
@@ -1223,24 +1268,31 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/StatusLine.tsx
 		/**
-		* The composer mount point: one line directly under the platform's stats row, so
-		* it reads as that row's second line rather than a stray block.
+		* The composer mount point: one full-width line in the composer stack, directly
+		* above the input card.
+		*
+		* `conversation.input.dock` is a stretched column child (`.composerStack` is a column
+		* flex with no `align-items`), so the width comes from the card's own custom
+		* property, exactly like the platform's queued-message dock in that slot. It is
+		* **not** the row below the card: `conversation.composer.dock` there is one centered
+		* flex row shared with the platform's stats pill and the context meter, where a
+		* contribution can only ever be a pill beside them (revisions 19 and 20).
 		*/
 		const DOCK_STYLE = {
 			display: "flex",
 			alignItems: "center",
 			justifyContent: "center",
-			gap: "8px",
-			fontSize: "var(--dsh-content-font-size-secondary, 13px)",
-			lineHeight: "calc(20px + var(--dsh-content-font-delta-secondary, 0px))",
+			gap: "6px",
+			font: "inherit",
+			lineHeight: "inherit",
 			fontVariantNumeric: "tabular-nums",
 			whiteSpace: "nowrap",
-			overflow: "hidden",
-			textOverflow: "ellipsis",
+			flexWrap: "wrap",
+			rowGap: "2px",
 			width: "100%",
-			maxWidth: "var(--dsh-chat-content-width)",
+			maxWidth: "var(--dsh-composer-card-max-width)",
 			margin: "0 auto",
-			padding: "4px calc(var(--dsh-composer-side-clearance) + 16px) 0"
+			padding: "0 var(--dsh-composer-side-clearance)"
 		};
 		const LABEL_STYLE = { color: "var(--dsw-alias-label-tertiary)" };
 		const SEPARATOR_STYLE = { color: "var(--dsw-alias-separator-primary, var(--dsw-alias-label-dimmed))" };
@@ -1287,12 +1339,15 @@ window.__ModuleLoader__.load({
 			}
 		}
 		/** Map a provider resolution onto what the line can say about it. */
-		function statusOf(resolution) {
+		function statusOf(resolution, catalogEmpty) {
 			switch (resolution.reason) {
 				case "hidden": return { kind: "hidden" };
 				case "needs-endpoint": return { kind: "needs-endpoint" };
 				case "unknown-source":
-				case "unsupported": return resolution.sourceId === null ? { kind: "unconfigured" } : { kind: "unsupported" };
+				case "unsupported":
+					if (resolution.sourceId === null) return { kind: "unconfigured" };
+					if (catalogEmpty) return { kind: "loading" };
+					return { kind: "unsupported" };
 				case "auto":
 				case "configured":
 					if (resolution.key === void 0 || resolution.sourceId === null || resolution.mode === null) return { kind: "unconfigured" };
@@ -1323,11 +1378,15 @@ window.__ModuleLoader__.load({
 				provider: current.provider,
 				config,
 				catalog: state.catalog
-			}));
+			}), state.catalog.length === 0);
 			const snapshot = status.kind === "ready" ? state.snapshots[status.key] : void 0;
 			const sourceLabel = status.kind === "ready" ? state.catalog.find((entry) => entry.id === status.sourceId)?.displayName ?? status.sourceId : "";
 			const fullParts = statusParts({
-				segments: describeStatus({
+				segments: state.catalog.length === 0 && state.status === "error" && state.error !== void 0 ? [{
+					kind: "state",
+					state: "error",
+					errorDetail: state.error
+				}] : describeStatus({
 					sourceLabel,
 					status,
 					snapshot,
@@ -1574,9 +1633,9 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/slots.ts
 		const STATUS_LINE_SLOTS = [{
-			name: "conversation.composer.dock",
+			name: "conversation.input.dock",
 			id: "usage-state",
-			order: 1,
+			order: 200,
 			locale: "usage-state"
 		}];
 		//#endregion
@@ -1722,6 +1781,21 @@ window.__ModuleLoader__.load({
 					this.publish({ credentialsError: messageOf(error) });
 				}
 			}
+			/**
+			* Record that the RPC contribution never mounted.
+			*
+			* Without this the only symptom is an empty catalog, which every surface reads
+			* as "nothing configured yet" — the real cause has to be nameable, because it is
+			* a plugin/host contract failure, not something the user can configure away.
+			*/
+			failRemote(message) {
+				this.publish({
+					status: "error",
+					error: message,
+					catalog: [],
+					snapshots: {}
+				});
+			}
 		};
 		//#endregion
 		//#region src/client/index.tsx
@@ -1735,40 +1809,6 @@ window.__ModuleLoader__.load({
 		];
 		const USAGE_STATE_NS = "usage-state";
 		const POLL_INTERVAL_MS = 3e4;
-		/** Hand-rolled codecs: the browser bundle must not carry zod. */
-		const booleanOrUndefined = {
-			mode: "strict",
-			typeSymbol: "dsh-usage-state#Force",
-			schema: { parse: (value) => value === void 0 ? void 0 : value === true }
-		};
-		const srcJson = { mode: "src-json" };
-		/** Must mirror `src/host/typert.ts`: the wire endpoint is `<namespace>/<method>`. */
-		const CONTRIBUTION = {
-			package: "dsh-usage-state",
-			descriptors: [{
-				id: "dsh-usage-state#usageState/getState",
-				service: "usageState",
-				namespace: "usageState",
-				method: "getState",
-				invocation: { kind: "direct" },
-				parameters: [{
-					name: "force",
-					wire: "force",
-					source: "json",
-					acceptsUndefined: true,
-					codec: booleanOrUndefined
-				}],
-				result: srcJson
-			}, {
-				id: "dsh-usage-state#usageState/describeCredentials",
-				service: "usageState",
-				namespace: "usageState",
-				method: "describeCredentials",
-				invocation: { kind: "direct" },
-				parameters: [],
-				result: srcJson
-			}]
-		};
 		function apply(ctx) {
 			ctx.effect(() => ctx.locale.register(LOCALE_NS, {
 				zh,
@@ -1815,7 +1855,11 @@ window.__ModuleLoader__.load({
 					store.refresh(false);
 					store.refreshModels();
 					store.refreshCredentials();
-				}, () => void 0);
+				}, (error) => {
+					const message = error instanceof Error ? error.message : String(error);
+					console.error("dsh-usage-state: remote contribution did not mount", error);
+					store.failRemote(message);
+				});
 				return () => {
 					cancelled = true;
 					dispose?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-usage-state",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "description": "DSH plugin: show account balance (API mode) or coding-plan quota (5h/7d/30d) for the model in use",
   "license": "MIT",
@@ -28,12 +28,14 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.4",
     "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-client-store": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2",
     "@deepseek-ai/dsh-typert-loader": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-typert-registry": "^0.2.0-rc.2",
     "@deepseek-ai/schemastery": "^3.18.2",
     "@types/node": "^24.0.0",
     "@types/react": "~18.3.1",