@eddyskywalker/dsh-chatgpt-subscription 0.6.0 → 0.6.5

package/CHANGELOG.md

@@ -27,6 +27,8 @@
     - **账号 id 与既有设置保持一致**：号池新增 `accountId` 钩子，WorkBuddy 用它返回 `${region}:${identity}` 这个既有公开键，而不是内核默认生成的随机 `acc_xxx`。这样老用户已存下的 `selectedAccountId` / `hiddenAccountIds` 无需迁移即可继续生效。
     - 卡片新增两个可选插槽：`renderLoginActions`（WorkBuddy 需要国区/国际区两个登录入口，单按钮表达不了）与 `renderAccountActions`（桌面账号的隐藏/恢复）；`PoolAccountSummaryDto` 新增可选 `removable`（缺省即可删除）。两者对另外四条线路完全向后兼容——既有号池测试全部保持通过。
     - 新增 `test/workbuddy-account-pool.test.ts`（14 条）与卡片/路由回归：身份与快照去重、桌面账号不可删除、隐藏不动文件、固定账号与冷却回退、轮询调度、429 换号、401 标记失效并换号、桌面 token 回写；共享卡片新增 2 条锁定「非本插件账号不出现删除按钮」。
+  - **设置页界面与另外四条线路对齐**：接入共享号池内核只统一了数据，卡片本身仍是本线路自己手搓的那套——手写的「本机凭据」账号列表排在共享卡片**前面**，随后还跟一个独立的「账号」分组堆身份字段，分组顺序、标题文案、按钮样式都与四条兄弟线路不一致。现在收敛为与四条线路**逐字一致**的分组序列（账号管理 → 连接 → 模型 → 增强功能 → 上下文窗口 → 用量与额度），标题用共享的「账号管理」，登录入口用共享的 `dsha-btn-primary`；身份信息（UIN、账号类型、区域、认证域名、凭据文件）改由共享卡片的 `renderDetails` 逐账号渲染，独立的「账号」分组整体删除，空态/路由不可达提示也移入卡片（不再与共享空态文案重复）；号池摘要 DTO 因此新增 `domain` / `backend` / `accountType` 三个可选字段。
+  - **对话页模型选择器只显示模型名**：`listModels` 不再下发 `description`——五条线路里只有它带描述，DSH 的共享模型选择器会因此给这一路多渲染一行「能力说明」。设置页的模型胶囊同步只显示名称（上下文窗口 / 图片 / 思考档位改挂 `title` 提示），与四条兄弟线路的胶囊完全一致。
   - **思考档位下拉跟随模型**：设置页此前固定渲染全部 6 档，即使当前账号的模型一个都不支持。现在选项由该账号模型**实际声明的档位**并集推导（仅部分模型支持的档位会标注，如 `High (2/5)`），没有任何模型声明档位时给出说明而不是空列表；已保存但当前无模型支持的档位会被保留并标注，不会在打开页面时被静默改写。
   - **修正「全部返回 200 即等于全部支持」的误判**：`/v3/config` 对多数模型只报单个 `effort` 默认值（如 `deepseek-v4.1-flash` 的 `{"effort":"high"}`），此前据此推断成完整 6 档，于是 DSH 模型选择器里出现了该模型并不具备的 `minimal`/`xhigh`。逐档实测确认这类模型接受的就是 `low`/`high`/`max`——与网关为 `glm-5.3-flash`、`kimi-k2.8-preview` **显式声明**的档位完全一致，其余取值由上游收敛到最近的档位而非作为独立档位生效——因此内置兜底表与解析逻辑同步收敛为这三档（`WORKBUDDY_STANDARD_EFFORTS`）。**收紧档位后又修掉它带出的一个反向缺陷**：目录给的**默认档**也可能落在档位表之外——`minimax-m3`、`kimi-k3`、国区 `glm-5.3` 等 12 个条目都报 `medium` 却只有三档。这种「默认档不在表内」的值会被档位解析判为不支持而丢弃，于是请求不带 `reasoning_effort`，上游返回**空的 `reasoning_content`**（实测 `minimax-m3`：不带字段三次全为 0 字符，带 `medium` 为 282–659 字符）。现在默认档会收敛到表内最近的档位（`convergeWorkBuddyEffort`，平局向上取，与 kimi-code 线路 `medium`→`high` 的既有映射一致），并在 `resolveWorkBuddyModel` 这个唯一读取口统一归一化，离线兜底表同样覆盖。
   - **合并前代码审查发现并修复的问题**（同源校验、缓存与凭据续期一致性、流式解码）：`/quota` 的 POST 与其它写路由一样校验同源；`/connection/test` 与 `/catalog/refresh` 先 `ensureFresh` 续期过期 token，不再对有效账号误报 401；`loadConfigCatalog` 不再把另一区域的缓存快照当成当前区域的结果（那会让模型选择器整个空掉，而不是回落到内置表）；续期回写保留原凭据文件的权限位并清理临时文件；流式请求不再附加 300s 墙钟超时（空闲超时由共享看门狗负责，长回答不会被掐断）；无参工具调用同样置 `hasToolCall` 并在首个 delta 带上工具名，否则整轮会被当成普通 stop、工具永不执行；流中错误帧抛错而不是当成干净的停止；路由销毁时终止未完成的浏览器登录轮询。每条修复都有对应回归测试。

