dsh-connect-trae 3.0.0 → 3.0.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 3.0.1 (2026-10-10)
+
+### 修复
+
+- **跟随 Trae 当前登录的账号（issue #29）**。在 Trae 桌面端**退出换登录**后，插件此前一直绑定**换号前**的账号继续计费，而同族插件 `dsh-connect-workbuddy` 会自动跟随 App 的新登录；报告人需要每次手动打开账号下拉切一次。根因是两处：`TraeCredentialStore.preferred()` 只取 `credentials[0]`（**不认哪个来源是 App 的 live 登录**），`current()` 在 `accountId` 有值时**严格绑定、find 不命中也不回退**（刻意为之，见 `src/auth.ts` 的注释——避免悄悄给用户换一个计费账号）。
+
+  分两条路径修，**都不改变未勾选用户的任何行为**：
+
+  1. **`preferred()` 改为 live 登录优先**（`source === 'desktop'` 的凭据先于插件自己的刷新副本）。只改**排序**、不改 `readAll()` 的取值去重——同一账号仍保留更长寿的副本，否则会退回「有效 token 在隔壁文件却读成过期」的旧问题（`src/auth.ts:371-384` 的注释）。这修好「从未显式选择」的默认路径，与 workbuddy 对齐。
+  2. **显式绑定的跟随**：新增只读方法 `liveLogin()` 报告「App 当前登录 ≠ 绑定账号」的**不一致**（纯读，绝不静默换绑）；卡片在账号下拉旁给出**提示行 + 一键切换**（复用与下拉相同的 `switchAccount` 写入，保持单一写入路径）；新增配置字段 `followAppLogin`（volatile，默认**关闭**）让宿主在每次配置生效时自动重绑——**默认关**是因为自动换绑意味着换人计费，必须由用户主动勾选，未勾选时提示行就是手动通道。
+
+  配套：usage 文档新增 `appLogin` 字段（仅在不一致时携带，健康文档不加字段、扫描失败也不拖垮整个文档），双语文案 `row.appLoginMismatch` / `row.appLoginFollow` / `row.followAppLogin`，README「多账号切换」补充该行为说明。
+
+### 测试
+
+- 新增 5 个：`preferred()` 优先 App 登录（旧 own 副本仍列出但不默认选中）、`liveLogin()` 三种不一致/一致状态、usage 文档 `appLogin` 的携带/省略/扫描失败降级；集成测试的 `MemorySettings` 补上 `revision` 冲突门（建模真实 `SettingsConflictError`）与新 volatile 字段 `followAppLogin`。
+- `pnpm run check`（typecheck + 全量测试 + build）通过。
+
 ## 3.0.0 (2026-10-07)
 
 > **积分从「侧边栏常驻一行」改为「输入框工具栏的按供应商读数 + 账号表格浮层」。**

package/README.md

@@ -41,6 +41,7 @@
 - **目录与勾选按区域隔离** —— 国内版与国际版各一套模型目录、勾选、图片开关与上下文预算，两个供应商各自读各自的槽位。
 - **识图能力跟随 Trae 自身的标注** —— Trae 把某个模型标为 `multimodal` 时，插件直接按多模态对外声明，无需你在卡片上逐一手勾（issue #16）。判据是「**你手动勾选的 ∪ Trae 标注多模态的**」：Trae 明确标 `false` 或未标注的模型保持纯文本，你可以照旧手动为它们打开图片输入。卡片上被自动开启的那一行显示为已勾选且只读，并说明原因。详见下方「图片输入（识图）」。
 - **多账号切换** —— 支持重新读取 Token 列表并选择账号；Token 不写入 DSH 设置。**你的选择会被记住并长期生效**：插件不会因为某个账号额度用尽、或检测到另一个可用账号就自作主张替你切换（换账号意味着换人计费）。所以当绑定的账号额度耗尽时，卡片会**明确告诉你**，并把本机其他还有额度的账号连同其可用积分数列出来，由你一键切换——而不是让面板一直空着、也不自动把你切走。「刷新账号与 Token」每次都会回报结果（找到几个账号、当前仍绑定谁），不会再「点了没反应」。下拉里显示的是产品名（`Trae` / `TRAE SOLO` / 国际版），便于分辨凭据来自哪个安装。
+- **跟随 Trae 当前登录的账号** —— 你在 Trae 桌面端**退出并换登录**后，卡片会检测到「插件绑定的账号」与「Trae 现在登录的账号」不一致，并给出一行提示与**一键切换**（复用账号下拉的同一次写入，不引入第二条切换路径）。想让插件**自动跟随**，可打开设置卡片里的「跟随 Trae 当前登录的账号」开关：此后每次配置生效都会把 `accounts.<region>` 重绑到 App 当前登录的账号。**该开关默认关闭**——已有配置保持原来的严格绑定，自动换绑意味着换人计费，必须由你主动勾选；未勾选时上面那行提示就是你的手动通道。（issue #29）
 - **只读用量与模型管理** —— 国内版查看 Work 积分与通用积分，国际版查看订阅/试用状态；刷新/启用 Trae 模型；只读查询不消耗额度。
 - **一键测试启用模型** —— 给**已启用**的每个模型发一条最小消息（一句 `ping`、不带工具），逐个告诉你能不能真的应答：**可用** / **需要更高档位**（Trae `1005`，你的套餐不覆盖）/ **上游不提供**（`4001`/`4011`，SOLO 通道没有这个模型）/ **被限流** / **登录凭据被拒** / **本次未测出**。最后一项是一等公民：超时、断连、代理、5xx **一律不算「不可用」**——只有上游明确的拒绝才算负面结论。**这是插件里唯一消耗额度的操作**（签到改变的是账号状态，不消耗），只在你点击时运行，结果只留在当前会话里不写入设置。
 - **每日签到领取** —— 国内版卡片上一键领取当日签到积分（按钮显示每日奖励，该账号已领取则显示「今日已领取」并禁用）；这是插件里**唯一会改变账号状态**的操作，由你主动点击触发。Trae 的签到按「**每台设备每天一次**」限制：切换账号后如果本机今天的名额已经用掉（无论是哪个账号用的），当前账号在本机当天无法再签，卡片会说明原因而不是谎报「已领取」。国际版没有签到活动，因此不显示该按钮。

package/lib/client.js

