dsh-connect-trae 2.0.4 → 2.0.6

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 2.0.6 (2026-09-22)
+
+### Features
+
+- **新增「可单独关闭任一版本的供应商」**（issue #11：用户问「能禁用国际版或国内版吗，有没有配置的地方」——「比如说我根本用不到国际版」）：
+  - **此前确实无解，而且最容易被误用的那条路走不通**：`edition` 配置只收窄**凭据扫描范围**（找账号用），不参与 provider 注册；`src/index.ts` 的注册循环对 `REGION_KEYS = ['cn','ai']` 是无条件注册的，所以设 `edition: "cn"` 之后 `trae-global` 依旧出现在模型选择器里。卸载国际版 App 同理——无账号时该区域回落到**插件内置的兜底目录**（Gemini / GPT / MiniMax / Kimi 共 7 条），这些模型一个都调不通，却和可用模型并排显示（这正是 issue #8 的成因）。DSH 侧也没有「停用某供应商」的入口。
+  - **交互**：设置卡片两个 tab 各带一个勾选，**默认都勾选**（老用户零感知）；取消勾选即关闭该供应商，重新勾选即恢复。
+  - **关闭是「真撤掉」，不是「藏 tab」**：抽掉 adapter 路由（`AdapterRegistrationHandle.replace([])`）——这是让模型**从 DSH 模型选择器消失**的那一步；同时抽掉供应商目录条目（`DirectoryRegistrationHandle.replace([])`），否则「设置 → 模型」仍会列出它。DSH 的类型契约明确允许持零路由而保持注册（"An empty array is legal here ... unlike an empty initial registration"），因此实现是**先正常注册、再 `replace([])`**，两步在同一同步段内完成，无可观测的路由空窗，且开关**立即生效、无需重启**。
+  - **顺带消掉一个失败面**：关闭的区域连启动时的模型目录拉取都跳过，不再发任何 Remote/SOLO 请求——「没装国际版每次启动报一次错」那类噪音一并消失。
+  - **状态不丢**：开关写入只改目标槽位的 `enabled` 一个字段，该区域的目录 / 勾选 / 图片开关 / 上下文预算与另一区域的整个槽位原样带过，所以「关掉 → 再打开」能完整恢复。配套地在卡片保存模型目录时**回写 `enabled`**——那次写入会替换整个槽位，漏掉它就会「保存一次模型列表 = 悄悄重新打开已关闭的供应商」。
+  - **已知代价（明确提示而非静默失败）**：若某会话此前选中了被关闭供应商的模型，路由撤掉后再调用会报 `NO_ADAPTER`；这是「彻底移除」的必然结果，卡片在该 tab 上给出明确文案说明设置均已保留、勾选即可恢复。
+  - **两侧读同一条规则**：Host 的 `regionEnabled()` 与卡片的 `regionEnabledOf()` 共用「仅显式 `false` 关闭」的判定，回归测试用 8 种正常/畸形形状交叉比对二者，锁定永不分歧；卡片另读 Host 随文档下发的 `enabled`（signed-in / signed-out 两个分支都带），因为**未登录的区域恰恰是用户最想关掉的那一个**。
+  - **修复开发期发现的「勾选点了没反应」**：卡片把**整个 settings 段**传给了只接受 **`regions` 子对象**的判定函数，于是它去查 `section['cn']`（不存在）并**永远返回 `true`**——复选框恒定显示为勾选、点击看起来毫无变化；而**写入其实已经成功**（设置里确实落下了 `enabled: false`），Host 侧路由也确实撤掉了，问题只在卡片的读取。修复方式不是「把参数改对」了事，而是让 `regionsMapOf()` 统一收口、**同时接受整段与子对象两种入参**，使传错一半在结构上不再可能静默返回 `true`；并补 2 条回归测试覆盖「整段入参」与「返回值必须是 `regions` 子对象」（把拆包逻辑改回原样，这 2 条立刻失败，已实测）。
+  - **补齐「真实点击」测试，堵住让该 bug 溜过的结构性缺口**：此前 `vitest.config.ts` 只收 `tests/**/*.spec.ts` 且 `environment: 'node'`，**根本无法渲染 React 组件**——仓库里唯一的客户端测试还是自己标注了 DRIFT WARNING 的「手工镜像副本」，不是产品代码，所以「点一下复选框」从来没有被自动化验证过（这正是 bug 能发布出去的原因）。现在 `tests/card-region-switch.spec.tsx` 在 jsdom 里渲染**真组件**、`fireEvent.click` 真实 `<input type="checkbox">`，断言 settings 落值与勾选态翻转，8 条用例覆盖空配置/已关闭/点击写入/重新启用保留选择/点第二个框/不切 tab/关闭态文案/不可写禁用。**变异验证**：把拆包逻辑改回出 bug 的样子，4 条立刻失败（含「存了 false 却显示已勾选」这一条，与用户症状一致）。配套：放开 `.spec.tsx`、`tsconfig` 分派、新增 `jsdom` / `@testing-library/react` / `@testing-library/dom` / `react-dom@18` 四个 devDependencies；`dsh-client-ui-primitives` 因带浏览器专用 CSS modules 在测试中整体 mock（产品依赖契约不变）。
+  - 新增 10 条回归测试（区域开关判定与两侧一致性、整段/子对象双入参、开关往返不丢状态、关闭后 `listProviders()` 与目录条目同步消失且不影响另一侧、**模型选择器分组也消失**、重启后仍生效、两个都关仍可恢复、旧配置两边都开、`enabled` 在两种文档分支都下发）。开发中做过**变异验证**：把「抽掉路由」改成「照常注册」（即只隐藏 tab 的假实现），集成测试立刻失败；把目录 `replace` 改回按区域调用，4 条测试失败；把整段入参的拆包逻辑去掉，2 条测试失败——测试确实咬得住。
+  - 取证与回复草稿：`docs/ISSUE11_DIAGNOSIS.md`、`docs/ISSUE11_REPLY_DRAFT.md`。
+
+## 2.0.5 (2026-09-22)
+
+### Fixes
+
+- **修复「缓存统计一直是 0」**（issue #10：用户反馈「我测试了一下一直0缓存」，并猜测是接口原因或 Trae 本身不缓存）：
+  - **根因在插件自己这一层**：Trae 上游**确实有前缀缓存、也确实在报**（实测逐字节相同的长 prompt 连发，第二次起 `cache_read_input_tokens` 从 0 升到 5248、9216），但插件解码 `token_usage` 事件时**只搬了 4 个计数器**（`prompt_tokens` / `completion_tokens` / `total_tokens` / `reasoning_tokens`），`cache_read_input_tokens` 与 `cache_creation_input_tokens` 被直接丢弃；`TraeStreamEvent.usage` 在**类型层就无法表达**这两个值，转发层自然也无从搬运。
+  - **不是「放行」就够，必须做字段名映射**：`dsh-llm-pi-ai` 只在 `usage.cacheRead > 0` 时写入 `cacheReadTokens`，而 pi-ai 的 `parseChunkUsage` 只识别 `prompt_tokens_details.cached_tokens` / `prompt_cache_hit_tokens` / `cached_tokens` 三种拼写——Trae 的原生字段名不在其中，原样透传依然读不到。现在映射为规范的 `prompt_tokens_details.cached_tokens` / `.cache_write_tokens`。
+  - **先确认了语义再动手**：pi-ai 会做 `input = prompt_tokens - cacheRead - cacheWrite`，该减法仅在「`prompt_tokens` 包含缓存量」（OpenAI 口径）时成立。实测同一份 prompt 的 `prompt_tokens` 恒为 9224 而 `cache_read` 从 5248 涨到 9216，若为 Anthropic 的排除口径则同一输入的实际规模会在 14472 → 18440 之间跳变，不可能——据此确认 Trae 用包含口径。端到端复核账目守恒：`8 + 9216 + 0 = 9224`，与 `prompt_tokens` 完全相等，无重复扣减。
+  - **`src/raw-chat.ts` 存在同一类缺口**（Raw Chat 通道将来启用时会踩同一个坑）：`RawChatDelta.usage` 补上缓存字段，并同时接受 OpenAI 嵌套拼写与 DeepSeek/Kimi 的顶层拼写。两个通道均保证「上游没报缓存时 wire 形状不变」，不产生空 `prompt_tokens_details`。
+  - 新增 4 个回归测试，其中 bridge 用例直接以真机捕获的 `token_usage` 事件原文作为输入。
+  - 取证与复现脚本：`docs/ISSUE10_DIAGNOSIS.md`、`scripts/probe-cache-convention.mjs`。
+  - **说明**：修复只保证「上游报了缓存就如实上报」。新会话/新前缀的第一轮必然 `cache_read=0`（冷启动），第二轮起才有值；实测 Trae 当前只报读不报写（`cache_creation_input_tokens` 恒为 0）。
+
 ## 2.0.4 (2026-09-16)
 
 ### Fixes

