@bittersmilezzz/dsh-model-selector 0.1.20 → 0.2.0

package/lib/client.js

@@ -119,6 +119,37 @@ window.__ModuleLoader__.load({
 			}
 			return best?.id;
 		}
+		/**
+		* 已知档位的秩；适配器自造的非规范 id（如 'turbo'）返回 undefined —— 与
+		* 「已知但秩为 0」（off）区分开。maxEffortOf 对并列的未知档取首个，把它当
+		* 「最强档」提交等于随机挑一个档、还可能被宿主拒，故调用方必须先过这一关。
+		*/
+		function dmsEffortRank(id) {
+			return Object.prototype.hasOwnProperty.call(EFFORT_RANK, id) ? EFFORT_RANK[id] : void 0;
+		}
+		/**
+		* 选择模型时自动落到最强档的决策（从 choose() 搬出并修正）：
+		*  - 非推理模型 / 无档位 → 不提交 effort；
+		*  - 最强档是 'off'（模型只提供 off）→ 不提交；
+		*  - 最强档是**非规范 id**（rank 未知）→ 不提交：maxEffortOf 对并列未知档取
+		*    首个，把它当「最强」提交会挑错档甚至被宿主拒（用户看到「切换失败」）；
+		*  - 否则提交已知最强档；只有它不等于模型声明的默认档时才播报落点。
+		*/
+		function dmsChoosePlan(reasoning) {
+			if (reasoning === void 0) return {
+				effort: void 0,
+				autoRaised: false
+			};
+			const best = maxEffortOf(reasoning);
+			if (best === void 0 || best === "off" || dmsEffortRank(best) === void 0) return {
+				effort: void 0,
+				autoRaised: false
+			};
+			return {
+				effort: best,
+				autoRaised: best !== reasoning.defaultEffort
+			};
+		}
 		function dmsEffortIndex(levels, id) {
 			return levels.findIndex((level) => level.id === id);
 		}
