dsh-connect-trae 4.6.9 → 4.6.10

package/CHANGELOG.md

@@ -1,5 +1,68 @@
 # Changelog
 
+## 4.6.10 (2026-10-30)
+
+> **到期提示加了一档「3 天内」。** 一个两天后过期的套餐，之前显示的是「7 天内过期」
+> ——话没错，但粗了三倍，而这句通知唯一的职责就是告诉你**还剩多久**。上游一直有
+> `within3d` 这个桶，插件却没用它。
+
+### 变更
+
+- **到期提示新增「3 天内」一档**（issue #71 的第三条建议）。
+  - **动机**：档位只有 24 小时和 7 天两档，而上游的桶是三个。两天后到期的积分
+    落进 7 天桶，于是被报成「7 天内过期」——真话，但粗了三倍。要么现在用掉这个
+    桶，要么永远让「还剩多久」这件事只能精确到 24 小时或 7 天这种量级。
+  - **口径：累积，每档报自己那个桶。** 上游的三个桶是**嵌套且累积**的
+    （`within24h` ⊆ `within3d` ⊆ `within7d`），所以每一档报的
+    「N 天内过期的总额」单独看都是真的；而且**同一时刻只显示一档**，读者永远
+    不需要把两个数字相加。
+  - **为什么不报排他金额**：曾考虑让 3 天档只报「1~3 天那一段」的金额，好处是
+    各档互不重叠、可相加。但那会与现有两档的语义**不一致**（7 天档报的一直是
+    `within7d.total` 这种累积额），而且平白多出一个数据字段和一处「档位顺序 +
+    档位口径」要同时维护的地方。累积口径下每句话单独成立，更简单也更不容易错。
+  - **数据层零改动**：`within3d` 桶本来就在上游摘要里算好了，本次只是把它接进
+    阶梯。`src/web-status.ts` 的取数逻辑一行未动。
+  - **文案**：新增 `row.expiryWarningDays`（中英各一条）。
+    「24 小时内」「3 天内」「7 天内」三档读起来是同一套量词，不引入新的说法。
+  - **语气**：新增 `dsm-trae-expiry-days`，视觉上**介于另外两档之间**——保留警示
+    边框（三天内到期不该被一眼扫过去），但不要警示底色（三天的量级不是 24 小时
+    那种急事）。于是四档从急到缓是：soon（警示底色）→ days（警示边框）→
+    week（普通）→ lapsed（更淡）。
+
+### 顺带修掉的两处结构性隐患
+
+**一、卡片与面板现在共用同一个阶梯**（新增 `src/client/expiry-ladder.ts`）。
+
+两处渲染的是**同一批 locale key**（`row.expiryWarning*`、`row.expiryEarliest`）、
+同一份上游桶，却各自写了一套档位判断。这正是 4.6.7 那个 bug 的根源——那张卡上
+写 `2026/10/31 23:59`、面板写 `23:59`，**差了一整天**，而当时没有一个测试
+失败。现在档位由一个模块选出（`expiryNotice`），两处都调用它，并且新增一条
+测试**从源码层面**钉住这件事：两个界面都不得直接读 `expiry.within24h` /
+`within3d` / `within7d` / `expired`，必须走共享阶梯。变异验证：让卡片私自读一个
+桶，该用例立刻红并点名是哪个界面读的哪个桶。
+
+**二、卡片的样式表缺一条守卫**。
+
+面板侧有「面板渲染的每个 class 都得有规则」的守卫（`composer-styles.spec.tsx`），
+卡片侧**没有**对应的——而卡片渲染的是同一批 `dsm-trae-expiry-*` class，规则却在
+另一个常量 `TRAE_CARD_CSS` 里。实测：删掉卡片的 `dsm-trae-expiry-days` 规则，
+全仓测试依然全绿。现补一条守卫覆盖卡片的四个语气 class 与两条共享规则。
+
+### 测试
+
+- 新增 **8** 例（1232 总例，较 4.6.9 净增 8）：
+  - 24 小时 / 3 天 / 7 天三档各自被选中，且报的是**自己那个桶**的金额与份数
+    （不是更宽的桶的数字）；
+  - 3 天档的「最早到期」报的是该档自己的时刻；
+  - 卡片与面板共用阶梯的**源码级**守卫；
+  - 卡片样式表覆盖四个语气 class 的守卫。
+- **变异验证**（每一项都确认会转红）：
+  - 删掉 3 天档的分支 → 档位测试红；
+  - 让卡片私自读一个桶 → 一致性守卫红并点名；
+  - 删掉面板侧的 `dsm-trae-expiry-days` 规则 → 面板样式守卫红；
+  - 删掉卡片侧的同一条规则 → 新增的卡片样式守卫红。
+- 全仓 **1232** 例通过（96 文件），双 tsconfig 类型检查通过。
+
 ## 4.6.9 (2026-10-30)
 
 > **三家插件的积分读数现已统一在 `conversation.input.right`（模型选择器左边）。**

