@eddyskywalker/dsh-chatgpt-subscription 0.19.1 → 0.21.0

package/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 ## Unreleased
 
+## 0.21.0 - 2026-10-12
+- **[Ollama] 修复添加 Key 后「订阅服务」整页空白；补齐线路启停开关；「全不选」与勾选状态实时同步到模型选择器**
+  - **问题 1（整页空白）**：`/ollama/api/accounts` 的 `add` 分支独自返回 `{ id }`，其余动作都返回完整 status。客户端把动作回包直接当作渲染状态，`status.models` 为 `undefined` 时渲染期 `TypeError` 把设置页整棵 React 子树打崩。修法：add 与其他动作一样回落到统一的完整 status 应答；客户端渲染路径对残缺 status 一律降级为空区块（`status?.models ?? []`），任何残缺载荷永不再崩页。
+  - **问题 2（缺开关）**：总览卡片里 Ollama 是唯一没有启停开关的线路（`canToggle: false` 硬编码）。适配器其实早已读取 `enabled` 旗标，缺的只是接线：新增 `POST /ollama/api/settings { enabled }`（与其余线路同形同义），hub 描述符接上开关，总览聚合回报真实旗标而非恒 `true`。
+  - **问题 3（「全不选」弹回全选）**：`enabledModelIds` 的「空数组 = 不过滤」语义使「全不选」写入 `[]` 后被读回成全选，长清单永远无法收窄。改为三态：`null` = 不过滤（全部，含日后新同步的模型）、数组 = 显式选择（`[]` = 全不选）。设置文件写入 `version: 2` 标记；旧文件的空数组只能解释为「未动过的默认」，读回 `null`，存量用户行为不变。手动勾满整张清单时客户端归一化回 `null`，「全部」继续跟随目录而非冻结在凑巧完整的那一刻。
+  - **问题 4（取消勾选后选择器仍显示）**：Ollama 是唯一不在设置变更后发 `llm/adapters-updated` 的线路，模型选择器只能等别的线路碰巧发事件才刷新。`/models` 与 `/settings` 的实际写入现在都发该事件，与其余线路逐字对齐。
+  - **测试**：路由层 8 例新增（add/delete 应答必须是完整 status、全不选持久化为 `[]`、`null` 恢复不过滤、version-2 前后文件各自读法、开关往返、只读不发事件）；适配器层按三态改写 3 例；客户端层 3 例（残缺动作回包不崩页、全不选后全部不勾且计数 0/2、勾满归一化为 `null`）。反向验证：撤掉客户端加固后「残缺回包」用例以原样 `TypeError: Cannot read properties of undefined (reading 'length')` 失败，恢复后全绿。
+  - **验证：`npm run typecheck` 0 错误；全量 `npm test` 215 passed | 1 skipped（216 文件）、3494 passed | 7 skipped | 0 failed。**
+
+## 0.20.0 - 2026-10-12
+- **[MiniMax Code] 新增「限额重置卡」：查看可用卡与近 30 天流水，选卡确认后重置套餐限额**
+  - **能力来源**：MiniMax 官方桌面端 v3.1.1（2026-10-04）起提供「限额重置」——订阅用户可在用量页查看可用重置卡与近 30 天获得/使用记录，**选择一张卡并确认后**重置对应限额。本插件复刻它，接同一组上游接口。
+  - **上游事实（用真实账号实测确证，非推测）**：`GET /backend/account/reset_card/list`（可用卡）、`GET /backend/account/reset_card/flows`（流水）、`POST /backend/account/reset_card/use`（消费）。主机是插件**已在用**的 `api.minimax.cn` / `api.minimaxi.com`（即 `QUOTA_HOST_CANDIDATES`），认证是**现有**的 `Authorization: Bearer`。不需要新主机、不需要签名头、不需要新认证方式。
+  - **三处踩过的坑，都写进了实现**：
+    - **`flows` 必带 `create_time`**（起始毫秒，取 30 天前），否则上游返回 `2013 invalid params`。这不是可选参数，是硬要求。
+    - **消费成功靠原样回传卡上的 `source_type` + `out_biz_no`，绝不自己生成 request id。** 服务端以 `out_biz_no` 去重；自造一个 id 等于递给服务端一个它没记录过的键，第二次点击就会**真的多消费一张卡**——正是本线路契约警告的那种伤害。
+    - **`outcome` 必须原样透传，不能塌缩成布尔值。** 六个值里 `REPLAYED` / `LOCK_BUSY` / `RETRYABLE_FAIL` 三个的含义是「可能已消费，请用**同一张卡**确认」，界面必须据此劝用户重试同一张卡而非换卡。官方客户端也是这么处理的。
+  - **幂等键不出浏览器**：`POST /reset-cards/use` 只接受 `{ cardId }`。host 侧先读一次面板，从**自己刚读到**的那份数据里查出该卡的 `source_type`/`out_biz_no` 再调上游——浏览器无法指定幂等键，也就无法消费一张它没读过的卡。同源检查照旧。
+  - **不确定态不刷新列表**：`LOCK_BUSY` / `RETRYABLE_FAIL` 之后**故意不重读面板、不刷新用量**，否则会把那一行「让用户用同一张卡重试」的提示直接从屏幕上刷掉。已决的四个 outcome 才刷新。
+  - **测试**：host 20 例 + 客户端 15 例，全部 mock fetch，**没有任何一次真实 `/use` 调用**。host 侧六组变异（删 `create_time`、自造 request id、不容忍 flows 失败、放行任意 outcome、只试首个主机、路由信任浏览器传来的 `out_biz_no`）各自被对应用例捕获；客户端侧四组变异（改错不确定态文案、删二次确认守卫、按钮不禁用、去掉使用后刷新）同样如期变红，恢复后全绿。
+  - **复审时独立重做变异**：只把 `out_biz_no` 换成自造值（一处改动），4 个用例立刻失败——含「重试必须用同一张卡」这条安全关键用例；恢复后 20/20。
+  - **验证：`npx tsc -b --force` 0 错误；`npx tsc -p test/tsconfig.json` 0 错误；全量 `npx vitest run` 215 passed | 1 skipped（216 文件）、3483 passed | 7 skipped | 0 failed。**
+  - **诚实声明：没有跑过真实消费。** 全部 `/use` 路径都是 mock 验收——真实消费会消耗用户真实的重置卡，本轮刻意不做。`list`/`flows` 的响应形状是用真实账号只读实测过的。
+  - **遗留项（既有问题，非本次引入）**：`QUOTA_HOST_CANDIDATES.global` 只有一个候选 `api.minimax.io`，而该主机对国区凭据返回 401。国际区账号的可用主机仍未实测——这与本线路既有的配额读取是同一个未解问题。
+
+- **[九条线路] 空闲超时把「没有可展示内容」误判成「连接已死」，长时间思考或上游持续心跳时整轮被判 TIMEOUT**
+  - **问题（issue #52）**：流式线路的空闲看门狗只对「解析器 yield 出的 `StreamChunk`」复位。Codex 线路的 `wrapStreamWithWatchdog` 包在 `parseResponsesStream()` 外面，于是两类完全正常的流量会被判成 5 分钟静默：① 上游持续发 `response.in_progress` 这类状态帧——它们走完 mapper 后**不产出任何 chunk**；② reasoning summary 超过 12000 字符展示上限被截断后继续发送摘要——`visibleReasoningDelta()` 返回空文本，且不够 768 字符的 flush 水位。同一条误判存在于其余八条自建流的线路（antigravity / claude / command-code / minimax / glm / kimi / workbuddy / ollama），共九条。
+  - **修法：把计时判据从「展示层产出」下沉到「传输层收到数据」。** 共享 seam `wrapStreamWithWatchdog` 新增可选第二参数 `StreamActivity`（`pulse()`），内部接 `@deepseek-ai/dsh-timeout` 的 `idleWatchdog.pulse()`——它只在 `next()` 挂起期间重新计时，正是「读操作在等、字节在到」这个场景。因为 TypeScript 里参数更少的函数可以赋值给参数更多的签名，历史单参调用点继续编译通过，八条线路因此各自独立接线、互不阻塞。每条线路在**两处**上报：`reader.read()` 返回非空字节时一次，每个完整 SSE 帧一次。第二处刻意放在 `data:` 过滤**之前**，所以 `: ping` / `: keep-alive` 这类纯注释心跳（Codex 解析器原本在 `data === ''` 处整个丢掉）同样算活动。**摘要上限与展示缓冲逐字未动**：截断只影响展示，不再影响活动判定，也没有生成任何假的界面文字。
+  - **Codex 线路另加可配置超时**：插件 Config 新增 `codexStreamIdleTimeoutMs`，默认仍是 300000，`min(1)` 且上限 `MAX_TIMER_DELAY_MS`——**0 不是关闭开关**，这条线是截止时间不是功能开关。该常量与 `pulse()` 在 `@deepseek-ai/dsh-timeout` 里自 0.1.2-alpha.5 起就存在（已核对该 tag 的源码），所以没有新增跨代兼容 seam。
+  - **测试**：新增 5 个文件、8 条线路各一例，全部不 mock `idle-watchdog`（要观察的正是它本身不肯触发）。每条线路的用例都是同一个实验：假响应体连续发送纯注释心跳帧、撑过数倍于空闲窗口的时间且**期间不产生任何可展示 chunk**，最后正常收尾——修复后必须正常完成，修复前必然 `stream idle timeout`。另各配一条反向用例：真正一个字节都不发时仍然抛 `TIMEOUT`，证明反向用例不是空转。摘要截断那一条显式断言 block-end 的 reasoning 仍含 `Reasoning summary truncated` 且长度 < 12100，排除「靠去掉上限过关」这条路。
+  - **变异验证（复审时独立重做）**：只把共享 seam 里 `pulse` 的实现置空（一处改动，不动任何线路），8 条线路的 12 条用例**全部**以真实 TIMEOUT 失败，反向静默用例仍通过；恢复后全绿。子代理另各自做过一次「注释掉本线路 `activity?.pulse()`」的变异，结论一致。
+  - **验证：`npx tsc -b --force` 0 错误；`npx tsc -p test/tsconfig.json` 0 错误；全量 `npx vitest run` 213 passed | 1 skipped（214 文件）、3448 passed | 7 skipped | 0 failed。** 本轮未复现历史记录里的 Windows host 端口保留类失败。
+  - **诚实声明：本轮全部为 mock SSE 验收，没有真实 ChatGPT 订阅账号参与。** 心跳形态只实测了 SSE 注释帧；「合法但被 mapper 丢弃的 `data:` 状态帧」由代码路径推断同样会 pulse（pulse 挂在每一帧上），但未单独构造该形态实测。issue 里并列出现的 `NGHTTP2_INTERNAL_ERROR` 属于 HTTP/2 传输层异常，本报告不声称本次改动能解决它。
+
+
 ## 0.19.1 - 2026-10-11
 - **[GLM（ZCode 账号）] 账号管理一行的三个按钮排不下，第三个被挤到下一行**
   - **问题**：「账号管理（已登录 N 个账号）」与右侧按钮区共用一行（`.dsha-grouphead` 是 `justify-content:space-between`），而按钮容器带 `flex-wrap:wrap`。标题占掉宽度后，三个按钮（添加国区账号 / 添加国际区账号 / 导入本机 ZCode 登录态）里第三个必然折行。WorkBuddy 与 Claude 都只有两个按钮，所以这条线路是**唯一**有三个的，问题也只在它身上显形。