package/README.md

@@ -75,7 +75,7 @@
 - **桌面账号归 IDE 所有，不可删除**：卡片只对插件自己添加的账号显示「删除」，桌面账号显示「隐藏 / 恢复」——隐藏只把它移出本插件的调度，绝不改动 CodeBuddy 的凭据文件；号池层同样拒绝删除桌面账号（双保险，均有测试）；
 - **续期后原子写回**原凭据文件（只改 `auth` 块），以免桌面端掉线——桌面账号的 refresh token 会轮换，若只写进插件自己的加密存储，IDE 手里就只剩一个已作废的 token。同一进程内的并发调用**共用一次刷新**，且不会二次刷新；
 - 上游是 OpenAI 兼容的 `POST {backend}/v2/chat/completions`，但有两条硬约束：**只支持流式**（`stream:false` → 400 `code 11101`），且**首条消息必须是 system**（否则国际区返回 400 `code 11128`）。因此请求构造器始终发送 `stream:true`，并在调用方没给系统提示时补一条中性的，避免手搓的一次性请求踩到这条规则；
-- **区域是凭据属性，不是请求属性**：`*.workbuddy.ai` / `*.codebuddy.ai` 走国际区 `https://www.<apex>`，其余走国区 `https://copilot.tencent.com`。设置页会把账号按**国区 / 国际区**分组并允许选择；切换后，模型目录、额度和后续对话都使用该账号。历史凭据快照按账号身份自动去重。插件托管账号可真正删除；桌面扫描账号只能从本插件隐藏/恢复，永不删除 CodeBuddy 的原文件。两区模型清单不同，把模型发到不服务它的区会返回 400 `code 11102`，因此模型选择器**按当前账号区域过滤**；
+- **区域是凭据属性，不是请求属性**：`*.workbuddy.ai` / `*.codebuddy.ai` 走国际区 `https://www.<apex>`，其余走国区 `https://copilot.tencent.com`。账号卡片逐条标注每个账号的**国区 / 国际区**并允许选择；切换后，模型目录、额度和后续对话都使用该账号。历史凭据快照按账号身份自动去重。插件托管账号可真正删除；桌面扫描账号只能从本插件隐藏/恢复，永不删除 CodeBuddy 的原文件。两区模型清单不同，把模型发到不服务它的区会返回 400 `code 11102`，因此模型选择器**按当前账号区域过滤**；
 - **模型目录取自网关自己的 `/v3/config`**（官方 CLI 启动时读的就是它）：每个模型的真实上下文上限、输出上限、是否接受图片、以及可用的思考档位都在这里，不做任何按模型名猜测。`/v1/models` 在这条线路上是 404，所以此前只能靠内置表——现在内置表只作为离线兜底，且是**从真实 `/v3/config` 转录**的（早期手写版本把 `glm-5.3`、`kimi-k3` 的窗口猜成 200K/256K，实际都是 1M）；
 - 目录同时区分**默认服务的上下文长度**与**模型上限**（如 `deepseek-v4.1-flash` 默认 300K、最大 1M）。本线路不发送显式长度参数，所以 DSH 的压缩与溢出判断按**默认服务长度**计算，不会让请求越过后端实际接受的窗口；
 - 思考档位**逐模型**取目录声明的档位表，回落顺序为「调用方显式指定 → 用户配置的默认档 → 目录为该模型声明的默认档」。最后一档不能省：上游在请求不带 `reasoning_effort` 时返回**空的 `reasoning_content`**（实测同一提示：不带字段 0 字符，带字段 130–215 字符），不发送就等于静默丢弃模型的思考。目录里的单个 `effort` 字段是**默认值**，既不是完整档位表也不是「只此一档」：实测这类模型接受 `low` / `high` / `max`，其余取值会被上游收敛到最近的档位，因此它们使用这三档的标准表（`WORKBUDDY_STANDARD_EFFORTS`）；显式声明了 `supportedEfforts` 的模型则原样采信。目录给出的**默认档**也可能落在档位表之外（如 `minimax-m3`、`kimi-k3`、国区 `glm-5.3` 都报 `medium` 却只有三档），这种值会被收敛到最近的档位——否则默认档会被判为不支持而丢弃，请求不带 `reasoning_effort`，上游返回**空的 `reasoning_content`**。不在该模型档位集合内的取值会被忽略而不是发出去（上游对不支持的档位返回 `code 11150`）；