package/README.en.md

@@ -29,6 +29,7 @@ A [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness) bund
 ## Features
 
 - **Dual parallel providers** — the CN side registers as the `trae` provider (e.g. `DeepSeek-V4-Flash`, `DeepSeek-V4-Pro`), the international side as `trae-global` (the Gemini/GPT/MiniMax roster), and **both rosters appear in the DSH model picker simultaneously**: different sessions can each pick a side without interfering.
+- **Either side can be switched off** — each tab carries its own checkbox (both checked by default): unchecking **withdraws that provider from the DSH model picker entirely** (not merely hiding the tab) and stops all of its requests; checking it again restores it with the account, directory, picks, and context budgets intact. If you never use the international side, just uncheck it.
 - **Tabbed settings card** — the card's top carries a "Domestic / Global" tab bar; each tab holds its own account picker, usage overview, and model management. Account, directory, selection, and unsaved drafts are fully isolated per tab — switching accounts or refreshing models on one tab never touches the other side's runtime catalog or sessions.
 - **Multiplier in the model name** — model names show the credit multiplier in Trae's own menu format (e.g. `GLM-5.2 · x0.79`), updated with each directory refresh.
 - **DSH local tool loop** — gets pending structured `tool_calls` from Trae `llm_utils_chat`, lets DSH execute its own local tools, then returns tool results to the model.

package/README.md

@@ -29,6 +29,7 @@
 ## 功能特性
 
 - **双供应商并行接入** —— 国内版注册为 DSH 的 `trae` provider（`DeepSeek-V4-Flash`、`DeepSeek-V4-Pro` 等），国际版注册为 `trae-global`（Gemini / GPT / MiniMax 阵容），**两边模型同时出现在 DSH 模型选择器里**：不同会话可以各选一边，互不干扰。
+- **可单独关闭任一版本** —— 两个 tab 各带一个勾选（默认都勾选）：取消勾选即把该版本的供应商**整个从 DSH 模型选择器撤掉**（不是只藏起 tab），并且不再发起任何请求；重新勾选即恢复，账号、目录、勾选与上下文预算全部保留。用不到国际版就把国际版关掉即可。
 - **插件卡片 tab 切换** —— 设置卡片顶部为「国内版 / 国际版」两个 tab，各含独立的账号选择、用量概览与模型管理；每个 tab 的账号、目录、勾选与未保存草稿完全隔离——在一个 tab 里切账号或刷新模型，不会触碰另一边的运行时目录与会话。
 - **倍率内嵌模型名** —— 模型名称按 Trae 自身菜单的格式显示积分倍率（如 `GLM-5.2 · x0.79`），倍率随目录刷新更新。
 - **DSH 本地工具循环** —— 通过 Trae `llm_utils_chat` 获取待执行的结构化 `tool_calls`，交由 DSH 自带的本地工具执行，再将工具结果回传模型。

package/lib/client.js

