dsh-client-ui-cpa-quota 0.7.2 → 0.7.4

package/README.md

@@ -46,7 +46,7 @@ Hover the ring next to the selected model for matching accounts, providers, plan
 - Supports multiple CLIProxyAPI instances and accounts, filtering the hover tooltip to the selected model while the settings panel always shows everything.
 - Orders windows as `5-hour → weekly → monthly → daily`; the ring uses the first available window in that order.
 - Queries Codex, Claude, Antigravity, Gemini CLI, Kimi, and xAI/Grok through their upstream quota APIs; other CPA providers still expose account status and recent activity.
-- **In-use account detection**: CPA's per-request usage queue feeds a local 7-day ledger, so the tooltip shows the accounts actually serving the selected model in the last 24 hours (sorted by last use, with an "in use" badge and 24h request/token totals) and collapses the rest under "Other accounts".
+- **In-use account detection**: CPA's per-request usage queue feeds a local 7-day ledger, so the tooltip shows the accounts that actually served the selected model within the current refresh cycle (sorted by last use, with an "in use" badge and request/token totals) and collapses the rest under "Other accounts". The in-use window follows the card's refresh interval.
 - Account probes run through a bounded pool with a per-request timeout — one hung upstream can never stall the refresh cycle.
 - Keeps the last successful snapshot across transient refresh failures and reuses rings across DSH screen remounts.
 - Colors: green ≥20% remaining, amber <20%, red exhausted/error, gray loading or missing a management key.
@@ -182,7 +182,7 @@ Point the plugin's manual instance input at the mock to see a full five-account
 - **Where are my keys stored?** In this browser's `localStorage` only. Quota requests go straight from the browser to each instance; the DSH host never sees your keys.
 - **Switching browsers?** Use **Export config / Import config** on the card to move instances and keys between browsers. The exported JSON is plaintext — store it carefully.
 - **Tooltip shows every account?** The tooltip filters accounts by what each one actually serves, using CPA's own per-auth model registry first, then the model name and the DSH provider id as fallbacks. Only when a model matches no registry entry and no family signal can it be pinned down does the tooltip list the remaining usable accounts — and it says so when it does.
-- **Tooltip shows fewer accounts than before?** The in-use filter is on by default: accounts that served the selected model in the last 24 hours are pinned with an "in use" badge, the rest collapse under "Other accounts". Turn off "只显示使用中的账号" on the card to see every candidate again.
+- **Tooltip shows fewer accounts than before?** The in-use filter is on by default: accounts that served the selected model within the current refresh cycle are pinned with an "in use" badge, the rest collapse under "Other accounts". Turn off "只显示使用中的账号" on the card to see every candidate again.
 - **"usage stats off" badge?** Enable usage statistics in your CPA config (`usage-statistics-enabled: true`) — the in-use detection reads CPA's per-request usage queue and needs that toggle on. Everything else works without it.
 
 ## Community

package/README.zh.md

@@ -46,7 +46,7 @@
 - 支持多个 CLIProxyAPI 实例和多个账号：悬浮卡片按当前模型过滤，设置面板始终展示全部。
 - 窗口按 `5 小时 → 每周 → 每月 → 每日` 排序；圆环优先使用第一个可用窗口。
 - 支持 Codex、Claude、Antigravity、Gemini CLI、Kimi、xAI/Grok；其它 CPA 厂商至少显示账号状态和近期请求活动。
-- **使用中账号识别**：CPA 的逐请求用量队列喂给本地 7 天账本，悬浮卡片显示最近 24 小时真正服务过当前模型的账号（按最后使用排序，带「使用中」徽章与 24h 请求/Token 统计），其余折叠进「其它账号」。
+- **使用中账号识别**：CPA 的逐请求用量队列喂给本地 7 天账本，悬浮卡片显示当前刷新周期内真正服务过当前模型的账号（按最后使用排序，带「使用中」徽章与请求/Token 统计），其余折叠进「其它账号」。窗口跟随卡片的刷新间隔。
 - 账号探测走有界并发池并带单请求超时——一个挂起的上游绝不会卡住整个刷新周期。
 - 刷新失败时保留上一次成功数据；DSH 切屏重挂载模型按钮时复用圆环，避免闪烁。
 - 颜色含义：绿色 ≥20% 剩余，黄色 <20%，红色已耗尽/错误，灰色加载中或未配置密钥。
@@ -182,7 +182,7 @@ node tests/mock-cpa.mjs     # 可选：在 http://127.0.0.1:8317 起一个假 CP
 - **密钥存在哪？** 只存当前浏览器的 `localStorage`。额度请求由浏览器直达各实例，DSH 宿主完全接触不到你的密钥。
 - **换浏览器？** 用卡片里的「导出配置 / 导入配置」在浏览器之间迁移实例与密钥。导出的 JSON 是明文，注意保管。
 - **悬浮卡片显示了全部账号？** 卡片按每个账号「实际服务什么模型」过滤，优先读 CPA 的每账号模型注册表（auth-files/models），模型名和 DSH 提供方 id 只作兜底。仅当某个模型在注册表里无记录、且无法从名称判断归属时，才会列出剩余可用账号，并在卡片里注明。