@@ -168,12 +199,15 @@ window.__ModuleLoader__.load({
 		* 只有当自回滚以来没有任何新的提交改写 committedRef（仍等于回滚前的档位）、
 		* 提交纪元未推进（epoch === epochAtCommit，即期间没有发起过新提交——提交失败
 		* 回滚后 committedRef 会回到与上一轮回滚相同的值，值比较无法区分「无新提交」
-		* 与「新提交失败回滚」，纪元才能区分）、且当前无拖动/提交在途时，迟到结果才
-		* 仍对应当前唯一的意图链——此时 UI 处于「回滚但后端已生效」的错位态，应补
-		* 一次同步而不是保持回滚。否则以新操作链为准。
+		* 与「新提交失败回滚」，纪元才能区分）、当前无拖动/提交在途，**且生效模型仍是
+		* 发起提交时的那个**（sameModel）时，迟到结果才仍对应当前唯一的意图链——此时
+		* UI 处于「回滚但后端已生效」的错位态，应补一次同步而不是保持回滚。
+		* 否则以新操作链为准：模型被外部改写（另一入口切换 / 宿主推送新投影 / 重连后
+		* 同步出别的选择）时，next/index 是在旧模型的档位表上算出来的，写回 UI 会显示
+		* 一个后端并未生效的档位。
 		*/
-		function dmsShouldAdoptLateSuccess(committed, previous, dragging, committing, epoch, epochAtCommit) {
-			return committed === previous && epoch === epochAtCommit && !dragging && !committing;
+		function dmsShouldAdoptLateSuccess(committed, previous, dragging, committing, epoch, epochAtCommit, sameModel) {
+			return sameModel && committed === previous && epoch === epochAtCommit && !dragging && !committing;
 		}
 		/**
 		* 拖动终止事件是否对应当前活动拖动：pointerActive 为假（拖动已结束/从未开始）
@@ -525,6 +559,11 @@ window.__ModuleLoader__.load({
 		* 拖出屏外）时，返回钳到视口内的 left 值，调用方改用 left 锚定。
 		* 返回 undefined 表示保持默认右锚定。
 		* menuWidth 传菜单实际渲染宽度（offsetWidth），与 CSS `min(280px, 100vw-32px)` 解耦。
+		*
+		* **坐标系**：入参与返回值都是**视口坐标**。菜单是 .dms-root（position:
+		* relative）内的 absolute 元素，left 的参考系是 root 的 padding box —— 调用方
+		* 必须减去 root 的左缘再写进 style.left，否则窄窗口下菜单整体右移、横向溢出
+		* 时整幅画到屏外。
 		*/
 		function dmsMenuLeft(rootRight, menuWidth, viewportWidth, margin) {
 			if (rootRight - menuWidth >= margin && rootRight <= viewportWidth - margin) return void 0;
@@ -533,6 +572,26 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/roving.ts
 		/**
+		* dsh-model-selector — 菜单 roving tabindex 的纯决策逻辑（node 可测）。
+		*
+		* 模型列表可达数百行，若每行都是 Tab 停靠点，Tab 键会陷入行海；roving
+		* tabindex（WAI-ARIA menu 模式的通行做法）只让「活动行」留在 Tab 序里，
+		* 其余行 tabindex=-1、仅方向键可达。本模块只负责一件事：给定当前渲染的
+		* 行集合与选中行，算出 Tab 从搜索框进入列表时应停靠的默认行键。
+		*/
+		/**
+		* 模型行键的**唯一构造点**：菜单 DOM 的 `data-row-key`、roving 决策与行焦点
+		* 回调必须同源。此前这三处各自拼模板串，一次局部改名就能让 dmsDefaultRowKey
+		* 返回的键匹配不到任何行（Tab 落点静默失效），且测试拿自制副本验证不到。
+		*/
+		function dmsRowKey(providerId, modelId) {
+			return `${providerId}\u0000${modelId}`;
+		}
+		/** 组头行键（分组视图里组头也参与方向键导航）。 */
+		function dmsHeaderKey(providerId) {
+			return `header:${providerId}`;
+		}
+		/**
 		* Tab 默认落点：搜索态取「选中行若在命中集内，否则首个命中」；分组态取
 		* 「选中行若可见，否则首个可见模型行」；全部折叠（无可见模型行）时回退到
 		* 首个组头。返回 null 表示当前没有任何可聚焦行（空态由菜单外的 role=status
@@ -547,6 +606,144 @@ window.__ModuleLoader__.load({
 			return set.headerKeys[0] ?? null;
 		}
 		//#endregion
+		//#region src/client/search.ts
+		/**
+		* 搜索归一化：NFKD 分解 → 去组合标记 → 小写。
+		*
+		* 比裸 `toLowerCase()` 宽容：`'İstanbul'` 能被 `'istanbul'` 命中（裸 toLowerCase
+		* 把 U+0130 折成 `'i̇'` 两个码位，与 ASCII `'i'` 反而不匹配 → 漏检；`'café'` 同理）。
+		* 注意它**可能改变码位长度**，所以不能用它的下标去切原串 —— 高亮区间另走
+		* {@link dmsNameHit}，只在长度不变时给区间。
+		*/
+		function dmsFold(text) {
+			return text.normalize("NFKD").replace(/\p{M}+/gu, "").toLowerCase();
+		}
+		/** 搜索词归一化（去首尾空白后折叠）。空串 = 非搜索态。 */
+		function dmsNormalizeQuery(raw) {
+			return dmsFold(raw.trim());
+		}
+		/** 模型条目的搜索文本（haystack）。与 choices 构建处同源，避免两处漂移。 */
+		function dmsHaystack(group, model) {
+			return dmsFold(`${model.name}\n${model.description ?? ""}\n${group.name}\n${model.id}\n${group.id}`);
+		}
+		/**
+		* 名称内的命中区间：折叠后长度不变时用下标定位；长度变化（含会改变码位数的
+		* 大小写/变音符映射）时返回 null —— 宁可不高亮，也不能用错位的区间去切原串
+		* （那会把高亮画到别的字符上，甚至越界）。
+		*/
+		function dmsNameHit(name, normalizedQuery) {
+			if (normalizedQuery === "") return null;
+			const folded = dmsFold(name);
+			if (folded.length !== name.length) return null;
+			const at = folded.indexOf(normalizedQuery);
+			return at < 0 ? null : {
+				start: at,
+				end: at + normalizedQuery.length
+			};
+		}
+		/**
+		* 搜索：遍历 choices 计数全部命中，只构造窗口内（前 limit 条）的渲染条目 ——
+		* 宽泛关键词（单字母）命中数百条时，每次击键省掉数百次对象分配与名称匹配；
+		* total 单独累计，播报与「仅显示前 N 条」提示仍然准确。
+		*/
+		function dmsSearchHits(choices, normalizedQuery, limit) {
+			if (normalizedQuery === "") return null;
+			const items = [];
+			let total = 0;
+			for (const choice of choices) {
+				if (!choice.haystack.includes(normalizedQuery)) continue;
+				total += 1;
+				if (items.length >= limit) continue;
+				items.push({
+					group: choice.group,
+					model: choice.model,
+					nameHit: dmsNameHit(choice.model.name, normalizedQuery)
+				});
+			}
+			return {
+				items,
+				total
+			};
+		}
+		/**
+		* 空态判定：**无模型优先于无命中** —— 目录为空而用户又输了关键词时，真相是
+		* 「没有可用的模型」（该引导用户去配置/加载目录），不是「没有匹配关键词的模型」
+		* （那会引导用户去改关键词，而无论改什么都不会有结果）。
+		*/
+		function dmsMenuEmptyState(input) {
+			if (input.status === "ready" && input.choiceCount === 0) return "noModels";
+			if (input.searching && input.hitCount === 0) return "noHits";
+			return null;
+		}
+		//#endregion
+		//#region src/client/keys.ts
+		/**
+		* 按键 → 动作。无行可去时对方向键/Home/End 返回 none 而不是吞键：列表为空
+		* （加载中/无命中/全折叠）时搜索框里的上下键仍应有移光标语义，preventDefault
+		* 由调用方在真正执行动作时才发。
+		*/
+		function dmsMenuKeyAction(input) {
+			if (input.composing) return { type: "none" };
+			const { key, open, fromSearch, inMenu, onNonInput, hasQuery, rowCount, hitCount } = input;
+			if (key === "Escape" && open) {
+				if (hasQuery && inMenu) return {
+					type: "clearQuery",
+					focusSearch: !fromSearch
+				};
+				return { type: "close" };
+			}
+			if (!open) return { type: "none" };
+			if ((key === "ArrowDown" || key === "ArrowUp") && (onNonInput || fromSearch)) {
+				if (rowCount === 0) return { type: "none" };
+				return {
+					type: "moveFocus",
+					offset: key === "ArrowDown" ? 1 : -1
+				};
+			}
+			if ((key === "Home" || key === "End") && onNonInput) {
+				if (rowCount === 0) return { type: "none" };
+				return {
+					type: "focusEdge",
+					last: key === "End"
+				};
+			}
+			if (key === "Enter" && fromSearch && hitCount > 0) return { type: "chooseFirstHit" };
+			return { type: "none" };
+		}
+		/**
+		* roving 环绕下标：焦点不在任何行上（activeIndex < 0）时向下从首行进、向上从
+		* 末行进；已在某行上时按 offset 循环。length <= 0 返回 -1（无可去之处）。
+		*/
+		function dmsNextRowIndex(activeIndex, offset, length) {
+			if (length <= 0) return -1;
+			return ((activeIndex < 0 ? offset > 0 ? -1 : 0 : activeIndex) + offset + length) % length;
+		}
+		//#endregion
+		//#region src/client/copy.ts
+		/**
+		* trigger 文案。目录成员资格只是参考（routable 契约）：current 匹配不到任何
+		* group 不代表没有选择 —— 此时显示 provider/model 原始 id，而不是「选择模型」。
+		*/
+		function dmsTriggerCopy(input, t) {
+			const { current, modelName, providerName, effortLabel, waiting } = input;
+			const modelLabel = modelName ?? (waiting ? t("trigger.loading") : current === null ? t("trigger.fallback") : `${current.provider}/${current.model}`);
+			const providerLabel = modelName === void 0 ? void 0 : providerName;
+			const label = effortLabel === void 0 ? modelLabel : `${modelLabel} · ${effortLabel}`;
+			const title = providerLabel === void 0 ? label : `${providerLabel} · ${label}`;
+			const named = providerLabel === void 0 ? modelLabel : `${providerLabel} ${modelLabel}`;
+			const ariaModel = modelName === void 0 ? current === null ? null : `${current.provider}/${current.model}` : named;
+			return {
+				modelLabel,
+				providerLabel,
+				label,
+				title,
+				aria: waiting ? t("trigger.loading") : ariaModel === null ? t("trigger.selectAria") : effortLabel === void 0 ? t("trigger.aria", { model: ariaModel }) : t("trigger.ariaEffort", {
+					model: ariaModel,
+					effort: effortLabel
+				})
+			};
+		}
+		//#endregion
 		//#region src/client/ModelSelect.tsx
 		/**
 		* ModelSelect: the enhanced composer model seat (`conversation.input.model`).
@@ -582,12 +779,14 @@ window.__ModuleLoader__.load({
 		* 必须释放滑杆的 committing 锁并回滚，否则滑杆被锁死到菜单关闭。
 		* 调法：后端/网络慢时调大避免误回滚（滑杆锁死时间随之变长）；调小更早释放交互。 */
 		const EFFORT_COMMIT_TIMEOUT_MS = 12e3;
-		const EffortSlider = react.memo(function EffortSlider({ state, select, t }) {
+		const EffortSlider = react.memo(function EffortSlider({ state, select, t, onSelectFailure }) {
 			const levels = dmsSliderLevels(state);
 			const [effort, setEffort] = react.useState(() => levels[dmsEffectiveEffortIndex(levels, state)]?.id ?? "");
 			const [preview, setPreview] = react.useState(() => dmsEffectiveEffortIndex(levels, state));
 			const [committing, setCommitting] = react.useState(false);
 			const [localError, setLocalError] = react.useState(null);
+			const stateRef = react.useRef(state);
+			stateRef.current = state;
 			const canvasRef = react.useRef(null);
 			const inputRef = react.useRef(null);
 			const committedRef = react.useRef("");
@@ -616,7 +815,7 @@ window.__ModuleLoader__.load({
 				setLocalError(null);
 			}, [
 				available,
-				levels.length,
+				levels,
 				state.current?.provider,
 				state.current?.model,
 				state.current?.reasoningEffort
@@ -658,7 +857,13 @@ window.__ModuleLoader__.load({
 				if (dmsEffortBusy(committingRef.current, state.status)) return;
 				const index = dmsClampIndex(raw, levels.length);
 				const next = levels[index]?.id;
-				if (next === void 0 || next === committedRef.current) return;
+				if (next === void 0) return;
+				if (next === committedRef.current) {
+					previewRef.current = index;
+					setPreview(index);
+					setEffort(next);
+					return;
+				}
 				committingRef.current = true;
 				const previous = committedRef.current;
 				commitEpochRef.current += 1;
@@ -671,6 +876,7 @@ window.__ModuleLoader__.load({
 				try {
 					const current = state.current;
 					if (current === null) throw new Error(t("empty.efforts"));
+					const modelKeyAtCommit = dmsRowKey(current.provider, current.model);
 					if (!await new Promise((resolve, reject) => {
 						let settled = false;
 						const timer = window.setTimeout(() => {
@@ -686,7 +892,9 @@ window.__ModuleLoader__.load({
 							reasoningEffort: next
 						}).then((accepted) => {
 							if (settled) {
-								if (accepted && mountedRef.current && dmsShouldAdoptLateSuccess(committedRef.current, previous, draggingRef.current, committingRef.current, commitEpochRef.current, epochAtCommit)) {
+								const latest = stateRef.current.current;
+								const sameModel = latest !== null && dmsRowKey(latest.provider, latest.model) === modelKeyAtCommit;
+								if (accepted && mountedRef.current && dmsShouldAdoptLateSuccess(committedRef.current, previous, draggingRef.current, committingRef.current, commitEpochRef.current, epochAtCommit, sameModel)) {
 									committedRef.current = next;
 									previewRef.current = index;
 									setEffort(next);
@@ -714,6 +922,7 @@ window.__ModuleLoader__.load({
 						setPreview(index);
 					}
 				} catch (cause) {
+					onSelectFailure();
 					const restore = Math.max(0, dmsEffortIndex(levels, previous));
 					committedRef.current = previous;
 					previewRef.current = restore;
@@ -730,7 +939,8 @@ window.__ModuleLoader__.load({
 				levels,
 				select,
 				state,
-				t
+				t,
+				onSelectFailure
 			]);
 			const drag = useEffortDrag({
 				levelCount: () => levels.length,
@@ -818,14 +1028,14 @@ window.__ModuleLoader__.load({
 						className: "dms-effort-desc",
 						children: effortDesc
 					}),
-					error === null ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "dms-sr",
 						role: "status",
-						children: error
+						children: error ?? ""
 					}),
-					error === null ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "dms-effort-error",
-						children: error
+						children: error ?? ""
 					})
 				]
 			});
@@ -839,7 +1049,7 @@ window.__ModuleLoader__.load({
 		* 但 100 条命中里绝大多数命中区间不变——按值比较 start/end，值相同即跳过
 		* 重渲染，搜索才不卡顿。
 		*/
-		const ModelOption = react.memo(function ModelOption({ group, model, showProvider, selected, busy, rowKey, active, onRowFocus, nameHit, t, onChoose }) {
+		const ModelOption = react.memo(function ModelOption({ group, model, showProvider, selected, busy, rowKey, active, searchMode, onRowFocus, nameHit, t, onChoose }) {
 			const hit = nameHit === void 0 || nameHit === null || nameHit.start === nameHit.end ? null : [
 				model.name.slice(0, nameHit.start),
 				model.name.slice(nameHit.start, nameHit.end),
@@ -847,8 +1057,9 @@ window.__ModuleLoader__.load({
 			];
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 				type: "button",
-				role: "menuitemradio",
-				"aria-checked": selected,
+				role: searchMode ? "option" : "menuitemradio",
+				"aria-checked": searchMode ? void 0 : selected,
+				"aria-selected": searchMode ? selected : void 0,
 				"data-row-key": rowKey,
 				tabIndex: active ? 0 : -1,
 				className: `dms-model-option${selected ? " dms-model-optionSelected" : ""}`,
@@ -903,6 +1114,7 @@ window.__ModuleLoader__.load({
 			if (prev.busy !== next.busy) return false;
 			if (prev.rowKey !== next.rowKey) return false;
 			if (prev.active !== next.active) return false;
+			if (prev.searchMode !== next.searchMode) return false;
 			if (prev.onRowFocus !== next.onRowFocus) return false;
 			if (prev.t !== next.t) return false;
 			if (prev.onChoose !== next.onChoose) return false;
@@ -932,6 +1144,12 @@ window.__ModuleLoader__.load({
 					failed
 				});
 			}, []);
+			const markSelectFailure = react.useCallback(() => {
+				lastActionRef.current = "select";
+			}, []);
+			const dismissToast = react.useCallback(() => {
+				setToast(null);
+			}, []);
 			const lastActionRef = react.useRef("load");
 			const rootRef = react.useRef(null);
 			const triggerRef = react.useRef(null);
@@ -941,7 +1159,7 @@ window.__ModuleLoader__.load({
 			const choices = react.useMemo(() => state.groups.flatMap((group) => group.models.map((model) => ({
 				group,
 				model,
-				haystack: `${model.name}\n${model.description ?? ""}\n${group.name}\n${model.id}\n${group.id}`.toLowerCase(),
+				haystack: dmsHaystack(group, model),
 				selection: {
 					provider: group.id,
 					model: model.id,
@@ -957,41 +1175,30 @@ window.__ModuleLoader__.load({
 			const effectiveEffort = state.current?.reasoningEffort ?? reasoning?.defaultEffort;
 			const effortLabel = reasoning === void 0 ? void 0 : effectiveEffort === void 0 ? t("effort.providerDefault") : reasoning.efforts.find((level) => level.id === effectiveEffort)?.name ?? effectiveEffort;
 			const busy = state.status === "selecting";
-			const normalized = query.trim().toLowerCase();
-			const hits = react.useMemo(() => {
-				if (normalized === "") return null;
-				const items = [];
-				let total = 0;
-				for (const choice of choices) {
-					if (!choice.haystack.includes(normalized)) continue;
-					total += 1;
-					if (items.length >= MAX_VISIBLE_HITS) continue;
-					let nameHit = null;
-					const at = choice.model.name.toLowerCase().indexOf(normalized);
-					if (at >= 0) nameHit = {
-						start: at,
-						end: at + normalized.length
-					};
-					items.push({
-						group: choice.group,
-						model: choice.model,
-						nameHit
-					});
-				}
-				return {
-					items,
-					total
-				};
-			}, [choices, normalized]);
+			const chooseInputRef = react.useRef({
+				busy,
+				current: state.current,
+				choices,
+				open
+			});
+			chooseInputRef.current = {
+				busy,
+				current: state.current,
+				choices,
+				open
+			};
+			const normalized = dmsNormalizeQuery(query);
+			const hits = react.useMemo(() => dmsSearchHits(choices, normalized, MAX_VISIBLE_HITS), [choices, normalized]);
+			const visibleModelKeys = react.useMemo(() => state.groups.flatMap((g) => collapsed.has(g.id) ? [] : g.models.map((m) => dmsRowKey(g.id, m.id))), [state.groups, collapsed]);
 			const defaultRowKey = react.useMemo(() => dmsDefaultRowKey({
-				hitKeys: hits === null ? null : hits.items.map((h) => `${h.group.id}\u0000${h.model.id}`),
-				modelKeys: state.groups.flatMap((g) => collapsed.has(g.id) ? [] : g.models.map((m) => `${g.id}\u0000${m.id}`)),
-				headerKeys: state.groups.map((g) => `header:${g.id}`),
-				selectedKey: state.current === null ? null : `${state.current.provider}\u0000${state.current.model}`
+				hitKeys: hits === null ? null : hits.items.map((h) => dmsRowKey(h.group.id, h.model.id)),
+				modelKeys: visibleModelKeys,
+				headerKeys: state.groups.map((g) => dmsHeaderKey(g.id)),
+				selectedKey: state.current === null ? null : dmsRowKey(state.current.provider, state.current.model)
 			}), [
 				hits,
+				visibleModelKeys,
 				state.groups,
-				collapsed,
 				state.current
 			]);
 			react.useEffect(() => {
@@ -1028,7 +1235,9 @@ window.__ModuleLoader__.load({
 					setMenuAbove(dmsMenuAbove(rect.top, rect.bottom, window.innerHeight));
 					setBelowMaxHeight(dmsBelowMaxHeight(rect.bottom, window.innerHeight, 420));
 					const menuWidth = menuRef.current?.offsetWidth ?? 0;
-					setMenuLeft(dmsMenuLeft(rect.right, menuWidth, window.innerWidth, 12));
+					const left = dmsMenuLeft(rect.right, menuWidth, window.innerWidth, 12);
+					const rootLeft = rootRef.current?.getBoundingClientRect().left ?? 0;
+					setMenuLeft(left === void 0 ? void 0 : left - rootLeft);
 				};
 				measure();
 				let raf = 0;
@@ -1111,42 +1320,47 @@ window.__ModuleLoader__.load({
 				state.groups.length,
 				reload
 			]);
+			const focusTrigger = () => {
+				const trigger = triggerRef.current;
+				if (trigger !== null && !trigger.disabled) {
+					trigger.focus();
+					return;
+				}
+				rootRef.current?.focus();
+			};
 			const close = react.useCallback((restoreFocus = false) => {
 				setOpen(false);
 				setNotice(null);
 				setQuery("");
-				if (restoreFocus) queueMicrotask(() => {
-					triggerRef.current?.focus();
-				});
+				if (restoreFocus) queueMicrotask(focusTrigger);
 			}, []);
 			const dismissOnOutsidePointer = react.useCallback(() => {
 				close(true);
 			}, [close]);
 			(0, _deepseek_ai_dsh_client_ui_primitives.useDismissOnOutsidePointer)(rootRef, open, dismissOnOutsidePointer);
 			react.useEffect(() => {
-				if (locked && open) close();
+				if (locked && open) close(true);
 			}, [
 				locked,
 				open,
 				close
 			]);
 			const choose = react.useCallback((selection) => {
-				if (busy) return;
-				if (state.current?.provider === selection.provider && state.current.model === selection.model) {
+				const { busy: isBusy, current, choices: catalog } = chooseInputRef.current;
+				if (isBusy) return;
+				if (current?.provider === selection.provider && current.model === selection.model) {
 					setNotice(t("notice.already"));
 					return;
 				}
-				const target = choices.find((c) => c.selection.provider === selection.provider && c.selection.model === selection.model);
-				const max = target?.model.reasoning === void 0 ? void 0 : maxEffortOf(target.model.reasoning);
-				const effort = max === "off" ? void 0 : max;
+				const target = catalog.find((c) => c.selection.provider === selection.provider && c.selection.model === selection.model);
+				const plan = dmsChoosePlan(target?.model.reasoning);
 				const full = {
 					provider: selection.provider,
 					model: selection.model,
-					...effort === void 0 ? {} : { reasoningEffort: effort }
+					...plan.effort === void 0 ? {} : { reasoningEffort: plan.effort }
 				};
 				lastActionRef.current = "select";
-				const autoRaised = effort !== void 0 && effort !== target?.model.reasoning?.defaultEffort;
-				const autoName = target?.model.reasoning?.efforts.find((level) => level.id === effort)?.name ?? effort ?? "";
+				const autoName = plan.effort === void 0 ? "" : target?.model.reasoning?.efforts.find((level) => level.id === plan.effort)?.name ?? plan.effort;
 				(async () => {
 					try {
 						if (!await new Promise((resolve, reject) => {
@@ -1172,18 +1386,13 @@ window.__ModuleLoader__.load({
 							showToast(message !== null ? t("error.action", { message }) : t("notice.selectFailed"));
 							return;
 						}
-						if (rootRef.current !== null) {
-							close(true);
-							if (autoRaised) showToast(t("toast.effortAuto", { effort: autoName }), false);
-						}
+						if (chooseInputRef.current.open) close(true);
+						if (plan.autoRaised) showToast(t("toast.effortAuto", { effort: autoName }), false);
 					} catch {
 						showToast(t("notice.selectFailed"));
 					}
 				})();
 			}, [
-				busy,
-				state.current,
-				choices,
 				select,
 				t,
 				directory,
@@ -1204,8 +1413,7 @@ window.__ModuleLoader__.load({
 				if (menu === null) return;
 				const items = [...menu.querySelectorAll("[data-row-key]")];
 				if (items.length === 0) return;
-				const active = items.findIndex((item) => item === document.activeElement);
-				items[((active < 0 ? offset > 0 ? -1 : 0 : active) + offset + items.length) % items.length]?.focus();
+				items[dmsNextRowIndex(items.findIndex((item) => item === document.activeElement), offset, items.length)]?.focus();
 			};
 			const focusEdge = (last) => {
 				const items = menuRef.current?.querySelectorAll("[data-row-key]");
@@ -1213,65 +1421,70 @@ window.__ModuleLoader__.load({
 				(last ? items[items.length - 1] : items[0])?.focus();
 			};
 			const onRootKeyDown = (event) => {
-				if (event.nativeEvent.isComposing) return;
 				const target = event.target;
-				if (event.key === "Escape" && open) {
-					if (query !== "" && rootRef.current?.contains(document.activeElement) === true) {
-						const fromSearch = target instanceof HTMLInputElement && target === searchRef.current;
+				const action = dmsMenuKeyAction({
+					key: event.key,
+					composing: event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229,
+					open,
+					fromSearch: target instanceof HTMLInputElement && target === searchRef.current,
+					inMenu: menuRef.current?.contains(document.activeElement) === true,
+					onNonInput: !(target instanceof HTMLInputElement),
+					hasQuery: query !== "",
+					rowCount: menuRef.current?.querySelectorAll("[data-row-key]").length ?? 0,
+					hitCount: hits?.items.length ?? 0
+				});
+				switch (action.type) {
+					case "none": return;
+					case "clearQuery":
+						event.preventDefault();
 						setNotice(null);
 						setQuery("");
-						if (!fromSearch) searchRef.current?.focus();
+						if (action.focusSearch) searchRef.current?.focus();
 						return;
-					}
-					event.preventDefault();
-					close(true);
-					return;
-				}
-				if (!open) return;
-				const fromSearch = target instanceof HTMLInputElement && target === searchRef.current;
-				if ((event.key === "ArrowDown" || event.key === "ArrowUp") && (!(target instanceof HTMLInputElement) || fromSearch)) {
-					event.preventDefault();
-					moveFocus(event.key === "ArrowDown" ? 1 : -1);
-					return;
-				}
-				if ((event.key === "Home" || event.key === "End") && !(target instanceof HTMLInputElement)) {
-					event.preventDefault();
-					focusEdge(event.key === "End");
-					return;
-				}
-				if (event.key === "Enter" && fromSearch) {
-					if (hits !== null && hits.items.length > 0) {
+					case "close":
+						event.preventDefault();
+						close(true);
+						return;
+					case "moveFocus":
+						event.preventDefault();
+						moveFocus(action.offset);
+						return;
+					case "focusEdge":
+						event.preventDefault();
+						focusEdge(action.last);
+						return;
+					case "chooseFirstHit": {
+						const first = hits?.items[0];
+						if (first === void 0) return;
 						event.preventDefault();
-						const first = hits.items[0];
 						choose({
 							provider: first.group.id,
 							model: first.model.id
 						});
+						return;
 					}
 				}
 			};
 			const onBlur = (event) => {
-				if (busy) return;
 				const related = event.relatedTarget;
+				if (related instanceof Node && rootRef.current?.contains(related) === true) return;
 				if (related instanceof Node) {
-					if (rootRef.current?.contains(related)) return;
 					close();
 					return;
 				}
-				close();
+				if (!document.hasFocus()) close();
 			};
-			const waiting = state.current === null && state.status === "loading";
-			const modelLabel = currentChoice?.model.name ?? (waiting ? t("trigger.loading") : state.current === null ? t("trigger.fallback") : `${state.current.provider}/${state.current.model}`);
-			const providerLabel = currentChoice?.group.name;
-			const triggerLabel = effortLabel === void 0 ? modelLabel : `${modelLabel} · ${effortLabel}`;
-			const triggerTitle = providerLabel === void 0 ? triggerLabel : `${providerLabel} · ${triggerLabel}`;
-			const triggerAria = waiting ? t("trigger.loading") : currentChoice === void 0 ? state.current === null ? t("trigger.selectAria") : t("trigger.aria", { model: `${state.current.provider}/${state.current.model}` }) : effortLabel === void 0 ? t("trigger.aria", { model: providerLabel === void 0 ? modelLabel : `${providerLabel} ${modelLabel}` }) : t("trigger.ariaEffort", {
-				model: providerLabel === void 0 ? modelLabel : `${providerLabel} ${modelLabel}`,
-				effort: effortLabel
-			});
+			const trigger = dmsTriggerCopy({
+				current: state.current,
+				modelName: currentChoice?.model.name,
+				providerName: currentChoice?.group.name,
+				effortLabel,
+				waiting: state.current === null && state.status === "loading"
+			}, t);
 			const renderErrorStrip = () => {
 				if (state.error !== null && lastActionRef.current === "load") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "dms-error",
+					role: "alert",
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: t("error.action", { message: state.error }) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						className: "dms-retry",
@@ -1293,11 +1506,16 @@ window.__ModuleLoader__.load({
 					children: t("action.reload")
 				})]
 			}, failure.id));
-			const noHits = hits !== null && hits.items.length === 0;
-			const noModels = hits === null && state.status === "ready" && choices.length === 0;
+			const emptyState = dmsMenuEmptyState({
+				status: state.status,
+				choiceCount: choices.length,
+				searching: hits !== null,
+				hitCount: hits?.total ?? 0
+			});
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				ref: rootRef,
 				className: "dms-root",
+				tabIndex: -1,
 				onKeyDown: onRootKeyDown,
 				onBlur,
 				children: [
@@ -1305,21 +1523,21 @@ window.__ModuleLoader__.load({
 						ref: triggerRef,
 						type: "button",
 						className: "dms-trigger",
-						"aria-label": triggerAria,
+						"aria-label": trigger.aria,
 						"aria-haspopup": "menu",
 						"aria-expanded": open,
 						"aria-controls": open ? `${id}-menu` : void 0,
-						title: triggerTitle,
+						title: trigger.title,
 						disabled: locked,
 						onClick: () => open ? close() : show(),
 						children: [
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dms-triggerLabel",
-								children: modelLabel
+								children: trigger.modelLabel
 							}),
-							providerLabel !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							trigger.providerLabel !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dms-triggerProvider",
-								children: providerLabel
+								children: trigger.providerLabel
 							}),
 							effortLabel !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dms-triggerEffort",
@@ -1343,15 +1561,16 @@ window.__ModuleLoader__.load({
 							}
 						},
 						className: "dms-menu dms-menuModel" + (menuAbove ? "" : " dms-menuBelow"),
-						"aria-busy": state.status === "loading" || busy,
 						children: [
 							state.status === "loading" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dms-status",
+								role: "status",
 								children: t("status.loading")
 							}),
 							renderErrorStrip(),
 							state.failures.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dms-failures",
+								role: "alert",
 								children: renderFailures(state.failures)
 							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1363,7 +1582,10 @@ window.__ModuleLoader__.load({
 									value: query,
 									placeholder: t("search.placeholder"),
 									"aria-label": t("search.placeholder"),
-									"aria-controls": `${id}-groups`,
+									role: "combobox",
+									"aria-expanded": hits !== null,
+									"aria-autocomplete": "list",
+									"aria-controls": emptyState === null ? `${id}-groups` : void 0,
 									autoComplete: "off",
 									enterKeyHint: "search",
 									spellCheck: false,
@@ -1387,28 +1609,34 @@ window.__ModuleLoader__.load({
 									})
 								})]
 							}),
-							hits !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dms-sr",
 								role: "status",
-								children: t("search.status", { count: String(hits.total) })
+								children: hits !== null && hits.total > 0 ? t("search.status", { count: String(hits.total) }) : ""
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dms-sr",
+								role: "note",
+								children: t("badge.reasoningHint")
 							}),
-							noHits && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							emptyState === "noHits" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dms-empty dms-groupsFill",
 								role: "status",
 								children: t("search.noMatch", { query: query.trim() })
 							}),
-							noModels && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							emptyState === "noModels" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dms-empty dms-groupsFill",
 								role: "status",
 								children: t("empty.models")
 							}),
-							!noHits && !noModels && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							emptyState === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dms-groups",
 								id: `${id}-groups`,
-								role: "menu",
+								role: hits !== null ? "listbox" : "menu",
+								"aria-busy": state.status === "loading" || busy,
 								"aria-label": t("menu.aria"),
 								children: hits !== null ? hits.items.map((hit) => {
-									const rowKey = `${hit.group.id}\u0000${hit.model.id}`;
+									const rowKey = dmsRowKey(hit.group.id, hit.model.id);
 									return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelOption, {
 										group: hit.group,
 										model: hit.model,
@@ -1417,6 +1645,7 @@ window.__ModuleLoader__.load({
 										busy,
 										rowKey,
 										active: rowKey === activeRowKey,
+										searchMode: true,
 										onRowFocus,
 										nameHit: hit.nameHit,
 										t,
@@ -1424,6 +1653,7 @@ window.__ModuleLoader__.load({
 									}, rowKey);
 								}) : state.groups.map((group) => {
 									const headingId = `${id}-${group.id}`;
+									const headerKey = dmsHeaderKey(group.id);
 									const isCollapsed = collapsed.has(group.id);
 									return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 										"data-group-id": group.id,
@@ -1433,14 +1663,15 @@ window.__ModuleLoader__.load({
 										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 											type: "button",
 											role: "menuitem",
-											"data-row-key": `header:${group.id}`,
-											tabIndex: -1,
+											"data-row-key": headerKey,
+											tabIndex: activeRowKey === headerKey ? 0 : -1,
 											className: "dms-groupHeader",
 											"aria-expanded": !isCollapsed,
 											"aria-label": t("group.toggleAria", {
 												name: group.name,
 												count: String(group.models.length)
 											}),
+											onFocus: () => onRowFocus(headerKey),
 											onClick: () => toggleCollapse(group.id),
 											children: [
 												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -1459,7 +1690,7 @@ window.__ModuleLoader__.load({
 												})
 											]
 										}), !isCollapsed && group.models.map((model) => {
-											const rowKey = `${group.id}\u0000${model.id}`;
+											const rowKey = dmsRowKey(group.id, model.id);
 											return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelOption, {
 												group,
 												model,
@@ -1468,6 +1699,7 @@ window.__ModuleLoader__.load({
 												busy,
 												rowKey,
 												active: rowKey === activeRowKey,
+												searchMode: false,
 												onRowFocus,
 												t,
 												onChoose: choose
@@ -1492,13 +1724,14 @@ window.__ModuleLoader__.load({
 								}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(EffortSlider, {
 									state,
 									select,
-									t
+									t,
+									onSelectFailure: markSelectFailure
 								})]
 							}),
-							notice !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dms-notice",
 								role: "status",
-								children: notice
+								children: notice ?? ""
 							})
 						]
 					}) : null,
@@ -1506,9 +1739,7 @@ window.__ModuleLoader__.load({
 						text: toast.text,
 						icon: toast.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutline16, {}) : void 0,
 						anchor: rootRef.current?.closest("[data-composer-card]") ?? null,
-						onDone: () => {
-							setToast(null);
-						}
+						onDone: dismissToast
 					}, toast.seq)
 				]
 			});
@@ -1522,12 +1753,18 @@ window.__ModuleLoader__.load({
 		* apply and removed again on unload. Class names are prefixed `dms-` so they
 		* cannot collide with CSS-module hashes from other plugins. Colors come only
 		* from `--dsw-*` theme tokens, matching the shipped Menu material.
+		*
+		* 显式 `: string` 注解：不加注解时 tsc 会把整份 CSS 推断成字面量类型并写进
+		* lib/types/client/styles.d.ts（19KB 的 d.ts 只为声明一个常量），发布包里
+		* 白白多出十几 KB 且每次改样式都全量重写。
 		*/
 		const CSS = `
 .dms-root {
   position: relative;
   min-width: 0;
 }
+/* root 只作为焦点落点（tabIndex=-1）：不画焦点环，真正的可聚焦控件在它内部。 */
+.dms-root:focus { outline: none; }
 
 .dms-trigger {
   display: flex;
@@ -1789,6 +2026,8 @@ window.__ModuleLoader__.load({
   font-size: 12px;
   line-height: 18px;
 }
+/* 常驻 live region（内容随状态更新）：空时收起，不占位。 */
+.dms-notice:empty { display: none; }
 .dms-effort {
   display: flex;
   align-items: center;
@@ -1959,6 +2198,8 @@ window.__ModuleLoader__.load({
 }
 .dms-effort.is-busy { opacity: .72; }
 .dms-effort-error { flex: 1 0 100%; margin-top: 8px; padding: 6px 10px; border-radius: 8px; color: var(--dsw-alias-state-error-primary, #c83e4d); background: var(--dsw-alias-state-error-tertiary, rgba(220,55,70,.08)); font-size: 11px; line-height: 1.5; }
+/* 常驻容器（内容随状态更新）：空时收起，不占位。 */
+.dms-effort-error:empty { display: none; }
 /* 视觉隐藏工具类（SR 播报/错误原文：不占布局但可被读屏读到）。 */
 .dms-sr {
   position: absolute;
@@ -1999,14 +2240,21 @@ window.__ModuleLoader__.load({
 }
 .dms-model-option-desc { display: block; margin-top: 3px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--dsw-alias-label-tertiary, #9296a0); font-size: 10px; }
 .dms-model-check { color: var(--dsw-static-deepseek-500, #4d70ff); font-size: 15px; text-align: center; }
-/* 方向键导航把焦点落在选项上，此前没有任何焦点指示。 */
-.dms-model-option:focus-visible { background: var(--dsw-alias-interactive-bg-hover); }
+/* 方向键导航把焦点落在选项上。选中态是「背景 + 加粗 + 勾号」，悬停是「背景」，
+   两者与焦点指示必须两两可辨 —— 只用同一个 hover 背景 token 会让「焦点落在
+   选中行上」完全不可见（roving 的默认落点恰恰优先选中行）。 */
+.dms-model-option:focus-visible {
+  background: var(--dsw-alias-interactive-bg-hover);
+  box-shadow: inset 0 0 0 2px var(--dsw-alias-border-l3);
+}
 /* 当前选中行：仅靠勾号不足以在密集列表里定位。 */
 .dms-model-optionSelected { background: var(--dsw-alias-interactive-bg-hover); }
 .dms-model-optionSelected .dms-model-option-name { font-weight: 600; }
 /* select 进行中：官方以 disabled 变灰表达，这里用 aria-busy 驱动同样的视觉、
-   不夺键盘焦点（aria-disabled 保连续性，见 ModelOption）。 */
-.dms-menu[aria-busy="true"] .dms-model-option { color: var(--dsw-alias-label-dimmed); }
+   不夺键盘焦点（aria-disabled 保连续性，见 ModelOption）。aria-busy 挂在
+   role=menu/listbox 容器上（.dms-groups）—— 挂在外层 .dms-menu 会罩住
+   live region、压制其播报。 */
+.dms-groups[aria-busy="true"] .dms-model-option { color: var(--dsw-alias-label-dimmed); }
 /* 搜索结果里的供应商标是区分跨供应商同名模型的唯一线索，之前无任何样式。 */
 .dms-model-option-provider {
   display: block;
@@ -2118,6 +2366,14 @@ body:not([data-ds-dark-theme]) .dms-effort.is-dragging .dms-effort-knob {
 		//#region src/client/index.ts
 		/** Dictionary namespace owned by this plugin. */
 		const NS = "modelSelector";
+		/**
+		* 座位优先级。ui-conversation 把 `conversation.input.model` 声明为 kind 'single'
+		* （单槽按 priority 升序取最低者渲染），官方占用者
+		* （@deepseek-ai/dsh-client-ui-model-selection）注册时不传 priority（即默认 0），
+		* 故 -1 恒胜出。**改这个值等于静默换回官方 UI** —— test/plugin-contract.test.mjs
+		* 直接断言本常量（而不是扫源码文本，那样一行注释就能骗过它），注册处也不许再写裸字面量。
+		*/
+		const SEAT_PRIORITY = -1;
 		/** Required services: the registry, session lookup, locale, the slot seat, and the model directory's Remote faces. */
 		const inject = [
 			"slots",
@@ -2175,10 +2431,11 @@ body:not([data-ds-dark-theme]) .dms-effort.is-dragging .dms-effort-knob {
 			});
 		}
 		//#endregion
+		exports.SEAT_PRIORITY = SEAT_PRIORITY;
 		exports.apply = apply;
 		exports.inject = inject;
 		return module.exports;
-	}
+		/* __DMS_SRC_HASH__ = "eead5888f44285e2028692c6971ab7d6d8cfeb16272176f9c2c392186c440c04" */	}
 });
 
 //# sourceMappingURL=client.js.map