@jxgame2020/dsh-token-quota 0.1.18 → 0.1.20

package/README.md

@@ -28,6 +28,10 @@ Zero changes to the DSH core repo: no core file is modified, no official bundle
 
 ## 安装 / Installation
 
+> **版本要求 / Version requirement**：`0.1.19+` 需要 DSH **≥ 0.1.5**（新 API：`SettingsProvider.installSection`、`ctx.remote.session`）。DSH 0.1.0-rc.7 及更早版本请使用 `@jxgame2020/dsh-token-quota@0.1.18`。
+>
+> **Version requirement**: `0.1.19+` requires DSH **≥ 0.1.5** (new APIs: `SettingsProvider.installSection`, `ctx.remote.session`). For DSH 0.1.0-rc.7 and earlier, install `@jxgame2020/dsh-token-quota@0.1.18`.
+
 ### 方式一：npm 安装（推荐）/ Option A: npm install (recommended)
 
 在你的 web profile（`~/.dsh/profiles/web`）下安装依赖：
@@ -36,11 +40,15 @@ Install the dependency in your web profile (`~/.dsh/profiles/web`):
 
 ```bash
 cd ~/.dsh/profiles/web
-npm install @jxgame2020/dsh-token-quota
+npm install @jxgame2020/dsh-token-quota --omit=peer
 ```
 
-> 用 pnpm 管理 profile 的话：`pnpm add @jxgame2020/dsh-token-quota`。
-> With pnpm: `pnpm add @jxgame2020/dsh-token-quota`.
+> **为什么 `--omit=peer` / Why `--omit=peer`**：插件运行时所需的 `@deepseek-ai/*` 由 DSH 宿主提供，不需要安装在 profile 里；npm 上这些包的最新 tag 是互不兼容的旧 rc 版本，自动安装 peer 会触发 ERESOLVE 冲突。0.1.20+ 已将这些 peer 全部标记为 optional，直接 `npm install @jxgame2020/dsh-token-quota` 通常也能成功；若仍报 `ERESOLVE`，加上 `--omit=peer` 即可。
+>
+> The plugin's `@deepseek-ai/*` dependencies are provided by the DSH host at runtime — they must NOT be installed into the profile (npm's latest tags for them are mutually-incompatible old rc versions, so auto-installing peers raises ERESOLVE). Since 0.1.20 all those peers are marked optional, so plain `npm install` usually works; if you still hit `ERESOLVE`, append `--omit=peer`.
+
+> 用 pnpm 管理 profile 的话：`pnpm add @jxgame2020/dsh-token-quota`（pnpm 默认不装 peer，无需额外参数）。
+> With pnpm: `pnpm add @jxgame2020/dsh-token-quota` (pnpm does not auto-install peers — no extra flag needed).
 
 在 `cordis.patch.yml` 中挂载插件：
 

package/lib/client.js