@@ -38,6 +38,61 @@ window.__ModuleLoader__.load({
 				[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.
+		*/
+		function regionsMapOf(value) {
+			if (typeof value !== "object" || value === null || Array.isArray(value)) return {};
+			const record = value;
+			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 = 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/client/icon.ts
 		/**
@@ -77,12 +132,18 @@ window.__ModuleLoader__.load({
 .dsm-btn-primary:hover:not(:disabled){opacity:.9}
 .dsm-trae-usage{display:flex;flex-direction:column;gap:16px;margin:0;padding:16px 0 4px}
 .dsm-trae-tabs{display:flex;gap:6px;padding:4px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:10px;background:var(--dsw-alias-bg-layer-3,#2a2c33)}
-.dsm-trae-tab{appearance:none;font:inherit;cursor:pointer;flex:1;border:0;border-radius:7px;padding:7px 10px;color:var(--dsw-alias-label-tertiary,#999);font-size:13px;font-weight:500;line-height:18px;background:transparent;transition:color .15s,background .15s;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.dsm-trae-tab-cell{display:flex;align-items:center;gap:2px;flex:1;min-width:0}
+.dsm-trae-tab{appearance:none;font:inherit;cursor:pointer;flex:1;min-width:0;border:0;border-radius:7px;padding:7px 10px;color:var(--dsw-alias-label-tertiary,#999);font-size:13px;font-weight:500;line-height:18px;background:transparent;transition:color .15s,background .15s;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
 .dsm-trae-tab:hover:not(:disabled):not(.dsm-trae-tab-active){color:var(--dsw-alias-label-primary,#e6e6e6)}
 .dsm-trae-tab:focus-visible{outline:2px solid var(--dsw-alias-brand-primary,#5686fe);outline-offset:1px}
 .dsm-trae-tab-active{color:var(--dsw-alias-label-primary,#e6e6e6);background:var(--dsw-alias-bg-layer-2,#232529);box-shadow:inset 0 0 0 1px var(--dsw-alias-border-l2,#3a3d45)}
+.dsm-trae-tab-off{opacity:.55}
+.dsm-trae-tab-switch{display:inline-flex;align-items:center;flex:none;padding:0 8px 0 2px;cursor:pointer}
+.dsm-trae-tab-switch input{margin:0;cursor:pointer;accent-color:var(--dsw-alias-brand-primary,#5686fe)}
+.dsm-trae-tab-switch input:disabled{cursor:not-allowed}
 .dsm-trae-tab-dot{display:inline-block;width:7px;height:7px;border-radius:50%;margin-right:6px;vertical-align:baseline}
 .dsm-trae-tab-hint{margin:0;color:var(--dsw-alias-label-tertiary,#999);font-size:12px;line-height:18px}
+.dsm-trae-tab-off-notice{margin:0;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:10px;color:var(--dsw-alias-label-secondary,#c6c9d0);font-size:12px;line-height:18px;background:var(--dsw-alias-bg-layer-3,#2a2c33)}
 .dsm-trae-usage-account{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 14px;border:1px solid var(--dsw-alias-border-l2,#3a3d45);border-radius:14px;background:var(--dsw-alias-bg-layer-2,#24262c)}
 .dsm-trae-usage-account-copy{display:flex;flex-direction:column;gap:3px;min-width:0}
 .dsm-trae-usage-expiry{padding-left:19px;color:var(--dsw-alias-label-tertiary,#9aa0a8);font-size:12px;line-height:18px}
@@ -223,6 +284,8 @@ window.__ModuleLoader__.load({
 			const [drafts, setDrafts] = (0, react.useState)({});
 			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. */
+			const [togglingRegion, setTogglingRegion] = (0, react.useState)(void 0);
 			const mounted = (0, react.useRef)(true);
 			(0, react.useEffect)(() => {
 				mounted.current = true;
@@ -233,6 +296,21 @@ window.__ModuleLoader__.load({
 			(0, react.useEffect)(() => settingsScope?.subscribe(() => {
 				setSettingsRevision((value) => value + 1);
 			}), [settingsScope]);
+			/**
+			* Whether one region's provider is switched on, read off the SAME committed
+			* settings document the Host reads (`regionEnabledOf` mirrors the Host's
+			* `regionStateOf` opt-out rule: only an explicit `false` disables). Reading
+			* the stored value rather than echoing local state means a rejected write,
+			* another window's change, or a restart all converge on the truth.
+			*
+			* The whole settings section is passed deliberately: `regionEnabledOf`
+			* accepts either it or the bare `regions` map, because passing the section
+			* where the map was expected was a shipped bug (the lookup read
+			* `section['cn']`, found nothing, and reported `true` forever — the checkbox
+			* stayed checked and clicking it appeared dead while the write succeeded).
+			*/
+			const regionOn = (item) => regionEnabledOf(settingsScope?.getSnapshot().value, item);
+			const activeRegionOn = regionOn(activeRegion);
 			const refreshUsage = (0, react.useCallback)(async (region, signal) => {
 				try {
 					const response = await fetch(withTraeRegion(TRAE_USAGE_PATH, region), {
@@ -260,7 +338,7 @@ window.__ModuleLoader__.load({
 				}
 			}, [t]);
 			(0, react.useEffect)(() => {
-				if (!open) return;
+				if (!open || !activeRegionOn) return;
 				const controller = new AbortController();
 				refreshUsage(activeRegion, controller.signal);
 				return () => {
@@ -269,6 +347,7 @@ window.__ModuleLoader__.load({
 			}, [
 				open,
 				activeRegion,
+				activeRegionOn,
 				refreshUsage
 			]);
 			const status = statusByRegion[activeRegion] ?? {
@@ -276,7 +355,7 @@ window.__ModuleLoader__.load({
 				accounts: []
 			};
 			(0, react.useEffect)(() => {
-				if (!open || status.status !== "signed-in") return;
+				if (!open || !activeRegionOn || status.status !== "signed-in") return;
 				const controller = new AbortController();
 				const timer = window.setInterval(() => {
 					refreshUsage(activeRegion, controller.signal);
@@ -288,6 +367,7 @@ window.__ModuleLoader__.load({
 			}, [
 				open,
 				activeRegion,
+				activeRegionOn,
 				refreshUsage,
 				status.status
 			]);
@@ -326,6 +406,22 @@ window.__ModuleLoader__.load({
 					if (mounted.current) setSwitchingAccount(false);
 				}
 			};
+			/**
+			* Switch one region's provider off or on (issue #11). The write carries the
+			* region's whole slot through untouched — only `enabled` changes — so the
+			* user's directory, model picks, image opt-ins and budgets survive a
+			* round trip. The Host withdraws or restores the provider route on the next
+			* `onChange`, which is what actually removes it from DSH's model picker.
+			*/
+			const toggleRegion = async (item, enabled) => {
+				if (settingsScope === void 0 || settingsScope.getSnapshot().writable !== true) return;
+				setTogglingRegion(item);
+				try {
+					await settingsScope.set("regions", nextRegionEnabled(settingsScope.getSnapshot().value, item, enabled));
+				} finally {
+					if (mounted.current) setTogglingRegion(void 0);
+				}
+			};
 			const refreshModels = async () => {
 				setBusy(true);
 				try {
@@ -443,6 +539,7 @@ window.__ModuleLoader__.load({
 				try {
 					if (status.status !== "signed-in") return;
 					await settingsScope.set("regions", nextRegionSlots(configuredRegions, activeRegion, {
+						enabled: regionOn(activeRegion),
 						lastCatalog: visibleModels.map((model) => ({
 							...model,
 							input: ["text"]
@@ -503,19 +600,36 @@ window.__ModuleLoader__.load({
 								"aria-label": title,
 								children: TRAE_REGIONS.map((item) => {
 									const regionStatus = statusByRegion[item];
-									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-										type: "button",
-										role: "tab",
-										"aria-selected": item === activeRegion,
-										className: `dsm-trae-tab${item === activeRegion ? " dsm-trae-tab-active" : ""}`,
-										onClick: () => {
-											setActiveRegion(item);
-										},
-										children: [regionStatus === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											"aria-hidden": "true",
-											className: "dsm-trae-tab-dot",
-											style: dotStyle(regionStatus.status)
-										}), item === "cn" ? t("row.tabCn") : t("row.tabAi")]
+									const on = regionOn(item);
+									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsm-trae-tab-cell",
+										role: "presentation",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+											type: "button",
+											role: "tab",
+											"aria-selected": item === activeRegion,
+											className: `dsm-trae-tab${item === activeRegion ? " dsm-trae-tab-active" : ""}${on ? "" : " dsm-trae-tab-off"}`,
+											onClick: () => {
+												setActiveRegion(item);
+											},
+											children: [regionStatus === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												"aria-hidden": "true",
+												className: "dsm-trae-tab-dot",
+												style: dotStyle(regionStatus.status)
+											}), item === "cn" ? t("row.tabCn") : t("row.tabAi")]
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("label", {
+											className: "dsm-trae-tab-switch",
+											title: t("row.tabSwitchHint"),
+											children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+												type: "checkbox",
+												checked: on,
+												disabled: settingsScope?.getSnapshot().writable !== true || togglingRegion !== void 0,
+												"aria-label": t("row.tabSwitchAria", { region: item === "cn" ? t("row.tabCn") : t("row.tabAi") }),
+												onChange: (event) => {
+													toggleRegion(item, event.currentTarget.checked);
+												}
+											})
+										})]
 									}, item);
 								})
 							}),
@@ -523,6 +637,11 @@ window.__ModuleLoader__.load({
 								className: "dsm-trae-tab-hint",
 								children: t("row.tabHint")
 							}),
+							regionOn(activeRegion) ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsm-trae-tab-off-notice",
+								role: "status",
+								children: t("row.tabOffNotice")
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "dsm-trae-usage-account",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -850,6 +969,9 @@ window.__ModuleLoader__.load({
 			"row.tabCn": "Domestic",
 			"row.tabAi": "Global",
 			"row.tabHint": "Each tab is a separate provider (trae / trae-global) with its own account, usage, and models. Both sides are live at once: different sessions can pick from either side, and changes on one tab never touch the other.",
+			"row.tabSwitchHint": "Uncheck to switch this provider off. Its models disappear from the DSH model picker; its account, usage, and model settings are kept and return when you check it again.",
+			"row.tabSwitchAria": "Offer the {region} provider to DSH",
+			"row.tabOffNotice": "This provider is switched off: none of its models are offered to DSH. Your account, usage, and model settings are kept — check the box above the tab to bring it back.",
 			"row.signedOut": "Not signed in",
 			"row.signedOutHint": "Sign in once in the Trae desktop app; this plugin follows that sign-in automatically.",
 			"row.searchedTitle": "Paths checked",
@@ -915,6 +1037,9 @@ window.__ModuleLoader__.load({
 			"row.tabCn": "国内版",
 			"row.tabAi": "国际版",
 			"row.tabHint": "每个 tab 是一个独立供应商（trae / trae-global），各有自己的账号、用量与模型。两边同时生效：不同会话可各选一边，一侧的改动不影响另一侧。",
+			"row.tabSwitchHint": "取消勾选即关闭该供应商：它的模型不再出现在 DSH 模型选择器里；账号、用量与模型设置都会保留，重新勾选即恢复。",
+			"row.tabSwitchAria": "是否向 DSH 提供{region}供应商",
+			"row.tabOffNotice": "该供应商已关闭：它的模型不会提供给 DSH。账号、用量与模型设置均已保留——勾选上方复选框即可恢复。",
 			"row.signedOut": "未登录",
 			"row.signedOutHint": "在 Trae 桌面 App 里登录一次即可，插件会自动跟随当前登录的账号。",
 			"row.searchedTitle": "已检查的路径",

package/lib/index.d.ts

@@ -760,6 +760,10 @@ type RawChatDelta = {
   inputTokens?: number;
   outputTokens?: number;
   totalTokens?: number;
+  /** Cache-read tokens (`prompt_tokens_details.cached_tokens` / `cached_tokens`). */
+  cacheReadTokens?: number;
+  /** Cache-write tokens (`prompt_tokens_details.cache_write_tokens`). */
+  cacheWriteTokens?: number;
 } | {
   type: 'done';
   finishReason: string;
@@ -1018,6 +1022,17 @@ type TraeStreamEvent = {
   outputTokens?: number;
   totalTokens?: number;
   reasoningTokens?: number;
+  /**
+   * Trae's prompt-cache accounting (`cache_read_input_tokens` /
+   * `cache_creation_input_tokens` on the `token_usage` event). Verified
+   * 2026-09-22 (docs/ISSUE10_DIAGNOSIS.md): a byte-identical 9224-token
+   * prompt reports `prompt_tokens: 9224` while `cache_read_input_tokens`
+   * rises to 9216, so these are a *subset* of `prompt_tokens` — the OpenAI
+   * convention, not Anthropic's exclusive one. Forwarding them as
+   * `cached_tokens` is therefore arithmetically correct.
+   */
+  cacheReadTokens?: number;
+  cacheWriteTokens?: number;
 } | {
   type: 'done';
   finishReason: string;
@@ -1331,6 +1346,42 @@ interface TraeWebSearchPath {
   reason: 'missing' | 'unreadable' | 'invalid';
   message?: string;
 }
+/**
+ * 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.
+ */
+declare function nextRegionSlots<Slot extends object>(regions: unknown, region: TraeRegion, slot: Slot): Record<string, unknown>;
+/**
+ * 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}).
+ */
+declare function regionEnabledOf(value: unknown, region: TraeRegion): boolean;
+/**
+ * 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.
+ */
+declare function nextRegionEnabled(value: unknown, region: TraeRegion, enabled: boolean): Record<string, unknown>;
 /** Subscription status of an international (ai) account, rendered instead of the CN credit packs. */
 interface TraeWebPayStatus {
   isDollarUsageBilling: boolean;
@@ -1354,6 +1405,7 @@ type TraeWebUsage = {
   accounts: readonly TraeWebAccount[];
   message?: string;
   searched?: readonly TraeWebSearchPath[];
+  enabled?: boolean;
 } | {
   status: 'signed-in';
   accountId: string;
@@ -1361,6 +1413,8 @@ type TraeWebUsage = {
   tokenExpiresAtMs: number;
   /** Which per-region model directory and selection this account owns. */
   region: TraeRegion;
+  /** Whether this region's provider is currently offered to DSH. */
+  enabled?: boolean;
   accounts: readonly TraeWebAccount[];
   models: readonly TraeWebModel[];
   enabledModelIds: readonly string[];
@@ -1395,6 +1449,12 @@ interface TraeUsageRouteOptions {
   displayModels(region: TraeRegion): readonly TraeModelInfo[];
   /** The user's model selection in the requested region, stored as model id (= Trae name). */
   enabledModelIds(region: TraeRegion): readonly string[];
+  /**
+   * Whether the requested region's provider is currently offered to DSH. The
+   * card renders this as the tab's on/off checkbox, so the switch reflects the
+   * committed settings value rather than a local guess.
+   */
+  regionEnabled(region: TraeRegion): boolean;
   /** Re-read one region's live directory from the upstream. */
   discoverModels?(region: TraeRegion, signal?: AbortSignal): Promise<readonly TraeModelInfo[]>;
   /** Raw-Chat capability state of the requested region. */
@@ -1425,6 +1485,15 @@ declare const inject: string[];
 declare const TRAE_SETTINGS_NS = "trae";
 /** One region's saved model state: its own directory and the user's selection within it. */
 interface TraeRegionState {
+  /**
+   * Whether this region's provider is switched on. Opt-out: only an explicit
+   * `false` disables it, so a config predating this switch keeps both providers
+   * running. A disabled region is fully withdrawn from the harness — its
+   * adapter route and its configurable-provider entry both hold zero routes, so
+   * it disappears from DSH's model picker instead of lingering as an
+   * unselectable row (see `syncRegionRegistration`).
+   */
+  enabled?: boolean;
   /** The last-refreshed raw directory for this region; what the card displays. */
   lastCatalog?: TraeModelInfo[];
   /** The user's selection in this region, as model ids (= Trae name). */
@@ -1480,7 +1549,16 @@ interface Config {
  * picks (the same failure workbuddy fixed with its region split).
  */
 declare function regionStateOf(config: Config, region: TraeRegion): TraeRegionState;
+/**
+ * Whether one region's provider is switched on (issue #11). Opt-out semantics:
+ * only an explicit `false` disables it, so every config written before this
+ * switch existed — including the pre-region-split flat fields, which never
+ * carry `enabled` — keeps both providers running exactly as before. The card
+ * reads the same rule through `regionEnabledOf`, so the two halves can never
+ * disagree about a region's state.
+ */
+declare function regionEnabled(config: Config, region: TraeRegion): boolean;
 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_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, 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_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, 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 TraeObservedModelConfig, 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 TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, 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_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, 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_STREAM_IDLE_TIMEOUT_MS, TRAE_USAGE_PATH, TRAE_VERSION_CODE_FALLBACK, type TraeActivityRule, type TraeAdapter, type TraeCachedModelConfig, TraeCatalog, type TraeChatResult, 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 TraeObservedModelConfig, 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 TraeWebCredits, type TraeWebUsage, type TraeWireModel, UnconfiguredTraeUpstreamClient, apply, applyContextBudgets, applyImageSelection, applyReasoningEffort, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };

package/lib/index.js

@@ -2166,7 +2166,9 @@ function decodeTraeEvent(event) {
 		...typeof record["prompt_tokens"] === "number" ? { inputTokens: record["prompt_tokens"] } : {},
 		...typeof record["completion_tokens"] === "number" ? { outputTokens: record["completion_tokens"] } : {},
 		...typeof record["total_tokens"] === "number" ? { totalTokens: record["total_tokens"] } : {},
-		...typeof record["reasoning_tokens"] === "number" ? { reasoningTokens: record["reasoning_tokens"] } : {}
+		...typeof record["reasoning_tokens"] === "number" ? { reasoningTokens: record["reasoning_tokens"] } : {},
+		...typeof record["cache_read_input_tokens"] === "number" ? { cacheReadTokens: record["cache_read_input_tokens"] } : {},
+		...typeof record["cache_creation_input_tokens"] === "number" ? { cacheWriteTokens: record["cache_creation_input_tokens"] } : {}
 	};
 	if (event.event === "done" || typeof record["finish_reason"] === "string" && record["response"] === void 0) return {
 		type: "done",
@@ -2253,12 +2255,20 @@ function bridgeTraeSoloStream(response, model) {
 						delta["tool_calls"] = toolCalls;
 					}
 					if (Object.keys(delta).length > 0) controller.enqueue(chunk(delta));
-				} else if (decoded.type === "usage") usage = {
-					...decoded.inputTokens === void 0 ? {} : { prompt_tokens: decoded.inputTokens },
-					...decoded.outputTokens === void 0 ? {} : { completion_tokens: decoded.outputTokens },
-					...decoded.totalTokens === void 0 ? {} : { total_tokens: decoded.totalTokens }
-				};
-				else if (decoded.type === "done") {
+				} else if (decoded.type === "usage") {
+					const cacheRead = decoded.cacheReadTokens;
+					const cacheWrite = decoded.cacheWriteTokens;
+					const details = {
+						...cacheRead === void 0 ? {} : { cached_tokens: cacheRead },
+						...cacheWrite === void 0 ? {} : { cache_write_tokens: cacheWrite }
+					};
+					usage = {
+						...decoded.inputTokens === void 0 ? {} : { prompt_tokens: decoded.inputTokens },
+						...decoded.outputTokens === void 0 ? {} : { completion_tokens: decoded.outputTokens },
+						...decoded.totalTokens === void 0 ? {} : { total_tokens: decoded.totalTokens },
+						...Object.keys(details).length === 0 ? {} : { prompt_tokens_details: details }
+					};
+				} else if (decoded.type === "done") {
 					upstreamEnded = true;
 					if (!emittedFinishReason) {
 						emittedFinishReason = true;
@@ -2549,11 +2559,16 @@ function decodeRawChatChunk(value) {
 	}
 	if (typeof record["usage"] === "object" && record["usage"] !== null) {
 		const usage = record["usage"];
+		const details = typeof usage["prompt_tokens_details"] === "object" && usage["prompt_tokens_details"] !== null ? usage["prompt_tokens_details"] : {};
+		const cacheRead = details["cached_tokens"] ?? usage["prompt_cache_hit_tokens"] ?? usage["cached_tokens"];
+		const cacheWrite = details["cache_write_tokens"];
 		result.push({
 			type: "usage",
 			...typeof usage["prompt_tokens"] === "number" ? { inputTokens: usage["prompt_tokens"] } : {},
 			...typeof usage["completion_tokens"] === "number" ? { outputTokens: usage["completion_tokens"] } : {},
-			...typeof usage["total_tokens"] === "number" ? { totalTokens: usage["total_tokens"] } : {}
+			...typeof usage["total_tokens"] === "number" ? { totalTokens: usage["total_tokens"] } : {},
+			...typeof cacheRead === "number" ? { cacheReadTokens: cacheRead } : {},
+			...typeof cacheWrite === "number" ? { cacheWriteTokens: cacheWrite } : {}
 		});
 	}
 	return result.length === 0 ? [{
@@ -3196,6 +3211,74 @@ function regionOfTraeStatusUrl(url) {
 	if (value === null || value === "") return "cn";
 	return TRAE_REGIONS.includes(value) ? value : void 0;
 }
+/**
+* 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) {
+	return {
+		...typeof regions === "object" && regions !== null && !Array.isArray(regions) ? regions : {},
+		[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.
+*/
+function regionsMapOf(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return {};
+	const record = value;
+	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 = 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
 /** Redact token-like content before it crosses to the browser. */
@@ -3249,12 +3332,14 @@ function toCredits(snapshot) {
 */
 async function traeWebUsage(deps, region) {
 	const store = deps.store(region);
+	const enabled = deps.regionEnabled(region);
 	const accounts = await store.accounts();
 	if ((await store.status()).state !== "signed-in") {
 		const { failures } = await store.diagnose();
 		return {
 			status: "signed-out",
 			accounts,
+			enabled,
 			searched: failures.map((failure) => ({
 				path: failure.path,
 				edition: failure.edition,
@@ -3271,6 +3356,7 @@ async function traeWebUsage(deps, region) {
 		return {
 			status: "signed-out",
 			accounts,
+			enabled,
 			message: safeMessage(error)
 		};
 	}
@@ -3279,6 +3365,7 @@ async function traeWebUsage(deps, region) {
 		accountName: credential.accountName ?? credential.userId,
 		tokenExpiresAtMs: credential.expiresAtMs,
 		region,
+		enabled,
 		accounts,
 		models: deps.displayModels(region).map((model) => ({
 			...model,
@@ -3556,6 +3643,17 @@ function regionStateOf(config, region) {
 		...config.contextBudgets === void 0 ? {} : { contextBudgets: config.contextBudgets }
 	};
 }
+/**
+* Whether one region's provider is switched on (issue #11). Opt-out semantics:
+* only an explicit `false` disables it, so every config written before this
+* switch existed — including the pre-region-split flat fields, which never
+* carry `enabled` — keeps both providers running exactly as before. The card
+* reads the same rule through `regionEnabledOf`, so the two halves can never
+* disagree about a region's state.
+*/
+function regionEnabled(config, region) {
+	return regionStateOf(config, region).enabled !== false;
+}
 const modelConfig = z.object({
 	id: z.string().required(),
 	name: z.string().required(),
@@ -3566,6 +3664,7 @@ const modelConfig = z.object({
 	wireFunction: z.string()
 });
 const regionStateConfig = z.object({
+	enabled: z.boolean().default(true).description("Whether this region's provider is offered to DSH (opt-out; false withdraws it entirely)"),
 	lastCatalog: z.array(modelConfig).default([]),
 	enabledModelIds: z.array(z.string()).default([]),
 	imageModelIds: z.array(z.string()).default([]),
@@ -3797,9 +3896,42 @@ function apply(ctx, config) {
 		client: (region) => stacks[region].usageClient,
 		displayModels: (region) => displayModels(current(), region),
 		enabledModelIds: (region) => regionStateOf(current(), region).enabledModelIds ?? [],
+		regionEnabled: (region) => regionEnabled(current(), region),
 		discoverModels: (region, signal) => stacks[region].discoverModels(signal),
 		rawDiagnostic: (region) => stacks[region].rawDiagnostic()
 	}));
+	/**
+	* Live registration handles per region, filled once the shim is listening.
+	* A disabled region holds ZERO routes while staying registered: DSH allows
+	* `replace([])` for exactly this case ("a settings section that emptied holds
+	* zero routes while staying registered"), which is what makes the on/off
+	* switch reversible without a restart. Withdrawing the adapter route is what
+	* actually removes the region's models from DSH's model picker — hiding the
+	* card tab alone would leave every model selectable.
+	*/
+	const registration = {
+		cn: {},
+		ai: {}
+	};
+	/**
+	* Publish each region's on/off state to the harness (issue #11). Both swaps
+	* are single synchronous sections, so no request can observe a half-applied
+	* state, and `replace` announces itself through `llm/adapters-updated`, which
+	* is what makes third-party consumers (e.g. a vision router deriving
+	* `<provider>-vision` variants) drop the region too. No-op until the shim has
+	* registered; `applySelection` runs again on every card write, so a toggle
+	* lands immediately.
+	*/
+	const syncRegionRegistration = (value) => {
+		for (const region of REGION_KEYS) registration[region].adapter?.replace(regionEnabled(value, region) ? [TRAE_PROVIDERS[region]] : []);
+		registration.cn.directory?.replace(REGION_KEYS.filter((region) => regionEnabled(value, region)).map((region) => ({
+			provider: TRAE_PROVIDERS[region],
+			displayName: TRAE_PROVIDER_DISPLAY_NAMES[region],
+			settingsNs: TRAE_SETTINGS_NS,
+			settingsPath: [],
+			declared: false
+		})));
+	};
 	/** Push the current config into every region's store selection and catalog. */
 	const applySelection = (value) => {
 		for (const region of REGION_KEYS) {
@@ -3808,6 +3940,7 @@ function apply(ctx, config) {
 			stack.catalog.set(configuredModels(value, region));
 			stack.invalidateAdapter();
 		}
+		syncRegionRegistration(value);
 	};
 	const sectionHooks = {
 		setSource(source) {
@@ -3841,9 +3974,6 @@ function apply(ctx, config) {
 	});
 	Promise.all(REGION_KEYS.map((region) => stacks[region].shim.ready)).then(async () => {
 		if (stopped) return;
-		let releaseAdapterCn;
-		let releaseAdapterAi;
-		let releaseDirectory;
 		try {
 			for (const region of REGION_KEYS) {
 				const stack = stacks[region];
@@ -3857,12 +3987,12 @@ function apply(ctx, config) {
 				stack.invalidateAdapter = () => {
 					trae.invalidate();
 				};
-				if (region === "cn") releaseAdapterCn = ctx.llm.registerAdapter([TRAE_PROVIDER], trae.adapter);
-				else releaseAdapterAi = ctx.llm.registerAdapter([TRAE_AI_PROVIDER], trae.adapter);
+				registration[region].adapter = region === "cn" ? ctx.llm.registerAdapter([TRAE_PROVIDER], trae.adapter) : ctx.llm.registerAdapter([TRAE_AI_PROVIDER], trae.adapter);
 			}
 			ctx.llm.registerModelDiscovery(TRAE_SETTINGS_NS, async (request, signal) => {
 				const region = regionOfTraeProvider(request.provider ?? "");
 				if (region === void 0) return [];
+				if (!regionEnabled(current(), region)) return [];
 				const cancellation = signal ?? request.signal;
 				return applyImageSelection(await stacks[region].discoverModels(cancellation), imageSet(current(), region)).map((model) => ({
 					id: model.id,
@@ -3872,46 +4002,50 @@ function apply(ctx, config) {
 					inputModalities: traeInputModalities(model)
 				}));
 			});
-			releaseDirectory = ctx.llm.registerConfigurableProviders(REGION_KEYS.map((region) => ({
+			registration.cn.directory = ctx.llm.registerConfigurableProviders(REGION_KEYS.map((region) => ({
 				provider: TRAE_PROVIDERS[region],
 				displayName: TRAE_PROVIDER_DISPLAY_NAMES[region],
 				settingsNs: TRAE_SETTINGS_NS,
 				settingsPath: [],
 				declared: false
 			})));
+			syncRegionRegistration(current());
 		} finally {
-			if (releaseAdapterCn === void 0 || releaseAdapterAi === void 0 || releaseDirectory === void 0) {
-				releaseAdapterCn?.();
-				releaseAdapterAi?.();
-				releaseDirectory?.();
+			if (registration.cn.adapter === void 0 || registration.ai.adapter === void 0 || registration.cn.directory === void 0) {
+				registration.cn.adapter?.();
+				registration.ai.adapter?.();
+				registration.cn.directory?.();
 			}
 		}
 		try {
 			ctx.effect(() => () => {
-				releaseAdapterCn?.();
-				releaseAdapterAi?.();
-				releaseDirectory?.();
+				registration.cn.adapter?.();
+				registration.ai.adapter?.();
+				registration.cn.directory?.();
 			});
 		} catch {
-			releaseAdapterCn?.();
-			releaseAdapterAi?.();
-			releaseDirectory?.();
+			registration.cn.adapter?.();
+			registration.ai.adapter?.();
+			registration.cn.directory?.();
+		}
+		for (const region of REGION_KEYS) {
+			if (!regionEnabled(current(), region)) continue;
+			(async () => {
+				const stack = stacks[region];
+				try {
+					const models = await stack.discoverModels();
+					if (stopped) return;
+					stack.catalog.set(derive(current(), models, region));
+				} catch (error) {
+					ctx.logger.warn(`dsh-connect-trae: live ${region} model directory unavailable; serving the configured catalog`, error);
+					stack.catalog.set(configuredModels(current(), region));
+				}
+				stack.invalidateAdapter();
+			})();
 		}
-		for (const region of REGION_KEYS) (async () => {
-			const stack = stacks[region];
-			try {
-				const models = await stack.discoverModels();
-				if (stopped) return;
-				stack.catalog.set(derive(current(), models, region));
-			} catch (error) {
-				ctx.logger.warn(`dsh-connect-trae: live ${region} model directory unavailable; serving the configured catalog`, error);
-				stack.catalog.set(configuredModels(current(), region));
-			}
-			stack.invalidateAdapter();
-		})();
 	}).catch((error) => {
 		ctx.logger.error("dsh-connect-trae: loopback shim failed; providers not registered", error);
 	});
 }
 //#endregion
-export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, SseDecoder, TRAE_AI_PROVIDER, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, 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_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, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };
+export { Config, FALLBACK_TRAE_MODELS, FALLBACK_TRAE_MODELS_AI, REGION_GATEWAYS, SseDecoder, TRAE_AI_PROVIDER, TRAE_CN_AGENT_TASK_PATH, TRAE_CN_TITLE_PATH, TRAE_MODEL_DETAIL_FUNCTIONS, TRAE_MODEL_DETAIL_PATH, TRAE_PAY_BASE, 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_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, bridgeTraeSoloStream, buildTraeAgentTaskBody, buildTraeCnHeaders, buildTraeFusionRawChatEnvelope, buildTraeModelDetailRequest, buildTraeRawChatDraft, buildTraeRawChatRuntimeConfig, classifyTraeRawChatFailure, createTraeAdapter, createTraeRawGateway, createTraeShim, decodeRawChatChunk, decodeTraeEvent, decryptTraeStorageValue, deriveCatalog, discoveredCatalog, fallbackModelsFor, hashTraeRawChatArg, identityHeaders, inject, legacyTraeOwnAuthPath, mergeTraeModelSources, name, nextRegionEnabled, nextRegionSlots, normalizeTraeCredential, normalizeTraeVersionCode, parseObservedModelConfig, parseReasoningCapability, parseTraeAuthValue, parseTraeCachedModel, parseTraeModelExtraConfigLogLine, parseTraeRawChatBehaviorConfig, parseTraeRemoteModel, parseTraeStorageDocument, pickTraeStorageIdentity, prepareSoloBody, probeTraeRawChatCapability, rawCapabilityDiagnostic, rawCapabilityFingerprint, readTraeCachedModel, readTraeCliIdentity, readTraeIdentity, refreshTraeCredential, regionEnabled, regionEnabledOf, regionOfCredential, regionOfEdition, regionOfHost, regionOfTraeProvider, regionOfTraeStatusUrl, regionOfUserRegion, regionStateOf, registerTraeUsageRoute, resolveTraeIdentity, resolveTraeRawRuntime, sanitizeCatalog, traeEndpoint, traeInputModalities, traeModelDisplayName, traeOwnAuthPath, traeRawChatExtraInfo, traeStorageCandidates, traeWebUsage, withTraeRegion };

package/package.json

@@ -2,7 +2,7 @@
   "name": "dsh-connect-trae",
   "displayName": "DSH Connect Trae",
   "description": "Connect locally signed-in Trae models to DeepSeek Harness, plus a read-only usage/credits summary.",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "author": "dingminhua",
   "copyright": "Copyright (c) 2026 LaoDing",
   "license": "MIT",
@@ -75,12 +75,12 @@
     "@deepseek-ai/cordis": "^4.0.1-rc.1",
     "@deepseek-ai/dsh-atomic-write": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/dsh-attachment": ">=0.1.5-0 <0.2.0-0",
+    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/dsh-home-paths": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/dsh-host-webserver": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/dsh-llm": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/dsh-llm-pi-ai": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/dsh-settings": ">=0.1.5-0 <0.2.0-0",
-    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.5-0 <0.2.0-0",
     "@deepseek-ai/schemastery": "^3.18.1-rc.1",
     "@earendil-works/pi-ai": ">=0.85.1",
     "react": "^18.2.0"
@@ -90,10 +90,10 @@
     "@deepseek-ai/dsh-atomic-write": "0.1.5-rc.2",
     "@deepseek-ai/dsh-attachment": "0.1.5-rc.2",
     "@deepseek-ai/dsh-client-locale": "0.1.5-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-renderer": "0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.5-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.5-rc.2",
     "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.2",
     "@deepseek-ai/dsh-home-paths": "0.1.5-rc.2",
     "@deepseek-ai/dsh-host-webserver": "0.1.5-rc.2",
@@ -102,9 +102,13 @@
     "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
     "@deepseek-ai/schemastery": "3.18.2",
     "@earendil-works/pi-ai": "^0.85.1",
+    "@testing-library/dom": "^10.4.2",
+    "@testing-library/react": "^16.3.3",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.31",
+    "jsdom": "^25.0.1",
     "react": "^18.3.1",
+    "react-dom": "18.3.1",
     "tsdown": "^0.22.2",
     "typescript": "^5.9.3",
     "vitest": "^4.1.8"