-- **悬浮卡片账号变少了？** 「只显示使用中」开关默认开启：最近 24 小时实际服务过当前模型的账号会置顶并带「使用中」徽章，其余折叠在「其它账号」里。关掉卡片上的开关即可回到全量候选视图。
+- **悬浮卡片账号变少了？** 「只显示使用中」开关默认开启：当前刷新周期内实际服务过当前模型的账号会置顶并带「使用中」徽章，其余折叠在「其它账号」里。关掉卡片上的开关即可回到全量候选视图。
 - **「用量统计未开启」徽章？** 在 CPA 配置里开启 `usage-statistics-enabled: true`——使用中识别读取的是 CPA 的逐请求用量队列，需要这个开关；不开也不影响其它功能。
 
 ## 社区

package/lib/client.js

@@ -49,6 +49,9 @@ window.__ModuleLoader__.load({
 		const USAGE_LEDGER_MAX_AGE = 7 * 24 * 60 * 60 * 1000;
 		const USAGE_LEDGER_MAX_EVENTS = 4000;
 		const USAGE_ACTIVE_WINDOW = 24 * 60 * 60 * 1000;
+		/** In-use window follows the card's refresh interval (set by applyConfig)
+		 * so "in use" means "served within the current refresh cycle". */
+		let usageWindowMs = USAGE_ACTIVE_WINDOW;
 		const USAGE_STATS_TTL = 10 * 60 * 1000;
 		const LS_ACTIVE_ONLY = "dsh-cpa-quota:active-only";
 		const W5H = 5 * 60 * 60;
@@ -1478,6 +1481,16 @@ window.__ModuleLoader__.load({
 		 * records are dropped. */
 		function pollUsageEvents(instance, base, entries) {
 			const ledger = usageLedgerFor(base);
+			// One-time migration: ledger events recorded by PRE-0.7.2 builds were
+			// keyed by the auth-file NAME; re-key them to the rendered display
+			// name so the in-use match covers history too. Idempotent.
+			const nameByFile = new Map(entries.map((e) => [text(e.name), accountDisplayName(e)]));
+			let migrated = false;
+			for (const ev of ledger.ev) {
+				const mapped = nameByFile.get(ev.a);
+				if (mapped !== undefined && mapped !== ev.a) { ev.a = mapped; migrated = true; }
+			}
+			if (migrated) persistUsageLedger(base, ledger);
 			const fpSet = new Set(ledger.fp);
 			const nameByIndex = new Map(entries.map((e) => [String(e.auth_index ?? e.authIndex), accountDisplayName(e)]));
 			return fetchJSON(`${instance.base}${USAGE_QUEUE_PATH}`, {
@@ -1526,7 +1539,7 @@ window.__ModuleLoader__.load({
 		/** Names with ANY ledger activity inside the window → last-used ts. */
 		function usageActiveNamesAny(base, now = Date.now()) {
 			const ledger = usageLedgerFor(base);
-			const cutoff = now - USAGE_ACTIVE_WINDOW;
+			const cutoff = now - usageWindowMs;
 			const lastByAccount = new Map();
 			for (const ev of ledger.ev) {
 				if (ev.t < cutoff) continue;
@@ -1539,7 +1552,7 @@ window.__ModuleLoader__.load({
 		/** Names that served the SELECTED model inside the window. */
 		function usageActiveNames(base, modelId, now = Date.now()) {
 			const ledger = usageLedgerFor(base);
-			const cutoff = now - USAGE_ACTIVE_WINDOW;
+			const cutoff = now - usageWindowMs;
 			const lastByAccount = new Map();
 			for (const ev of ledger.ev) {
 				if (ev.t < cutoff || !modelListMatches(ev.m, modelId)) continue;
@@ -2609,7 +2622,7 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 								window.dispatchEvent(new CustomEvent(EV_CONFIG));
 							},
 						}),
-						ZH ? "只显示使用中的账号（24 小时内用过当前模型）" : "Only show accounts that recently served the current model (24h)"),
+						ZH ? "只显示使用中的账号（每个刷新周期内用过当前模型）" : "Only show accounts that served the current model in the current refresh cycle"),
 					...rows.map((row) => {
 						const key = baseKey(row.baseURL);
 						const status = instanceStatus(row);
@@ -2712,6 +2725,8 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 			// uninjected properties; plugin config arrives via this argument only.
 			let config = readConfig(configArg);
 			let refreshMs = config.refreshMinutes * 60 * 1000;
+			// "In use" tracks the current refresh cycle (also set on config changes).
+			usageWindowMs = refreshMs;
 
 			/** model label/id (lowercased) → { baseURL, modelId, providerId } */
 			let modelIndex = new Map();
@@ -2766,6 +2781,8 @@ body[data-ds-dark-theme] .cpa-q-select{color-scheme:dark}
 			function applyConfig(next) {
 				config = next;
 				refreshMs = config.refreshMinutes * 60 * 1000;
+				// "In use" tracks the current refresh cycle.
+				usageWindowMs = refreshMs;
 				rebuildInstances();
 				scheduleDecorate();
 				restartQuotaTimer();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-client-ui-cpa-quota",
   "description": "CliProxyAPI quota indicator: a native-styled ring left of the composer model name; hover shows per-account provider quotas, subscription plans, and status for Codex, Claude, Antigravity, Gemini CLI, Kimi, xAI/Grok, and other CPA auth providers. Targets the current dsh plugin contract (settings-namespace-keyed plugin cards).",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "author": "wkscc310",
   "repository": {
     "type": "git",