@eddyskywalker/dsh-chatgpt-subscription 0.36.0 → 0.36.2

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## Unreleased
 
+## 0.36.2 - 2026-10-22
+- **[claude] 设置卡不再拿一枚已死的 access token 请求上游：status / 额度 / 测试连接 / 目录刷新统一走号池续期，托管账号闲置一夜后不再诱导用户重新登录（#66）**
+  - **现象**：Claude 订阅的 access token 只有约 8 小时寿命。卡片上的「令牌到期」、额度读取与「测试连接」在托管（managed）账号闲置一夜后全部出错——到期时间显示为过去时间、额度区报错、连接测试失败，看起来像「登录每天失效」，用户于是每天重新登录一次；而重登只是把到期时间刷成新的 8 小时，第二天照旧。
+  - **根因**：续期只发生在模型请求路径（`adapter` → `pool.getEffectiveAccount()` → `freshAccount()`，由 `claudeNeedsRefresh()` 在到期前 5 分钟内触发）。`/claude/api` 的 `status`、`quota`、`connection/test`、`catalog/refresh` 则直接用 `activeAccount()` 从号池读出的**存储值**请求上游，从不续期：卡片永远只看到「最后一枚被存下来的 access token」，8 小时后必然过期。相邻的 Kimi Code 线路早有 `effectiveCredentials()` 解决此事，Claude 线路缺这一段。
+  - **改法**：`registerClaudeRoutes()` 新增与 Kimi 同形的 `effectiveCredentials(target)` —— 无 pool 或无 `target.id` 时返回存储凭据，否则经 `pool.getFreshCredential(target.id, fetchFn)` 续期，续期失败时回落存储凭据（卡片仍能渲染账号列表，真实原因由那次请求报告）。四条卡片路径统一改用它；`status` 先续期、再读额度、再构建响应，所以 `accounts[].expiresAt`（读自号池行，续期会写回）就是续期后的新值。`readStatus()` 增加可选第二参，让额度读取、catalog 加载与 `accounts[]` 描述同一枚已消费的凭据。
+  - **不变量**：adopted（Claude Code 快照）仍然永不刷新——号池对 adopted 恒不续期、并在发网络请求前就拒绝，正好落进上面的回落分支，卡片只展示快照自身的 `authStatus`；只有续期被上游**拒绝**（`refreshFailureStatus` 仅对 `ClaudeUnauthorizedError` 写入）时，账号行才显示「需重新登录」，临时网络失败不会把账号标死。单飞由号池内核 `freshAccount()` 负责，同一枚 refresh token 不会被花两次，路由层没有另做互斥。
+  - **测试**：`test/claude-routes.test.ts` 新增 `describe('credential renewal on the card paths')`（6 例，注入假 refresh seam 与记录 `Authorization` 的 fetch double，全程无网络）——`GET /status` 恰好续期 1 次且池内 `expiresAt` 变未来、不写 `authStatus`、usage 请求带新 bearer、`accounts[].expiresAt` 与池内一致、`quotaError: null`；`POST /quota` 同理；`connection/test` 与 `catalog/refresh` 分别以新 bearer 请求 `/v1/messages` 与 `/v1/models`；过期 adopted 快照刷新 0 次且仍渲染 `authStatus='expired'`；卡片与模型请求并发、两次卡片轮询并发都只续期一次。反向验证：把 `routes.ts` 退回基线后 6 条中 5 条失败（adopted 那条按设计通过）。
+  - **验证**：`npm run typecheck` 三个工程 0 错误；全量 `npm test` 275 文件通过 / 1 跳过，4477 passed / 7 skipped / 0 failed；`npm run build` 通过。
+  - **已知边界**：卡片路径的续期与模型请求共用同一续期入口，因此一次续期失败（例如离线）会让下一次状态轮询再次尝试续期；这与模型请求路径的既有行为一致，未在路由层另加冷却。
+## 0.36.1 - 2026-10-22
+- **[cline-pass] 额度不再只在手动刷新时动：状态读取按 TTL 在答背后刷新，设置卡与输入框徽标 60 秒自动更新**
+  - **现象**：Cline Pass 设置页打开后额度数字就定住了——同一次会话里消耗掉的部分，要重新打开页面或点一次「刷新额度」才会反映；输入框旁的额度徽标同样停在首次读到的数字。
+  - **根因**：两层各缺一半。宿主侧 `GET /cline-pass/api/status` 只答 `store.usage()` 的内存快照，只有显式 `POST /usage` 才真正向上游读（模块注释还写着「读取不触发上游调用」）；客户端侧设置页只在挂载时读一次 status，而共享徽标虽然自带 60 秒轮询，cline 这一行的 `readStatus` 却把 `refresh` 参数丢掉了，点击于是退化成又一次廉价 GET。
+  - **改法（宿主）**：新增 `CLINE_PASS_QUOTA_TTL_MS`（5 分钟）与 `usageStale()`（`fetchedAt <= 0` 同样算过期）；`GET /status` 先答缓存，快照缺失或过期时用 `QuotaRefresh` 在答背后起一轮刷新，并把 `quotaRefreshing` 放进状态 DTO，让客户端知道该立刻补读；扇出逻辑抽成 `refreshUsage()`，显式 `POST /usage` 与后台刷新共用同一份实现，同源校验、400 文案、凭据零外泄全部保持不变。单飞由 `start()` 的 `pending` 保证：N 次轮询只扇出一轮。另给路由选项加了 `quotaTtlMs` 测试缝。
+  - **改法（客户端）**：`ClinePassApi.status(refresh)` 分流——`false` 走 `GET /status`，`true` 走 `POST /usage` 并只取其中的 status 半边；设置页补上 60 秒可见轮询 + `visibilitychange` + `createQuotaFollowUp`（读到 `quotaRefreshing: true` 就 1.5 秒后补读，最多 3 次）；轮询是静默的——失败既不刷红字也不清掉用户正在看的红字，半输入的草稿由既有两道闸保护；徽标把 `refresh` 转发出去，点击才真正强制刷新。
+  - **测试**：新增 `test/cline-pass-quota-poll.test.ts`（9 例）与 `test/cline-pass-quota-poll.test.tsx`（10 例）——冷缓存即排刷新并回 `quotaRefreshing`、新鲜快照 0 次上游调用、假 Date 拨过 TTL 后缓存照答而背后替换、2 账号 3 次轮询只扇出 2 次、显式动作立即刷新且 400/403 原样、徽标点击走 POST /usage、隐藏标签页不读、轮询失败静默、卸载清理定时器与监听。
+  - **验证**：`npm run typecheck` 三工程 0 错误；`npm test` 274 文件 / 4470 例通过（1 条 `minimax-code-video-history` 的 Windows `rename EPERM` 抖动，单跑 22/22 通过，与本改动无关）；`npm run build` 通过。
+  - **已知边界**：`QuotaRefresh.run()` 不与正在跑的 `start()` 合流，所以「手动刷新正好撞上后台刷新」这一步仍会多扇出一轮；两轮写入形状相同、后写的 `setUsage` 生效，代价是一次多余上游请求。真正合流要给共享 helper 加 `wait`，会牵动另外六条线路，本次不做，代码里按此写明。
 ## 0.36.0 - 2026-10-22
 - **[client] 修复俄语语言包与 `@linxin666/dsh-i18n` 等已安装语言包冲突导致插件客户端激活失败崩溃的问题**
   - **现象**：Web 界面启动失败，提示 `web boot: 1 entry did not activate`，`@eddyskywalker/dsh-chatgpt-subscription: failed`。

