@goodandready/dsh-opencode-provider 0.5.25 → 0.5.26

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.26 — release 3: quota display and switch notices
+
+- **#75 — quota display modes**: new `usageDisplay` setting with `auto`/`always`/`off` (legacy `showSidebarQuota` maps to `always`); `auto` shows the sidebar card when a Go usage report exists. Exposed in Settings and TUI.
+- **#79 — account-switch notice**: routing trace entries now carry the opaque DSH session id; a `conversation.composer.dock` notice shows a non-blocking switch message for the current conversation after rotation or quota fallback. No prompt content or keys are exposed.
+- 130 tests.
+
 ## 0.5.25 — release 2: stale data
 
 - **#87 — stale usage**: a failed usage refresh now returns the last successful report with `stale: true` and `lastSuccessAt` instead of discarding it. The quota sidebar/panel and Settings label the stale snapshot; an explicit refresh no longer loses the previous reading.

package/README.md

@@ -132,12 +132,12 @@ npm pack
 Install the **packed tarball** into a profile:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.25.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.26.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.25.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.26.tgz
 
 # Or install the published package:
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.25
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.26
 ```
 
 Restart dsh (or DSH Desktop), then pick **OpenCode (plugin)** or **OpenCode Go (plugin)** in the model picker.

package/README.ru.md

@@ -131,12 +131,12 @@ npm pack
 Установка из **упакованного tarball**:
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.25.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.26.tgz
 # DSH Desktop:
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.25.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.26.tgz
 
 # Либо установка опубликованного пакета из npm:
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.25
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.26
 ```
 
 После установки перезапустите dsh (или DSH Desktop) и выберите **OpenCode (plugin)** или **OpenCode Go (plugin)** в списке моделей.

package/README.zh.md

@@ -126,12 +126,12 @@ npm pack
 通过**打包文件 (.tgz)**安装：
 
 ```bash
-dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.25.tgz
+dsh plugin --profile web add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.26.tgz
 # DSH 桌面端：
-dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.25.tgz
+dsh plugin --profile desktop add /absolute/path/to/goodandready-dsh-opencode-provider-0.5.26.tgz
 
 # 或从 npm 安装已发布版本：
-dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.25
+dsh plugin --profile web add @goodandready/dsh-opencode-provider@0.5.26
 ```
 
 安装完成后重启 dsh 或 DSH 桌面端，在模型选择器中选择 **OpenCode (plugin)** 或 **OpenCode Go (plugin)** 即可。

package/lib/client.js