@@ -307,8 +307,8 @@ DSH 设置页的「Subagent」卡片会把勾选的模型写成会话级的允
 
 1. 重启 DSH，让 Host 加载本插件；
 2. 打开 **设置 → WorkBuddy**；
-3. 二选一：登录 CodeBuddy 桌面端后点「重新扫描」，或直接点「添加国区账号 / 添加国际区账号」并在官方页面完成浏览器授权；
-4. 在国区/国际区分组中选择账号，再按需勾选模型、设置默认思考深度与上下文窗口。
+3. 二选一：登录 CodeBuddy 桌面端后点「重新扫描」，或点「账号管理」右上角的「添加国区账号 / 添加国际区账号」并在官方页面完成浏览器授权；
+4. 在「账号管理」里选择账号（每条都标注国区 / 国际区），再按需勾选模型、设置默认思考深度与上下文窗口。
 
 `workbuddy-subscription` 会像其他 Provider 一样出现在 DSH 模型选择器中，并可与名为 `workbuddy` 的自定义 API 同时存在。**上下文窗口**默认取网关 `/v3/config` 声明的**默认服务长度**，可逐模型覆盖（用于 DSH 的压缩与溢出判断，支持 `1M` / `300K` / `200000` 等写法）；**默认思考深度**逐模型生效，选项由当前账号各模型**实际声明的档位**取并集（仅部分模型支持的档位会标注数量），档位不在该模型集合内时不会被发送。
 

package/lib/client.js