@@ -103,6 +103,20 @@ window.__ModuleLoader__.load({
 			return typeof accounts === "object" && accounts !== null ? accounts : {};
 		}
 		/**
+		* Whether the host-side "follow the Trae app's sign-in" switch is on (issue
+		* #29). Absent reads as OFF, so an existing configuration keeps the strict
+		* bind it shipped with and the switch is an opt-in — the same opt-out
+		* semantics as {@link regionEnabledOf}, for the same reason: a config written
+		* before this field existed cannot ask for behavior it never declared.
+		*
+		* Reads the whole settings section (or the bare field); deep-unwraps first
+		* because on DSH 0.1.7 a volatile field arrives as a `{get(): T}` live
+		* reference, whose `typeof === 'object'` would otherwise pass a naive check.
+		*/
+		function followAppLoginEnabled(configured) {
+			return unwrapVolatileDeep(configured)?.followAppLogin === true;
+		}
+		/**
 		* Build the next `regions` settings value for the card's save. The write
 		* targets ONLY the signed-in account's region slot; every other region's slot
 		* is carried over untouched, so switching accounts never clobbers the other
@@ -822,6 +836,36 @@ window.__ModuleLoader__.load({
 				}
 			};
 			/**
+			* Follow the Trae app's current sign-in from the hint row (issue #29).
+			*
+			* One click, and it goes through the SAME `switchAccount` write the account
+			* dropdown uses — so the card has exactly one writer for `accounts`, the Host
+			* sees the change through `loader/volatile-update` like every other card
+			* write, and there is no second settings path to keep in sync. The app's
+			* sign-in is `status.appLogin`, which the Host only reports when it differs
+			* from the bound account, so a click here always moves the binding to what
+			* the app is actually logged into.
+			*/
+			const followAppLogin = async () => {
+				if (status.status !== "signed-in" || status.appLogin === void 0) return;
+				await switchAccount(status.appLogin.id);
+			};
+			/**
+			* Toggle the follow-the-app switch (`followAppLogin`, issue #29): the Host's
+			* automatic rebind follows this field, so the card only commits it. OFF by
+			* default in the schema; an existing config keeps the strict bind it shipped
+			* with until the user ticks this.
+			*/
+			const toggleFollowAppLogin = async (enabled) => {
+				if (settingsScope === void 0 || settingsScope.getSnapshot().writable !== true) return;
+				setWriteError(void 0);
+				try {
+					await writeSettingsField(settingsScope, "followAppLogin", enabled, (readBack) => followAppLoginEnabled(readBack) === enabled);
+				} catch (error) {
+					if (mounted.current) setWriteError(error instanceof Error ? error.message : t("row.requestFailed"));
+				}
+			};
+			/**
 			* Claim today's check-in reward for the active tab's region.
 			*
 			* The Host route owns every guard that matters — POST only, loopback origin
@@ -1229,6 +1273,21 @@ window.__ModuleLoader__.load({
 									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.showPointsInMainUi") })]
 								})
 							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsm-trae-mainui-switch",
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+									className: "dsm-trae-mainui-switch-label",
+									title: t("row.followAppLoginHint"),
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+										type: "checkbox",
+										checked: followAppLoginEnabled(settingsValue),
+										disabled: settingsScope?.getSnapshot().writable !== true,
+										onChange: (event) => {
+											toggleFollowAppLogin(event.currentTarget.checked);
+										}
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.followAppLogin") })]
+								})
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "dsm-trae-usage-account",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1301,6 +1360,22 @@ window.__ModuleLoader__.load({
 											children: t("row.creditsAlternativeSwitch")
 										})]
 									}) : null,
+									status.status === "signed-in" && status.appLogin !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsm-trae-usage-alternative",
+										role: "status",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+											className: "dsm-trae-usage-alternative-text",
+											children: t("row.appLoginMismatch", { account: status.appLogin.accountName })
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+											type: "button",
+											className: "dsm-trae-usage-switch-button",
+											disabled: switchingAccount || settingsScope?.getSnapshot()?.writable !== true,
+											onClick: () => {
+												followAppLogin();
+											},
+											children: t("row.appLoginFollow")
+										})]
+									}) : null,
 									rescanNote === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 										className: "dsm-trae-usage-note",
 										role: "status",
@@ -2285,6 +2360,10 @@ window.__ModuleLoader__.load({
 			"row.creditsExhausted": "The bound account ({account}) has run out of credit",
 			"row.creditsAlternative": "Another account on this machine still has credit: {accounts}",
 			"row.creditsAlternativeSwitch": "Switch to it",
+			"row.appLoginMismatch": "Trae is signed in to {account}, but this plugin is still bound to the previous account",
+			"row.appLoginFollow": "Switch to it",
+			"row.followAppLogin": "Follow the account Trae is signed in to",
+			"row.followAppLoginHint": "When you switch accounts in the Trae desktop app, rebind to the new sign-in automatically instead of staying on the previous one. Off by default: an existing binding is kept until you tick this.",
 			"row.modelsTestEmpty": "Enable at least one model first.",
 			"row.modelsTestError": "Test failed: {message}",
 			"row.modelsTestDone": "{available} of {total} answered.",
@@ -2401,6 +2480,10 @@ window.__ModuleLoader__.load({
 			"row.creditsExhausted": "当前绑定账号（{account}）额度已用尽",
 			"row.creditsAlternative": "本机还有可用账号：{accounts}",
 			"row.creditsAlternativeSwitch": "切换到它",
+			"row.appLoginMismatch": "Trae 当前登录的是 {account}，但本插件仍绑定在上一个账号",
+			"row.appLoginFollow": "切换过去",
+			"row.followAppLogin": "跟随 Trae 当前登录的账号",
+			"row.followAppLoginHint": "在 Trae 桌面端切换登录后，自动换绑到新登录的账号，而不是停留在旧账号。默认关闭：已有绑定保持不变，直到你勾选它。",
 			"row.modelsTestEmpty": "请先启用至少一个模型。",
 			"row.modelsTestError": "测试失败：{message}",
 			"row.modelsTestDone": "{total} 个里有 {available} 个正常应答。",

package/lib/index.d.ts

@@ -475,12 +475,35 @@ declare class TraeCredentialStore {
   selectAccount(accountId: string | undefined): void;
   candidates(): TraeStorageCandidate[];
   /**
-   * Deterministic default when no account is explicitly selected: the first
-   * discovered account. This is NOT credit-seeking — it never reorders accounts
-   * to find one with general credits. The plugin bills exactly the account the
-   * user selected, or the first account when nothing has been selected yet.
+   * Deterministic default when no account is explicitly selected: the account
+   * the Trae desktop app is signed in to RIGHT NOW, else the first discovered
+   * one. This is NOT credit-seeking — it never reorders accounts to find one
+   * with general credits. The plugin bills exactly the account the user
+   * selected, the app's current sign-in when nothing has been selected, and
+   * only then the first account.
+   *
+   * The app's live sign-in outranks the plugin's own refreshed copies (issue
+   * #29): after the user switches accounts in Trae, the desktop storage file
+   * holds the NEW login while the plugin's copy of the old one still resolves,
+   * so a bare `credentials[0]` kept defaulting to a sign-in the app has
+   * abandoned — and `dsh-connect-workbuddy`, whose `preferred()` ranks the live
+   * file first, followed the app instead. Ordering only: the VALUE behind an
+   * account id is still whichever copy expires later (`readAll`), so a refresh
+   * the plugin performed is never discarded by this preference.
    */
   private preferred;
+  /**
+   * The account the Trae app is signed in to right now, when that differs from
+   * the account this store is bound to (issue #29).
+   *
+   * This is a READ, not a rebind: `current()` keeps resolving the bound
+   * account verbatim so billing never moves without a decision — the store
+   * only reports the mismatch, and the card (hint row) or the host (follow
+   * switch) turns it into a settings write the user can see and undo. Absent
+   * when nothing is live, when the live account IS the bound one, or when the
+   * binding itself already fell through to the live account.
+   */
+  liveLogin(): Promise<TraeAccountChoice | undefined>;
   accounts(): Promise<TraeAccountChoice[]>;
   current(): Promise<TraeCredential | undefined>;
   /**
@@ -1689,6 +1712,24 @@ interface TraeWebAccount {
   tokenExpiresAtMs: number;
   selected: boolean;
 }
+/**
+ * The account the Trae desktop app is signed in to right now, when it differs
+ * from the one this plugin is bound to (issue #29).
+ *
+ * Reported on the usage document so the card can offer one-click follow without
+ * an extra round trip; also written back on a POST to the accounts refresh
+ * route when the client confirms it saw the hint. Absent whenever the two
+ * agree or the app is not readable — a healthy document carries no extra
+ * fields and the plugin never bills from this value directly: the FOLLOW is a
+ * settings write of `accounts.<region>`, made by the card or by the host's
+ * follow switch, never a silent rebind here.
+ */
+interface TraeWebAppLogin {
+  id: string;
+  accountName: string;
+  edition: 'cn' | 'sg' | 'solo' | 'solo-sg';
+  region: TraeRegion;
+}
 interface TraeWebCreditAlternative {
   id: string;
   accountName: string;
@@ -1729,6 +1770,33 @@ declare function unwrapVolatile<T>(value: T): T;
  * value is never touched.
  */
 declare function unwrapVolatileDeep<T>(value: T): T;
+/**
+ * Read the per-region account selections out of a settings value.
+ *
+ * SHARED because `accounts` now has TWO writers: the card, and the composer
+ * panel's account table (2.14.0). Two writers of one field must use one merge
+ * rule, or they drift — and the rule is not obvious.
+ *
+ * Deep-unwraps first: on DSH 0.1.7 a volatile field arrives as a `{get(): T}`
+ * live reference, which passes the `typeof === 'object'` check and would be
+ * returned as if it were the map. Every lookup on it is then `undefined`, and
+ * the merge (`{ ...configured, [region]: id }`) would spread a reference into
+ * `{get: <function>}` — dropping the other region's selection and leaking a
+ * function into the settings document.
+ */
+declare function configuredAccountsOf(configured: unknown): Record<string, string>;
+/**
+ * Whether the host-side "follow the Trae app's sign-in" switch is on (issue
+ * #29). Absent reads as OFF, so an existing configuration keeps the strict
+ * bind it shipped with and the switch is an opt-in — the same opt-out
+ * semantics as {@link regionEnabledOf}, for the same reason: a config written
+ * before this field existed cannot ask for behavior it never declared.
+ *
+ * Reads the whole settings section (or the bare field); deep-unwraps first
+ * because on DSH 0.1.7 a volatile field arrives as a `{get(): T}` live
+ * reference, whose `typeof === 'object'` would otherwise pass a naive check.
+ */
+declare function followAppLoginEnabled(configured: unknown): boolean;
 /**
  * Build the next `regions` settings value for the card's save. The write
  * targets ONLY the signed-in account's region slot; every other region's slot
@@ -1819,6 +1887,15 @@ type TraeWebUsage = {
    * other case so a healthy account never pays for the extra read.
    */
   alternatives?: readonly TraeWebCreditAlternative[];
+  /**
+   * Present only when the Trae app's CURRENT sign-in differs from the
+   * account this plugin is bound to (issue #29): the card then offers a
+   * one-click follow instead of making the user hunt the account dropdown
+   * after every app-side sign-out. Absent in every other case — a healthy
+   * document costs no extra read beyond the accounts scan the document
+   * already runs.
+   */
+  appLogin?: TraeWebAppLogin;
   /**
    * Daily check-in state (CN only). Absent on the international region,
    * whose check-in surface does not exist — probed 2026-09-24: the
@@ -1853,6 +1930,14 @@ interface TraeUsageRouteOptions {
    * exhausted-account hint is simply not offered.
    */
   creditsOfAccount?(region: TraeRegion, accountId: string): Promise<TraeWebCredits | undefined>;
+  /**
+   * The account the Trae app is signed in to right now, when it differs from
+   * the bound one (issue #29). Optional: absent means the card's follow hint
+   * simply is not offered (a test harness or a host without the store's scan).
+   * Read-only — the HOST never rebinds from this value; the follow is a
+   * settings write, made by the card or by the host's follow switch.
+   */
+  liveLogin?(region: TraeRegion): Promise<TraeWebAppLogin | undefined>;
   /** The requested region's last-refreshed raw directory (one entry per upstream model). */
   displayModels(region: TraeRegion): readonly TraeModelInfo[];
   /** The user's model selection in the requested region, stored as model id (= Trae name). */
@@ -2030,6 +2115,26 @@ interface Config {
    * settings form can both read and write it.
    */
   showPointsInMainUi?: boolean;
+  /**
+   * Follow the Trae desktop app's CURRENT sign-in instead of staying bound to
+   * the account the user (or the default) picked earlier (issue #29).
+   *
+   * When the app switches accounts, the old binding kept billing the previous
+   * account forever while `dsh-connect-workbuddy` followed the app
+   * automatically — every Trae sign-out then needed a manual switch here. With
+   * this switch ON, each settings re-apply rebinds `accounts.<region>` to
+   * whatever the app is signed in to right now (the live login outranks the
+   * plugin's own refreshed copies, see `TraeCredentialStore.preferred`).
+   *
+   * OFF by default: an existing configuration keeps the strict bind it
+   * shipped with, because silently switching billing accounts is exactly what
+   * `current()`'s no-fallback rule exists to prevent — the user opts in. When
+   * OFF, the card still shows a one-click hint (its own settings write), so
+   * the report in #29 is solved on both paths without any behavior change
+   * nobody asked for. Declared volatile so the card's switch can read and
+   * write it on the 0.1.7 settings form.
+   */
+  followAppLogin?: boolean;
   /**
    * Per-region model state, keyed `cn` | `ai`. The CN and international apps
    * expose different rosters, so each keeps its own directory and selection
@@ -2088,4 +2193,4 @@ declare function asVolatile<S>(schema: S): S;
 declare const Config: z<Config>;
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_AI_PROVIDER, TRAE_CHECKIN_PATH, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODELS_TEST_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROBE_TIMEOUT_MS, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STATE_DB_FILENAME, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinClaim, type TraeCheckinStatus, type TraeContextBudget, type TraeCredential, TraeCredentialStore, TraeDelegatingUpstreamClient, type TraeDiscoveredModel, type TraeDiscoveredReasoning, type TraeEdition, TraeFallbackUpstreamClient, type TraeFallbackUpstreamOptions, type TraeFusionRawChatEnvelope, TraeGatedUpstreamClient, type TraeGatedUpstreamOptions, type TraeIdentity, type TraeInputModality, type TraeModelDetailRequest, type TraeModelInfo, type TraeModelProbeVerdict, type TraeModelsTestResponse, type TraeObservedModelConfig, type TraeProbeResult, type TraeProbeVerdict, TraeRawCapabilityController, type TraeRawCapabilityControllerOptions, type TraeRawCapabilitySnapshot, TraeRawCapabilityState, type TraeRawChatBehaviorConfig, type TraeRawChatCapability, type TraeRawChatClientOptions, type TraeRawChatConfig, type TraeRawChatFailureReason, type TraeRawChatRuntimeConfig, TraeRawChatUpstreamClient, type TraeRawDiagnostic, type TraeRawDiagnosticState, type TraeRawGateway, type TraeRawGatewayOptions, type TraeRawResolverResult, type TraeReasoningCapability, type TraeReasoningEffort, type TraeRefreshDevice, type TraeRegion, type TraeRegionGateways, TraeRegionState, type TraeShim, TraeSoloBridge, type TraeSoloClientOptions, TraeSoloRemoteCatalogClient, type TraeSoloRemoteCatalogOptions, TraeSoloUpstreamClient, type TraeStorageCandidate, type TraeStreamEvent, type TraeUpstreamClient, TraeUsageClient, type TraeUsageOptions, type TraeUsagePack, type TraeUsageRouteOptions, type TraeUsageSnapshot, type TraeUsageSummary, type TraeUsageView, type TraeWebActivity, type TraeWebCheckin, type TraeWebCheckinClaim, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, asVolatile, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyProbeError, classifyProbeResult, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, describeIdShape, describeNameShape, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, maskUserPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeBody, probeModelsSequentially, probeOneModel, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, settingsNamespaceOf, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStateDatabaseCandidates, traeStorageCandidates, traeWebUsage, traeWindowsAppNames, unwrapVolatile, unwrapVolatileDeep, withTraeRegion };
+export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, type RawChatDelta, type RawChatMessage, type RawChatTool, SseDecoder, type SseEvent, TRAE_AI_PROVIDER, TRAE_CHECKIN_PATH, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODELS_TEST_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROBE_TIMEOUT_MS, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STATE_DB_FILENAME, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, type TraeCheckinClaim, type TraeCheckinStatus, type TraeContextBudget, type TraeCredential, TraeCredentialStore, TraeDelegatingUpstreamClient, type TraeDiscoveredModel, type TraeDiscoveredReasoning, type TraeEdition, TraeFallbackUpstreamClient, type TraeFallbackUpstreamOptions, type TraeFusionRawChatEnvelope, TraeGatedUpstreamClient, type TraeGatedUpstreamOptions, type TraeIdentity, type TraeInputModality, type TraeModelDetailRequest, type TraeModelInfo, type TraeModelProbeVerdict, type TraeModelsTestResponse, type TraeObservedModelConfig, type TraeProbeResult, type TraeProbeVerdict, TraeRawCapabilityController, type TraeRawCapabilityControllerOptions, type TraeRawCapabilitySnapshot, TraeRawCapabilityState, type TraeRawChatBehaviorConfig, type TraeRawChatCapability, type TraeRawChatClientOptions, type TraeRawChatConfig, type TraeRawChatFailureReason, type TraeRawChatRuntimeConfig, TraeRawChatUpstreamClient, type TraeRawDiagnostic, type TraeRawDiagnosticState, type TraeRawGateway, type TraeRawGatewayOptions, type TraeRawResolverResult, type TraeReasoningCapability, type TraeReasoningEffort, type TraeRefreshDevice, type TraeRegion, type TraeRegionGateways, TraeRegionState, type TraeShim, TraeSoloBridge, type TraeSoloClientOptions, TraeSoloRemoteCatalogClient, type TraeSoloRemoteCatalogOptions, TraeSoloUpstreamClient, type TraeStorageCandidate, type TraeStreamEvent, type TraeUpstreamClient, TraeUsageClient, type TraeUsageOptions, type TraeUsagePack, type TraeUsageRouteOptions, type TraeUsageSnapshot, type TraeUsageSummary, type TraeUsageView, type TraeWebActivity, type TraeWebAppLogin, type TraeWebCheckin, type TraeWebCheckinClaim, type TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, asVolatile, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyProbeError, classifyProbeResult, classifyTraeRawChatFailure, configuredAccountsOf, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, describeIdShape, describeNameShape, discoveredCatalog, fallbackModelsFor, followAppLoginEnabled, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, maskUserPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeBody, probeModelsSequentially, probeOneModel, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, settingsNamespaceOf, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStateDatabaseCandidates, traeStorageCandidates, traeWebUsage, traeWindowsAppNames, unwrapVolatile, unwrapVolatileDeep, withTraeRegion };

package/lib/index.js

@@ -452,6 +452,202 @@ function createTraeAdapter(options) {
 	};
 }
 //#endregion
+//#region src/status-paths.ts
+/** Plugin-owned usage endpoint consumed by its browser half. */
+const TRAE_USAGE_PATH = "/plugins/dsh-connect-trae/usage";
+/** Plugin-owned live model refresh endpoint. */
+const TRAE_MODELS_REFRESH_PATH = "/plugins/dsh-connect-trae/models/refresh";
+/**
+* Plugin-owned availability probe: POST the model ids to test, get one verdict
+* per model. Unlike every read-only sibling this route SPENDS quota — a real
+* (minimal) chat call per model — so it is user-initiated only, and the card
+* labels the button as consuming a small amount.
+*/
+const TRAE_MODELS_TEST_PATH = "/plugins/dsh-connect-trae/models/test";
+/** Plugin-owned local account rescan endpoint. */
+const TRAE_ACCOUNTS_REFRESH_PATH = "/plugins/dsh-connect-trae/accounts/refresh";
+/**
+* General balance of EVERY account in a region, for the composer panel's table.
+*
+* Separate from the usage route on purpose: the usage document backs the
+* 5-minute readout, and multiplying its upstream reads by the account count
+* would charge a healthy account for something it never looks at — the same
+* principle that keeps `creditAlternatives` firing only when a balance hits
+* zero. This one is paid when the panel is actually opened, which is the only
+* place the table is shown.
+*/
+const TRAE_ACCOUNT_CREDITS_PATH = "/plugins/dsh-connect-trae/account-credits";
+/**
+* Plugin-owned daily check-in claim endpoint. POST, loopback-only, and the only
+* route in this plugin that changes upstream account state.
+*/
+const TRAE_CHECKIN_PATH = "/plugins/dsh-connect-trae/checkin";
+/** Query parameter naming the region a card request addresses. */
+const TRAE_REGION_PARAM = "region";
+/** Every region, in card tab order. */
+const TRAE_REGIONS = ["cn", "ai"];
+/**
+* Address one region's status route. The two regions are separate provider
+* stacks; every card request carries the region whose tab the user is on.
+*/
+function withTraeRegion(path, region) {
+	return `${path}?${TRAE_REGION_PARAM}=${region}`;
+}
+/**
+* Read the region parameter off a status-route URL. Absent means the domestic
+* tab (`cn`); a present-but-unknown value returns undefined so the route can
+* answer 400 instead of guessing.
+*/
+function regionOfTraeStatusUrl(url) {
+	const at = url.indexOf("?");
+	const value = at === -1 ? null : new URLSearchParams(url.slice(at + 1)).get(TRAE_REGION_PARAM);
+	if (value === null || value === "") return "cn";
+	return TRAE_REGIONS.includes(value) ? value : void 0;
+}
+/**
+* Peel ONE `{get(): T}` live reference, the shape DSH 0.1.7 delivers a
+* volatile-marked settings field as (see {@link unwrapVolatileDeep}).
+*/
+function unwrapVolatile(value) {
+	if (value !== null && typeof value === "object" && typeof value.get === "function") return value.get();
+	return value;
+}
+/**
+* Deep copy of a value with every `{get(): T}` live reference replaced by the
+* value it resolves to.
+*
+* DSH 0.1.7 hands volatile-marked fields back as live references, and a live
+* reference is still `typeof === 'object'` — so it passes a naive object check
+* and every lookup on it is `undefined`. Worse, spreading one (`{ ...ref }`)
+* does NOT read the field: it produces `{ get: <function> }`. Any merge that
+* spreads a resolved field to preserve its siblings — the card's "write one
+* region, keep the other" write, or the account map's spread — would otherwise
+* DROP every sibling and leak a function into the document.
+*
+* Both halves therefore unwrap before touching a resolved field. This lives in
+* the node-free host↔client bridge because the browser half needs it too.
+*
+* Non-reference values are recursed into so a nested volatile field is caught
+* as well; arrays and objects are rebuilt rather than mutated, so the caller's
+* value is never touched.
+*/
+function unwrapVolatileDeep(value) {
+	if (value === null || typeof value !== "object") return value;
+	if (typeof value.get === "function") return unwrapVolatileDeep(value.get());
+	if (Array.isArray(value)) return value.map((entry) => unwrapVolatileDeep(entry));
+	const source = value;
+	const out = {};
+	for (const key of Object.keys(source)) out[key] = unwrapVolatileDeep(source[key]);
+	return out;
+}
+/**
+* Read the per-region account selections out of a settings value.
+*
+* SHARED because `accounts` now has TWO writers: the card, and the composer
+* panel's account table (2.14.0). Two writers of one field must use one merge
+* rule, or they drift — and the rule is not obvious.
+*
+* Deep-unwraps first: on DSH 0.1.7 a volatile field arrives as a `{get(): T}`
+* live reference, which passes the `typeof === 'object'` check and would be
+* returned as if it were the map. Every lookup on it is then `undefined`, and
+* the merge (`{ ...configured, [region]: id }`) would spread a reference into
+* `{get: <function>}` — dropping the other region's selection and leaking a
+* function into the settings document.
+*/
+function configuredAccountsOf(configured) {
+	const accounts = unwrapVolatileDeep(configured)?.accounts;
+	return typeof accounts === "object" && accounts !== null ? accounts : {};
+}
+/**
+* Whether the host-side "follow the Trae app's sign-in" switch is on (issue
+* #29). Absent reads as OFF, so an existing configuration keeps the strict
+* bind it shipped with and the switch is an opt-in — the same opt-out
+* semantics as {@link regionEnabledOf}, for the same reason: a config written
+* before this field existed cannot ask for behavior it never declared.
+*
+* Reads the whole settings section (or the bare field); deep-unwraps first
+* because on DSH 0.1.7 a volatile field arrives as a `{get(): T}` live
+* reference, whose `typeof === 'object'` would otherwise pass a naive check.
+*/
+function followAppLoginEnabled(configured) {
+	return unwrapVolatileDeep(configured)?.followAppLogin === true;
+}
+/**
+* Build the next `regions` settings value for the card's save. The write
+* targets ONLY the signed-in account's region slot; every other region's slot
+* is carried over untouched, so switching accounts never clobbers the other
+* region's picks. Tolerates any stored shape (absent, non-object) by starting
+* from an empty document.
+*/
+function nextRegionSlots(regions, region, slot) {
+	const unwrapped = unwrapVolatileDeep(regions);
+	return {
+		...typeof unwrapped === "object" && unwrapped !== null && !Array.isArray(unwrapped) ? unwrapped : {},
+		[region]: slot
+	};
+}
+/**
+* Narrow a settings value to the `regions` map. Accepts EITHER the whole
+* settings section (`{ regions: {...}, ... }`) or the `regions` map itself, and
+* unwraps the former. This tolerance is deliberate: passing the whole section
+* where the map was expected was a real shipped bug — the lookup then read
+* `section['cn']` (absent), so the card's checkbox reported `true` forever and
+* clicking it appeared to do nothing even though the write succeeded.
+*
+* Unwraps live references first: on DSH 0.1.7 the `regions` field arrives as a
+* `{get(): T}` reference, which passes the `typeof === 'object'` check below
+* and would otherwise be returned as if it were the map — making every region
+* read back as absent (and the enabled flag read as "on" forever).
+*/
+function regionsMapOf(value) {
+	const unwrapped = unwrapVolatileDeep(value);
+	if (typeof unwrapped !== "object" || unwrapped === null || Array.isArray(unwrapped)) return {};
+	const record = unwrapped;
+	const nested = record["regions"];
+	if (typeof nested === "object" && nested !== null && !Array.isArray(nested)) return nested;
+	return record;
+}
+/** One region's stored slot as a plain object; any other shape reads as empty. */
+function regionSlotOf(value, region) {
+	const slot = unwrapVolatile(regionsMapOf(value)[region]);
+	return typeof slot === "object" && slot !== null && !Array.isArray(slot) ? slot : {};
+}
+/**
+* Whether one region's provider is switched on. Opt-out semantics: only an
+* explicit `false` disables it, so a config written before this switch existed
+* (and the pre-region-split flat fields, which never carry `enabled`) keep both
+* providers running exactly as before. The Host reads the same rule through
+* `regionStateOf`, so card and Host can never disagree about a region's state.
+*
+* `value` may be the whole settings section or the `regions` map (see
+* {@link regionsMapOf}).
+*/
+function regionEnabledOf(value, region) {
+	return regionSlotOf(value, region)["enabled"] !== false;
+}
+/**
+* Build the next `regions` settings value for a provider on/off toggle. ONLY
+* the target region's `enabled` flag changes: every other field of that slot
+* (its directory, selection, image opt-ins, context budgets) and every other
+* region's slot are carried over verbatim, so switching a provider off never
+* discards the user's model picks and switching it back on restores them.
+*
+* This is deliberately separate from {@link nextRegionSlots}: that helper
+* writes a whole slot from a signed-in tab's draft, while this one must work
+* for a region that is signed OUT — which is precisely the region a user wants
+* to switch off (no international install, no international account).
+*
+* `value` may be the whole settings section or the `regions` map; the RETURN
+* value is always the `regions` map, i.e. exactly what `settingsScope.set(
+* 'regions', ...)` needs.
+*/
+function nextRegionEnabled(value, region, enabled) {
+	return nextRegionSlots(regionsMapOf(value), region, {
+		...regionSlotOf(value, region),
+		enabled
+	});
+}
+//#endregion
 //#region src/decrypt.ts
 const TRAE_AUTH_STORAGE_KEY = "iCubeAuthInfo://icube.cloudide";
 const SALT_A = Uint8Array.from([
@@ -1171,13 +1367,52 @@ var TraeCredentialStore = class {
 		return this.edition === "auto" ? all.filter((candidate) => candidate.source === "desktop" || candidate.edition === cliEdition) : all.filter((candidate) => candidate.edition === this.edition && (candidate.source === "desktop" || candidate.edition === cliEdition));
 	}
 	/**
-	* Deterministic default when no account is explicitly selected: the first
-	* discovered account. This is NOT credit-seeking — it never reorders accounts
-	* to find one with general credits. The plugin bills exactly the account the
-	* user selected, or the first account when nothing has been selected yet.
+	* Deterministic default when no account is explicitly selected: the account
+	* the Trae desktop app is signed in to RIGHT NOW, else the first discovered
+	* one. This is NOT credit-seeking — it never reorders accounts to find one
+	* with general credits. The plugin bills exactly the account the user
+	* selected, the app's current sign-in when nothing has been selected, and
+	* only then the first account.
+	*
+	* The app's live sign-in outranks the plugin's own refreshed copies (issue
+	* #29): after the user switches accounts in Trae, the desktop storage file
+	* holds the NEW login while the plugin's copy of the old one still resolves,
+	* so a bare `credentials[0]` kept defaulting to a sign-in the app has
+	* abandoned — and `dsh-connect-workbuddy`, whose `preferred()` ranks the live
+	* file first, followed the app instead. Ordering only: the VALUE behind an
+	* account id is still whichever copy expires later (`readAll`), so a refresh
+	* the plugin performed is never discarded by this preference.
 	*/
 	preferred(credentials) {
-		return credentials[0];
+		return credentials.find((credential) => credential.source === "desktop") ?? credentials[0];
+	}
+	/**
+	* The account the Trae app is signed in to right now, when that differs from
+	* the account this store is bound to (issue #29).
+	*
+	* This is a READ, not a rebind: `current()` keeps resolving the bound
+	* account verbatim so billing never moves without a decision — the store
+	* only reports the mismatch, and the card (hint row) or the host (follow
+	* switch) turns it into a settings write the user can see and undo. Absent
+	* when nothing is live, when the live account IS the bound one, or when the
+	* binding itself already fell through to the live account.
+	*/
+	async liveLogin() {
+		if (this.accountId === void 0 || this.accountId === "") return void 0;
+		const credentials = await this.readAll();
+		const live = this.preferred(credentials);
+		if (live === void 0) return void 0;
+		const liveId = traeAccountId(live);
+		if (liveId === this.accountId) return void 0;
+		return {
+			id: liveId,
+			accountName: live.accountName ?? (live.userId || `${live.edition} account`),
+			edition: live.edition,
+			region: regionOfCredential(live),
+			source: live.source,
+			tokenExpiresAtMs: live.expiresAtMs,
+			selected: false
+		};
 	}
 	async accounts() {
 		const credentials = await this.readAll();
@@ -3927,170 +4162,6 @@ var TraeUsageClient = class {
 	}
 };
 //#endregion
-//#region src/status-paths.ts
-/** Plugin-owned usage endpoint consumed by its browser half. */
-const TRAE_USAGE_PATH = "/plugins/dsh-connect-trae/usage";
-/** Plugin-owned live model refresh endpoint. */
-const TRAE_MODELS_REFRESH_PATH = "/plugins/dsh-connect-trae/models/refresh";
-/**
-* Plugin-owned availability probe: POST the model ids to test, get one verdict
-* per model. Unlike every read-only sibling this route SPENDS quota — a real
-* (minimal) chat call per model — so it is user-initiated only, and the card
-* labels the button as consuming a small amount.
-*/
-const TRAE_MODELS_TEST_PATH = "/plugins/dsh-connect-trae/models/test";
-/** Plugin-owned local account rescan endpoint. */
-const TRAE_ACCOUNTS_REFRESH_PATH = "/plugins/dsh-connect-trae/accounts/refresh";
-/**
-* General balance of EVERY account in a region, for the composer panel's table.
-*
-* Separate from the usage route on purpose: the usage document backs the
-* 5-minute readout, and multiplying its upstream reads by the account count
-* would charge a healthy account for something it never looks at — the same
-* principle that keeps `creditAlternatives` firing only when a balance hits
-* zero. This one is paid when the panel is actually opened, which is the only
-* place the table is shown.
-*/
-const TRAE_ACCOUNT_CREDITS_PATH = "/plugins/dsh-connect-trae/account-credits";
-/**
-* Plugin-owned daily check-in claim endpoint. POST, loopback-only, and the only
-* route in this plugin that changes upstream account state.
-*/
-const TRAE_CHECKIN_PATH = "/plugins/dsh-connect-trae/checkin";
-/** Query parameter naming the region a card request addresses. */
-const TRAE_REGION_PARAM = "region";
-/** Every region, in card tab order. */
-const TRAE_REGIONS = ["cn", "ai"];
-/**
-* Address one region's status route. The two regions are separate provider
-* stacks; every card request carries the region whose tab the user is on.
-*/
-function withTraeRegion(path, region) {
-	return `${path}?${TRAE_REGION_PARAM}=${region}`;
-}
-/**
-* Read the region parameter off a status-route URL. Absent means the domestic
-* tab (`cn`); a present-but-unknown value returns undefined so the route can
-* answer 400 instead of guessing.
-*/
-function regionOfTraeStatusUrl(url) {
-	const at = url.indexOf("?");
-	const value = at === -1 ? null : new URLSearchParams(url.slice(at + 1)).get(TRAE_REGION_PARAM);
-	if (value === null || value === "") return "cn";
-	return TRAE_REGIONS.includes(value) ? value : void 0;
-}
-/**
-* Peel ONE `{get(): T}` live reference, the shape DSH 0.1.7 delivers a
-* volatile-marked settings field as (see {@link unwrapVolatileDeep}).
-*/
-function unwrapVolatile(value) {
-	if (value !== null && typeof value === "object" && typeof value.get === "function") return value.get();
-	return value;
-}
-/**
-* Deep copy of a value with every `{get(): T}` live reference replaced by the
-* value it resolves to.
-*
-* DSH 0.1.7 hands volatile-marked fields back as live references, and a live
-* reference is still `typeof === 'object'` — so it passes a naive object check
-* and every lookup on it is `undefined`. Worse, spreading one (`{ ...ref }`)
-* does NOT read the field: it produces `{ get: <function> }`. Any merge that
-* spreads a resolved field to preserve its siblings — the card's "write one
-* region, keep the other" write, or the account map's spread — would otherwise
-* DROP every sibling and leak a function into the document.
-*
-* Both halves therefore unwrap before touching a resolved field. This lives in
-* the node-free host↔client bridge because the browser half needs it too.
-*
-* Non-reference values are recursed into so a nested volatile field is caught
-* as well; arrays and objects are rebuilt rather than mutated, so the caller's
-* value is never touched.
-*/
-function unwrapVolatileDeep(value) {
-	if (value === null || typeof value !== "object") return value;
-	if (typeof value.get === "function") return unwrapVolatileDeep(value.get());
-	if (Array.isArray(value)) return value.map((entry) => unwrapVolatileDeep(entry));
-	const source = value;
-	const out = {};
-	for (const key of Object.keys(source)) out[key] = unwrapVolatileDeep(source[key]);
-	return out;
-}
-/**
-* Build the next `regions` settings value for the card's save. The write
-* targets ONLY the signed-in account's region slot; every other region's slot
-* is carried over untouched, so switching accounts never clobbers the other
-* region's picks. Tolerates any stored shape (absent, non-object) by starting
-* from an empty document.
-*/
-function nextRegionSlots(regions, region, slot) {
-	const unwrapped = unwrapVolatileDeep(regions);
-	return {
-		...typeof unwrapped === "object" && unwrapped !== null && !Array.isArray(unwrapped) ? unwrapped : {},
-		[region]: slot
-	};
-}
-/**
-* Narrow a settings value to the `regions` map. Accepts EITHER the whole
-* settings section (`{ regions: {...}, ... }`) or the `regions` map itself, and
-* unwraps the former. This tolerance is deliberate: passing the whole section
-* where the map was expected was a real shipped bug — the lookup then read
-* `section['cn']` (absent), so the card's checkbox reported `true` forever and
-* clicking it appeared to do nothing even though the write succeeded.
-*
-* Unwraps live references first: on DSH 0.1.7 the `regions` field arrives as a
-* `{get(): T}` reference, which passes the `typeof === 'object'` check below
-* and would otherwise be returned as if it were the map — making every region
-* read back as absent (and the enabled flag read as "on" forever).
-*/
-function regionsMapOf(value) {
-	const unwrapped = unwrapVolatileDeep(value);
-	if (typeof unwrapped !== "object" || unwrapped === null || Array.isArray(unwrapped)) return {};
-	const record = unwrapped;
-	const nested = record["regions"];
-	if (typeof nested === "object" && nested !== null && !Array.isArray(nested)) return nested;
-	return record;
-}
-/** One region's stored slot as a plain object; any other shape reads as empty. */
-function regionSlotOf(value, region) {
-	const slot = unwrapVolatile(regionsMapOf(value)[region]);
-	return typeof slot === "object" && slot !== null && !Array.isArray(slot) ? slot : {};
-}
-/**
-* Whether one region's provider is switched on. Opt-out semantics: only an
-* explicit `false` disables it, so a config written before this switch existed
-* (and the pre-region-split flat fields, which never carry `enabled`) keep both
-* providers running exactly as before. The Host reads the same rule through
-* `regionStateOf`, so card and Host can never disagree about a region's state.
-*
-* `value` may be the whole settings section or the `regions` map (see
-* {@link regionsMapOf}).
-*/
-function regionEnabledOf(value, region) {
-	return regionSlotOf(value, region)["enabled"] !== false;
-}
-/**
-* Build the next `regions` settings value for a provider on/off toggle. ONLY
-* the target region's `enabled` flag changes: every other field of that slot
-* (its directory, selection, image opt-ins, context budgets) and every other
-* region's slot are carried over verbatim, so switching a provider off never
-* discards the user's model picks and switching it back on restores them.
-*
-* This is deliberately separate from {@link nextRegionSlots}: that helper
-* writes a whole slot from a signed-in tab's draft, while this one must work
-* for a region that is signed OUT — which is precisely the region a user wants
-* to switch off (no international install, no international account).
-*
-* `value` may be the whole settings section or the `regions` map; the RETURN
-* value is always the `regions` map, i.e. exactly what `settingsScope.set(
-* 'regions', ...)` needs.
-*/
-function nextRegionEnabled(value, region, enabled) {
-	return nextRegionSlots(regionsMapOf(value), region, {
-		...regionSlotOf(value, region),
-		enabled
-	});
-}
-//#endregion
 //#region src/web-status.ts
 /**
 * The upstream's business code for "该设备今日已参与签到" — this DEVICE already
@@ -4233,6 +4304,10 @@ async function traeWebUsage(deps, region) {
 			message: safeMessage(error)
 		};
 	}
+	let appLogin;
+	try {
+		appLogin = await deps.liveLogin?.(region);
+	} catch {}
 	const account = {
 		accountId: accounts.find((item) => item.selected)?.id ?? "",
 		accountName: credential.accountName ?? credential.userId,
@@ -4240,6 +4315,7 @@ async function traeWebUsage(deps, region) {
 		region,
 		enabled,
 		accounts,
+		...appLogin === void 0 ? {} : { appLogin },
 		models: deps.displayModels(region).map((model) => ({
 			...model,
 			...model.input === void 0 ? {} : { input: [...model.input] }
@@ -4837,6 +4913,7 @@ const Config = z.object({
 	]).default("auto").description("Trae edition hint")),
 	accountId: z.string().description("Deprecated: pre-split account selector, attributed to its own region"),
 	showPointsInMainUi: asVolatile(z.boolean().default(false).description("在输入框工具栏显示积分读数「Trae CN · <数值>」（仅当选中的模型属于本插件时出现，可点击查看账号与积分明细）")),
+	followAppLogin: asVolatile(z.boolean().default(false).description("跟随 Trae 桌面端当前登录账号换绑（打开后每次配置生效时重绑到 App 现在登录的账号）")),
 	accounts: asVolatile(accountSelectionConfig.description("Per-region account selections, keyed cn | ai")),
 	regions: asVolatile(z.dict(regionStateConfig).default({}).description("Per-region model directory and selection, keyed cn | ai")),
 	lastCatalog: z.array(modelConfig).description("Deprecated: pre-region-split CN model directory"),
@@ -5092,6 +5169,49 @@ function apply(ctx, config) {
 			rawDiagnostic: () => rawDiagnostic()
 		};
 	}
+	/**
+	* The app's current sign-in when it differs from the bound account (issue
+	* #29). Pure read: the store resolves the bound account verbatim, so billing
+	* never moves from here — the card's hint and the follow switch below are
+	* the only writers.
+	*/
+	const liveLoginOf = async (region) => {
+		try {
+			const live = await stacks[region].store.liveLogin();
+			if (live === void 0 || live.region !== region) return void 0;
+			return {
+				id: live.id,
+				accountName: live.accountName,
+				edition: live.edition,
+				region: live.region
+			};
+		} catch {
+			return;
+		}
+	};
+	/**
+	* Persist `accounts.<region>` = the app's live sign-in and rebind the store
+	* (issue #29). The ONE Host-side path that moves the binding, driven by the
+	* follow switch in {@link maybeFollowAppLogin}; the card's one-click hint
+	* goes through its own settings write instead (one writer per path). Returns
+	* the applied login so the caller can report what moved.
+	*
+	* The write goes through `settings.update` (the volatile write gate), not a
+	* direct config mutation: `apply()` receives a snapshot, and the settings
+	* event (`loader/volatile-update`) is what re-runs `applySelection` with the
+	* updated document — the same channel every card write already uses.
+	*/
+	const followAppLogin = async (region) => {
+		const live = await liveLoginOf(region);
+		if (live === void 0 || writeSettings === void 0) return void 0;
+		const configured = configuredAccountsOf(current());
+		if (configured[region] === live.id) return live;
+		await writeSettings({ accounts: {
+			...configured,
+			[region]: live.id
+		} });
+		return live;
+	};
 	ctx.inject(["webServer"], (webCtx) => registerTraeUsageRoute(webCtx, {
 		store: (region) => stacks[region].store,
 		client: (region) => stacks[region].usageClient,
@@ -5101,7 +5221,8 @@ function apply(ctx, config) {
 		discoverModels: (region, signal) => stacks[region].discoverModels(signal),
 		probeModels: (region, ids) => stacks[region].probeModels(ids),
 		rawDiagnostic: (region) => stacks[region].rawDiagnostic(),
-		creditsOfAccount: (region, accountId) => stacks[region].creditsOfAccount(accountId)
+		creditsOfAccount: (region, accountId) => stacks[region].creditsOfAccount(accountId),
+		liveLogin: (region) => liveLoginOf(region)
 	}));
 	/**
 	* Live registration handles per region, filled once the shim is listening.
@@ -5157,13 +5278,59 @@ function apply(ctx, config) {
 			}
 		} catch {}
 	})();
+	let writeSettings;
 	ctx.inject(["settings"], (settingsCtx) => {
 		const settings = settingsCtx.settings;
 		ctx.effect(() => settings.configure({ auto: true }, ctx.fiber));
+		writeSettings = async (patch) => {
+			const revision = () => settings.describe().find((entry) => entry.ns === settingsNs)?.revision;
+			const conflict = (error) => typeof error === "object" && error !== null && error.code === "SETTINGS_CONFLICT";
+			try {
+				await settings.update(settingsNs, patch, revision());
+			} catch (error) {
+				if (!conflict(error)) throw error;
+				await settings.update(settingsNs, patch, revision());
+			}
+		};
+		ctx.effect(() => () => {
+			writeSettings = void 0;
+		});
 	});
 	ctx.on("loader/volatile-update", () => {
 		applySelection(current());
+		maybeFollowAppLogin();
 	});
+	/**
+	* Follow the app's sign-in on every settings change when the switch is ON
+	* (issue #29). Runs AFTER `applySelection` so this pass binds the previous
+	* document, reads the app's live login against it, and — if they differ —
+	* writes `accounts.<region>` once; that write emits `volatile-update` again,
+	* which re-runs `applySelection` on the NEW document. The loop terminates on
+	* its own the moment `liveLogin()` reports no mismatch (the second pass binds
+	* the live account, so `preferred` and `current` agree). The guard below
+	* additionally forbids two writes in flight, so a stuck mismatch can never
+	* turn into a write storm: the next settings change retries from scratch.
+	*
+	* The switch reads FALSE for an existing config (see {@link Config}), so a
+	* user who never opted in never gets a rebind — the card's one-click hint is
+	* their path instead.
+	*/
+	let followInFlight = false;
+	const maybeFollowAppLogin = async () => {
+		if (followInFlight || !followAppLoginEnabled(current())) return;
+		followInFlight = true;
+		try {
+			for (const region of REGION_KEYS) {
+				if (!regionEnabled(current(), region)) continue;
+				await followAppLogin(region);
+			}
+		} catch (error) {
+			ctx.logger.warn("dsh-connect-trae: follow-app-login rebind skipped", error);
+		} finally {
+			followInFlight = false;
+		}
+	};
+	maybeFollowAppLogin();
 	let stopped = false;
 	ctx.effect(() => () => {
 		stopped = true;
@@ -5245,4 +5412,4 @@ function apply(ctx, config) {
 	});
 }
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, SseDecoder, TRAE_AI_PROVIDER, TRAE_CHECKIN_PATH, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODELS_TEST_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROBE_TIMEOUT_MS, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STATE_DB_FILENAME, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, TraeCatalog, TraeCredentialStore, TraeDelegatingUpstreamClient, TraeFallbackUpstreamClient, TraeGatedUpstreamClient, TraeRawCapabilityController, TraeRawCapabilityState, TraeRawChatUpstreamClient, TraeSoloBridge, TraeSoloRemoteCatalogClient, TraeSoloUpstreamClient, TraeUsageClient, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, asVolatile, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyProbeError, classifyProbeResult, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, describeIdShape, describeNameShape, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, maskUserPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeBody, probeModelsSequentially, probeOneModel, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, settingsNamespaceOf, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStateDatabaseCandidates, traeStorageCandidates, traeWebUsage, traeWindowsAppNames, unwrapVolatile, unwrapVolatileDeep, withTraeRegion };
+export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, SseDecoder, TRAE_AI_PROVIDER, TRAE_CHECKIN_PATH, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODELS_TEST_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, TRAE_PROBE_TIMEOUT_MS, TRAE_PROVIDER, TRAE_PROVIDERS, TRAE_PROVIDER_DISPLAY_NAMES, TRAE_RAW_CHAT_V1_PATH, TRAE_RAW_CHAT_V2_PATH, TRAE_REASONING_EFFORTS, TRAE_REGIONS, TRAE_REGION_PARAM, TRAE_SETTINGS_NS, TRAE_SOLO_CHAT_PATH, TRAE_SOLO_FUNCTION, TRAE_SOLO_MODELS_PATH, TRAE_SOLO_REMOTE_BASE, TRAE_STATE_DB_FILENAME, TRAE_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, TraeCatalog, TraeCredentialStore, TraeDelegatingUpstreamClient, TraeFallbackUpstreamClient, TraeGatedUpstreamClient, TraeRawCapabilityController, TraeRawCapabilityState, TraeRawChatUpstreamClient, TraeSoloBridge, TraeSoloRemoteCatalogClient, TraeSoloUpstreamClient, TraeUsageClient, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, asVolatile, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyProbeError, classifyProbeResult, classifyTraeRawChatFailure, configuredAccountsOf, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, describeIdShape, describeNameShape, discoveredCatalog, fallbackModelsFor, followAppLoginEnabled, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, maskUserPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeBody, probeModelsSequentially, probeOneModel, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, settingsNamespaceOf, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStateDatabaseCandidates, traeStorageCandidates, traeWebUsage, traeWindowsAppNames, unwrapVolatile, unwrapVolatileDeep, withTraeRegion };

package/package.json

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