@@ -4,7 +4,7 @@ window.__ModuleLoader__.load({
 		var module = { exports: {} };
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
+		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let react = require("react");
 		//#region lib/types/client/store.js
@@ -26,7 +26,7 @@ window.__ModuleLoader__.load({
 		* @returns the store handle.
 		*/
 		function createTokenQuotaPanelStore() {
-			return (0, _deepseek_ai_dsh_client_runtime_client.defineStore)({
+			return (0, _deepseek_ai_dsh_client_store.defineStore)({
 				init: () => ({
 					snapshot: null,
 					groups: [],
@@ -79,7 +79,7 @@ window.__ModuleLoader__.load({
 						d.dimWhenIdle = dimWhenIdle;
 					},
 					setUpgrade: (d, upgrade) => {
-						const normalized = upgrade !== null && upgrade.latestVersion !== "" && upgrade.latestVersion !== "0.1.18" ? upgrade : null;
+						const normalized = upgrade !== null && upgrade.latestVersion !== "" && upgrade.latestVersion !== "0.1.19" ? upgrade : null;
 						if (d.upgrade === null || d.upgrade.latestVersion !== normalized?.latestVersion) d.upgradeDismissed = false;
 						d.upgrade = normalized;
 					},
@@ -185,91 +185,91 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var TokenQuotaPanel_module_css_default = {
-			"tabIcon": "NPLLIq_tabIcon",
-			"upgradeCommands": "NPLLIq_upgradeCommands",
-			"versionNew": "NPLLIq_versionNew",
-			"checkErrorHint": "NPLLIq_checkErrorHint",
-			"collapse": "NPLLIq_collapse",
-			"rowName": "NPLLIq_rowName",
-			"upgradeBannerFlash": "NPLLIq_upgradeBannerFlash",
-			"dialogHint": "NPLLIq_dialogHint",
-			"panelDim": "NPLLIq_panelDim",
-			"upgradeHint": "NPLLIq_upgradeHint",
+			"panel": "NPLLIq_panel",
+			"rowHeader": "NPLLIq_rowHeader",
+			"upgradeCommandRow": "NPLLIq_upgradeCommandRow",
+			"logToolbar": "NPLLIq_logToolbar",
+			"gearBtn": "NPLLIq_gearBtn",
 			"logPagerInfo": "NPLLIq_logPagerInfo",
-			"resetSelect": "NPLLIq_resetSelect",
-			"logClearDialog": "NPLLIq_logClearDialog",
-			"dialogClose": "NPLLIq_dialogClose",
-			"selectBtn": "NPLLIq_selectBtn",
-			"logClearDate": "NPLLIq_logClearDate",
-			"rowMeta": "NPLLIq_rowMeta",
-			"tabLabel": "NPLLIq_tabLabel",
-			"dialogSection": "NPLLIq_dialogSection",
-			"copyBtn": "NPLLIq_copyBtn",
-			"resetRow": "NPLLIq_resetRow",
+			"fillWarn": "NPLLIq_fillWarn",
+			"headerText": "NPLLIq_headerText",
+			"dialogLabel": "NPLLIq_dialogLabel",
+			"dialogBtn": "NPLLIq_dialogBtn",
+			"monitorHint": "NPLLIq_monitorHint",
+			"logPagerPages": "NPLLIq_logPagerPages",
+			"subtitle": "NPLLIq_subtitle",
+			"upgradeCommands": "NPLLIq_upgradeCommands",
 			"dialogActions": "NPLLIq_dialogActions",
+			"title": "NPLLIq_title",
 			"fillOver": "NPLLIq_fillOver",
-			"save": "NPLLIq_save",
-			"logModelCol": "NPLLIq_logModelCol",
-			"fillIdle": "NPLLIq_fillIdle",
-			"header": "NPLLIq_header",
-			"logUsedCol": "NPLLIq_logUsedCol",
-			"radioRow": "NPLLIq_radioRow",
-			"dialogBtn": "NPLLIq_dialogBtn",
-			"body": "NPLLIq_body",
-			"monitorName": "NPLLIq_monitorName",
-			"dialog": "NPLLIq_dialog",
-			"switch": "NPLLIq_switch",
+			"monitorRow": "NPLLIq_monitorRow",
+			"panelDimStrong": "NPLLIq_panelDimStrong",
 			"currentBadge": "NPLLIq_currentBadge",
-			"subtitle": "NPLLIq_subtitle",
-			"upgradeBanner": "NPLLIq_upgradeBanner",
-			"copyBtnDone": "NPLLIq_copyBtnDone",
 			"checkUpdatesRow": "NPLLIq_checkUpdatesRow",
+			"input": "NPLLIq_input",
+			"checkErrorHint": "NPLLIq_checkErrorHint",
+			"dialogOverlay": "NPLLIq_dialogOverlay",
+			"tabLabel": "NPLLIq_tabLabel",
+			"upgradeClose": "NPLLIq_upgradeClose",
+			"dialogClose": "NPLLIq_dialogClose",
 			"logScroll": "NPLLIq_logScroll",
-			"logToolbar": "NPLLIq_logToolbar",
-			"logPagerControls": "NPLLIq_logPagerControls",
+			"fullNotice": "NPLLIq_fullNotice",
+			"settingsBtn": "NPLLIq_settingsBtn",
+			"upgradeBanner": "NPLLIq_upgradeBanner",
+			"upgradeBannerFlash": "NPLLIq_upgradeBannerFlash",
+			"logPager": "NPLLIq_logPager",
 			"logPageSizeSelect": "NPLLIq_logPageSizeSelect",
+			"rowName": "NPLLIq_rowName",
+			"logClearDate": "NPLLIq_logClearDate",
+			"collapse": "NPLLIq_collapse",
+			"bar": "NPLLIq_bar",
+			"controls": "NPLLIq_controls",
+			"copyBtnDone": "NPLLIq_copyBtnDone",
+			"body": "NPLLIq_body",
+			"logPagerBtn": "NPLLIq_logPagerBtn",
+			"notice": "NPLLIq_notice",
+			"monitorName": "NPLLIq_monitorName",
+			"logClearBtn": "NPLLIq_logClearBtn",
+			"dialogBody": "NPLLIq_dialogBody",
+			"resetRow": "NPLLIq_resetRow",
+			"dialogHint": "NPLLIq_dialogHint",
+			"panelDim": "NPLLIq_panelDim",
 			"logDialog": "NPLLIq_logDialog",
-			"logDayCol": "NPLLIq_logDayCol",
-			"monitorList": "NPLLIq_monitorList",
-			"panelDimStrong": "NPLLIq_panelDimStrong",
-			"monitorHint": "NPLLIq_monitorHint",
-			"logTable": "NPLLIq_logTable",
-			"logPager": "NPLLIq_logPager",
-			"dialogOverlay": "NPLLIq_dialogOverlay",
-			"noticeError": "NPLLIq_noticeError",
 			"tab": "NPLLIq_tab",
-			"upgradeBannerText": "NPLLIq_upgradeBannerText",
-			"logClearBtn": "NPLLIq_logClearBtn",
-			"notice": "NPLLIq_notice",
-			"fillWarn": "NPLLIq_fillWarn",
+			"upgradeHint": "NPLLIq_upgradeHint",
+			"header": "NPLLIq_header",
+			"switch": "NPLLIq_switch",
+			"noticeError": "NPLLIq_noticeError",
 			"upgradeCommand": "NPLLIq_upgradeCommand",
+			"row": "NPLLIq_row",
+			"rowMeta": "NPLLIq_rowMeta",
+			"checkUpdatesLabel": "NPLLIq_checkUpdatesLabel",
+			"dialog": "NPLLIq_dialog",
 			"dialogHeader": "NPLLIq_dialogHeader",
-			"title": "NPLLIq_title",
+			"logModelCol": "NPLLIq_logModelCol",
+			"logUsedCol": "NPLLIq_logUsedCol",
 			"logSearch": "NPLLIq_logSearch",
-			"controls": "NPLLIq_controls",
-			"input": "NPLLIq_input",
-			"logHeader": "NPLLIq_logHeader",
-			"settingsBtn": "NPLLIq_settingsBtn",
-			"upgradeCommandRow": "NPLLIq_upgradeCommandRow",
+			"logPagerControls": "NPLLIq_logPagerControls",
+			"fillIdle": "NPLLIq_fillIdle",
+			"monitorList": "NPLLIq_monitorList",
+			"upgradeBannerText": "NPLLIq_upgradeBannerText",
 			"dialogBtnPrimary": "NPLLIq_dialogBtnPrimary",
-			"logPagerBtn": "NPLLIq_logPagerBtn",
-			"panel": "NPLLIq_panel",
 			"version": "NPLLIq_version",
-			"upgradeClose": "NPLLIq_upgradeClose",
-			"headerText": "NPLLIq_headerText",
-			"fullNotice": "NPLLIq_fullNotice",
-			"logPagerPages": "NPLLIq_logPagerPages",
-			"headerActions": "NPLLIq_headerActions",
-			"rowHeader": "NPLLIq_rowHeader",
-			"bar": "NPLLIq_bar",
 			"dialogTitle": "NPLLIq_dialogTitle",
-			"checkUpdatesLabel": "NPLLIq_checkUpdatesLabel",
-			"gearBtn": "NPLLIq_gearBtn",
-			"monitorRow": "NPLLIq_monitorRow",
+			"dialogSection": "NPLLIq_dialogSection",
 			"checkBtn": "NPLLIq_checkBtn",
-			"dialogLabel": "NPLLIq_dialogLabel",
-			"dialogBody": "NPLLIq_dialogBody",
-			"row": "NPLLIq_row"
+			"save": "NPLLIq_save",
+			"selectBtn": "NPLLIq_selectBtn",
+			"logDayCol": "NPLLIq_logDayCol",
+			"resetSelect": "NPLLIq_resetSelect",
+			"copyBtn": "NPLLIq_copyBtn",
+			"logClearDialog": "NPLLIq_logClearDialog",
+			"radioRow": "NPLLIq_radioRow",
+			"versionNew": "NPLLIq_versionNew",
+			"tabIcon": "NPLLIq_tabIcon",
+			"logTable": "NPLLIq_logTable",
+			"logHeader": "NPLLIq_logHeader",
+			"headerActions": "NPLLIq_headerActions"
 		};
 		//#endregion
 		//#region lib/types/client/TokenQuotaPanel.js
@@ -411,8 +411,7 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => {
 				const onFocusIn = (event) => {
 					const target = event.target;
-					const isInput = target !== null && (target.matches("input, textarea, [contenteditable=\"true\"]") || target.closest("input, textarea, [contenteditable=\"true\"]") !== null);
-					setInputActive(isInput);
+					setInputActive(target !== null && (target.matches("input, textarea, [contenteditable=\"true\"]") || target.closest("input, textarea, [contenteditable=\"true\"]") !== null));
 				};
 				window.addEventListener("focusin", onFocusIn);
 				return () => {
@@ -572,13 +571,13 @@ window.__ModuleLoader__.load({
 									title: t("upgradeAvailableHint"),
 									children: [
 										"v",
-										"0.1.18",
+										"0.1.19",
 										" → v",
 										upgrade.latestVersion
 									]
 								}) : (0, react_jsx_runtime.jsxs)("span", {
 									className: TokenQuotaPanel_module_css_default.version,
-									children: ["v", "0.1.18"]
+									children: ["v", "0.1.19"]
 								})]
 							}), (0, react_jsx_runtime.jsx)("div", {
 								className: TokenQuotaPanel_module_css_default.subtitle,
@@ -1279,10 +1278,10 @@ window.__ModuleLoader__.load({
 		const TOKEN_QUOTA_NAMESPACE = "token-quota";
 		/** Snapshot pull cadence in milliseconds. */
 		const POLL_INTERVAL_MS = 3e3;
-		/** Required services: slot registry, connection RPC, locale, settings scope. */
+		/** Required services: slot registry, sessions, locale, settings scope. */
 		const inject = [
 			"slots",
-			"connection",
+			"sessions",
 			"locale",
 			"settingsScope"
 		];
@@ -1299,7 +1298,7 @@ window.__ModuleLoader__.load({
 			}), "token-quota-ui: panel dictionaries");
 			const t = ctx.locale.bind(NS);
 			const scope = ctx.settingsScope.bind({ namespace: TOKEN_QUOTA_NAMESPACE });
-			const connection = ctx.get("connection");
+			const sessions = ctx.get("sessions");
 			const store = createTokenQuotaPanelStore();
 			let bound;
 			let lastGroups = [];
@@ -1366,11 +1365,11 @@ window.__ModuleLoader__.load({
 					bound?.setFullNotice(t("fullSwitchFailed"));
 					return;
 				}
-				connection.api.sessions.selectModel({
+				ctx.remote.session.selectModel({
 					sessionId: lastSessionId,
 					provider: target.provider,
 					model: target.model
-				}).then(({ result }) => {
+				}).then((result) => {
 					if (result.ok) {
 						lastCurrent = result.value.selected;
 						flashFullNotice(t("fullSwitchTo").replace("{model}", target.model));
@@ -1381,14 +1380,21 @@ window.__ModuleLoader__.load({
 				});
 			};
 			let pullCount = 0;
+			/** Resolve the session's current model from its durable modelSelection projection. */
+			const currentOf = (sessionId) => {
+				const binding = sessions.binding(sessionId);
+				if (binding === void 0) return null;
+				return binding.session.projections.faceOf("modelSelection").getSnapshot()?.lastUsed ?? null;
+			};
 			const refreshCurrent = () => {
 				if (lastSessionId === void 0) return;
-				connection.api.sessions.models({ sessionId: lastSessionId }).then(({ result }) => {
+				ctx.remote.session.modelCatalog().then((result) => {
 					if (result.ok) {
-						const currentChanged = lastCurrent?.provider !== result.value.current?.provider || lastCurrent?.model !== result.value.current?.model;
+						const current = currentOf(lastSessionId);
+						const currentChanged = lastCurrent?.provider !== current?.provider || lastCurrent?.model !== current?.model;
 						lastGroups = result.value.groups;
-						lastCurrent = result.value.current;
-						bound?.setDirectory(result.value.groups, result.value.current);
+						lastCurrent = current;
+						bound?.setDirectory(result.value.groups, current);
 						if (currentChanged) fetch("/token-quota", { headers: { accept: "application/json" } }).then((response) => response.ok ? response.json() : void 0, () => void 0).then((snapshot) => {
 							if (snapshot !== void 0) {
 								bound?.setSnapshot(snapshot);
@@ -1437,11 +1443,12 @@ window.__ModuleLoader__.load({
 				lastSessionId = sessionId;
 				bound?.setLoading(true);
 				bound?.setError(null);
-				connection.api.sessions.models({ sessionId }).then(({ result }) => {
+				ctx.remote.session.modelCatalog().then((result) => {
 					if (result.ok) {
+						const current = currentOf(sessionId);
 						lastGroups = result.value.groups;
-						lastCurrent = result.value.current;
-						bound?.setDirectory(result.value.groups, result.value.current);
+						lastCurrent = current;
+						bound?.setDirectory(result.value.groups, current);
 						bound?.setLoading(false);
 					} else {
 						bound?.setError(`${result.error.code}: ${result.error.message}`);
@@ -1512,11 +1519,11 @@ window.__ModuleLoader__.load({
 				scope.set("reset", reset);
 			};
 			const selectModel = (sessionId, provider, model) => {
-				connection.api.sessions.selectModel({
+				ctx.remote.session.selectModel({
 					sessionId,
 					provider,
 					model
-				}).then(({ result }) => {
+				}).then((result) => {
 					if (result.ok) {
 						lastCurrent = result.value.selected;
 						bound?.setFullNotice(null);

package/lib/index.js

@@ -6,7 +6,6 @@ import { Service } from "@deepseek-ai/cordis";
 import z from "@deepseek-ai/schemastery";
 import "@deepseek-ai/dsh-agent";
 import { LlmError } from "@deepseek-ai/dsh-llm";
-import { installSettingsSection, settingsNamespace } from "@deepseek-ai/dsh-settings";
 //#region lib/types/types.js
 /**
 * Shared wire/type vocabulary for the daily token-quota plugin.
@@ -66,7 +65,7 @@ const PACKAGE_NAME = "@jxgame2020/dsh-token-quota";
 /** npm registry endpoint for the plugin's latest version. */
 const REGISTRY_LATEST_URL = "https://registry.npmjs.org/@jxgame2020%2Fdsh-token-quota/latest";
 /** How often the Host re-checks for a newer version when update checks are enabled. */
-const UPDATE_CHECK_INTERVAL_MS = 864e5;
+const UPDATE_CHECK_INTERVAL_MS = 1440 * 60 * 1e3;
 /** Map a detected package manager to its install verb. */
 function installVerb(manager) {
 	switch (manager) {
@@ -146,8 +145,7 @@ function detectManager(dir) {
 * `undefined` when no profile declares the plugin (e.g. a bundle-managed mount).
 */
 function findProfile() {
-	const home = process.env.DSH_HOME !== void 0 && process.env.DSH_HOME.trim().length > 0 ? process.env.DSH_HOME : join(homedir(), ".dsh");
-	const profilesDir = join(home, "profiles");
+	const profilesDir = join(process.env.DSH_HOME !== void 0 && process.env.DSH_HOME.trim().length > 0 ? process.env.DSH_HOME : join(homedir(), ".dsh"), "profiles");
 	let names;
 	try {
 		names = readdirSync(profilesDir);
@@ -235,8 +233,7 @@ function cycleKey(now, reset) {
 }
 /** Default counter file under the Harness home (overridable through config). */
 function defaultStoragePath() {
-	const home = process.env.DSH_HOME ?? join(homedir(), ".dsh");
-	return join(home, "token-quota.json");
+	return join(process.env.DSH_HOME ?? join(homedir(), ".dsh"), "token-quota.json");
 }
 /** Combined input + output + cache token count of one provider usage report. */
 function usageTokens(usage) {
@@ -304,49 +301,51 @@ var TokenQuotaService = class TokenQuotaService extends Service {
 		super(ctx, "tokenQuota");
 		this.storagePath = config.storagePath !== void 0 && config.storagePath.length > 0 ? config.storagePath : defaultStoragePath();
 		this.load();
-		installSettingsSection(ctx, settingsNamespace(TOKEN_QUOTA_NAMESPACE), TOKEN_QUOTA_SETTINGS_SCHEMA, { limits: {} }, {
-			setSource: (current) => {
-				this.settingsSource = () => {
-					const doc = current();
-					return {
-						limits: doc.limits ?? {},
-						monitored: doc.monitored ?? [],
-						onFull: doc.onFull === "switchPriority" ? "switchAll" : doc.onFull ?? "stop",
-						checkUpdates: doc.checkUpdates ?? true,
-						dimWhenIdle: doc.dimWhenIdle ?? false,
-						reset: doc.reset ?? void 0
+		ctx.inject(["settings"], (settingsCtx) => {
+			settingsCtx.settings.installSection(ctx, TOKEN_QUOTA_NAMESPACE, TOKEN_QUOTA_SETTINGS_SCHEMA, { limits: {} }, {
+				setSource: (current) => {
+					this.settingsSource = () => {
+						const doc = current();
+						return {
+							limits: doc.limits ?? {},
+							monitored: doc.monitored ?? [],
+							onFull: doc.onFull === "switchPriority" ? "switchAll" : doc.onFull ?? "stop",
+							checkUpdates: doc.checkUpdates ?? true,
+							dimWhenIdle: doc.dimWhenIdle ?? false,
+							reset: doc.reset ?? void 0
+						};
 					};
-				};
-			},
-			validate: (value) => {
-				for (const [key, limit] of Object.entries(value.limits ?? {})) {
-					assertTokenQuotaLimit(limit, key);
-					splitTokenQuotaKey(key);
-				}
-			},
-			onChange: () => {
-				const doc = this.settingsSource();
-				this.limits = { ...doc.limits };
-				this.monitored = doc.monitored !== void 0 && doc.monitored.length > 0 ? new Set(doc.monitored) : void 0;
-				this.checkUpdates = doc.checkUpdates;
-				this.syncUpdateChecking();
-				if (doc.reset !== void 0 && typeof doc.reset === "object" && doc.reset !== null && typeof doc.reset.offsetHours === "number" && typeof doc.reset.hour === "number" && typeof doc.reset.minute === "number") {
-					const configured = doc.reset;
-					this.reset = {
-						offsetHours: Math.max(-12, Math.min(14, Math.round(configured.offsetHours))),
-						hour: Math.max(0, Math.min(23, Math.round(configured.hour))),
-						minute: Math.max(0, Math.min(59, Math.round(configured.minute)))
-					};
-					this.rollCycleIfNeeded();
-				} else {
-					this.reset = {
-						offsetHours: localOffsetHours(),
-						hour: 0,
-						minute: 0
-					};
-					this.rollCycleIfNeeded();
+				},
+				validate: (value) => {
+					for (const [key, limit] of Object.entries(value.limits ?? {})) {
+						assertTokenQuotaLimit(limit, key);
+						splitTokenQuotaKey(key);
+					}
+				},
+				onChange: () => {
+					const doc = this.settingsSource();
+					this.limits = { ...doc.limits };
+					this.monitored = doc.monitored !== void 0 && doc.monitored.length > 0 ? new Set(doc.monitored) : void 0;
+					this.checkUpdates = doc.checkUpdates;
+					this.syncUpdateChecking();
+					if (doc.reset !== void 0 && typeof doc.reset === "object" && doc.reset !== null && typeof doc.reset.offsetHours === "number" && typeof doc.reset.hour === "number" && typeof doc.reset.minute === "number") {
+						const configured = doc.reset;
+						this.reset = {
+							offsetHours: Math.max(-12, Math.min(14, Math.round(configured.offsetHours))),
+							hour: Math.max(0, Math.min(23, Math.round(configured.hour))),
+							minute: Math.max(0, Math.min(59, Math.round(configured.minute)))
+						};
+						this.rollCycleIfNeeded();
+					} else {
+						this.reset = {
+							offsetHours: localOffsetHours(),
+							hour: 0,
+							minute: 0
+						};
+						this.rollCycleIfNeeded();
+					}
 				}
-			}
+			});
 		});
 		this.tryMountRoute();
 		if (this.disposeRoute === void 0) this.disposeRouteWatcher = ctx.on("internal/service", (name) => {
@@ -454,7 +453,7 @@ var TokenQuotaService = class TokenQuotaService extends Service {
 		return this.upgradeCheck;
 	}
 	async doRefreshUpgrade() {
-		const current = "0.1.18";
+		const current = "0.1.19";
 		let latest;
 		try {
 			const response = await fetch(REGISTRY_LATEST_URL, {
@@ -550,7 +549,7 @@ var TokenQuotaService = class TokenQuotaService extends Service {
 	/** Read the current snapshot (also used by tests and inspection). */
 	readSnapshot() {
 		this.rollCycleIfNeeded();
-		const keys = /* @__PURE__ */ new Set([...Object.keys(this.usage), ...Object.keys(this.limits)]);
+		const keys = new Set([...Object.keys(this.usage), ...Object.keys(this.limits)]);
 		const entries = [];
 		for (const key of keys) {
 			const parts = this.safeSplit(key);

package/lib/types/bound-test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=bound-test.d.ts.map

package/lib/types/bound-test.js

@@ -0,0 +1,5 @@
+import { createTokenQuotaPanelStore } from "./client/store.js";
+const store = createTokenQuotaPanelStore();
+let bound;
+bound?.setSnapshot(null);
+//# sourceMappingURL=bound-test.js.map

package/lib/types/client/TokenQuotaPanel.d.ts

@@ -1,5 +1,5 @@
 import type { PropsLocale, PropsRuntime, PropsStore } from '@deepseek-ai/dsh-client-ui-slots';
-import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client';
+import type { SessionId } from '@deepseek-ai/dsh-session/types';
 import type { TokenQuotaFullAction, TokenQuotaReset } from '@jxgame2020/dsh-token-quota/types';
 import type { createTokenQuotaPanelStore } from './store.ts';
 /** Injected business face: data loading and mutations wired in `apply`. */

package/lib/types/client/bound-test.d.ts

@@ -0,0 +1,2 @@
+export declare function test(): void;
+//# sourceMappingURL=bound-test.d.ts.map

package/lib/types/client/bound-test.js

@@ -0,0 +1,7 @@
+import { createTokenQuotaPanelStore } from "./store.js";
+export function test() {
+    const store = createTokenQuotaPanelStore();
+    let bound;
+    bound?.setFullNotice(null);
+}
+//# sourceMappingURL=bound-test.js.map

package/lib/types/client/import-test.d.ts

@@ -0,0 +1,2 @@
+export declare function test(): void;
+//# sourceMappingURL=import-test.d.ts.map

package/lib/types/client/import-test.js

@@ -0,0 +1,3 @@
+import { createTokenQuotaPanelStore } from "./store.js";
+export function test() { const store = createTokenQuotaPanelStore(); let bound; bound?.setFullNotice(null); }
+//# sourceMappingURL=import-test.js.map

package/lib/types/client/index.d.ts

@@ -12,7 +12,7 @@
  * full-quota strategy runs: `stop` shows a notice, the other three
  * auto-switch to a suitable model.
  */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
 import { type TokenQuotaKey } from './locales.ts';
 export type { TokenQuotaPanelInjected } from './TokenQuotaPanel.tsx';
 export type { ModelQuotaRow, TokenQuotaPanelState } from './store.ts';
@@ -24,7 +24,7 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
         'token-quota': TokenQuotaKey;
     }
 }
-/** Required services: slot registry, connection RPC, locale, settings scope. */
+/** Required services: slot registry, sessions, locale, settings scope. */
 export declare const inject: string[];
 /**
  * Client plugin body: poll the Host snapshot route, run the full-quota

package/lib/types/client/index.js

@@ -8,8 +8,8 @@ const NS = 'token-quota';
 const TOKEN_QUOTA_NAMESPACE = 'token-quota';
 /** Snapshot pull cadence in milliseconds. */
 const POLL_INTERVAL_MS = 3000;
-/** Required services: slot registry, connection RPC, locale, settings scope. */
-export const inject = ['slots', 'connection', 'locale', 'settingsScope'];
+/** Required services: slot registry, sessions, locale, settings scope. */
+export const inject = ['slots', 'sessions', 'locale', 'settingsScope'];
 /**
  * Client plugin body: poll the Host snapshot route, run the full-quota
  * strategy, wire the injected face (directory load, limit write, model
@@ -20,7 +20,10 @@ export function apply(ctx) {
     ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'token-quota-ui: panel dictionaries');
     const t = ctx.locale.bind(NS);
     const scope = ctx.settingsScope.bind({ namespace: TOKEN_QUOTA_NAMESPACE });
-    const connection = ctx.get('connection');
+    // The Host `dsh-session` package's `ctx.sessions: SessionStore` merge can
+    // shadow the client ISessions face in a combined type-check; the runtime
+    // 'sessions' service is the ISessions implementation regardless.
+    const sessions = ctx.get('sessions');
     // Store handle shared with the registration; the framework instantiates the
     // live store per entry and hands its bound actions to the inject factory,
     // so the apply-world only ever writes through `bound`.
@@ -107,11 +110,11 @@ export function apply(ctx) {
             bound?.setFullNotice(t('fullSwitchFailed'));
             return;
         }
-        void connection.api.sessions.selectModel({
+        void ctx.remote.session.selectModel({
             sessionId: lastSessionId,
             provider: target.provider,
             model: target.model,
-        }).then(({ result }) => {
+        }).then((result) => {
             if (result.ok) {
                 lastCurrent = result.value.selected;
                 flashFullNotice(t('fullSwitchTo').replace('{model}', target.model));
@@ -130,16 +133,26 @@ export function apply(ctx) {
     // switch on full quota) moves the 「当前」 badge without waiting the full
     // directory-refresh cadence.
     let pullCount = 0;
+    /** Resolve the session's current model from its durable modelSelection projection. */
+    const currentOf = (sessionId) => {
+        const binding = sessions.binding(sessionId);
+        if (binding === undefined)
+            return null;
+        const face = binding.session.projections.faceOf('modelSelection');
+        const state = face.getSnapshot();
+        return state?.lastUsed ?? null;
+    };
     const refreshCurrent = () => {
         if (lastSessionId === undefined)
             return;
-        void connection.api.sessions.models({ sessionId: lastSessionId }).then(({ result }) => {
+        void ctx.remote.session.modelCatalog().then((result) => {
             if (result.ok) {
-                const currentChanged = lastCurrent?.provider !== result.value.current?.provider
-                    || lastCurrent?.model !== result.value.current?.model;
+                const current = currentOf(lastSessionId);
+                const currentChanged = lastCurrent?.provider !== current?.provider
+                    || lastCurrent?.model !== current?.model;
                 lastGroups = result.value.groups;
-                lastCurrent = result.value.current;
-                bound?.setDirectory(result.value.groups, result.value.current);
+                lastCurrent = current;
+                bound?.setDirectory(result.value.groups, current);
                 // If the server silently switched to a different model (e.g. the
                 // auto-switch on quota exhaustion), re-run the full-quota strategy
                 // immediately against the new current model so any further fallback
@@ -201,11 +214,12 @@ export function apply(ctx) {
         lastSessionId = sessionId;
         bound?.setLoading(true);
         bound?.setError(null);
-        void connection.api.sessions.models({ sessionId }).then(({ result }) => {
+        void ctx.remote.session.modelCatalog().then((result) => {
             if (result.ok) {
+                const current = currentOf(sessionId);
                 lastGroups = result.value.groups;
-                lastCurrent = result.value.current;
-                bound?.setDirectory(result.value.groups, result.value.current);
+                lastCurrent = current;
+                bound?.setDirectory(result.value.groups, current);
                 bound?.setLoading(false);
             }
             else {
@@ -282,7 +296,7 @@ export function apply(ctx) {
         void scope.set('reset', reset);
     };
     const selectModel = (sessionId, provider, model) => {
-        void connection.api.sessions.selectModel({ sessionId, provider, model }).then(({ result }) => {
+        void ctx.remote.session.selectModel({ sessionId, provider, model }).then((result) => {
             if (result.ok) {
                 lastCurrent = result.value.selected;
                 // A manual pick clears any leftover auto-switch / exhausted notice.

package/lib/types/client/store.d.ts

@@ -7,8 +7,8 @@
  *
  * @module @deepseek-ai/dsh-client-ui-token-quota/client/store
  */
-import { type EngineStoreHandle } from '@deepseek-ai/dsh-client-runtime/client';
-import type { ModelProviderGroup, ModelSelection } from '@deepseek-ai/dsh-api-remotes/client';
+import { type EngineStoreHandle } from '@deepseek-ai/dsh-client-store';
+import type { ModelProviderGroup, ModelSelection } from '@deepseek-ai/dsh-api-session-controller/types';
 import type { TokenQuotaFullAction, TokenQuotaLog, TokenQuotaReset, TokenQuotaSnapshot, TokenQuotaUpgrade } from '@jxgame2020/dsh-token-quota/types';
 /** One rendered model row: directory identity merged with the quota snapshot. */
 export interface ModelQuotaRow {

package/lib/types/client/store.js

@@ -7,7 +7,7 @@
  *
  * @module @deepseek-ai/dsh-client-ui-token-quota/client/store
  */
-import { defineStore } from '@deepseek-ai/dsh-client-runtime/client';
+import { defineStore } from '@deepseek-ai/dsh-client-store';
 /** Build the stable per-model key shared by the counter, settings, and snapshot. */
 function tokenQuotaKey(provider, model) {
     return `${provider}/${model}`;

package/lib/types/import-test.d.ts

@@ -0,0 +1,2 @@
+export declare function test(): void;
+//# sourceMappingURL=import-test.d.ts.map

package/lib/types/import-test.js

@@ -0,0 +1,3 @@
+import { createTokenQuotaPanelStore } from "./store.js";
+export function test() { const store = createTokenQuotaPanelStore(); let bound; bound?.setFullNotice(null); }
+//# sourceMappingURL=import-test.js.map

package/lib/types/index.js

@@ -38,7 +38,6 @@ import z from '@deepseek-ai/schemastery';
 // the service listens to without importing any runtime value.
 import '@deepseek-ai/dsh-agent';
 import { LlmError } from '@deepseek-ai/dsh-llm';
-import { installSettingsSection, settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { TOKEN_QUOTA_EXCEEDED_CODE, TOKEN_QUOTA_NAMESPACE, tokenQuotaKey, } from "./types.js";
 import { assertTokenQuotaLimit, splitTokenQuotaKey } from "./invariant.js";
 /** The plugin's package name, used to locate the profile dependency and the registry endpoint. */
@@ -307,60 +306,65 @@ export class TokenQuotaService extends Service {
             : defaultStoragePath();
         this.load();
         // Limits live in the user settings document; the Web panel writes them and
-        // the section watcher pushes every change back here.
-        installSettingsSection(ctx, settingsNamespace(TOKEN_QUOTA_NAMESPACE), TOKEN_QUOTA_SETTINGS_SCHEMA, { limits: {} }, {
-            setSource: (current) => {
-                // Normalize the resolved (schema-shaped) document into the plugin's
-                // required shape: empty monitored = monitor everything, absent onFull
-                // falls back to 'stop'.
-                this.settingsSource = () => {
-                    const doc = current();
-                    return {
-                        limits: doc.limits ?? {},
-                        monitored: doc.monitored ?? [],
-                        // Legacy `switchPriority` (removed in 0.1.7) maps to `switchAll`:
-                        // capped models first, then uncapped — both monitored-only.
-                        onFull: doc.onFull === 'switchPriority' ? 'switchAll' : (doc.onFull ?? 'stop'),
-                        checkUpdates: doc.checkUpdates ?? true,
-                        dimWhenIdle: doc.dimWhenIdle ?? false,
-                        reset: doc.reset ?? undefined,
+        // the section watcher pushes every change back here. DSH 0.1.5 replaced
+        // the standalone `installSettingsSection` helper with
+        // `SettingsProvider.installSection`, reached through `ctx.inject` so the
+        // settings service is guaranteed to be up before registration.
+        ctx.inject(['settings'], (settingsCtx) => {
+            settingsCtx.settings.installSection(ctx, TOKEN_QUOTA_NAMESPACE, TOKEN_QUOTA_SETTINGS_SCHEMA, { limits: {} }, {
+                setSource: (current) => {
+                    // Normalize the resolved (schema-shaped) document into the plugin's
+                    // required shape: empty monitored = monitor everything, absent onFull
+                    // falls back to 'stop'.
+                    this.settingsSource = () => {
+                        const doc = current();
+                        return {
+                            limits: doc.limits ?? {},
+                            monitored: doc.monitored ?? [],
+                            // Legacy `switchPriority` (removed in 0.1.7) maps to `switchAll`:
+                            // capped models first, then uncapped — both monitored-only.
+                            onFull: doc.onFull === 'switchPriority' ? 'switchAll' : (doc.onFull ?? 'stop'),
+                            checkUpdates: doc.checkUpdates ?? true,
+                            dimWhenIdle: doc.dimWhenIdle ?? false,
+                            reset: doc.reset ?? undefined,
+                        };
                     };
-                };
-            },
-            validate: (value) => {
-                for (const [key, limit] of Object.entries(value.limits ?? {})) {
-                    assertTokenQuotaLimit(limit, key);
-                    splitTokenQuotaKey(key);
-                }
-            },
-            onChange: () => {
-                const doc = this.settingsSource();
-                this.limits = { ...doc.limits };
-                this.monitored = doc.monitored !== undefined && doc.monitored.length > 0
-                    ? new Set(doc.monitored)
-                    : undefined;
-                this.checkUpdates = doc.checkUpdates;
-                this.syncUpdateChecking();
-                if (doc.reset !== undefined
-                    && typeof doc.reset === 'object'
-                    && doc.reset !== null
-                    && typeof doc.reset.offsetHours === 'number'
-                    && typeof doc.reset.hour === 'number'
-                    && typeof doc.reset.minute === 'number') {
-                    const configured = doc.reset;
-                    this.reset = {
-                        offsetHours: Math.max(-12, Math.min(14, Math.round(configured.offsetHours))),
-                        hour: Math.max(0, Math.min(23, Math.round(configured.hour))),
-                        minute: Math.max(0, Math.min(59, Math.round(configured.minute))),
-                    };
-                    this.rollCycleIfNeeded();
-                }
-                else {
-                    // null / malformed (unset) = machine-local midnight — the default.
-                    this.reset = { offsetHours: localOffsetHours(), hour: 0, minute: 0 };
-                    this.rollCycleIfNeeded();
-                }
-            },
+                },
+                validate: (value) => {
+                    for (const [key, limit] of Object.entries(value.limits ?? {})) {
+                        assertTokenQuotaLimit(limit, key);
+                        splitTokenQuotaKey(key);
+                    }
+                },
+                onChange: () => {
+                    const doc = this.settingsSource();
+                    this.limits = { ...doc.limits };
+                    this.monitored = doc.monitored !== undefined && doc.monitored.length > 0
+                        ? new Set(doc.monitored)
+                        : undefined;
+                    this.checkUpdates = doc.checkUpdates;
+                    this.syncUpdateChecking();
+                    if (doc.reset !== undefined
+                        && typeof doc.reset === 'object'
+                        && doc.reset !== null
+                        && typeof doc.reset.offsetHours === 'number'
+                        && typeof doc.reset.hour === 'number'
+                        && typeof doc.reset.minute === 'number') {
+                        const configured = doc.reset;
+                        this.reset = {
+                            offsetHours: Math.max(-12, Math.min(14, Math.round(configured.offsetHours))),
+                            hour: Math.max(0, Math.min(23, Math.round(configured.hour))),
+                            minute: Math.max(0, Math.min(59, Math.round(configured.minute))),
+                        };
+                        this.rollCycleIfNeeded();
+                    }
+                    else {
+                        // null / malformed (unset) = machine-local midnight — the default.
+                        this.reset = { offsetHours: localOffsetHours(), hour: 0, minute: 0 };
+                        this.rollCycleIfNeeded();
+                    }
+                },
+            });
         });
         // Snapshot route: optional — only mounted when a webServer service exists
         // (the Web profile); headless deployments keep the enforcement without it.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jxgame2020/dsh-token-quota",
   "description": "Daily per-model token quota accounting, enforcement, and a floating quota panel for the DeepSeek Harness — a fully self-contained plugin (no core-Harness wiring, no generated RPC contract)",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "publishConfig": {
     "access": "public"
   },
@@ -31,8 +31,9 @@
   "dsh": {
     "client": {
       "inject": [
+        "@deepseek-ai/dsh-api-session-controller",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-store",
         "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-api-remotes"
@@ -56,28 +57,31 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "*",
     "@deepseek-ai/dsh-agent": "*",
+    "@deepseek-ai/dsh-api-gateway": "*",
     "@deepseek-ai/dsh-api-remotes": "*",
+    "@deepseek-ai/dsh-api-session-controller": "*",
+    "@deepseek-ai/dsh-attachment": "*",
+    "@deepseek-ai/dsh-brand": "*",
     "@deepseek-ai/dsh-client-connection": "*",
     "@deepseek-ai/dsh-client-locale": "*",
-    "@deepseek-ai/dsh-client-runtime": "*",
+    "@deepseek-ai/dsh-client-store": "*",
     "@deepseek-ai/dsh-client-ui-layout": "*",
+    "@deepseek-ai/dsh-client-ui-renderer": "*",
+    "@deepseek-ai/dsh-client-ui-session": "*",
     "@deepseek-ai/dsh-client-ui-settings": "*",
     "@deepseek-ai/dsh-client-ui-slots": "*",
     "@deepseek-ai/dsh-invariants": "*",
+    "@deepseek-ai/dsh-jobs": "*",
     "@deepseek-ai/dsh-llm": "*",
     "@deepseek-ai/dsh-session": "*",
-    "@deepseek-ai/dsh-settings": "*",
-    "react": "^18.2.0",
-    "@deepseek-ai/dsh-host-apiproxy": "*",
-    "@deepseek-ai/dsh-attachment": "*",
-    "@deepseek-ai/dsh-brand": "*",
-    "@deepseek-ai/dsh-jobs": "*",
     "@deepseek-ai/dsh-session-projection": "*",
+    "@deepseek-ai/dsh-settings": "*",
     "@deepseek-ai/dsh-tools": "*",
     "@deepseek-ai/dsh-user-approval": "*",
     "@deepseek-ai/dsh-user-questions": "*",
     "@deepseek-ai/dsh-workspace": "*",
-    "@deepseek-ai/schemastery": "*"
+    "@deepseek-ai/schemastery": "*",
+    "react": "^18.2.0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -148,6 +152,21 @@
     },
     "@deepseek-ai/schemastery": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-api-gateway": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-api-session-controller": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-store": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-renderer": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-session": {
+      "optional": true
     }
   }
 }