package/lib/client.js

@@ -12801,14 +12801,37 @@ window.__ModuleLoader__.load({
 		//#region src/client/cline-pass/api.ts
 		const api$7 = createLineApi(CLINE_PASS_ROUTE_PREFIX, "Cline Pass");
 		/**
+		* Whether the host is refreshing the quota behind this answer.
+		*
+		* The field is optional by contract, because a host built before it existed
+		* answers without it. Every caller only ever compares it to `true`, so "absent"
+		* and "false" read the same — nothing is in flight — and a stale host degrades to
+		* plain polling instead of crashing. Kept as one reader so that convention lives
+		* in a single place rather than being re-derived at each call site.
+		*/
+		function quotaRefreshingOf(status) {
+			return status.quotaRefreshing === true;
+		}
+		/**
 		* The Cline Pass settings API, as the card uses it.
 		*
 		* Deliberately the same envelope and the same fetch shape every other provider
 		* section uses, so the shared account-pool card and this helper read alike.
 		*/
 		var ClinePassApi = class {
-			status() {
-				return api$7.get("/status");
+			/**
+			* One status read.
+			*
+			* A plain call is the GET the first paint, the 60 s poll and the composer
+			* badge use: it is cheap and never fans out one upstream request per account.
+			* `refresh` is the forced path — the same POST /usage the card's own button
+			* drives — and the host answers it with `{ usage, status }`; only the status
+			* half is returned, because every caller renders a status card rather than the
+			* raw quota payload.
+			*/
+			status(refresh = false) {
+				if (!refresh) return api$7.get("/status");
+				return api$7.post("/usage", {}).then((outcome) => outcome.status);
 			}
 			updateSettings(patch) {
 				return api$7.post("/settings", patch).then(() => this.status());
@@ -13186,6 +13209,14 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/cline-pass/ClinePassSection.tsx
 		const API$3 = new ClinePassApi();
+		/**
+		* How often an open card re-reads the quota.
+		*
+		* The same 60 s every other line's card and composer badge uses: a window that
+		* moves on a multi-hour scale does not need a faster poll, and a slower one
+		* would leave a card visibly stale after the user spends a request.
+		*/
+		const QUOTA_POLL_MS = 6e4;
 		function detail$1(error) {
 			return error instanceof Error ? error.message : String(error);
 		}
@@ -13231,19 +13262,46 @@ window.__ModuleLoader__.load({
 			const [settingsForm, setSettingsForm] = (0, react.useState)(null);
 			const [history, setHistory] = (0, react.useState)(null);
 			const [loginFlow, setLoginFlow] = (0, react.useState)(null);
-			const reload = (0, react.useCallback)(async () => {
+			/** Follow-up poll owed while the host refreshes the quota behind an answer. */
+			const quotaFollowUp = (0, react.useRef)(null);
+			/**
+			* One status read; `quiet` is every read nobody pressed a button for.
+			*
+			* A quiet read is silent on purpose: it never paints an error and never clears
+			* one, so a poll that fails while a user reads the page, or types into a
+			* settings field, does not change what is on screen. The manual actions below
+			* still report their own failures loudly. The draft guards inside the two
+			* setters are what keep a background answer from overwriting typed text.
+			*/
+			const loadStatus = (0, react.useCallback)(async (quiet = false) => {
 				try {
 					const next = await API$3.status();
 					setStatus(next);
 					setSettingsForm((current) => current ?? (next.settings === void 0 ? null : settingsFormOf$1(next)));
-					setError(null);
+					if (!quiet) setError(null);
+					quotaFollowUp.current ??= createQuotaFollowUp();
+					quotaFollowUp.current.observe(quotaRefreshingOf(next), () => {
+						loadStatus(true);
+					});
 				} catch (cause) {
-					setError(detail$1(cause));
+					if (!quiet) setError(detail$1(cause));
 				}
 			}, []);
 			(0, react.useEffect)(() => {
-				reload();
-			}, [reload]);
+				loadStatus();
+			}, [loadStatus]);
+			(0, react.useEffect)(() => {
+				const refreshWhenVisible = () => {
+					if (document.visibilityState === "visible") loadStatus(true);
+				};
+				document.addEventListener("visibilitychange", refreshWhenVisible);
+				const timer = window.setInterval(refreshWhenVisible, QUOTA_POLL_MS);
+				return () => {
+					window.clearInterval(timer);
+					document.removeEventListener("visibilitychange", refreshWhenVisible);
+					quotaFollowUp.current?.cancel();
+				};
+			}, [loadStatus]);
 			(0, react.useEffect)(() => {
 				if (status === null) return;
 				setDrafts((current) => {
@@ -13271,12 +13329,12 @@ window.__ModuleLoader__.load({
 						if (next.status === "complete") {
 							setNotice(zh$4.loginComplete.replace("{account}", next.accountAlias === "" ? "Cline Pass" : next.accountAlias));
 							setShowKeyForm(false);
-							reload();
+							loadStatus();
 						} else if (next.status === "failed") setError(zh$4.loginFailed.replace("{detail}", next.error));
 					}).catch((cause) => setError(detail$1(cause)));
 				}, Math.max(2, flow.intervalSeconds) * 1e3);
 				return () => window.clearInterval(timer);
-			}, [loginFlow, reload]);
+			}, [loginFlow, loadStatus]);
 			const startLogin = (0, react.useCallback)(() => {
 				setBusy("login");
 				setError(null);
@@ -21467,8 +21525,11 @@ window.__ModuleLoader__.load({
 		*
 		* Quota follows the ACCOUNT, and a pool has several. The badge therefore shows
 		* the most-consumed window across the accounts the host has already read, which
-		* is the one that will stop the next request first; it never triggers a quota
-		* read of its own, so a poll cannot fan out one upstream call per account.
+		* is the one that will stop the next request first. Its own 60 s poll is a plain
+		* read, so a poll never fans out one upstream call per account; only an explicit
+		* click on the badge asks the host for the forced refresh, the same POST the
+		* card's own "refresh usage" button drives — which is exactly what the shared
+		* badge's `refresh` argument is for, and what this line used to drop.
 		*/
 		function ClinePassComposerQuota(props) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ComposerQuotaBadge, {
@@ -21476,7 +21537,7 @@ window.__ModuleLoader__.load({
 				loadModelDirectory: props.loadModelDirectory,
 				providerId: "cline-pass",
 				label: zh$4.composerLabel,
-				readStatus: () => API$1.status(),
+				readStatus: (refresh) => API$1.status(refresh),
 				selectFacts: selectClinePassFacts
 			});
 		}