dsh-connect-trae 2.10.0 → 3.0.1

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();
@@ -1266,13 +1501,16 @@ var TraeCredentialStore = class {
 	*/
 	async readAll() {
 		const { credentials: desktop } = await this.readDesktopAll();
-		const credentials = [...desktop.filter((credential) => this.matchesRegion(credential))];
-		for (const own of await this.readOwns()) {
-			if (!this.matchesRegion(own)) continue;
-			if (credentials.some((credential) => traeAccountId(credential) === traeAccountId(own))) continue;
-			credentials.push(own);
-		}
-		return credentials;
+		const byAccount = /* @__PURE__ */ new Map();
+		const consider = (credential) => {
+			if (!this.matchesRegion(credential)) return;
+			const id = traeAccountId(credential);
+			const incumbent = byAccount.get(id);
+			if (incumbent === void 0 || credential.expiresAtMs > incumbent.expiresAtMs) byAccount.set(id, credential);
+		};
+		for (const credential of desktop) consider(credential);
+		for (const own of await this.readOwns()) consider(own);
+		return [...byAccount.values()];
 	}
 	/**
 	* Which paths were tried and why each one failed. Read-only and token-free:
@@ -3924,159 +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";
-/**
-* 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
@@ -4219,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,
@@ -4226,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] }
@@ -4297,6 +4387,37 @@ async function creditAlternatives(deps, region, accounts) {
 * The region a request addresses, or a 400 answer. Absent parameter means the
 * domestic tab; an unknown value is refused rather than guessed.
 */
+/**
+* The general balance of every account in one region.
+*
+* One upstream read per account — the same call `creditsOfAccount` already
+* makes for the exhausted-balance alternatives, widened to every account and to
+* zero balances. Costs nothing until the composer panel is opened, so the
+* 5-minute readout never pays for it (see {@link TRAE_ACCOUNT_CREDITS_PATH}).
+*
+* An account whose read fails or is unavailable still appears, without a
+* figure: the table lists how many accounts exist even when one cannot be
+* quoted, rather than dropping it and making the switch unavailable.
+*/
+async function traeAccountCredits(deps, region) {
+	const accounts = (await deps.store(region).accounts()).filter((account) => account.region === region);
+	if (accounts.length === 0) return [];
+	return Promise.all(accounts.map(async (account) => {
+		let generalAvailable;
+		if (account.selected) try {
+			generalAvailable = toCredits(await deps.client(region).snapshot()).generalAvailable;
+		} catch {}
+		else if (deps.creditsOfAccount !== void 0) try {
+			generalAvailable = (await deps.creditsOfAccount(region, account.id))?.generalAvailable;
+		} catch {}
+		return {
+			id: account.id,
+			accountName: account.accountName,
+			selected: account.selected,
+			...generalAvailable === void 0 ? {} : { generalAvailable }
+		};
+	}));
+}
 function requestRegion(req, res) {
 	const region = regionOfTraeStatusUrl(req.url ?? "/");
 	if (region === void 0) {
@@ -4329,6 +4450,27 @@ function registerTraeUsageRoute(ctx, deps) {
 				}
 			}
 		});
+		/**
+		* General balance of every account in the region — read only when the
+		* composer panel is opened. One upstream read per account, paid once per
+		* open rather than on the 5-minute cycle (see
+		* {@link TRAE_ACCOUNT_CREDITS_PATH}).
+		*/
+		const disposeAccountCredits = ctx.webServer.register({
+			kind: "exact",
+			path: TRAE_ACCOUNT_CREDITS_PATH,
+			handler: async (req, res) => {
+				if (req.method !== "GET") return json(res, 405, { error: "method not allowed" });
+				if (!loopbackOrigin(req)) return json(res, 403, { error: "origin-not-trusted" });
+				const region = requestRegion(req, res);
+				if (region === void 0) return;
+				try {
+					json(res, 200, { accounts: await traeAccountCredits(deps, region) });
+				} catch (error) {
+					json(res, 500, { error: safeMessage(error) });
+				}
+			}
+		});
 		const disposeAccounts = ctx.webServer.register({
 			kind: "exact",
 			path: TRAE_ACCOUNTS_REFRESH_PATH,
@@ -4462,6 +4604,7 @@ function registerTraeUsageRoute(ctx, deps) {
 			disposeRefresh();
 			disposeModelsTest();
 			disposeAccounts();
+			disposeAccountCredits();
 			disposeUsage();
 		};
 	}, "dsh-connect-trae: Web usage route");
@@ -4769,7 +4912,8 @@ const Config = z.object({
 		"solo-sg"
 	]).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(true).description("在DSH主界面显示积分状态（可在侧边栏那一行上随时关闭）")),
+	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"),
@@ -5025,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,
@@ -5034,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.
@@ -5090,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;
@@ -5178,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 };