@@ -189,6 +189,11 @@ window.__ModuleLoader__.load({
 				sidebar: "Sidebar",
 				showSidebarQuota: "Show the quota card in the sidebar",
 				showSidebarQuotaHint: "The card updates immediately after saving and otherwise every 60 seconds.",
+				usageDisplay: "Quota display",
+				usageDisplayAuto: "Auto (when Go usage is available)",
+				usageDisplayAlways: "Always",
+				usageDisplayOff: "Off",
+				usageDisplayHint: "Auto shows the sidebar card only when a Go usage report is available; Always keeps it visible; Off stops polling-hidden display.",
 				routing: "Routing",
 				routingHint: "Recent account/model choices. No prompts or keys are recorded.",
 				routingEmpty: "No routing decisions yet.",
@@ -199,6 +204,7 @@ window.__ModuleLoader__.load({
 				routingDefault: "Automatic",
 				routingRotation: "Rotation",
 				routingFallback: "Quota fallback",
+				accountSwitchNotice: "Account switched to {account} ({reason}).",
 				routingFailed: "Failed",
 				quotaFallbackModel: "Quota fallback model",
 				quotaFallbackModelHint: "If Go rejects with a quota error, retry once on this free model through Console/Zen.",
@@ -409,6 +415,11 @@ window.__ModuleLoader__.load({
 				sidebar: "侧边栏",
 				showSidebarQuota: "在侧边栏显示配额卡片",
 				showSidebarQuotaHint: "保存后立即更新；其余时间每 60 秒更新一次。",
+				usageDisplay: "配额显示",
+				usageDisplayAuto: "自动（有 Go 用量时）",
+				usageDisplayAlways: "常驻",
+				usageDisplayOff: "关闭",
+				usageDisplayHint: "自动：仅有 Go 用量报告时显示侧边栏卡片；常驻：始终显示；关闭：隐藏。",
 				routing: "路由",
 				routingHint: "最近使用的账户/模型选择。不会记录提示词或密钥。",
 				routingEmpty: "尚无路由决策。",
@@ -419,6 +430,7 @@ window.__ModuleLoader__.load({
 				routingDefault: "自动",
 				routingRotation: "轮换",
 				routingFallback: "配额回退",
+				accountSwitchNotice: "账户已切换为 {account}（{reason}）。",
 				routingFailed: "失败",
 				quotaFallbackModel: "配额回退模型",
 				quotaFallbackModelHint: "Go 返回配额错误时，通过 Console/Zen 用此免费模型重试一次。",
@@ -469,6 +481,9 @@ window.__ModuleLoader__.load({
 		function fetchState() {
 			return call("/dsh-opencode/state");
 		}
+		function fetchNotices() {
+			return call("/dsh-opencode/notices");
+		}
 		function refreshState() {
 			return call("/dsh-opencode/refresh", {
 				method: "POST",
@@ -1238,7 +1253,10 @@ window.__ModuleLoader__.load({
 			const { t } = props;
 			const state = useHostState(6e4);
 			const expanded = usePanelOpen();
-			if (state === null || state.config.showSidebarQuota !== true) return null;
+			if (state === null) return null;
+			const mode = state.config.usageDisplay ?? (state.config.showSidebarQuota === true ? "always" : "auto");
+			if (mode === "off") return null;
+			if (mode === "auto" && state.usage === null) return null;
 			const windows = state.usage?.report?.windows;
 			const accountLabel = state.accounts.find((account) => account.active)?.label;
 			const rows = [
@@ -1681,6 +1699,7 @@ window.__ModuleLoader__.load({
 				maxOutputTokensOverrides: Object.fromEntries(Object.entries(state.config.maxOutputTokensOverrides).map(([id, value]) => [id, String(value)])),
 				showSidebarQuota: state.config.showSidebarQuota,
 				activeAccount: state.config.activeAccount,
+				usageDisplay: state.config.usageDisplay,
 				accounts: state.config.accounts.map((account) => ({ ...account })),
 				modelAccountRules: state.config.modelAccountRules.map((rule) => ({ ...rule })),
 				quotaFallbackModel: state.config.quotaFallbackModel,
@@ -1727,6 +1746,7 @@ window.__ModuleLoader__.load({
 				maxOutputTokensOverrides: numberRecordOrNull(draft.maxOutputTokensOverrides),
 				showSidebarQuota: draft.showSidebarQuota,
 				activeAccount: draft.activeAccount.trim(),
+				usageDisplay: draft.usageDisplay,
 				accounts: draft.accounts.map((account) => ({
 					label: account.label.trim(),
 					apiKeyEnv: account.apiKeyEnv.trim()
@@ -3148,16 +3168,33 @@ window.__ModuleLoader__.load({
 								children: t("sidebar")
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-								className: "oc-row",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-									type: "checkbox",
-									checked: draft.showSidebarQuota,
-									onChange: (event) => update({ showSidebarQuota: event.target.checked })
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("showSidebarQuota") })]
+								className: "oc-field",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "oc-label",
+									children: t("usageDisplay")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+									className: "oc-select",
+									value: draft.usageDisplay,
+									onChange: (event) => update({ usageDisplay: event.target.value }),
+									children: [
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+											value: "auto",
+											children: t("usageDisplayAuto")
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+											value: "always",
+											children: t("usageDisplayAlways")
+										}),
+										/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+											value: "off",
+											children: t("usageDisplayOff")
+										})
+									]
+								})]
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 								className: "oc-hint",
-								children: t("showSidebarQuotaHint")
+								children: t("usageDisplayHint")
 							})
 						]
 					}),
@@ -3290,6 +3327,7 @@ window.__ModuleLoader__.load({
 .oc-drag { cursor: grab; color: var(--oc-text-tertiary); user-select: none; font-size: 13px; line-height: 1; }
 .oc-drag:active { cursor: grabbing; }
 .oc-notice { font-size: 12px; padding: 7px 10px; border-radius: 7px; background: var(--oc-accent-soft); border: 1px solid var(--oc-accent-border); }
+.oc-switch-notice { margin: 4px auto; padding: 4px 10px; border: 1px solid var(--oc-border); border-radius: 999px; background: var(--oc-fill-soft); color: var(--oc-text-secondary); font-size: 11px; line-height: 1.4; text-align: center; }
 .oc-error { font-size: 12px; padding: 7px 10px; border-radius: 7px; background: var(--oc-danger-soft); border: 1px solid var(--oc-danger-border); color: var(--oc-danger); }
 [class*="_footerActions"]:has(.oc-foot), [class*="_footerActions"]:has(.oc-railButton) { flex-direction: column; }
 .oc-foot { box-sizing: border-box; flex: 1 1 auto; width: 100%; min-width: 0; display: flex; flex-direction: column; gap: 6px; margin: 0 0 4px; padding: 8px; border: 0.5px solid transparent; border-radius: var(--dsw-radius-md, 8px); background: transparent; color: var(--oc-text-secondary); font: inherit; text-align: left; cursor: pointer; }
@@ -3321,6 +3359,47 @@ window.__ModuleLoader__.load({
 .oc-table th, .oc-table td { text-align: left; padding: 5px 8px; border-bottom: 1px solid var(--oc-border-soft); vertical-align: top; }
 .oc-table th { font-weight: 600; opacity: 0.8; }
 `;
+		// src/client/switch-notice.tsx
+		/** Ambient notice under the composer when this conversation switched accounts. */
+		function SwitchNotice({ sessionId, t }) {
+			const [notice, setNotice] = (0, react.useState)(null);
+			const seenAt = (0, react.useRef)(Date.now() - 5e3);
+			(0, react.useEffect)(() => {
+				if (sessionId === void 0 || String(sessionId) === "") return;
+				let alive = true;
+				const poll = () => {
+					fetchNotices().then(({ events }) => {
+						if (!alive) return;
+						const event = events.filter((entry) => entry.session === String(sessionId) && entry.at > seenAt.current && entry.ok && (entry.reason === "rotation" || entry.reason === "quota-fallback")).sort((left, right) => right.at - left.at)[0];
+						if (event === void 0) return;
+						seenAt.current = event.at;
+						setNotice({
+							account: event.account,
+							reason: event.reason,
+							at: event.at
+						});
+					}).catch(() => {});
+				};
+				poll();
+				const timer = setInterval(poll, 5e3);
+				return () => {
+					alive = false;
+					clearInterval(timer);
+				};
+			}, [sessionId]);
+			(0, react.useEffect)(() => {
+				if (notice === null) return;
+				const timer = setTimeout(() => setNotice(null), 6e4);
+				return () => clearTimeout(timer);
+			}, [notice]);
+			if (notice === null) return null;
+			const reason = notice.reason === "quota-fallback" ? t("routingFallback") : t("routingRotation");
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "oc-switch-notice",
+				role: "status",
+				children: t("accountSwitchNotice").replace("{account}", notice.account).replace("{reason}", reason)
+			});
+		}
 		// src/client/index.tsx
 		function injectCss() {
 			if (typeof document === "undefined") return () => {};
@@ -3356,6 +3435,12 @@ window.__ModuleLoader__.load({
 				locale: NS,
 				inject: () => ({ close: () => ctx.get("layout")?.selectPanel(null) })
 			}, QuotaPanel));
+			ctx.slots.inject("conversation.composer.dock", () => slots.register({
+				name: "conversation.composer.dock",
+				id: "opencode-switch-notice",
+				order: 80,
+				locale: NS
+			}, SwitchNotice));
 			ctx.inject(["layout"], (layoutCtx) => {
 				const layoutSlots = layoutCtx.slots;
 				layoutCtx.slots.inject("sidebar.footer.action", () => layoutSlots.register({

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import { Context } from "@deepseek-ai/cordis";
 import { AttachmentStore } from "@deepseek-ai/dsh-attachment";
 import { WebServer } from "@deepseek-ai/dsh-host-webserver";
 type TransportId = 'openai-chat' | 'openai-responses' | 'anthropic' | 'google';
+type UsageDisplay = 'auto' | 'always' | 'off';
 interface AccountConfig {
   label?: string;
   apiKeyEnv?: string;
@@ -66,7 +67,9 @@ interface Config {
   stickySession?: boolean;
   /** Pinned account id; empty means automatic. */
   activeAccount?: string;
-  /** Show the quota card in the sidebar. */
+  /** Sidebar quota visibility; legacy booleans map to always/auto. */
+  usageDisplay?: UsageDisplay;
+  /** Legacy boolean; used only when `usageDisplay` is absent. */
   showSidebarQuota?: boolean;
   /** Product user agent sent to OpenCode. */
   userAgent?: string;
@@ -97,6 +100,7 @@ interface ResolvedConfig {
   autoSwitch: boolean;
   stickySession: boolean;
   activeAccount: string;
+  usageDisplay: UsageDisplay;
   showSidebarQuota: boolean;
   userAgent: string;
 }
@@ -163,6 +167,8 @@ interface RoutingTraceEntry {
   readonly provider: string;
   readonly model: string;
   readonly account: string;
+  /** DSH session id; never prompt content. */
+  readonly session?: string;
   readonly reason: RoutingReason;
   readonly fallback: boolean;
   readonly ok: boolean;

package/lib/index.js

@@ -81,7 +81,7 @@ const DEFAULT_GO_API_BASE = "https://opencode.ai/inference/go";
 const DEFAULT_GO_ZEN_BASE = "https://opencode.ai/zen/go/v1";
 const DEFAULT_USAGE_URL = "https://opencode.ai/zen/go/v1/usage";
 const DEFAULT_AUTH_ENTRY = "opencode-go";
-const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.25";
+const DEFAULT_USER_AGENT = "dsh-opencode-provider/0.5.26";
 const DEFAULT_CONTEXT_WINDOW = 262144;
 const DEFAULT_MAX_TOKENS = 32768;
 const DEFAULT_GENERATE_MAX_TOKENS = 32768;
@@ -126,6 +126,11 @@ const Config = z.object({
 	autoSwitch: markVolatile(z.boolean().default(true)),
 	stickySession: markVolatile(z.boolean().default(true)),
 	activeAccount: markVolatile(z.string().default("")),
+	usageDisplay: markVolatile(z.union([
+		"auto",
+		"always",
+		"off"
+	])),
 	showSidebarQuota: markVolatile(z.boolean().default(false)),
 	userAgent: markVolatile(z.string().default(DEFAULT_USER_AGENT))
 });
@@ -222,6 +227,7 @@ function resolveConfig(config) {
 		autoSwitch: config.autoSwitch !== false,
 		stickySession: config.stickySession !== false,
 		activeAccount: typeof config.activeAccount === "string" ? config.activeAccount : "",
+		usageDisplay: config.usageDisplay === "always" || config.usageDisplay === "off" ? config.usageDisplay : config.usageDisplay === "auto" ? "auto" : config.showSidebarQuota === true ? "always" : "auto",
 		showSidebarQuota: config.showSidebarQuota === true,
 		userAgent: typeof config.userAgent === "string" && config.userAgent !== "" ? config.userAgent : DEFAULT_USER_AGENT
 	};
@@ -3305,6 +3311,7 @@ var OpenCodeAdapter = class extends LlmAdapter {
 		const runStartedAt = Date.now();
 		const model = effectiveModel(options.model, config);
 		const sessionId = openCodeSessionId(options);
+		const traceSession = options.sessionId === void 0 ? "" : String(options.sessionId);
 		const rawKeys = orderKeysForModel(this.deps.resolveKeys !== void 0 ? await this.deps.resolveKeys(options.provider) : [await this.deps.resolveKey(options.provider)], options.model, config.modelAccountRules);
 		const rule = matchModelAccount(options.model, config.modelAccountRules);
 		let keys = rawKeys;
@@ -3404,6 +3411,7 @@ var OpenCodeAdapter = class extends LlmAdapter {
 					provider: options.provider,
 					model: options.model,
 					account: entry.label ?? "default",
+					...traceSession === "" ? {} : { session: traceSession },
 					reason: attemptReason,
 					fallback,
 					ok: true
@@ -3418,6 +3426,7 @@ var OpenCodeAdapter = class extends LlmAdapter {
 						provider: options.provider,
 						model: options.model,
 						account: entry.label ?? "default",
+						...traceSession === "" ? {} : { session: traceSession },
 						reason: attemptReason,
 						fallback,
 						ok: false,
@@ -3446,6 +3455,7 @@ var OpenCodeAdapter = class extends LlmAdapter {
 			provider: options.provider,
 			model: options.model,
 			account: lastAccount,
+			...traceSession === "" ? {} : { session: traceSession },
 			reason,
 			fallback,
 			ok: false,
@@ -4734,6 +4744,7 @@ function publicConfig(config) {
 		autoSwitch: config.autoSwitch,
 		stickySession: config.stickySession,
 		activeAccount: config.activeAccount,
+		usageDisplay: config.usageDisplay,
 		showSidebarQuota: config.showSidebarQuota,
 		userAgent: config.userAgent
 	};
@@ -4923,6 +4934,10 @@ function configOps(patch) {
 	if ("autoSwitch" in patch) set("autoSwitch", patch.autoSwitch === true);
 	if ("stickySession" in patch) set("stickySession", patch.stickySession === true);
 	if ("activeAccount" in patch) set("activeAccount", patch.activeAccount);
+	if ("usageDisplay" in patch) {
+		const value = patch.usageDisplay;
+		if (value === "auto" || value === "always" || value === "off") set("usageDisplay", value);
+	}
 	if ("showSidebarQuota" in patch) set("showSidebarQuota", patch.showSidebarQuota === true);
 	if ("userAgent" in patch) set("userAgent", patch.userAgent);
 	return ops;
@@ -5074,6 +5089,21 @@ function applyRoutes(ctx, web, deps) {
 			json(res, 500, { error: error instanceof Error ? error.message : "state failed" });
 		}
 	});
+	route("/dsh-opencode/notices", async (req, res) => {
+		if (req.method !== "GET") {
+			json(res, 405, { error: "GET required" });
+			return;
+		}
+		if (!trustedHost(req)) {
+			json(res, 403, { error: "non-local Host refused" });
+			return;
+		}
+		if (!allowedOrigin(req)) {
+			json(res, 403, { error: "cross-origin request refused" });
+			return;
+		}
+		json(res, 200, { events: deps.adapter.routingTrace() });
+	});
 	route("/dsh-opencode/health", async (req, res) => {
 		if (req.method !== "GET") {
 			json(res, 405, { error: "GET required" });
@@ -5477,6 +5507,32 @@ function buildOpenCodeTuiSection(deps) {
 					value: text.trim() === "true"
 				})
 			},
+			{
+				path: ["usageDisplay"],
+				group: "sidebar",
+				kind: "select",
+				label: "Quota display",
+				hint: "Auto, Always, or Off for the sidebar quota card.",
+				options: [
+					{
+						value: "auto",
+						label: "Auto"
+					},
+					{
+						value: "always",
+						label: "Always"
+					},
+					{
+						value: "off",
+						label: "Off"
+					}
+				],
+				format: (value) => typeof value === "string" ? value : deps.usageDisplay(),
+				parse: (text) => text === "auto" || text === "always" || text === "off" ? {
+					kind: "set",
+					value: text
+				} : void 0
+			},
 			{
 				path: ["showSidebarQuota"],
 				group: "sidebar",
@@ -5793,6 +5849,7 @@ function apply(ctx, config) {
 			quotaFallbackModel: () => current().quotaFallbackModel,
 			autoSwitch: () => current().autoSwitch,
 			stickySession: () => current().stickySession,
+			usageDisplay: () => current().usageDisplay,
 			showSidebarQuota: () => current().showSidebarQuota
 		});
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-opencode-provider",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "description": "OpenCode / OpenCode Go LLM provider plugin for DeepSeek Harness (dsh).",
   "license": "MIT",
   "type": "module",