dsh-connect-trae 2.10.0 → 3.0.0

package/lib/index.d.ts

@@ -1689,15 +1689,6 @@ interface TraeWebAccount {
   tokenExpiresAtMs: number;
   selected: boolean;
 }
-/**
- * Another account on this machine that still has credit, surfaced only while
- * the BOUND account is exhausted (issue #25).
- *
- * The account switch is persisted, so a user whose bound account ran out sees
- * a permanently zeroed card with no explanation. This carries just enough to
- * name the alternative in the UI — identity plus the two CN credit buckets —
- * and is only ever produced by a read-only upstream call.
- */
 interface TraeWebCreditAlternative {
   id: string;
   accountName: string;
@@ -2023,19 +2014,20 @@ interface Config {
    */
   accounts?: Partial<Record<TraeRegion, string>>;
   /**
-   * Show the CN account's general credit balance as a permanent line at the
-   * bottom of the DSH sidebar (issue #26, contributed by JiewiW).
+   * Show the credit readout in the composer tool row: `Trae CN · <n>`, rendered
+   * ONLY while the session's selected model belongs to this plugin, clickable
+   * for the account/balances panel.
    *
-   * ON by default and opt-out since 2.9.1. It was opt-in first, on the theory
-   * that a user who never asked for a periodic usage read should not get one —
-   * but the switch lived only in the plugin card, and the card is not reachable
-   * in every host: a market plugin can own the Plugins tab and never dispatch
-   * `plugins.bundle.config`, so the line was permanently off with no discoverable
-   * way to turn it on. The line now carries its own on/off control in the
-   * sidebar, which is reachable exactly where the feature renders.
+   * This field first gated the sidebar credit line (issue #26, contributed by
+   * JiewiW); when that line was removed in 2.13.0 the composer readout replaced
+   * it and rendered unconditionally; 2.13.3 restores the switch, because the
+   * user went looking for it and a readout inside the SHARED composer row
+   * deserves the same opt-in the sidebar line had. The field is REUSED so an
+   * existing `true` keeps the readout on across the upgrade.
    *
-   * Declared volatile alongside `accounts`/`regions` so the settings form can
-   * both read and write it.
+   * OFF by default. The card's checkbox is the only writer, so exactly one path
+   * can change it. Declared volatile alongside `accounts`/`regions` so the
+   * settings form can both read and write it.
    */
   showPointsInMainUi?: boolean;
   /**

package/lib/index.js

@@ -1266,13 +1266,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:
@@ -3939,6 +3942,17 @@ 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.
 */
@@ -4297,6 +4311,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 +4374,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 +4528,7 @@ function registerTraeUsageRoute(ctx, deps) {
 			disposeRefresh();
 			disposeModelsTest();
 			disposeAccounts();
+			disposeAccountCredits();
 			disposeUsage();
 		};
 	}, "dsh-connect-trae: Web usage route");
@@ -4769,7 +4836,7 @@ 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 · <数值>」（仅当选中的模型属于本插件时出现，可点击查看账号与积分明细）")),
 	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"),

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-trae",
   "displayName": "DSH Connect Trae",
   "description": "把本机登录的 Trae 模型接入 DeepSeek Harness：国内版与国际版双供应商并行，提供用量/积分概览与每日签到领取。",
-  "version": "2.10.0",
+  "version": "3.0.0",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",
@@ -109,6 +109,7 @@
     "@testing-library/react": "^16.3.3",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.31",
+    "@types/react-dom": "^18.3.7",
     "@types/semver": "^7.7.0",
     "jsdom": "^25.0.1",
     "react": "^18.3.1",