dsh-connect-trae 3.6.0 → 3.6.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 3.6.1 (2026-10-16)
+
+> **「自动续期」不再是一句没有期限的承诺。** 卡片现在会告诉你**刷新令牌**何时到期 ——
+> 在那之前访问令牌会自动续期，在那之后自动续期就彻底停了，必须重新登录一次 Trae。
+
+### 修复
+
+- **刷新令牌的到期时间对用户完全不可见（issue #37 追问引出）**：
+  - **问题**：卡片一直只写「访问令牌 {时间} 过期（自动续期）」。这句话是对的，
+    而且一直对 —— 直到**刷新令牌**到期的那个瞬间，自动续期就永久停止了。
+    一个读了几个月「自动续期」的用户，没有任何理由预期这件事。
+  - **根因**：刷新令牌的到期时间**被解析了、也被存下来了，但从来没送到浏览器** ——
+    状态接口里根本没有这个字段，所以卡片无从显示。
+  - **现在**：状态接口暴露刷新令牌到期时间，卡片**按账号**在临近到期时给出一行提示：
+    - 剩余 **30 天**以内 → 提醒（警告色），写明**到期时间**与**还剩几天**；
+    - **已到期** → 明确说明「自动续期已停止」，并给出恢复方式（重新登录一次 Trae）；
+    - **还很久 / 没有该字段**（CLI 凭据本身不带）→ **不显示任何东西**。
+      健康的令牌不该在每一行都占一行文字，伪造的期限比不显示更糟。
+
+  > 这条不是理论问题：我们在排查 `#38` 时**亲身遇到过** —— 某区域插件自存的凭据访问令牌已过期，
+  刷新也返回 401，而卡片上一直写着「自动续期」。当时只能靠人肉发现。
+
+### 测试
+
+- 新增 5 例覆盖三种状态与两个边界（健康不显示、临近显示截止日与剩余天数、已过期显示错误态、
+  无该字段不伪造、最后一天仍算「未过期」）。
+- **变异验证**：去掉 30 天提醒窗口 → 2 例变红；在缺少字段时伪造一个期限 → 1 例变红。
+- 全仓 **660** 例测试通过，类型检查通过。
+
 ## 3.6.0 (2026-10-16)
 
 > **多个账号可以并存了。** 本版新增**账号导入 / 导出**：不再需要每次把某台机器的登录凭据

package/lib/client.js