package/lib/client.js

@@ -6290,6 +6290,26 @@ window.__ModuleLoader__.load({
 		function messageOf$1(cause) {
 			return cause instanceof Error ? cause.message : String(cause);
 		}
+		/**
+		* The reset-card panel: the cards still held, plus the recent flow.
+		*
+		* Goes through the shared reader, so a host half that is older than this one
+		* produces the reader's "restart DSH" sentence rather than a bare parse crash.
+		*/
+		function fetchResetCards() {
+			return get$1("/reset-cards");
+		}
+		/**
+		* Spend one card.
+		*
+		* The body carries the `cardId` and nothing else — deliberately. The card's
+		* idempotency key is a field the service de-duplicates on, so letting the
+		* browser supply one would let a client spend a card it never read. The host
+		* looks the card up and sends the key it found.
+		*/
+		function useResetCard(cardId) {
+			return post$2("/reset-cards/use", { cardId });
+		}
 		//#endregion
 		//#region src/client/minimax-code/locales.ts
 		const NS_MINIMAX_CODE = "dsh-minimax-code";
@@ -6359,6 +6379,26 @@ window.__ModuleLoader__.load({
 			quotaUsedShare: "已用 {percent}%",
 			quotaRefresh: "刷新用量",
 			quotaRefreshing: "刷新中...",
+			resetSection: "限额重置",
+			resetHint: "订阅附带的限额重置卡可以立即重置用量限额。请先选择一张卡，再确认消费。",
+			resetConfirm: "请选择一张卡并确认消费。完成后会重新读取用量，不会自动重发对话。",
+			resetAvailable: "可用重置卡 {count} 张",
+			resetNone: "当前没有可用的重置卡。",
+			resetUnavailable: "暂时读不到重置卡（未登录，或该账号没有这个功能）。",
+			resetExpires: "到期 {time}",
+			resetUse: "使用",
+			resetUsing: "重置中…",
+			resetRefresh: "刷新重置卡",
+			resetRefreshing: "读取中…",
+			resetFlowTitle: "近 30 天记录",
+			resetFlowEmpty: "近 30 天没有重置卡记录。",
+			resetFlowGrant: "获得",
+			resetFlowUse: "已使用",
+			resetOutcomeSuccess: "重置成功。",
+			resetOutcomeReplayed: "该卡已使用，限额状态已更新。",
+			resetOutcomeUncertain: "结果不确定，请用同一张卡重试确认，不会重复扣卡——换一张卡会真的多消费一张。",
+			resetOutcomeExpired: "该卡已过期，无法用于重置；列表已刷新。",
+			resetOutcomeNotFound: "该卡不存在或已不可用；列表已刷新。",
 			composerLabel: "额度",
 			selectAll: "全选",
 			unselectAll: "全不选",
@@ -6449,6 +6489,26 @@ window.__ModuleLoader__.load({
 			quotaUsedShare: "{percent}% used",
 			quotaRefresh: "Refresh usage",
 			quotaRefreshing: "Refreshing...",
+			resetSection: "Quota reset",
+			resetHint: "Reset cards included with the subscription reset a usage limit immediately. Pick one card, then confirm spending it.",
+			resetConfirm: "Select a card and confirm spending it. Usage is re-read afterwards; no conversation is resent.",
+			resetAvailable: "{count} reset card(s) available",
+			resetNone: "No reset card is available right now.",
+			resetUnavailable: "Reset cards are unreadable right now (not signed in, or this account does not have the feature).",
+			resetExpires: "Expires {time}",
+			resetUse: "Use",
+			resetUsing: "Resetting…",
+			resetRefresh: "Refresh cards",
+			resetRefreshing: "Reading...",
+			resetFlowTitle: "Last 30 days",
+			resetFlowEmpty: "No reset-card activity in the last 30 days.",
+			resetFlowGrant: "Granted",
+			resetFlowUse: "Used",
+			resetOutcomeSuccess: "Reset succeeded.",
+			resetOutcomeReplayed: "That card was already used; the limit state has been updated.",
+			resetOutcomeUncertain: "The result is uncertain. Retry with the SAME card to confirm — retrying does not spend a second card, switching to another one does.",
+			resetOutcomeExpired: "That card has expired and cannot reset the limit; the list has been refreshed.",
+			resetOutcomeNotFound: "That card does not exist or is no longer usable; the list has been refreshed.",
 			composerLabel: "Quota",
 			selectAll: "Select all",
 			unselectAll: "Unselect all",
@@ -6536,6 +6596,51 @@ window.__ModuleLoader__.load({
 				composerLabel: t("composerLabel")
 			};
 		}
+		/**
+		* One reset-card panel read, defensively shaped.
+		*
+		* The route is new and the card renders whatever it is handed, so a half that
+		* answers something else (a stale host, a route that 404s into an error body the
+		* reader already raised) must not turn into a render crash on `cards.length`.
+		* A missing list is an empty list, which is also the truthful reading: the user
+		* can select nothing and the use button stays disabled.
+		*/
+		function normalizeResetCards(value) {
+			return {
+				cards: Array.isArray(value?.cards) ? value.cards : [],
+				flows: Array.isArray(value?.flows) ? value.flows : [],
+				fetchedAtMs: typeof value?.fetchedAtMs === "number" && Number.isFinite(value.fetchedAtMs) ? value.fetchedAtMs : 0
+			};
+		}
+		/**
+		* What the card tells the user after a spend, one sentence per outcome.
+		*
+		* The six outcomes are not six flavours of the same answer. Two are certain
+		* ("done"), two are refusals (the card is gone — re-read the list), and two are
+		* `I did not find out`: the service de-duplicates on the card's own key, so
+		* retrying THE SAME card costs nothing while picking another one really does
+		* spend a second card. That is why the uncertain sentence names the same card.
+		*/
+		function resetOutcomeNotice(outcome, t) {
+			switch (outcome) {
+				case "SUCCESS": return t("resetOutcomeSuccess");
+				case "REPLAYED": return t("resetOutcomeReplayed");
+				case "LOCK_BUSY":
+				case "RETRYABLE_FAIL": return t("resetOutcomeUncertain");
+				case "EXPIRED": return t("resetOutcomeExpired");
+				case "NOT_FOUND": return t("resetOutcomeNotFound");
+			}
+		}
+		/**
+		* Whether an outcome leaves the spent card's fate decided.
+		*
+		* True for the four outcomes that will not change if the user waits: the card is
+		* consumed or it is not usable. False for the two uncertain ones — refreshing
+		* there would drop the very row the sentence tells the user to retry with.
+		*/
+		function outcomeIsDecided(outcome) {
+			return outcome !== "LOCK_BUSY" && outcome !== "RETRYABLE_FAIL";
+		}
 		/** Device-code poll cadence. The host owns the real expiry. */
 		const LOGIN_POLL_INTERVAL_MS$1 = 2e3;
 		function useMinimaxCodeSection({ onModelChange }) {
@@ -6550,6 +6655,9 @@ window.__ModuleLoader__.load({
 			const [contextDrafts, setContextDrafts] = (0, react.useState)({});
 			const [savingModel, setSavingModel] = (0, react.useState)(null);
 			const [pool, setPool] = (0, react.useState)(void 0);
+			const [resetCards, setResetCards] = (0, react.useState)(null);
+			const [resetNotice, setResetNotice] = (0, react.useState)(null);
+			const [selectedResetCardId, setSelectedResetCardId] = (0, react.useState)(null);
 			const quotaFollowUp = (0, react.useRef)(void 0);
 			const loadStatus = (0, react.useCallback)(async (quiet = false) => {
 				if (!quiet) setError(null);
@@ -6636,6 +6744,64 @@ window.__ModuleLoader__.load({
 					} catch {}
 				})();
 			}, [authenticated, status?.quota]);
+			/**
+			* Read the reset-card panel.
+			*
+			* Silent on failure, exactly like the pool read: this feature is absent on
+			* accounts that never earned a card, and a settings card must not raise an
+			* error banner for a route that has nothing to say.
+			*/
+			const loadResetCards = (0, react.useCallback)(async () => {
+				try {
+					setResetCards(normalizeResetCards(await fetchResetCards()));
+				} catch {
+					setResetCards(null);
+				}
+			}, []);
+			/**
+			* The panel is read once the card knows there is an account to read it for.
+			*
+			* Reads before sign-in answer with a refusal, which is not a state the user
+			* can act on, so the read waits for a signed-in account exactly as the usage
+			* read below does.
+			*/
+			(0, react.useEffect)(() => {
+				if (!authenticated) return;
+				loadResetCards();
+			}, [authenticated, loadResetCards]);
+			const refreshResetCards = async () => {
+				await loadResetCards();
+			};
+			const selectResetCard = (cardId) => {
+				setSelectedResetCardId(cardId);
+			};
+			/**
+			* Spend one card, behind the confirmation the official client asks for.
+			*
+			* The confirmation lives here rather than in the view because "cancel" must
+			* mean no request at all: the card may not even be sent when the user says no.
+			* After a decided outcome the panel is re-read so the spent card leaves the
+			* list; after an uncertain one it is deliberately left alone, because the row
+			* the user is told to retry with is the one that would disappear.
+			*/
+			const spendResetCard = async (cardId) => {
+				if (typeof window !== "undefined" && !window.confirm(t("resetConfirm"))) return;
+				try {
+					setBusy("reset-card");
+					setError(null);
+					const result = await useResetCard(cardId);
+					setResetCards(normalizeResetCards(result.cards));
+					setResetNotice(resetOutcomeNotice(result.outcome, t));
+					setSelectedResetCardId(null);
+					if (!outcomeIsDecided(result.outcome)) return;
+					await loadResetCards();
+					await refreshQuota();
+				} catch (cause) {
+					setError(messageOf$1(cause));
+				} finally {
+					setBusy(null);
+				}
+			};
 			const login = async () => {
 				try {
 					setBusy("login");
@@ -6901,7 +7067,10 @@ window.__ModuleLoader__.load({
 					connectionNotice,
 					contextDrafts,
 					savingModel,
-					pool
+					pool,
+					resetCards,
+					resetNotice,
+					selectedResetCardId
 				},
 				derived: {
 					authenticated,
@@ -6910,6 +7079,8 @@ window.__ModuleLoader__.load({
 					models,
 					contextModels,
 					overrideCount,
+					resetCardList: resetCards?.cards ?? [],
+					resetCardFlows: resetCards?.flows ?? [],
 					poolLabels: accountPoolLabelsFor$1(t)
 				},
 				actions: {
@@ -6928,6 +7099,9 @@ window.__ModuleLoader__.load({
 					resetContextWindow,
 					resetAllContextWindows,
 					refreshQuota,
+					refreshResetCards,
+					selectResetCard,
+					useResetCard: spendResetCard,
 					testConnection,
 					updateContextDraft
 				}
@@ -6964,9 +7138,9 @@ window.__ModuleLoader__.load({
 		}
 		function MinimaxCodeSection({ onModelChange }) {
 			const { state, derived, actions } = useMinimaxCodeSection({ onModelChange });
-			const { status, loading, busy, error, flow, copied, connectionNotice, contextDrafts, savingModel, pool } = state;
-			const { authenticated, account, quota, models, contextModels, overrideCount, poolLabels } = derived;
-			const { login, cancelLogin, copyCode, logout, poolAction, setStrategy, toggleModel, setAllModels, setCheckinEnabled, runCheckinNow, updateEffort, saveContextWindow, resetContextWindow, resetAllContextWindows, refreshQuota, testConnection, updateContextDraft } = actions;
+			const { status, loading, busy, error, flow, copied, connectionNotice, contextDrafts, savingModel, pool, resetCards, resetNotice, selectedResetCardId } = state;
+			const { authenticated, account, quota, models, contextModels, overrideCount, poolLabels, resetCardList, resetCardFlows } = derived;
+			const { login, cancelLogin, copyCode, logout, poolAction, setStrategy, toggleModel, setAllModels, setCheckinEnabled, runCheckinNow, updateEffort, saveContextWindow, resetContextWindow, resetAllContextWindows, refreshQuota, refreshResetCards, selectResetCard, useResetCard, testConnection, updateContextDraft } = actions;
 			const t = fallbackTranslate$1;
 			if (loading) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "dsha-page",
@@ -7350,6 +7524,98 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
+					resetCards !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+						className: "dsha-group",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsha-grouphead",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t("resetSection") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									className: "dsha-btn",
+									disabled: busy !== null,
+									onClick: () => void refreshResetCards(),
+									children: busy === "reset-card" ? t("resetRefreshing") : t("resetRefresh")
+								})]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsha-muted",
+								children: t("resetHint")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsha-row",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsha-label",
+									children: t("resetAvailable").replace("{count}", String(resetCardList.length))
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsha-value",
+									children: formatDate(resetCards.fetchedAtMs)
+								})]
+							}),
+							resetCardList.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsha-empty",
+								children: t("resetNone")
+							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dshm-reset-list",
+								children: resetCardList.map((card) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+									className: "dsha-row dshm-reset-row",
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsha-btn dshm-reset-pick",
+										"aria-pressed": selectedResetCardId === card.cardId,
+										disabled: busy !== null,
+										onClick: () => selectResetCard(selectedResetCardId === card.cardId ? null : card.cardId),
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+											className: "dshm-mono",
+											children: card.cardId
+										})
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsha-value",
+										children: t("resetExpires").replace("{time}", formatDate(card.expiresAtMs))
+									})]
+								}, card.cardId))
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsha-notice dshm-quota-note",
+								children: t("resetConfirm")
+							}),
+							resetNotice !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsha-notice dshm-quota-note",
+								role: "status",
+								children: resetNotice
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsha-actions",
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									className: "dsha-btn dsha-btn-primary",
+									disabled: busy !== null || selectedResetCardId === null,
+									onClick: () => {
+										if (selectedResetCardId !== null) useResetCard(selectedResetCardId);
+									},
+									children: busy === "reset-card" ? t("resetUsing") : t("resetUse")
+								})
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsha-muted dshm-quota-note",
+								children: t("resetFlowTitle")
+							}),
+							resetCardFlows.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsha-empty",
+								children: t("resetFlowEmpty")
+							}) : resetCardFlows.map((entry, index) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsha-row",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsha-label",
+									children: entry.eventType === "GRANT" ? t("resetFlowGrant") : t("resetFlowUse")
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+									className: "dsha-value dshm-mono",
+									children: [
+										entry.cardId,
+										" · ",
+										formatDate(entry.createdAtMs)
+									]
+								})]
+							}, `${entry.cardId}:${entry.createdAtMs}:${index}`))
+						]
+					}),
 					error !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "dsha-error",
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: error })
@@ -9974,13 +10240,13 @@ window.__ModuleLoader__.load({
 			const [key, setKey] = (0, react.useState)("");
 			const [alias, setAlias] = (0, react.useState)("");
 			const [showKeyForm, setShowKeyForm] = (0, react.useState)(false);
-			/** Ids the user has switched on. Empty means 'no filter', i.e. all of them. */
-			const [enabled, setEnabled] = (0, react.useState)(/* @__PURE__ */ new Set());
+			/** Ids the user has switched on. Null means 'no filter', i.e. all of them. */
+			const [enabled, setEnabled] = (0, react.useState)(null);
 			const reload = (0, react.useCallback)(async () => {
 				try {
 					const next = await API.status();
 					setStatus(next);
-					setEnabled(new Set(next.enabledModelIds));
+					setEnabled(next.enabledModelIds == null ? null : new Set(next.enabledModelIds));
 				} catch (cause) {
 					setError(cause instanceof Error ? cause.message : String(cause));
 				}
@@ -10026,31 +10292,32 @@ window.__ModuleLoader__.load({
 				});
 			}, [run]);
 			const isModelEnabled = (0, react.useCallback)((id) => {
-				return enabled.size === 0 || enabled.has(id);
+				return enabled === null || enabled.has(id);
 			}, [enabled]);
 			const applyEnabled = (0, react.useCallback)((next) => {
 				run("models", async () => {
 					const result = await API.setEnabledModels(next);
-					setEnabled(new Set(result.enabledModelIds));
+					setEnabled(result.enabledModelIds == null ? null : new Set(result.enabledModelIds));
 					return API.status();
 				});
 			}, [run]);
 			const toggleModel = (0, react.useCallback)((id, checked) => {
 				if (status === null) return;
-				const current = status.models.filter((model) => isModelEnabled(model.id)).map((model) => model.id);
+				const all = status.models ?? [];
+				const current = all.filter((model) => isModelEnabled(model.id)).map((model) => model.id);
 				const next = checked ? [.../* @__PURE__ */ new Set([...current, id])] : current.filter((entry) => entry !== id);
-				applyEnabled(next);
+				applyEnabled(next.length === all.length ? null : next);
 			}, [
 				status,
 				isModelEnabled,
 				applyEnabled
 			]);
 			const setAllModels = (0, react.useCallback)((selectAll) => {
-				if (status === null || status.models.length === 0) return;
-				applyEnabled(selectAll ? status.models.map((model) => model.id) : []);
-			}, [status, applyEnabled]);
+				applyEnabled(selectAll ? null : []);
+			}, [applyEnabled]);
 			const t = zh$1;
 			const pool = status?.pool;