@@ -4217,41 +4217,28 @@ window.__ModuleLoader__.load({
 			title: "WorkBuddy",
 			pageDesc: "复用本机 CodeBuddy 桌面端登录态，管理 WorkBuddy（CodeBuddy 订阅）模型、上下文窗口与额度。",
 			account: "账号",
-			noAccounts: "暂无账号，点击「添加国区账号 / 添加国际区账号」完成浏览器授权，或登录 CodeBuddy 桌面端后重新扫描。",
-			signedIn: "已找到凭据",
+			noAccounts: "暂无账号。点击右上角「添加账号」完成浏览器授权，或登录 CodeBuddy 桌面端后重新扫描；桌面账号只能从本插件隐藏，绝不删除 CodeBuddy 的原凭据。",
 			signedOut: "未找到凭据",
 			nickname: "昵称",
-			uid: "账号 ID",
 			uin: "UIN",
 			region: "区域",
 			regionCn: "国区",
 			regionIntl: "国际区",
 			accountType: "账号类型",
-			backend: "后端地址",
-			domain: "认证域名",
-			tokenExpires: "登录态有效期",
-			tokenExpired: "已过期",
 			sourceFile: "凭据文件",
 			authDirectory: "凭据目录",
 			storage: "凭据存储",
 			storageNotice: "桌面端账号仍读取 CodeBuddy 自己的凭据文件，插件不会删除这些文件；通过这里添加的账号保存在系统加密存储中（Windows DPAPI / macOS Keychain / Linux Secret Service），token 不进入浏览器。",
-			notFoundTitle: "未找到 WorkBuddy 账号",
-			notFoundHint: "可安装并登录 CodeBuddy 后重新扫描，也可以直接点击下方「添加国区账号」或「添加国际区账号」完成浏览器授权。",
 			routeUnreachable: "无法读取 WorkBuddy 设置路由",
 			routeUnreachableHint: "浏览器里加载的插件版本可能比 Host 进程里运行的新（客户端资源是现读磁盘的，Host 只在启动时加载）。请重启 DSH，让两端来自同一份构建。",
 			rescan: "重新扫描",
 			rescanning: "扫描中...",
-			accounts: "本机凭据",
-			accountsHint: "按账号地区分组。插件添加的账号可删除；CodeBuddy 桌面账号只能从本插件隐藏，绝不删除桌面端原凭据。点击账号会切换模型目录、额度和后续对话。",
-			useAccount: "使用此账号",
-			selectedAccount: "当前账号",
+			accounts: "账号管理",
 			addCnAccount: "添加国区账号",
 			addIntlAccount: "添加国际区账号",
 			authorizing: "授权中…",
 			loginWaiting: "请在新打开的浏览器页面完成登录与授权。",
 			loginFailed: "账号授权失败",
-			pluginAccount: "插件账号",
-			desktopAccount: "桌面账号",
 			encryptedStorage: "系统加密存储",
 			hiddenAccount: "已隐藏",
 			hideAccount: "从插件隐藏",
@@ -4310,41 +4297,28 @@ window.__ModuleLoader__.load({
 			title: "WorkBuddy",
 			pageDesc: "Reuse the local CodeBuddy desktop sign-in to manage WorkBuddy (CodeBuddy subscription) models, context windows, and quota.",
 			account: "Account",
-			noAccounts: "No accounts yet. Add a China or international account, or sign in with the CodeBuddy desktop client and rescan.",
-			signedIn: "Credential found",
+			noAccounts: "No accounts yet. Use “Add account” above to authorize, or sign in with the CodeBuddy desktop client and rescan; desktop accounts can only be hidden here, never removed from CodeBuddy.",
 			signedOut: "No credential found",
 			nickname: "Nickname",
-			uid: "Account ID",
 			uin: "UIN",
 			region: "Region",
 			regionCn: "China",
 			regionIntl: "International",
 			accountType: "Account type",
-			backend: "Backend",
-			domain: "Auth domain",
-			tokenExpires: "Sign-in valid until",
-			tokenExpired: "Expired",
 			sourceFile: "Credential file",
 			authDirectory: "Credential directory",
 			storage: "Credential storage",
 			storageNotice: "Desktop accounts continue to use CodeBuddy’s credential files, which this plugin never deletes. Accounts added here use encrypted OS storage (Windows DPAPI, macOS Keychain, or Linux Secret Service); tokens never enter the browser.",
-			notFoundTitle: "No WorkBuddy account found",
-			notFoundHint: "Install and sign in to CodeBuddy and rescan, or use “Add China account” / “Add international account” below to authorize in the browser.",
 			routeUnreachable: "The WorkBuddy settings route could not be read",
 			routeUnreachableHint: "The plugin loaded in the browser may be newer than the one running in the Host: client assets are read from disk on demand, while the Host loads them only at startup. Restart DSH so both halves come from the same build.",
 			rescan: "Rescan",
 			rescanning: "Scanning...",
-			accounts: "Local credentials",
-			accountsHint: "Accounts are grouped by region. Plugin-managed accounts can be deleted; CodeBuddy desktop accounts can only be hidden from this plugin and their source files are never deleted. Selecting one switches models, quota, and chats.",
-			useAccount: "Use this account",
-			selectedAccount: "Selected account",
+			accounts: "Account Management",
 			addCnAccount: "Add China account",
 			addIntlAccount: "Add international account",
 			authorizing: "Authorizing…",
 			loginWaiting: "Complete sign-in and authorization in the newly opened browser page.",
 			loginFailed: "Account authorization failed",
-			pluginAccount: "Plugin account",
-			desktopAccount: "Desktop account",
 			encryptedStorage: "Encrypted OS storage",
 			hiddenAccount: "Hidden",
 			hideAccount: "Hide from plugin",
@@ -4421,6 +4395,21 @@ window.__ModuleLoader__.load({
 		};
 		const API$4 = "/workbuddy/api";
 		/**
+		* The shared card's label set.
+		*
+		* Only the three labels WorkBuddy genuinely words differently are taken from
+		* this tab's dictionary; everything else is the shared set, so the five
+		* provider tabs cannot drift apart in wording.
+		*/
+		function accountPoolLabels(t) {
+			return {
+				...accountPoolZh,
+				noAccounts: t.noAccounts,
+				storageNotice: t.storageNotice,
+				email: t.nickname
+			};
+		}
+		/**
 		* Call one settings route and unwrap its `{ ok, value }` envelope.
 		*
 		* The response body is read as text first, because a route that is not mounted
@@ -4538,24 +4527,6 @@ window.__ModuleLoader__.load({
 				accounts: Array.isArray(data?.accounts) ? data.accounts : []
 			};
 		}
-		/**
-		* The shared card's label set, taken from this tab's dictionary.
-		*
-		* Wording is the shared one so the five provider tabs cannot drift apart; the
-		* couple of WorkBuddy-specific words are supplied here.
-		*/
-		function accountPoolLabels(t) {
-			return {
-				...accountPoolZh,
-				accountPool: t.accounts,
-				noAccounts: t.noAccounts,
-				storage: t.storage,
-				storageNotice: t.storageNotice,
-				deleteAccount: t.deleteAccount,
-				email: t.nickname,
-				accountId: t.uid
-			};
-		}
 		function WorkBuddySection({ onModelChange, loadModelDirectory }) {
 			const [status, setStatus] = (0, react.useState)(null);
 			const [loading, setLoading] = (0, react.useState)(true);
@@ -4563,7 +4534,6 @@ window.__ModuleLoader__.load({
 			const [error, setError] = (0, react.useState)(null);
 			const [statusFailed, setStatusFailed] = (0, react.useState)(false);
 			const [connection, setConnection] = (0, react.useState)(null);
-			const [accounts, setAccounts] = (0, react.useState)(null);
 			const [loginProgress, setLoginProgress] = (0, react.useState)(null);
 			const loginIntervalRef = (0, react.useRef)(null);
 			const loginTimeoutRef = (0, react.useRef)(null);
@@ -4594,24 +4564,10 @@ window.__ModuleLoader__.load({
 					setLoading(false);
 				}
 			}, []);
-			const loadAccounts = (0, react.useCallback)(async () => {
-				try {
-					const payload = await fetchApi$4("/accounts");
-					setAccounts({
-						authDirectory: payload?.authDirectory ?? "",
-						managedStoragePath: payload?.managedStoragePath,
-						accounts: Array.isArray(payload?.accounts) ? payload.accounts : []
-					});
-				} catch {}
-			}, []);
 			(0, react.useEffect)(() => {
 				loadStatus();
-				loadAccounts();
 				const refreshWhenVisible = () => {
-					if (document.visibilityState === "visible") {
-						loadStatus(true);
-						loadAccounts();
-					}
+					if (document.visibilityState === "visible") loadStatus(true);
 				};
 				document.addEventListener("visibilitychange", refreshWhenVisible);
 				return () => {
@@ -4619,14 +4575,13 @@ window.__ModuleLoader__.load({
 					if (loginIntervalRef.current !== null) window.clearInterval(loginIntervalRef.current);
 					if (loginTimeoutRef.current !== null) window.clearTimeout(loginTimeoutRef.current);
 				};
-			}, [loadStatus, loadAccounts]);
+			}, [loadStatus]);
 			const handleRescan = async () => {
 				try {
 					setBusy("rescan");
 					setError(null);
 					const updated = await fetchApi$4("/rescan", { method: "POST" });
-					setStatus(updated);
-					await loadAccounts();
+					setStatus(normalizeStatus(updated));
 					notifyChange();
 				} catch (err) {
 					setError(err instanceof Error ? err.message : String(err));
@@ -4663,7 +4618,6 @@ window.__ModuleLoader__.load({
 										body: JSON.stringify({ selectedAccountId: poll.accountId })
 									});
 									await loadStatus();
-									await loadAccounts();
 									notifyChange();
 								} else if (poll.status === "error") {
 									window.clearInterval(timer);
@@ -4707,7 +4661,6 @@ window.__ModuleLoader__.load({
 						})
 					});
 					setStatus(normalizeStatus(updated));
-					await loadAccounts();
 					notifyChange();
 				} catch (err) {
 					setError(err instanceof Error ? err.message : String(err));
@@ -4728,7 +4681,6 @@ window.__ModuleLoader__.load({
 						body: JSON.stringify({ strategy })
 					});
 					setStatus(normalizeStatus(updated));
-					await loadAccounts();
 				} catch (err) {
 					setError(err instanceof Error ? err.message : String(err));
 				} finally {
@@ -4881,136 +4833,12 @@ window.__ModuleLoader__.load({
 				})
 			});
 			const quota = status?.quota;
-			const account = status?.account;
 			const authenticated = status?.authenticated === true;
 			const unreachable = statusFailed && status === null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dsha-page",
 				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
-						className: "dsha-group",
-						children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: "dsha-grouphead",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: authenticated ? t.account : t.signedOut }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-									className: "dsha-btn",
-									disabled: busy !== null,
-									onClick: () => void handleRescan(),
-									children: busy === "rescan" ? t.rescanning : t.rescan
-								})]
-							}),
-							unreachable ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								className: "dsha-empty",
-								children: t.routeUnreachable
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsha-notice",
-								children: t.routeUnreachableHint
-							})] }) : !authenticated ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								className: "dsha-empty",
-								children: t.notFoundTitle
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsha-notice",
-								children: t.notFoundHint
-							})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.nickname
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value",
-										children: account?.nickname || "—"
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.uid
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value dshwb-mono",
-										children: account?.uid || "—"
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.uin
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value dshwb-mono",
-										children: maskUin(account?.uin)
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.region
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-										className: "dsha-value",
-										children: [account?.region === "intl" ? t.regionIntl : t.regionCn, account?.accountType ? ` · ${account.accountType}` : ""]
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.domain
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value dshwb-mono",
-										children: account?.domain || "—"
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.backend
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value dshwb-mono",
-										children: account?.backend || "—"
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.tokenExpires
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value",
-										children: account?.expiresAt === null || account?.expiresAt === void 0 ? "—" : account.expiresAt <= Date.now() ? t.tokenExpired : formatDate(account.expiresAt)
-									})]
-								}),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: "dsha-row",
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-label",
-										children: t.sourceFile
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: "dsha-value dshwb-mono",
-										title: account?.sourceFile ?? status?.managedStoragePath ?? "",
-										children: account?.source === "managed" ? t.encryptedStorage : displayFile(account?.sourceFile)
-									})]
-								})
-							] }),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: "dsha-row",
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "dsha-label",
-									children: t.authDirectory
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: "dsha-value dshwb-mono",
-									children: status?.authDirectory || "—"
-								})]
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-								className: "dsha-notice",
-								children: t.storageNotice
-							})
-						]
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AccountPoolSection, {
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(AccountPoolSection, {
 						accounts: poolAccounts,
 						activeAccountId: status?.activeAccountId,
 						rotationStrategy: status?.rotationStrategy ?? "sequential",
@@ -5026,12 +4854,12 @@ window.__ModuleLoader__.load({
 						renderLoginActions: () => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "dsha-account-add-actions",
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-								className: "dsha-btn",
+								className: "dsha-btn dsha-btn-primary",
 								disabled: busy !== null,
 								onClick: () => void handleAddAccount("cn"),
 								children: busy === "login:cn" ? t.authorizing : t.addCnAccount
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-								className: "dsha-btn",
+								className: "dsha-btn dsha-btn-primary",
 								disabled: busy !== null,
 								onClick: () => void handleAddAccount("intl"),
 								children: busy === "login:intl" ? t.authorizing : t.addIntlAccount
@@ -5049,27 +4877,67 @@ window.__ModuleLoader__.load({
 							children: t.hideAccount
 						})] }),
 						renderDetails: (candidate) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
-								t.region,
-								": ",
-								candidate.region === "intl" ? t.regionIntl : t.regionCn
-							] }),
 							candidate.uin ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
 								t.uin,
 								": ",
 								maskUin(candidate.uin)
 							] }) : null,