@@ -335,6 +335,13 @@ window.__ModuleLoader__.load({
 .dsm-trae-usage-account{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 14px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:14px;background:var(--dsw-alias-bg-layer-2,#24262c)}
 .dsm-trae-usage-account-copy{display:flex;flex-direction:column;gap:3px;min-width:0}
 .dsm-trae-usage-expiry{padding-left:19px;color:var(--dsw-alias-label-tertiary,#9aa0a8);font-size:12px;line-height:18px}
+/* Refresh-token countdown (issue #37 follow-up). Sits under the access-token
+   line and aligns with it, so the two read as one stack: "token renews" then
+   "but this is when renewal itself ends". Only rendered when it is close or
+   already past, so a healthy account is unchanged. */
+.dsm-trae-refresh-warn{padding-left:19px;font-size:12px;line-height:18px}
+.dsm-trae-refresh-warn-soon{color:var(--dsw-alias-state-warn-primary,#b45309)}
+.dsm-trae-refresh-warn-lapsed{color:var(--dsw-alias-state-error-primary,#dc2626)}
 .dsm-trae-account-picker{display:block}
 /* The 璁剧疆 block: label + hint on the left, control on the right, one save for
    the whole block. It replaces the bare checkbox rows that used to write on
@@ -1306,6 +1313,40 @@ window.__ModuleLoader__.load({
 				minute: "2-digit"
 			}).format(new Date(value));
 		}
+		/** How close a refresh token must be to lapsing before the card warns, in days. */
+		const REFRESH_WARN_DAYS = 30;
+		/**
+		* The refresh-token warning for one account, or undefined when there is nothing
+		* worth saying.
+		*
+		* The access token renews itself every few minutes, so its own expiry answers
+		* "when does this need attention" with "never, until the refresh token lapses".
+		* The refresh token is therefore the only honest countdown on this card, and it
+		* has to be shown BEFORE it runs out: once it lapses the plugin cannot renew at
+		* all and the only recovery is signing in to Trae again, which a user who has
+		* been reading "auto-renewal" for months has no reason to expect.
+		*
+		* Three tones, matching the credit-expiry notice: `lapsed` (renewal already
+		* dead), `soon` (inside the warning window), and nothing otherwise — a healthy
+		* token must not add a line to every account row forever.
+		*/
+		function refreshTokenWarning(expiresAtMs, nowMs, t, formatTime) {
+			if (expiresAtMs === void 0) return void 0;
+			const text = formatTime(expiresAtMs);
+			if (expiresAtMs <= nowMs) return {
+				tone: "lapsed",
+				text: t("row.refreshTokenLapsed", { expiresAt: text })
+			};
+			const days = Math.ceil((expiresAtMs - nowMs) / 864e5);
+			if (days > REFRESH_WARN_DAYS) return void 0;
+			return {
+				tone: "soon",
+				text: t("row.refreshTokenExpiring", {
+					expiresAt: text,
+					days
+				})
+			};
+		}
 		function formatCapacity(value, unknown) {
 			if (value === void 0) return unknown;
 			if (value >= 1e6 && value % 1e6 === 0) return `${value / 1e6}M`;
@@ -2575,6 +2616,14 @@ window.__ModuleLoader__.load({
 																			sourceLabel(account.source)
 																		]
 																	}),
+																	(() => {
+																		const warning = refreshTokenWarning(account.refreshExpiresAtMs, Date.now(), t, formatDateTime);
+																		return warning === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																			className: `dsm-trae-refresh-warn dsm-trae-refresh-warn-${warning.tone}`,
+																			role: "status",
+																			children: warning.text
+																		});
+																	})(),
 																	error === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 																		className: "dsm-trae-account-note",
 																		role: "alert",
@@ -3617,6 +3666,8 @@ window.__ModuleLoader__.load({
 			"row.sourceCli": "Trae CLI",
 			"row.signedIn": "Signed in: {accountName}",
 			"row.tokenExpiry": "Access token expires {expiresAt} (auto-renewal)",
+			"row.refreshTokenExpiring": "Sign in to Trae again by {expiresAt} ({days} day(s) left) — automatic renewal stops after that.",
+			"row.refreshTokenLapsed": "Automatic renewal has stopped: the Trae sign-in expired {expiresAt}. Sign in to Trae again to restore it.",
 			"row.requestFailed": "Request failed",
 			"row.creditsAvailableLabel": "Available",
 			"row.workCreditsLabel": "Work credits",
@@ -3783,6 +3834,8 @@ window.__ModuleLoader__.load({
 			"row.sourceCli": "Trae CLI",
 			"row.signedIn": "已登录：{accountName}",
 			"row.tokenExpiry": "访问令牌 {expiresAt} 过期（自动续期）",
+			"row.refreshTokenExpiring": "请在 {expiresAt} 前重新登录一次 Trae（还剩 {days} 天），此后将无法自动续期。",
+			"row.refreshTokenLapsed": "自动续期已停止：Trae 登录凭据已于 {expiresAt} 过期。请重新登录一次 Trae 以恢复。",
 			"row.requestFailed": "请求失败",
 			"row.creditsAvailableLabel": "可用",
 			"row.workCreditsLabel": "Work 积分",

package/lib/index.d.ts

@@ -590,6 +590,13 @@ interface TraeAccountChoice {
   region: TraeRegion;
   source: 'desktop' | 'dsh' | 'cli';
   tokenExpiresAtMs: number;
+  /**
+   * When this account's refresh token lapses, when the credential carries one.
+   * The access token above renews itself automatically until this expires; see
+   * the mirror field on `TraeWebAccount` in status-paths.ts for why the card
+   * needs it.
+   */
+  refreshExpiresAtMs?: number;
   selected: boolean;
 }
 /**
@@ -2002,6 +2009,18 @@ interface TraeWebAccount {
   region: TraeRegion;
   source: 'desktop' | 'dsh' | 'cli';
   tokenExpiresAtMs: number;
+  /**
+   * When this account's REFRESH token expires, when the credential carries one.
+   *
+   * The access token above is renewed automatically — the plugin refreshes it
+   * five minutes before it lapses — so by itself it answers "when does this
+   * need attention", which is "never, while the refresh token lives". The
+   * refresh token is the real horizon: once IT expires the automatic renewal
+   * stops working and the user must sign in to Trae again. Before this field the
+   * card could only say "auto-renewal", which stays true right up to the moment
+   * it silently stops being true.
+   */
+  refreshExpiresAtMs?: number;
   selected: boolean;
 }
 /**
@@ -2228,6 +2247,13 @@ type TraeWebUsage = {
   accountId: string;
   accountName: string;
   tokenExpiresAtMs: number;
+  /**
+   * When the BOUND account's refresh token expires (absent when the credential
+   * carries none). See {@link TraeWebAccount.refreshExpiresAtMs} — this is the
+   * horizon that actually matters, because the access token above renews
+   * itself until this one lapses.
+   */
+  refreshExpiresAtMs?: number;
   /** Which per-region model directory and selection this account owns. */
   region: TraeRegion;
   /** Whether this region's provider is currently offered to DSH. */

package/lib/index.js

@@ -1867,6 +1867,7 @@ var TraeCredentialStore = class {
 			region: regionOfCredential(live),
 			source: live.source,
 			tokenExpiresAtMs: live.expiresAtMs,
+			...live.refreshExpiresAtMs === void 0 ? {} : { refreshExpiresAtMs: live.refreshExpiresAtMs },
 			selected: false
 		};
 	}
@@ -1881,6 +1882,7 @@ var TraeCredentialStore = class {
 			region: regionOfCredential(credential),
 			source: credential.source,
 			tokenExpiresAtMs: credential.expiresAtMs,
+			...credential.refreshExpiresAtMs === void 0 ? {} : { refreshExpiresAtMs: credential.refreshExpiresAtMs },
 			selected: selectedExists ? traeAccountId(credential) === this.accountId : credential === defaultSelected
 		}));
 	}
@@ -5484,6 +5486,7 @@ async function traeWebUsage(deps, region) {
 		accountId: accounts.find((item) => item.selected)?.id ?? "",
 		accountName: credential.accountName ?? credential.userId,
 		tokenExpiresAtMs: credential.expiresAtMs,
+		...credential.refreshExpiresAtMs === void 0 ? {} : { refreshExpiresAtMs: credential.refreshExpiresAtMs },
 		region,
 		enabled,
 		accounts,

package/package.json

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