package/lib/client.js

@@ -1196,11 +1196,17 @@ window.__ModuleLoader__.load({
 .dsm-trae-usage-switch-button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.14))}
 .dsm-trae-usage-switch-button:disabled{opacity:.5;cursor:not-allowed}
 .dsm-trae-usage-note{margin:8px 0 0;color:var(--dsw-alias-label-tertiary,#999);font-size:11px;line-height:16px}
-/* Credit-expiry notice, card copy. Three tones by urgency, so the 24-hour case
-   cannot be mistaken for the 7-day one at a glance. Reads as an advisory, not
-   an error: the account works fine, the credit is simply about to lapse. */
+/* Credit-expiry notice, card copy. Four tones by urgency, so the 24-hour case
+   cannot be mistaken for the 3-day one, nor either for the 7-day one, at a
+   glance. Reads as an advisory, not an error: the account works fine, the
+   credit is simply about to lapse.
+   The 3-day tone sits BETWEEN the other two on purpose: it carries the
+   warning border (the reader must not scroll past a 3-day expiry without
+   noticing) but not the warning fill (a 3-day pack is not the emergency a
+   24-hour pack is). */
 .dsm-trae-expiry{display:flex;flex-direction:column;gap:2px;margin-top:10px;padding:10px 12px;border:1px solid;border-radius:10px;font-size:12px;line-height:18px}
 .dsm-trae-expiry-soon{border-color:var(--dsw-alias-state-warn-secondary,#fbbf24);background:var(--dsw-alias-state-warn-tertiary,#fef3c7);color:var(--dsw-alias-label-primary,#e6e6e6)}
+.dsm-trae-expiry-days{border-color:var(--dsw-alias-state-warn-secondary,#fbbf24);background:transparent;color:var(--dsw-alias-label-primary,#e6e6e6)}
 .dsm-trae-expiry-week{border-color:var(--dsw-alias-border-l2,#3a3d45);background:var(--dsw-alias-bg-layer-3,#2c2f36);color:var(--dsw-alias-label-primary,#e6e6e6)}
 .dsm-trae-expiry-lapsed{border-color:var(--dsw-alias-border-l2,#3a3d45);background:var(--dsw-alias-bg-layer-3,#2c2f36);color:var(--dsw-alias-label-tertiary,#999)}
 .dsm-trae-expiry-detail{font-size:11px;line-height:16px;opacity:.8}
@@ -1664,6 +1670,11 @@ window.__ModuleLoader__.load({
   background:var(--dsw-alias-state-warn-tertiary,#fef3c7);
   color:var(--dsw-alias-label-primary,#1f2329);
 }
+.dsm-trae-expiry-days{
+  border-color:var(--dsw-alias-state-warn-secondary,#fbbf24);
+  background:transparent;
+  color:var(--dsw-alias-label-primary,#1f2329);
+}
 .dsm-trae-expiry-week{
   border-color:var(--dsw-alias-border-l2,rgba(127,127,127,.36));
   background:transparent;
@@ -3502,6 +3513,74 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/expiry-ladder.ts
+		/**
+		* Choose the notice's tier and its figures.
+		*
+		* Escalation order matters: a live expiry the user can still act on outranks
+		* a lapsed one they cannot, even when the lapsed amount is larger.
+		*
+		* The 3-day tier exists because the 7-day bucket covers it. Without it, credit
+		* expiring in two days was reported as "within 7 days" — true, but three times
+		* too coarse to plan around, in the one sentence whose job is "how long do I
+		* have left".
+		*/
+		function expiryNotice(expiry) {
+			if (expiry.within24h.packs > 0) return {
+				tier: "soon",
+				total: expiry.within24h.total,
+				packs: expiry.within24h.packs,
+				...expiry.within24h.earliestExpiresAtMs === void 0 ? {} : { soonestExpiresAtMs: expiry.within24h.earliestExpiresAtMs }
+			};
+			if (expiry.within3d.packs > 0) return {
+				tier: "days",
+				total: expiry.within3d.total,
+				packs: expiry.within3d.packs,
+				...expiry.within3d.earliestExpiresAtMs === void 0 ? {} : { soonestExpiresAtMs: expiry.within3d.earliestExpiresAtMs }
+			};
+			if (expiry.within7d.packs > 0) return {
+				tier: "week",
+				total: expiry.within7d.total,
+				packs: expiry.within7d.packs,
+				...expiry.within7d.earliestExpiresAtMs === void 0 ? {} : { soonestExpiresAtMs: expiry.within7d.earliestExpiresAtMs }
+			};
+			if (expiry.expired.packs > 0) return {
+				tier: "lapsed",
+				total: expiry.expired.total,
+				packs: expiry.expired.packs
+			};
+		}
+		/**
+		* The locale key that states this tier's headline.
+		*
+		* Kept beside the tier choice so a new tier cannot be added without its copy.
+		*/
+		function expiryHeadlineKey(tier) {
+			switch (tier) {
+				case "soon": return "row.expiryWarningSoon";
+				case "days": return "row.expiryWarningDays";
+				case "week": return "row.expiryWarningWeek";
+				case "lapsed": return "row.expiryWarningLapsed";
+			}
+		}
+		/**
+		* The CSS class that gives this tier its urgency tone.
+		*
+		* Four tones so the 24-hour case cannot be mistaken for the 3-day one, nor
+		* either for the 7-day one, at a glance. The 3-day tone sits BETWEEN the other
+		* two: it carries the warning border (a 3-day expiry must not be scrolled past
+		* unnoticed) but not the warning fill (a 3-day pack is not the emergency a
+		* 24-hour pack is).
+		*/
+		function expiryToneClass(tier) {
+			switch (tier) {
+				case "soon": return "dsm-trae-expiry-soon";
+				case "days": return "dsm-trae-expiry-days";
+				case "week": return "dsm-trae-expiry-week";
+				case "lapsed": return "dsm-trae-expiry-lapsed";
+			}
+		}
+		//#endregion
 		//#region src/client/TraeAccountPanel.tsx
 		/**
 		* A warning that credit is about to lapse.
@@ -3516,37 +3595,19 @@ window.__ModuleLoader__.load({
 		* rather than reassuring.
 		*/
 		function ExpiryNotice({ expiry, t }) {
-			const { expired, within24h, within7d } = expiry;
-			let message;
-			let soonest;
-			let tone;
-			if (within24h.packs > 0) {
-				message = t("row.expiryWarningSoon", {
-					total: formatNumber(within24h.total),
-					packs: String(within24h.packs)
-				});
-				soonest = within24h.earliestExpiresAtMs;
-				tone = "dsm-trae-expiry-soon";
-			} else if (within7d.packs > 0) {
-				message = t("row.expiryWarningWeek", {
-					total: formatNumber(within7d.total),
-					packs: String(within7d.packs)
-				});
-				soonest = within7d.earliestExpiresAtMs;
-				tone = "dsm-trae-expiry-week";
-			} else if (expired.packs > 0) {
-				message = t("row.expiryWarningLapsed", {
-					total: formatNumber(expired.total),
-					packs: String(expired.packs)
-				});
-				tone = "dsm-trae-expiry-lapsed";
-			} else return null;
+			const notice = expiryNotice(expiry);
+			if (notice === void 0) return null;
+			const message = t(expiryHeadlineKey(notice.tier), {
+				total: formatNumber(notice.total),
+				packs: String(notice.packs)
+			});
+			const tone = expiryToneClass(notice.tier);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: `dsm-trae-expiry ${tone}`,
 				role: "status",
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: message }), soonest === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: message }), notice.soonestExpiresAtMs === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: "dsm-trae-expiry-detail",
-					children: t("row.expiryEarliest", { time: formatDateTime(soonest) })
+					children: t("row.expiryEarliest", { time: formatDateTime(notice.soonestExpiresAtMs) })
 				})]
 			});
 		}
@@ -6369,34 +6430,28 @@ window.__ModuleLoader__.load({
 		function formatCredits(value) {
 			return value.toLocaleString("en-US", { maximumFractionDigits: 0 });
 		}
-		/** The soonest expiry any bucket names, or undefined when none carries one. */
+		/**
+		* The soonest expiry the chosen tier names, or undefined when none carries one.
+		*
+		* Read from the tier the shared ladder picked, so the time shown always belongs
+		* to the horizon the headline claims — the two cannot disagree.
+		*/
 		function soonestExpiryOf(expiry) {
-			return expiry.within24h.earliestExpiresAtMs ?? expiry.within7d.earliestExpiresAtMs ?? void 0;
+			return expiryNotice(expiry)?.soonestExpiresAtMs;
 		}
 		/**
-		* Which urgency tone the notice takes.
+		* The notice's headline sentence, naming the amount and the pack count.
 		*
-		* Escalation order matters: a live expiry the user can still act on outranks a
-		* lapsed one they cannot, even when the lapsed amount is larger.
+		* The TIER is chosen by the shared ladder (see `./expiry-ladder.ts`), which the
+		* card's account panel uses too — the two surfaces render the same locale
+		* keys, so the choice must not be made twice.
 		*/
-		function expiryToneOf(expiry) {
-			if (expiry.within24h.packs > 0) return "dsm-trae-expiry-soon";
-			if (expiry.within7d.packs > 0) return "dsm-trae-expiry-week";
-			return "dsm-trae-expiry-lapsed";
-		}
-		/** The notice's headline sentence, naming the amount and the pack count. */
 		function expiryMessageOf(expiry, t) {
-			if (expiry.within24h.packs > 0) return t("row.expiryWarningSoon", {
-				total: formatCredits(expiry.within24h.total),
-				packs: String(expiry.within24h.packs)
-			});
-			if (expiry.within7d.packs > 0) return t("row.expiryWarningWeek", {
-				total: formatCredits(expiry.within7d.total),
-				packs: String(expiry.within7d.packs)
-			});
-			return t("row.expiryWarningLapsed", {
-				total: formatCredits(expiry.expired.total),
-				packs: String(expiry.expired.packs)
+			const notice = expiryNotice(expiry);
+			if (notice === void 0) return "";
+			return t(expiryHeadlineKey(notice.tier), {
+				total: formatCredits(notice.total),
+				packs: String(notice.packs)
 			});
 		}
 		/**
@@ -6737,7 +6792,7 @@ window.__ModuleLoader__.load({
 							}) })]
 						}),
 						activeRegion === "cn" && signedIn?.credits?.expiry !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: `dsm-trae-expiry ${expiryToneOf(signedIn.credits.expiry)}`,
+							className: `dsm-trae-expiry ${expiryToneClass(expiryNotice(signedIn.credits.expiry)?.tier ?? "lapsed")}`,
 							role: "status",
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: expiryMessageOf(signedIn.credits.expiry, t) }), soonestExpiryOf(signedIn.credits.expiry) === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dsm-trae-expiry-detail",
@@ -7055,6 +7110,7 @@ window.__ModuleLoader__.load({
 			"row.creditsAlternative": "Another account on this machine still has credit: {accounts}",
 			"row.creditsAlternativeSwitch": "Switch to it",
 			"row.expiryWarningSoon": "{total} credit lapses within 24 hours ({packs} packs)",
+			"row.expiryWarningDays": "{total} credit lapses within 3 days ({packs} packs)",
 			"row.expiryWarningWeek": "{total} credit lapses within 7 days ({packs} packs)",
 			"row.expiryWarningLapsed": "{total} credit has already lapsed but is still counted in the balance ({packs} packs)",
 			"row.expiryEarliest": "Earliest: {time}",
@@ -7442,6 +7498,7 @@ window.__ModuleLoader__.load({
 			"row.creditsAlternative": "本机还有可用账号：{accounts}",
 			"row.creditsAlternativeSwitch": "切换到它",
 			"row.expiryWarningSoon": "有 {total} 积分将在 24 小时内过期（{packs} 个套餐）",
+			"row.expiryWarningDays": "有 {total} 积分将在 3 天内过期（{packs} 个套餐）",
 			"row.expiryWarningWeek": "有 {total} 积分将在 7 天内过期（{packs} 个套餐）",
 			"row.expiryWarningLapsed": "有 {total} 积分已过期但仍计入余额（{packs} 个套餐）",
 			"row.expiryEarliest": "最早到期：{time}",

package/lib/index.d.ts

@@ -915,6 +915,13 @@ interface TraeWebExpiringCredits {
  * Only present when at least one pack carried a usable `expiresAtMs` — a card
  * must never read "we were not told when anything expires" as "nothing is
  * about to lapse".
+ *
+ * The three forward buckets are NESTED and CUMULATIVE: `within24h` ⊆
+ * `within3d` ⊆ `within7d`, each counting every pack inside its own horizon.
+ * So each bucket answers "how much lapses within N" and the copy states that
+ * bucket's own figure — which is why ONE bucket's number is always true on
+ * its own terms, and why the reader never has to add two figures together (the
+ * notice shows exactly one tier at a time).
  */
 interface TraeWebCreditExpiry {
   within24h: TraeWebExpiringCredits;

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-trae",
   "displayName": "DSH Connect Trae",
   "description": "把本机登录的 Trae 模型接入 DeepSeek Harness：国内版与国际版双供应商并行，提供用量/积分概览与每日签到领取。",
-  "version": "4.6.9",
+  "version": "4.6.10",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",