dsh-connect-trae 4.4.3 → 4.4.5

package/lib/client.js

@@ -411,6 +411,182 @@ window.__ModuleLoader__.load({
 			return tier !== void 0 && tier !== "" && !/^free$/i.test(tier);
 		}
 		//#endregion
+		//#region src/model-order.ts
+		/**
+		* Wire name of the default SOLO chat function.
+		*
+		* Lives here rather than in `solo.ts` so this module stays importable from the
+		* client; `solo.ts` re-exports it, so there is still exactly one definition.
+		*/
+		const TRAE_SOLO_FUNCTION = "solo_work_lite";
+		/**
+		* The chat functions of one region, in PRIORITY order.
+		*
+		* Two consumers read it, and both mean "priority", which is why they can share
+		* one array: the wire asks these functions in order and the first to list a
+		* config owns it (`solo.ts`), and the card draws the groups in the same order so
+		* the row a user sees first is the one the resolver prefers.
+		*/
+		const TRAE_CHANNEL_PRIORITY = {
+			cn: [
+				"solo_work_remote",
+				TRAE_SOLO_FUNCTION,
+				"solo_agent_remote",
+				"chat_v3",
+				"solo_coder"
+			],
+			ai: [
+				"solo_work_remote",
+				TRAE_SOLO_FUNCTION,
+				"solo_agent_remote",
+				"chat_v3"
+			]
+		};
+		/**
+		* Rank of one channel inside the region's priority list.
+		*
+		* Three cases, and the order between them is deliberate:
+		*
+		*  - a known chat channel: its index in the priority list;
+		*  - an UNKNOWN channel name (a function the region does not call through —
+		*    `withChatCallableFunctions` clears those, so this is a defensive branch):
+		*    after every known channel, then alphabetically among themselves;
+		*  - NO channel at all (a row demoted to the default chat function): last. Such
+		*    a row is the one the resolver knows least about, so it must not push a
+		*    properly attributed row down the list.
+		*/
+		function channelRank(channel, priority) {
+			if (channel === void 0 || channel === "") return priority.length + 1;
+			const known = priority.indexOf(channel);
+			return known === -1 ? priority.length : known;
+		}
+		/**
+		* Compare two display names the way a person reading a model list expects:
+		* case-insensitively, with embedded numbers compared as NUMBERS, so `GLM-5.10`
+		* sorts after `GLM-5.9`. Plain text comparison puts `5.10` first, which reads as
+		* a bug to anyone who sees the version numbers.
+		*/
+		function compareNames(left, right) {
+			const byName = left.trim().localeCompare(right.trim(), void 0, {
+				numeric: true,
+				sensitivity: "base"
+			});
+			return byName !== 0 ? byName : left.localeCompare(right);
+		}
+		/**
+		* The catalog in display order: channel priority first, then name.
+		*
+		* Total and stable — ties fall through to `id`, so two rows with the same name
+		* in the same channel still get one fixed order rather than the order they
+		* arrived in.
+		*/
+		function orderTraeModels(rows, region = "cn") {
+			const priority = TRAE_CHANNEL_PRIORITY[region] ?? TRAE_CHANNEL_PRIORITY.cn;
+			return [...rows].sort((left, right) => {
+				const byRank = channelRank(left.wireFunction, priority) - channelRank(right.wireFunction, priority);
+				if (byRank !== 0) return byRank;
+				if (left.wireFunction !== right.wireFunction) return (left.wireFunction ?? "").localeCompare(right.wireFunction ?? "");
+				const byName = compareNames(left.name, right.name);
+				return byName !== 0 ? byName : left.id.localeCompare(right.id);
+			});
+		}
+		/**
+		* Split rows into channel groups, in display order.
+		*
+		* Ordering is re-applied here rather than trusted from the caller: a group list
+		* built from an unsorted input would put the groups in arrival order, which is
+		* the exact instability this module exists to remove.
+		*/
+		function groupTraeModels(rows, region = "cn") {
+			const groups = [];
+			const byChannel = /* @__PURE__ */ new Map();
+			for (const row of orderTraeModels(rows, region)) {
+				const channel = row.wireFunction === "" ? void 0 : row.wireFunction;
+				const key = channel ?? "\0default";
+				const existing = byChannel.get(key);
+				if (existing !== void 0) {
+					existing.rows.push(row);
+					continue;
+				}
+				const group = {
+					channel,
+					rows: [row]
+				};
+				byChannel.set(key, group);
+				groups.push(group);
+			}
+			return groups;
+		}
+		/**
+		* Does one row match a search query?
+		*
+		* Matches the display name, the display id and the WIRE config name — the last
+		* one because a user debugging a `4001 config_name rejected` arrives with the
+		* upstream name in hand, and the two differ exactly on the rows that carry a
+		* suffix (`DeepSeek-V4-Flash` vs `DeepSeek-V4-Flash-Official`).
+		*/
+		function traeModelMatchesQuery(model, query) {
+			const needle = query.trim().toLowerCase();
+			if (needle === "") return true;
+			if (model.name.toLowerCase().includes(needle)) return true;
+			if (model.id.toLowerCase().includes(needle)) return true;
+			return (model.wireConfigName ?? "").toLowerCase().includes(needle);
+		}
+		/** Filter by {@link traeModelMatchesQuery}, preserving order. */
+		function filterTraeModels(rows, query) {
+			if (query.trim() === "") return [...rows];
+			return rows.filter((row) => traeModelMatchesQuery(row, query));
+		}
+		/**
+		* The channels a NORMAL Trae chat session actually runs on: the `solo_work_*`
+		* family, i.e. the panel's own chat modes.
+		*
+		* Deliberately not "every channel we can call". After issue #52 P1 the catalog
+		* is 34 rows and 10 of them are reachable only through a SPECIALIST channel:
+		* `solo_coder` (7: `Doubao-Seed-2.0-Code`, `glm-5.1`, `glm-5v-turbo`,
+		* `kimi-k2.5`, `minimax-m2.7`, `qwen-3.5`, `qwen-3.6-plus`), `chat_v3` (2:
+		* `kimi-k2.8-preview`, `qwen3.8-flash`) and `solo_agent_remote` (1:
+		* `Doubao-Seed-Code`). Measured 2026-10-23 on a live CN account. Those rows work
+		* — that is why P1 kept them — but they are not what Trae's main chat offers,
+		* and mixing them into the default view is exactly the "a code model answering a
+		* solo request" shape issue #52 asked about.
+		*/
+		const TRAE_COMMON_FUNCTIONS = {
+			cn: ["solo_work_remote", TRAE_SOLO_FUNCTION],
+			ai: ["solo_work_remote", TRAE_SOLO_FUNCTION]
+		};
+		/**
+		* The function a request for this row will NAME.
+		*
+		* A row with no `wireFunction` is not "unknown to the wire": the bridge sends
+		* the region default (`TRAE_SOLO_FUNCTION`), so for every question about where
+		* the turn goes, the default is the answer. The distinction still matters for
+		* DISPLAY (`groupTraeModels` keeps these in their own group, because their
+		* provenance — which directory group advertised them — really is unknown), but
+		* not for scope: a `solo_work_lite` turn is a normal chat turn either way.
+		*/
+		function traeModelCallChannel(model) {
+			const channel = model.wireFunction;
+			return channel === void 0 || channel === "" ? TRAE_SOLO_FUNCTION : channel;
+		}
+		/**
+		* Does this row belong to the view?
+		*
+		* Judged on {@link traeModelCallChannel}, never on `wireFunction` directly:
+		* otherwise the one row without a function (`doubao_1_8`, measured 2026-10-23)
+		* would fall OUT of the common view while being called through exactly the
+		* common channel it belongs to.
+		*/
+		function traeModelInView(model, view, region = "cn") {
+			if (view === "all") return true;
+			return (TRAE_COMMON_FUNCTIONS[region] ?? TRAE_COMMON_FUNCTIONS.cn).includes(traeModelCallChannel(model));
+		}
+		/** Keep the rows a view asks for, preserving order. */
+		function scopeTraeModels(rows, view, region = "cn") {
+			if (view === "all") return [...rows];
+			return rows.filter((row) => traeModelInView(row, view, region));
+		}
+		//#endregion
 		//#region src/promo.ts
 		/** Zone used when upstream omits `off_peak.time_zone` (CN accounts). */
 		const TRAE_PROMO_DEFAULT_TIME_ZONE = "Asia/Shanghai";
@@ -490,17 +666,39 @@ window.__ModuleLoader__.load({
 			if (price.beforeRate <= 0 || price.rate >= price.beforeRate) return void 0;
 			return Math.round(price.rate / price.beforeRate * 100);
 		}
+		/**
+		* The member price, but only when it beats the rate the badge is already showing.
+		*
+		* Two rates on the same base are two ways to reach one price: `member` quoting
+		* 0.06 beside a live 0.06 is not "another 5 折". Comparing the post-discount
+		* numbers is the only honest test — a branch with no rate cannot be shown to be
+		* cheaper, so it is not quoted at all.
+		*/
+		function cheaperMemberOf(price, discount) {
+			const member = discount.member;
+			if (member === void 0 || member.rate === void 0) return void 0;
+			if (price.rate === void 0 || member.rate >= price.rate) return void 0;
+			const discountPercent = discountOf(member);
+			if (discountPercent === void 0) return void 0;
+			return {
+				rate: member.rate,
+				discountPercent
+			};
+		}
 		function badgeOf(kind, price, discount, window) {
 			const discountPercent = discountOf(price);
 			if (discountPercent === void 0) return void 0;
-			const memberDiscountPercent = discount.member === void 0 ? void 0 : discountOf(discount.member);
+			const member = cheaperMemberOf(price, discount);
 			return {
 				kind,
 				discountPercent,
 				percentOff: 100 - discountPercent,
 				...price.beforeRate === void 0 ? {} : { beforeRate: price.beforeRate },
 				...price.rate === void 0 ? {} : { rate: price.rate },
-				...memberDiscountPercent === void 0 ? {} : { memberDiscountPercent },
+				...member === void 0 ? {} : {
+					memberDiscountPercent: member.discountPercent,
+					memberRate: member.rate
+				},
 				...window === void 0 ? {} : {
 					fromClock: clockOf(window.startMinute),
 					untilClock: clockOf(window.endMinute),
@@ -520,7 +718,8 @@ window.__ModuleLoader__.load({
 			const current = discount.current;
 			if (current !== void 0) {
 				if ((current.discountType ?? "none") !== "none" && (current.beforeRate === void 0 || current.rate === void 0 || current.rate < current.beforeRate)) {
-					const badge = badgeOf(kindOf(discount), current, discount);
+					const kind = kindOf(discount);
+					const badge = badgeOf(kind, current, discount, kind === "offPeak" ? runningWindow(discount, now, defaultTimeZone) : void 0);
 					if (badge !== void 0) return badge;
 				}
 			}
@@ -814,6 +1013,64 @@ window.__ModuleLoader__.load({
 .dsm-trae-models-head{display:flex;align-items:center;justify-content:space-between;gap:12px}
 .dsm-trae-models-title{margin:0;color:var(--dsw-alias-label-primary,#e6e6e6);font-size:14px;font-weight:600;line-height:20px}
 .dsm-trae-models-summary{margin:2px 0 0;color:var(--dsw-alias-label-tertiary,#999);font-size:12px;line-height:18px}
+/* CATALOG SHAPE (issue #52): search + channel groups.
+ *
+ * The catalog is the union of every Trae mode, so a flat list reads as "a mess
+ * of models" no matter how many rows it holds. The search box answers 「where is
+ * X」 and the group headers answer 「why are there so many」 — the header names the
+ * mode each row is actually called through, so the union is legible instead of
+ * merely long. Both are presentation only: no rule here changes what is saved. */
+.dsm-trae-models-search{display:flex;align-items:center;gap:10px;min-width:0}
+/* SCOPE CHIPS (issue #52, P2).
+ *
+ * A segmented pair, not two more dsm-btn-outline buttons: those are 30px tall
+ * and would compete with the section's own buttons, while this control is a
+ * filter on the list directly below it. aria-pressed carries the state, so the
+ * visual and the announced state cannot disagree. */
+.dsm-trae-models-view{display:flex;align-items:center;gap:2px;padding:2px;border-radius:8px;background:var(--dsw-alias-bg-layer-2,#232529);align-self:flex-start}
+.dsm-trae-models-view-opt{padding:4px 10px;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-tertiary,#9aa0a8);font-size:12px;line-height:17px;cursor:pointer;font-variant-numeric:tabular-nums;white-space:nowrap}
+.dsm-trae-models-view-opt:hover{color:var(--dsw-alias-label-secondary,#c6c9d0)}
+/* The pressed chip is bg-layer-3 on a bg-layer-2 track: the verified pair that
+ * reads as "this segment sits ON the control" in both themes. (bg-layer-1 was
+ * the first choice and is NOT a token DSH defines — the fallback would then win
+ * in both themes, the exact defect card-styles.spec.tsx exists to catch.) */
+.dsm-trae-models-view-opt[aria-pressed="true"]{background:var(--dsw-alias-bg-layer-3,#2e3136);color:var(--dsw-alias-label-primary,#e6e6e6);font-weight:600}
+.dsm-trae-models-view-opt:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:-2px}
+/* The follow-up line under a scoped list ("N enabled are outside this view") and
+ * the "show all" affordance inside it. Same 12px tertiary treatment as the hint
+ * line above the list, because it is the same kind of statement: a note about
+ * the list, not part of it. */
+.dsm-trae-models-note{margin:0;display:flex;align-items:center;gap:8px;flex-wrap:wrap;color:var(--dsw-alias-label-tertiary,#999);font-size:12px;line-height:18px}
+.dsm-trae-models-widen{margin-left:2px;padding:0;border:0;background:transparent;color:var(--dsw-alias-brand-primary,#5686fe);font-size:12px;line-height:18px;cursor:pointer;text-decoration:underline;text-underline-offset:2px}
+.dsm-trae-models-widen:hover{color:var(--dsw-alias-brand-primary,#5686fe);opacity:.8}
+.dsm-trae-models-widen:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:1px;border-radius:3px}
+.dsm-trae-models-search-input{flex:1 1 auto;min-width:0;padding:6px 10px;border-radius:8px;border:1px solid var(--dsw-alias-border-l2,#36373b);background:var(--dsw-alias-bg-layer-2,#232529);color:var(--dsw-alias-label-primary,#e6e6e6);font-size:13px;line-height:18px}
+.dsm-trae-models-search-input::placeholder{color:var(--dsw-alias-label-tertiary,#999)}
+.dsm-trae-models-search-input:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:-1px}
+.dsm-trae-models-search-count{flex:none;color:var(--dsw-alias-label-tertiary,#999);font-size:12px;line-height:18px;font-variant-numeric:tabular-nums}
+.dsm-trae-models-empty{margin:0;padding:14px 12px;color:var(--dsw-alias-label-tertiary,#999);font-size:12px;line-height:18px}
+.dsm-trae-model-group{display:block}
+.dsm-trae-model-group+.dsm-trae-model-group{border-top:1px solid var(--dsw-alias-border-l2,#36373b)}
+/* list-style:none + a drawn marker: the native triangle cannot be styled to
+   sit on the header's baseline, and Safari needs the -webkit- pseudo removed
+   separately. The marker is TEXT on purpose — an icon import would tie the card
+   to a host package for one glyph. */
+/* The header tint is a NEUTRAL overlay, not a DSH token: it has to sit one step
+   away from the row background in BOTH themes, and the only token the card may
+   use there (bg-layer-2) is what the rows already paint. A 6% grey wash is the
+   same "slightly recessed" relationship for a light and a dark surface. */
+.dsm-trae-model-group-head{display:flex;align-items:center;gap:8px;padding:7px 12px;cursor:pointer;background:rgba(127,127,127,.12);color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:12px;line-height:17px;font-weight:600;list-style:none}
+.dsm-trae-model-group-head::-webkit-details-marker{display:none}
+.dsm-trae-model-group-head::before{content:'▸';flex:none;width:9px;color:var(--dsw-alias-label-tertiary,#999);font-size:10px}
+.dsm-trae-model-group[open]>.dsm-trae-model-group-head::before{content:'▾'}
+.dsm-trae-model-group-head:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:-2px}
+.dsm-trae-model-group-name{flex:1 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsm-trae-model-group-count{flex:none;color:var(--dsw-alias-label-tertiary,#999);font-weight:400;font-variant-numeric:tabular-nums}
+/* The header separates itself from its FIRST row; between rows the generic
+   .dsm-trae-model+.dsm-trae-model hairline still applies, and between groups
+   the rule above does. Without this the first row of every group looked pasted
+   onto its header. */
+.dsm-trae-model-group-head+.dsm-trae-model{border-top:1px solid var(--dsw-alias-border-l2,#36373b)}
 /* EVERY model is on the page — no inner scroller, no max-height.
  *
  * A capped list with its own scrollbar was tried and rejected by the user: it
@@ -3588,6 +3845,26 @@ window.__ModuleLoader__.load({
 			return formatNumber(value);
 		}
 		/**
+		* Human name for one wire channel (issue #52, P0).
+		*
+		* The group header answers 「why is this list so long」 — because it is the union
+		* of several Trae modes — so it must name the mode, not print `solo_work_remote`.
+		* An unknown function falls through to its raw name on purpose: a channel this
+		* build does not know about is a fact worth showing rather than hiding behind
+		* 「其他」, and it is exactly what a bug report should quote.
+		*/
+		function modelChannelLabel(channel, t) {
+			if (channel === void 0) return t("row.modelsChannelDefault");
+			const key = {
+				solo_work_remote: "row.modelsChannelWorkRemote",
+				solo_work_lite: "row.modelsChannelWorkLite",
+				solo_agent_remote: "row.modelsChannelAgentRemote",
+				chat_v3: "row.modelsChannelChatV3",
+				solo_coder: "row.modelsChannelCoder"
+			}[channel];
+			return key === void 0 ? channel : t(key);
+		}
+		/**
 		* The verdict badge for one model, or null when it has not been tested.
 		*
 		* `unknown` renders as inconclusive, never as a failure: a throttle or a dropped
@@ -3660,7 +3937,8 @@ window.__ModuleLoader__.load({
 				until: badge.untilClock,
 				zone: badge.timeZone
 			}));
-			if (badge.memberDiscountPercent !== void 0) hints.push(t("row.promoHintMember", {
+			if (badge.memberDiscountPercent !== void 0 && badge.memberRate !== void 0) hints.push(t("row.promoHintMember", {
+				rate: String(badge.memberRate),
 				zhe: promoZhe$1(badge.memberDiscountPercent),
 				percent: String(100 - badge.memberDiscountPercent)
 			}));
@@ -3734,6 +4012,37 @@ window.__ModuleLoader__.load({
 			/** Per-region unsaved model edits; a draft on one tab is never dropped by
 			* switching to the other tab, only by that tab's discard/save. */
 			const [drafts, setDrafts] = (0, react.useState)({});
+			/**
+			* Search text over the model catalog (issue #52, P0).
+			*
+			* Kept in COMPONENT state, not in the draft: filtering what you look at is not
+			* an edit, so it must survive a save and must never make the card look dirty.
+			*/
+			const [modelQuery, setModelQuery] = (0, react.useState)("");
+			/**
+			* How much of the catalog the list shows (issue #52, P2).
+			*
+			* `common` is the DEFAULT because it answers the question the issue was filed
+			* with: 24 of the 34 rows are reachable from a normal `solo_work_*` chat turn,
+			* and the other 10 exist only on a specialist channel (`solo_coder` 7,
+			* `chat_v3` 2, `solo_agent_remote` 1 — measured 2026-10-23). The vendor's own
+			* picker shows 14–24 per mode, so 24 is the first list since P0 that looks
+			* like the client the reporter compared against.
+			*
+			* Nothing is REMOVED by this: the view is presentation only. Every action
+			* (「test all」, bulk context, the save) still ranges over the full catalog, and
+			* an enabled model that the view hides is called out below the list rather
+			* than silently dropped from the screen.
+			*/
+			const [modelView, setModelView] = (0, react.useState)("common");
+			/**
+			* Channel groups the user folded shut, keyed `panel|channel`.
+			*
+			* Stored as the EXCEPTION rather than the state of every group so the default
+			* stays 「open」: the catalog is short enough to read once grouped, and a
+			* default of "collapsed" would hide a model the user came to enable.
+			*/
+			const [closedModelGroups, setClosedModelGroups] = (0, react.useState)(/* @__PURE__ */ new Set());
 			const [saving, setSaving] = (0, react.useState)(false);
 			const [switchingAccount, setSwitchingAccount] = (0, react.useState)(false);
 			/** Region whose on/off checkbox write is in flight, so its box can't race. */
@@ -4489,6 +4798,47 @@ window.__ModuleLoader__.load({
 			const draft = drafts[activeRegion];
 			const visibleModels = draft?.models ?? (status.status === "signed-in" ? status.models : []);
 			/**
+			* The catalog as the card draws it: one fixed order, then the search filter,
+			* then split into the channels the rows will actually be called through
+			* (issue #52, P0).
+			*
+			* The ROLL is `orderTraeModels` and it is applied here as well as at
+			* discovery, because a catalog saved by an older build carries the arrival
+			* order — the very thing the reporter photographed. Re-sorting costs one
+			* comparison pass over ≤40 rows and makes the screen independent of which
+			* version wrote `lastCatalog`.
+			*
+			* Every action below still ranges over `visibleModels` (the whole catalog),
+			* never `shownModels`: 「test all」 and the bulk context buttons must act on all
+			* rows, not on whatever the search box happens to show.
+			*/
+			const modelRegion = regionOfPanel(activeRegion);
+			const orderedModels = orderTraeModels(visibleModels, modelRegion);
+			/**
+			* Scope, then search, then group — in that order, and each step answers a
+			* different question (P2): the view is 「how much of the catalog」, the query is
+			* 「which row」, the groups are 「where will the turn go」.
+			*
+			* SEARCH IS SCOPED TO THE VIEW. A global search would contradict the group
+			* headers the user is looking at (results from a channel that is not on
+			* screen), and scoping it means the empty state has to be honest about what it
+			* did not look at — see `matchesOutsideView`.
+			*/
+			const commonModels = scopeTraeModels(orderedModels, "common", modelRegion);
+			const scopedModels = modelView === "all" ? orderedModels : commonModels;
+			const commonModelCount = commonModels.length;
+			const shownModels = filterTraeModels(scopedModels, modelQuery);
+			const modelGroups = groupTraeModels(shownModels, modelRegion);
+			const modelQueryActive = modelQuery.trim() !== "";
+			/**
+			* Matches the query has in the FULL catalog while the view has none.
+			*
+			* Without this, searching `kimi` with the default view up would answer
+			* 「没有匹配」 for `kimi-k2.5`, which is on screen in 全部 — the one wrong
+			* answer a search box must not give. Zero means "genuinely absent".
+			*/
+			const matchesOutsideView = modelQueryActive && shownModels.length === 0 ? filterTraeModels(orderedModels, modelQuery).length : 0;
+			/**
 			* One clock reading for the whole model list.
 			*
 			* Promotion badges are judged against it (see `promoBadge`): reading the clock
@@ -4501,6 +4851,17 @@ window.__ModuleLoader__.load({
 			const activeEnabledIds = draft?.enabledIds ?? savedEnabledIds;
 			const activeImageIds = draft?.imageIds ?? savedImageIds;
 			/**
+			* Enabled rows this view does not draw.
+			*
+			* The view hides 10 rows by default; if the user had enabled some of them
+			* before this existed, their checkbox is not on the screen, so the ONLY honest
+			* options are "say they exist" or "let the screen imply they are off". The save
+			* path is already safe (it writes `activeEnabledIds` from state, never from the
+			* rendered checkboxes), so this is about not lying to the reader.
+			*/
+			const scopedIds = new Set(scopedModels.map((model) => model.id));
+			const enabledOutsideView = modelView === "all" ? [] : orderedModels.filter((model) => activeEnabledIds.has(model.id) && !scopedIds.has(model.id));
+			/**
 			* Effective image capability of one row, mirroring what the Host reports to
 			* DSH: the user's opt-in unioned with Trae's own `multimodal` flag (issue
 			* #16). Rendering the union is what keeps this checkbox truthful — showing the
@@ -4624,7 +4985,7 @@ window.__ModuleLoader__.load({
 					if (status.status !== "signed-in") return;
 					const nextSlot = {
 						enabled: regionOn(activeRegion),
-						lastCatalog: visibleModels.map((model) => ({
+						lastCatalog: orderedModels.map((model) => ({
 							...model,
 							input: ["text"],
 							...model.multimodal === void 0 ? {} : { multimodal: model.multimodal }
@@ -5088,79 +5449,177 @@ window.__ModuleLoader__.load({
 												role: "alert",
 												children: testError
 											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+											orderedModels.length > commonModelCount ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+												className: "dsm-trae-models-view",
+												role: "group",
+												"aria-label": t("row.modelsViewLabel"),
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													className: "dsm-trae-models-view-opt",
+													"aria-pressed": modelView === "common",
+													title: t("row.modelsViewCommonHint"),
+													onClick: () => {
+														setModelView("common");
+													},
+													children: t("row.modelsViewCommon", { count: commonModelCount })
+												}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													className: "dsm-trae-models-view-opt",
+													"aria-pressed": modelView === "all",
+													title: t("row.modelsViewAllHint"),
+													onClick: () => {
+														setModelView("all");
+													},
+													children: t("row.modelsViewAll", { count: orderedModels.length })
+												})]
+											}) : null,
+											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+												className: "dsm-trae-models-search",
+												children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+													type: "search",
+													className: "dsm-trae-models-search-input",
+													value: modelQuery,
+													placeholder: t("row.modelsSearchPlaceholder"),
+													"aria-label": t("row.modelsSearch"),
+													onChange: (event) => {
+														setModelQuery(event.target.value);
+														setClosedModelGroups(/* @__PURE__ */ new Set());
+													}
+												}), modelQueryActive ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+													className: "dsm-trae-models-search-count",
+													children: t("row.modelsSearchCount", {
+														shown: shownModels.length,
+														total: scopedModels.length
+													})
+												}) : null]
+											}),
+											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 												className: "dsm-trae-model-list",
-												children: visibleModels.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-													className: `dsm-trae-model${activeEnabledIds.has(model.id) ? "" : " dsm-trae-model-disabled"}`,
-													children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-														className: "dsm-trae-model-head",
-														children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-															className: "dsm-trae-model-enabled",
-															children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-																type: "checkbox",
-																checked: activeEnabledIds.has(model.id),
-																disabled: settingsScope?.getSnapshot().writable !== true || saving,
-																onChange: () => {
-																	toggleModel(model.id);
-																}
-															}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-																className: "dsm-trae-model-copy",
-																children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-																	className: "dsm-trae-model-name",
-																	children: [
-																		model.name,
-																		activeRegion === "enterprise" || model.creditMultiplier === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-																			className: "dsm-trae-model-name-rate",
-																			children: ["· x", model.creditMultiplier.toFixed(2)]
-																		}),
-																		probeBadge(probeByRegion[activeRegion][model.id], t)
-																	]
-																}), promoBadge(model, t, nowForPromo)]
+												children: [modelGroups.length === 0 ? matchesOutsideView > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+													className: "dsm-trae-models-empty",
+													children: [t("row.modelsSearchOutsideView", {
+														query: modelQuery.trim(),
+														count: matchesOutsideView
+													}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+														type: "button",
+														className: "dsm-trae-models-widen",
+														onClick: () => {
+															setModelView("all");
+														},
+														children: t("row.modelsViewShowAll")
+													})]
+												}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+													className: "dsm-trae-models-empty",
+													children: t("row.modelsSearchEmpty", { query: modelQuery.trim() })
+												}) : null, modelGroups.map((group) => {
+													const groupKey = `${activeRegion}|${group.channel ?? ""}`;
+													const groupOpen = modelQueryActive || !closedModelGroups.has(groupKey);
+													return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
+														className: "dsm-trae-model-group",
+														open: groupOpen,
+														onToggle: (event) => {
+															const open = event.currentTarget.open;
+															setClosedModelGroups((current) => {
+																if (open === !current.has(groupKey)) return current;
+																const next = new Set(current);
+																if (open) next.delete(groupKey);
+																else next.add(groupKey);
+																return next;
+															});
+														},
+														children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("summary", {
+															className: "dsm-trae-model-group-head",
+															children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																className: "dsm-trae-model-group-name",
+																children: modelChannelLabel(group.channel, t)
+															}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+																className: "dsm-trae-model-group-count",
+																children: t("row.modelsGroupCount", { count: group.rows.length })
 															})]
-														}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-															className: "dsm-trae-model-options",
-															children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-																className: "dsm-trae-model-image",
-																children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-																	type: "checkbox",
-																	checked: rowAcceptsImage(model),
-																	disabled: rowImageIsAutomatic(model) || settingsScope?.getSnapshot().writable !== true || saving,
-																	title: rowImageIsAutomatic(model) ? t("row.modelImageAuto") : void 0,
-																	onChange: () => {
-																		toggleImage(model.id);
-																	}
-																}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelImage") })]
-															}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
-																className: "dsm-trae-context-budget",
-																"aria-label": t("row.contextBudget"),
-																children: [model.maxContextWindow !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-																	type: "radio",
-																	name: `context-${model.id}`,
-																	checked: activeContextBudgets[model.id] !== model.maxContextWindow,
-																	disabled: settingsScope?.getSnapshot().writable !== true || saving,
-																	onChange: () => {
-																		setContextBudget(model.id, model.contextWindow);
-																	}
-																}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: formatCapacity(model.contextWindow, t("row.modelUnknown")) })] }) : null, /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-																	type: "radio",
-																	name: `context-${model.id}`,
-																	checked: model.maxContextWindow === void 0 || activeContextBudgets[model.id] === model.maxContextWindow,
-																	disabled: model.maxContextWindow === void 0 || settingsScope?.getSnapshot().writable !== true || saving,
-																	onChange: () => {
-																		setContextBudget(model.id, model.maxContextWindow);
-																	}
-																}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: formatCapacity(model.maxContextWindow ?? model.contextWindow, t("row.modelUnknown")) })] })]
+														}), group.rows.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+															className: `dsm-trae-model${activeEnabledIds.has(model.id) ? "" : " dsm-trae-model-disabled"}`,
+															children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+																className: "dsm-trae-model-head",
+																children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+																	className: "dsm-trae-model-enabled",
+																	children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+																		type: "checkbox",
+																		checked: activeEnabledIds.has(model.id),
+																		disabled: settingsScope?.getSnapshot().writable !== true || saving,
+																		onChange: () => {
+																			toggleModel(model.id);
+																		}
+																	}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+																		className: "dsm-trae-model-copy",
+																		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+																			className: "dsm-trae-model-name",
+																			children: [
+																				model.name,
+																				activeRegion === "enterprise" || model.creditMultiplier === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+																					className: "dsm-trae-model-name-rate",
+																					children: ["· x", model.creditMultiplier.toFixed(2)]
+																				}),
+																				probeBadge(probeByRegion[activeRegion][model.id], t)
+																			]
+																		}), promoBadge(model, t, nowForPromo)]
+																	})]
+																}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+																	className: "dsm-trae-model-options",
+																	children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+																		className: "dsm-trae-model-image",
+																		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+																			type: "checkbox",
+																			checked: rowAcceptsImage(model),
+																			disabled: rowImageIsAutomatic(model) || settingsScope?.getSnapshot().writable !== true || saving,
+																			title: rowImageIsAutomatic(model) ? t("row.modelImageAuto") : void 0,
+																			onChange: () => {
+																				toggleImage(model.id);
+																			}
+																		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelImage") })]
+																	}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("fieldset", {
+																		className: "dsm-trae-context-budget",
+																		"aria-label": t("row.contextBudget"),
+																		children: [model.maxContextWindow !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+																			type: "radio",
+																			name: `context-${model.id}`,
+																			checked: activeContextBudgets[model.id] !== model.maxContextWindow,
+																			disabled: settingsScope?.getSnapshot().writable !== true || saving,
+																			onChange: () => {
+																				setContextBudget(model.id, model.contextWindow);
+																			}
+																		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: formatCapacity(model.contextWindow, t("row.modelUnknown")) })] }) : null, /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+																			type: "radio",
+																			name: `context-${model.id}`,
+																			checked: model.maxContextWindow === void 0 || activeContextBudgets[model.id] === model.maxContextWindow,
+																			disabled: model.maxContextWindow === void 0 || settingsScope?.getSnapshot().writable !== true || saving,
+																			onChange: () => {
+																				setContextBudget(model.id, model.maxContextWindow);
+																			}
+																		}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: formatCapacity(model.maxContextWindow ?? model.contextWindow, t("row.modelUnknown")) })] })]
+																	})]
+																})]
+															}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+																className: "dsm-trae-model-meta",
+																children: [
+																	/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelContext", { context: formatCapacity(model.maxContextWindow ?? model.contextWindow, t("row.modelUnknown")) }) }),
+																	model.maxTokens === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelOutput", { output: formatCapacity(model.maxTokens, t("row.modelUnknown")) }) }),
+																	model.reasoning === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelReasoning", { efforts: model.reasoning.supported.join(" / ") }) })
+																]
 															})]