+			const models = status?.models ?? [];
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "dsha-group",
@@ -10191,21 +10458,21 @@ window.__ModuleLoader__.load({
 							style: { fontSize: 12 },
 							children: t.wireNote
 						}),
-						status !== null && status.models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						status !== null && models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "dsha-empty",
 							children: status.catalogSynced ? t.catalogEmpty : t.catalogNeverSynced
 						}),
-						status !== null && status.models.length === 0 && !status.usable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						status !== null && models.length === 0 && !status.usable && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 							className: "dsha-muted",
 							style: { fontSize: 12 },
 							children: t.catalogNeedKey
 						}),
-						status !== null && status.models.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+						status !== null && models.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 							className: "dsha-muted",
 							style: { fontSize: 12 },
-							children: t.modelCount.replace("{count}", String(status.models.length))
+							children: t.modelCount.replace("{count}", String(models.length))
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelChecklist, {
-							items: status.models.map((model) => ({
+							items: models.map((model) => ({
 								id: model.id,
 								name: model.name ?? model.id,
 								enabled: isModelEnabled(model.id)
@@ -10329,7 +10596,7 @@ window.__ModuleLoader__.load({
 			{
 				id: "ollama",
 				name: "Ollama",
-				setEnabled: null,
+				setEnabled: (enabled) => postLineSettings("/ollama/api", { enabled }),
 				renderDetail: ({ onModelChange }) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(OllamaSection, { onModelChange })
 			}
 		];
@@ -11777,6 +12044,10 @@ window.__ModuleLoader__.load({
 .dshm-model-list{display:flex;flex-wrap:wrap;gap:7px;padding-top:8px}
 .dshm-model-list code{background:var(--dsw-alias-bg-layer-2);border:0.5px solid var(--dsw-alias-border-l2);border-radius:6px;color:var(--dsw-alias-label-secondary);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px;padding:5px 8px;white-space:nowrap}
 .dshm-quota-note{margin-top:12px}
+.dshm-reset-list{display:flex;flex-direction:column;gap:6px;padding-top:8px}
+.dshm-reset-row{align-items:center;justify-content:space-between}
+.dshm-reset-pick{background:none;border:0.5px solid var(--dsw-alias-border-l2);cursor:pointer;padding:4px 8px}
+.dshm-reset-pick[aria-pressed="true"]{border-color:var(--dsw-alias-border-focus,var(--dsw-alias-border-l3));background:var(--dsw-alias-bg-layer-2)}
 `, STYLE_ID$2);
 		}
 		//#endregion