dsh-connect-trae 4.4.3 → 4.4.4

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 4.4.4 (2026-10-23)
+
+> **同价的会员分支不再被读成第二重折扣；顺手补上官方客户端渲染链路的取证。**
+>
+> 合并自 PR #53。真机截图比对时发现：同一个 `deepseek-v4.1-flash`，插件胶囊写「闲时 5 折」、
+> 官方客户端写「会员 5 折」、详情栏又并排列出两段一模一样的 5 折——查下来不是渲染错，
+> 是我们把**同一个折后价的两条资格路径**讲成了两层折扣。
+
+### 修复
+
+- **不再把「同价的会员分支」说成第二重折扣**（`fix(promo)`，真机截图比对时发现）。
+  `deepseek-v4.1-flash` 的活动 `off_peak_member_discount_18_9` 里，`member` 与 `off_peak` 是
+  **同一个折后价的两条资格路径**（实测 2026-10-23：两者都是 `0.12 → 0.06, discount 50`；
+  会员全天可享，非会员只在闲时窗口内可享）。旧悬停无条件引用 `member` 并写「会员价另有 5 折」，
+  读起来就是 0.06 再打五折 = 0.03 —— 上游从来没有这个价。现在 `badgeOf()` 比较两条分支的
+  **折后价**，只有 `member.rate < 现价` 才带会员价，且文案改成给绝对数
+  （`会员价 0.06 积分/百万 token（5 折）` / `subscription price is 0.06 credits/Mtoken (50% off)`）；
+  等值时整句不出现。
+  **顺带**：`current` 判定出来的「闲时」徽标，若本地时钟确认某个窗口正开着，现在会把该窗口
+  （起止 + 时区）挂上去 —— 以前只有本地窗口算出来的徽标带时段，于是有「写着闲时 5 折、
+  悬停却说不出时段」的形状。时钟与上游不一致时不补，宁可少说。
+  **取证**：官方客户端同一行显示「会员 5 折」、详情栏并排列出两段 5 折，是因为它读的是服务端
+  下发的渲染配置（`featureOrder` + Jexl + `tag`/`tooltip.sections`），不是自己判折扣；
+  链路与实测写入 `docs/PROMO_CLIENT_RENDER.md`，`docs/PROMO_BADGE.md` §3/§4 同步补注。
+  **测试**：`promo.spec.ts` 新增「同价会员分支不引用」「上游闲时判定补时段」「时钟不认时不补」
+  三条；`card-promo.spec.tsx` 与 `model-label-slot.spec.tsx` 各新增一条悬停断言。
+  **验证**：`tsc` 两端静默；`vitest run` **81 文件 / 1019 条全过**（4.4.3 基线 1014 + 新增 5，
+  合并后 main 上复核实测）；`tsdown` 两个 build 通过，体积与 4.4.3 持平。
+
 ## 4.4.3 (2026-10-23)
 
 > **模型选择器里也看得见活动优惠；账号池信息架构对齐 workbuddy；顺带修一个会让已保存设置

package/lib/client.js