-														})]
-													}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-														className: "dsm-trae-model-meta",
-														children: [
-															/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelContext", { context: formatCapacity(model.maxContextWindow ?? model.contextWindow, t("row.modelUnknown")) }) }),
-															model.maxTokens === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelOutput", { output: formatCapacity(model.maxTokens, t("row.modelUnknown")) }) }),
-															model.reasoning === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("row.modelReasoning", { efforts: model.reasoning.supported.join(" / ") }) })
-														]
-													})]
-												}, model.id))
+														}, model.id))]
+													}, groupKey);
+												})]
+											}),
+											enabledOutsideView.length === 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+												className: "dsm-trae-models-note",
+												children: [t("row.modelsEnabledOutsideView", { count: enabledOutsideView.length }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+													type: "button",
+													className: "dsm-trae-models-widen",
+													onClick: () => {
+														setModelView("all");
+													},
+													children: t("row.modelsViewShowAll")
+												})]
 											}),
 											/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 												className: "dsm-trae-context-bulk",
@@ -6211,6 +6670,25 @@ window.__ModuleLoader__.load({
 			"row.modelsSummary": "{count} enabled",
 			"row.modelsRefresh": "Refresh from Trae",
 			"row.modelsRefreshing": "Refreshing models…",
+			"row.modelsSearch": "Search models",
+			"row.modelsSearchPlaceholder": "Search by name or config name",
+			"row.modelsSearchCount": "{shown} of {total}",
+			"row.modelsSearchEmpty": "No model matches 「{query}」.",
+			"row.modelsGroupCount": "{count}",
+			"row.modelsViewLabel": "Model scope",
+			"row.modelsViewCommon": "Common channels · {count}",
+			"row.modelsViewAll": "All · {count}",
+			"row.modelsViewCommonHint": "Models a normal SOLO workspace chat can call (solo_work_remote / solo_work_lite).",
+			"row.modelsViewAllHint": "Also includes models only offered by a specialist channel: solo_coder, chat_v3, solo_agent_remote.",
+			"row.modelsViewShowAll": "Show all",
+			"row.modelsSearchOutsideView": "No match for 「{query}」 on the common channels; the full catalog has {count}.",
+			"row.modelsEnabledOutsideView": "{count} enabled model(s) are not in this view.",
+			"row.modelsChannelWorkRemote": "SOLO workspace · remote",
+			"row.modelsChannelWorkLite": "SOLO workspace · default",
+			"row.modelsChannelAgentRemote": "SOLO agent · remote",
+			"row.modelsChannelChatV3": "Chat · v3",
+			"row.modelsChannelCoder": "Code · solo_coder",
+			"row.modelsChannelDefault": "No mode announced (calls solo_work_lite)",
 			"row.modelsTestEnabled": "Test enabled models",
 			"row.modelsTestAll": "Test all models",
 			"row.modelsTesting": "Testing {done}/{total}…",
@@ -6273,7 +6751,7 @@ window.__ModuleLoader__.load({
 			"row.promoOffPeak": "Off-peak {percent}% off",
 			"row.promoHintRate": "was {before} credits/Mtoken, now {rate}",
 			"row.promoHintWindow": "off-peak hours {from}–{until} ({zone})",
-			"row.promoHintMember": "subscription price is a further {percent}% off",
+			"row.promoHintMember": "subscription price is {rate} credits/Mtoken ({percent}% off)",
 			"row.modelEnabled": "Enabled",
 			"row.discard": "Discard changes",
 			"row.save": "Save",
@@ -6562,6 +7040,25 @@ window.__ModuleLoader__.load({
 			"row.modelsSummary": "已启用 {count} 个",
 			"row.modelsRefresh": "从 Trae 刷新",
 			"row.modelsRefreshing": "正在刷新模型…",
+			"row.modelsSearch": "搜索模型",
+			"row.modelsSearchPlaceholder": "按模型名或 config_name 搜索",
+			"row.modelsSearchCount": "{shown} / {total}",
+			"row.modelsSearchEmpty": "没有匹配「{query}」的模型。",
+			"row.modelsGroupCount": "{count} 个",
+			"row.modelsViewLabel": "模型范围",
+			"row.modelsViewCommon": "常用通道 · {count}",
+			"row.modelsViewAll": "全部 · {count}",
+			"row.modelsViewCommonHint": "普通 SOLO 工作区对话能调到的模型（solo_work_remote / solo_work_lite）。",
+			"row.modelsViewAllHint": "还包含只在专用通道提供的模型：solo_coder、chat_v3、solo_agent_remote。",
+			"row.modelsViewShowAll": "查看全部",
+			"row.modelsSearchOutsideView": "常用通道内没有匹配「{query}」的模型，全部目录里有 {count} 个。",
+			"row.modelsEnabledOutsideView": "另有 {count} 个已启用的模型不在此视图内。",
+			"row.modelsChannelWorkRemote": "SOLO 工作区 · 远程",
+			"row.modelsChannelWorkLite": "SOLO 工作区 · 默认",
+			"row.modelsChannelAgentRemote": "SOLO 智能体 · 远程",
+			"row.modelsChannelChatV3": "对话 · v3",
+			"row.modelsChannelCoder": "代码 · solo_coder",
+			"row.modelsChannelDefault": "未标注模式（走 solo_work_lite）",
 			"row.modelsTestEnabled": "一键测试启用模型",
 			"row.modelsTestAll": "一键测试所有模型",
 			"row.modelsTesting": "正在测试 {done}/{total}…",
@@ -6624,7 +7121,7 @@ window.__ModuleLoader__.load({
 			"row.promoOffPeak": "闲时 {zhe} 折",
 			"row.promoHintRate": "原价 {before} 积分/百万 token，现价 {rate}",
 			"row.promoHintWindow": "闲时时段 {from}–{until}（{zone}）",
-			"row.promoHintMember": "会员价另有 {zhe} 折",
+			"row.promoHintMember": "会员价 {rate} 积分/百万 token（{zhe} 折）",
 			"row.modelEnabled": "启用模型",
 			"row.discard": "放弃修改",
 			"row.save": "保存",
@@ -7041,7 +7538,8 @@ window.__ModuleLoader__.load({
 				until: badge.untilClock,
 				zone: badge.timeZone
 			}));
-			if (badge.memberDiscountPercent !== void 0) hints.push(fillPlaceholders(copy["row.promoHintMember"], {
+			if (badge.memberDiscountPercent !== void 0 && badge.memberRate !== void 0) hints.push(fillPlaceholders(copy["row.promoHintMember"], {
+				rate: String(badge.memberRate),
 				zhe: promoZhe(badge.memberDiscountPercent),
 				percent: String(100 - badge.memberDiscountPercent)
 			}));