+							candidate.accountType ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
+								t.accountType,
+								": ",
+								candidate.accountType
+							] }) : null,
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
+								t.region,
+								": ",
+								candidate.region === "intl" ? t.regionIntl : t.regionCn
+							] }),
+							candidate.domain ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dshwb-mono",
+								title: `${candidate.domain} · ${candidate.backend ?? ""}`,
+								children: candidate.domain
+							}) : null,
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dshwb-mono",
 								children: candidate.source === "managed" ? t.encryptedStorage : displayFile(candidate.sourceFile)
 							}),
 							candidate.hidden === true ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t.hiddenAccount }) : null
-						] })
+						] }),
+						children: [
+							unreachable ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsha-empty",
+								children: t.routeUnreachable
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsha-notice",
+								children: t.routeUnreachableHint
+							})] }) : null,
+							loginProgress ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: "dsha-notice",
+								children: loginProgress
+							}) : null,
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsha-row",
+								style: { marginTop: 12 },
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsha-label",
+									children: t.authDirectory
+								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: "dsha-value dshwb-mono",
+									title: status?.authDirectory || "",
+									children: status?.authDirectory || "—"
+								})]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+								className: "dsha-actions",
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									className: "dsha-btn",
+									disabled: busy !== null,
+									onClick: () => void handleRescan(),
+									children: busy === "rescan" ? t.rescanning : t.rescan
+								})
+							})
+						]
 					}),