@@ -490,17 +490,39 @@ window.__ModuleLoader__.load({
 			if (price.beforeRate <= 0 || price.rate >= price.beforeRate) return void 0;
 			return Math.round(price.rate / price.beforeRate * 100);
 		}
+		/**
+		* The member price, but only when it beats the rate the badge is already showing.
+		*
+		* Two rates on the same base are two ways to reach one price: `member` quoting
+		* 0.06 beside a live 0.06 is not "another 5 折". Comparing the post-discount
+		* numbers is the only honest test — a branch with no rate cannot be shown to be
+		* cheaper, so it is not quoted at all.
+		*/
+		function cheaperMemberOf(price, discount) {
+			const member = discount.member;
+			if (member === void 0 || member.rate === void 0) return void 0;
+			if (price.rate === void 0 || member.rate >= price.rate) return void 0;
+			const discountPercent = discountOf(member);
+			if (discountPercent === void 0) return void 0;
+			return {
+				rate: member.rate,
+				discountPercent
+			};
+		}
 		function badgeOf(kind, price, discount, window) {
 			const discountPercent = discountOf(price);
 			if (discountPercent === void 0) return void 0;
-			const memberDiscountPercent = discount.member === void 0 ? void 0 : discountOf(discount.member);
+			const member = cheaperMemberOf(price, discount);
 			return {
 				kind,
 				discountPercent,
 				percentOff: 100 - discountPercent,
 				...price.beforeRate === void 0 ? {} : { beforeRate: price.beforeRate },
 				...price.rate === void 0 ? {} : { rate: price.rate },
-				...memberDiscountPercent === void 0 ? {} : { memberDiscountPercent },
+				...member === void 0 ? {} : {
+					memberDiscountPercent: member.discountPercent,
+					memberRate: member.rate
+				},
 				...window === void 0 ? {} : {
 					fromClock: clockOf(window.startMinute),
 					untilClock: clockOf(window.endMinute),
@@ -520,7 +542,8 @@ window.__ModuleLoader__.load({
 			const current = discount.current;
 			if (current !== void 0) {
 				if ((current.discountType ?? "none") !== "none" && (current.beforeRate === void 0 || current.rate === void 0 || current.rate < current.beforeRate)) {
-					const badge = badgeOf(kindOf(discount), current, discount);
+					const kind = kindOf(discount);
+					const badge = badgeOf(kind, current, discount, kind === "offPeak" ? runningWindow(discount, now, defaultTimeZone) : void 0);
 					if (badge !== void 0) return badge;
 				}
 			}
@@ -3660,7 +3683,8 @@ window.__ModuleLoader__.load({
 				until: badge.untilClock,
 				zone: badge.timeZone
 			}));
-			if (badge.memberDiscountPercent !== void 0) hints.push(t("row.promoHintMember", {
+			if (badge.memberDiscountPercent !== void 0 && badge.memberRate !== void 0) hints.push(t("row.promoHintMember", {
+				rate: String(badge.memberRate),
 				zhe: promoZhe$1(badge.memberDiscountPercent),
 				percent: String(100 - badge.memberDiscountPercent)
 			}));
@@ -6273,7 +6297,7 @@ window.__ModuleLoader__.load({
 			"row.promoOffPeak": "Off-peak {percent}% off",
 			"row.promoHintRate": "was {before} credits/Mtoken, now {rate}",
 			"row.promoHintWindow": "off-peak hours {from}–{until} ({zone})",
-			"row.promoHintMember": "subscription price is a further {percent}% off",
+			"row.promoHintMember": "subscription price is {rate} credits/Mtoken ({percent}% off)",
 			"row.modelEnabled": "Enabled",
 			"row.discard": "Discard changes",
 			"row.save": "Save",
@@ -6624,7 +6648,7 @@ window.__ModuleLoader__.load({
 			"row.promoOffPeak": "闲时 {zhe} 折",
 			"row.promoHintRate": "原价 {before} 积分/百万 token，现价 {rate}",
 			"row.promoHintWindow": "闲时时段 {from}–{until}（{zone}）",
-			"row.promoHintMember": "会员价另有 {zhe} 折",
+			"row.promoHintMember": "会员价 {rate} 积分/百万 token（{zhe} 折）",
 			"row.modelEnabled": "启用模型",
 			"row.discard": "放弃修改",
 			"row.save": "保存",
@@ -7041,7 +7065,8 @@ window.__ModuleLoader__.load({
 				until: badge.untilClock,
 				zone: badge.timeZone
 			}));
-			if (badge.memberDiscountPercent !== void 0) hints.push(fillPlaceholders(copy["row.promoHintMember"], {
+			if (badge.memberDiscountPercent !== void 0 && badge.memberRate !== void 0) hints.push(fillPlaceholders(copy["row.promoHintMember"], {
+				rate: String(badge.memberRate),
 				zhe: promoZhe(badge.memberDiscountPercent),
 				percent: String(100 - badge.memberDiscountPercent)
 			}));

package/package.json

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