-					loginProgress ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						className: "dsha-notice",
-						children: loginProgress
-					}) : null,
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 						className: "dsha-group",
 						children: [
@@ -5145,26 +5013,22 @@ window.__ModuleLoader__.load({
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dsha-models",
 								"aria-label": "WorkBuddy Models",
-								children: status?.models.map((model) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
-									title: model.description ?? model.id,
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-										type: "checkbox",
-										checked: model.enabled,
-										disabled: busy !== null,
-										onChange: (event) => void toggleModel(model.id, event.currentTarget.checked)
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-										className: "dshwb-model",
-										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: model.name }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-											className: "dshwb-model-meta",
-											children: [
-												formatCapacity(model.contextWindow),
-												" · ",
-												model.supportsImage ? t.imageSupport : t.textOnly,
-												model.reasoningEfforts && model.reasoningEfforts.length > 0 ? ` · ${model.reasoningEfforts.join("/")}` : ""
-											]
-										})]
-									})]
-								}, model.id))
+								children: status?.models.map((model) => {
+									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+										title: [
+											model.id,
+											formatCapacity(model.contextWindow),
+											model.supportsImage ? t.imageSupport : t.textOnly,
+											...model.reasoningEfforts && model.reasoningEfforts.length > 0 ? [model.reasoningEfforts.join("/")] : []
+										].join(" · "),
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+											type: "checkbox",
+											checked: model.enabled,
+											disabled: busy !== null,
+											onChange: (event) => void toggleModel(model.id, event.currentTarget.checked)
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: model.name })]
+									}, model.id);
+								})
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "dsha-actions",
@@ -6488,29 +6352,24 @@ window.__ModuleLoader__.load({
 		/**
 		* WorkBuddy-only additions to the shared settings design system.
 		*
-		* The base control styles (`.dsha-page`, `.dsha-group`, `.dsha-models`, …) come
-		* from the stylesheet the sibling routes install, so this file declares only
-		* what is unique to this card: the per-model capability line and the
-		* "unavailable in this region" treatment.
+		* The base control styles (`.dsha-page`, `.dsha-group`, `.dsha-models`, the
+		* account card, …) come from the stylesheet the sibling routes install, in the
+		* same order the client installs them, so this file declares only what stays
+		* unique to this card: the mono credential paths and the login-progress line.
+		*
+		* Everything this tab used to declare locally — the per-model capability line
+		* and the account-region headings — is gone: the model pill is name-only like
+		* every sibling tab, and the account card is the shared one.
 		*/
 		function installWorkBuddyStyles() {
 			if (typeof document === "undefined" || document.getElementById("dsh-workbuddy-settings-style")) return;
 			const style = document.createElement("style");
 			style.id = STYLE_ID;
 			style.textContent = `
-.dshwb-model{display:flex;flex-direction:column;gap:2px;min-width:0}
-.dshwb-model-meta{color:var(--dsw-alias-label-tertiary);font-size:10px;font-weight:400;line-height:1.3;white-space:nowrap}
-.dsha-models input:checked+span .dshwb-model-meta{color:var(--dsw-alias-label-secondary)}
-.dshwb-region{display:inline-flex;align-items:center;gap:4px}
-.dshwb-muted-note{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;margin:8px 0 0}
 .dshwb-mono{font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:11px}
-.dsha-account-region{margin-top:14px}
-.dsha-account-region h4{color:var(--dsw-alias-label-secondary);font-size:12px;font-weight:650;margin:0 0 8px}
 .dsha-account-add-actions{display:flex;flex-wrap:wrap;gap:8px}
-.dsha-account-card.hidden{opacity:.68}
-.dshwb-account-select{appearance:none;background:transparent;border:0;color:inherit;cursor:pointer;font:inherit;padding:0;text-align:left;width:100%}
-.dshwb-account-select:disabled{cursor:default}
-.dshwb-account-select:hover:not(:disabled) .dsha-account-title{color:var(--dsw-alias-label-link,#397ee8)}
+.dsha-account-add-actions .dsha-btn{background:var(--dsw-alias-button-info-fill,#397ee8);border-color:transparent;color:var(--dsw-alias-button-info-label,#fff)}
+.dsha-account-add-actions .dsha-btn:hover:not(:disabled){opacity:.9;background:var(--dsw-alias-button-info-fill,#397ee8)}
 `;
 			document.head.append(style);
 		}