@bittersmilezzz/dsh-model-selector 0.2.0 → 0.3.0

package/lib/client.js

@@ -760,9 +760,9 @@ window.__ModuleLoader__.load({
 		* reused from @deepseek-ai/dsh-client-ui-primitives at runtime; colors
 		* come from `--dsw-*` tokens in the injected stylesheet.
 		*/
-		const IconChevronDown = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutline14, {});
-		const IconCheck = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline14, {});
-		const IconClear = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseFill14, {});
+		const IconChevronDown = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconChevronDownOutlineRegular, { size: 14 });
+		const IconCheck = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutlineRegular, { size: 14 });
+		const IconClear = /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCloseFillRegular, { size: 14 });
 		/**
 		* How long a successfully loaded directory snapshot is trusted before the
 		* menu re-fetches it over RPC. The snapshot lives in the per-session store,
@@ -877,7 +877,7 @@ window.__ModuleLoader__.load({
 					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) => {
+					const result = await new Promise((resolve, reject) => {
 						let settled = false;
 						const timer = window.setTimeout(() => {
 							if (settled) return;
@@ -890,11 +890,11 @@ window.__ModuleLoader__.load({
 							provider: current.provider,
 							model: current.model,
 							reasoningEffort: next
-						}).then((accepted) => {
+						}).then((result) => {
 							if (settled) {
 								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)) {
+								if (result?.ok === true && mountedRef.current && dmsShouldAdoptLateSuccess(committedRef.current, previous, draggingRef.current, committingRef.current, commitEpochRef.current, epochAtCommit, sameModel)) {
 									committedRef.current = next;
 									previewRef.current = index;
 									setEffort(next);
@@ -906,7 +906,7 @@ window.__ModuleLoader__.load({
 							settled = true;
 							window.clearTimeout(timer);
 							commitTimerRef.current = null;
-							resolve(accepted);
+							resolve(result);
 						}, (cause) => {
 							if (settled) return;
 							settled = true;
@@ -914,7 +914,11 @@ window.__ModuleLoader__.load({
 							commitTimerRef.current = null;
 							reject(cause);
 						});
-					})) throw new Error(t("effort.failed"));
+					});
+					if (result === void 0 || !result.ok) {
+						if (result !== void 0) console.warn("[dsh-model-selector] effort select failed:", result.error);
+						throw new Error(t("effort.failed"));
+					}
 					if (mountedRef.current) {
 						committedRef.current = next;
 						previewRef.current = index;
@@ -922,18 +926,22 @@ window.__ModuleLoader__.load({
 						setPreview(index);
 					}
 				} catch (cause) {
-					onSelectFailure();
-					const restore = Math.max(0, dmsEffortIndex(levels, previous));
-					committedRef.current = previous;
-					previewRef.current = restore;
-					if (mountedRef.current) {
-						setEffort(previous);
-						setPreview(restore);
-						setLocalError(cause instanceof Error ? cause.message : String(cause));
+					if (commitEpochRef.current === epochAtCommit) {
+						onSelectFailure();
+						const restore = Math.max(0, dmsEffortIndex(levels, previous));
+						committedRef.current = previous;
+						previewRef.current = restore;
+						if (mountedRef.current) {
+							setEffort(previous);
+							setPreview(restore);
+							setLocalError(cause instanceof Error ? cause.message : String(cause));
+						}
 					}
 				} finally {
-					committingRef.current = false;
-					if (mountedRef.current) setCommitting(false);
+					if (commitEpochRef.current === epochAtCommit) {
+						committingRef.current = false;
+						if (mountedRef.current) setCommitting(false);
+					}
 				}
 			}, [
 				levels,
@@ -1049,7 +1057,7 @@ window.__ModuleLoader__.load({
 		* 但 100 条命中里绝大多数命中区间不变——按值比较 start/end，值相同即跳过
 		* 重渲染，搜索才不卡顿。
 		*/
-		const ModelOption = react.memo(function ModelOption({ group, model, showProvider, selected, busy, rowKey, active, searchMode, onRowFocus, nameHit, t, onChoose }) {
+		const ModelOption = react.memo(function ModelOption({ group, model, showProvider, selected, busy, rowKey, active, searchMode, onRowFocus, nameHit, setsize, posinset, 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),
@@ -1060,6 +1068,9 @@ window.__ModuleLoader__.load({
 				role: searchMode ? "option" : "menuitemradio",
 				"aria-checked": searchMode ? void 0 : selected,
 				"aria-selected": searchMode ? selected : void 0,
+				id: searchMode ? `dms-opt-${encodeURIComponent(rowKey)}` : void 0,
+				"aria-setsize": searchMode && setsize !== void 0 && setsize > posinset ? setsize : void 0,
+				"aria-posinset": searchMode && posinset !== void 0 ? posinset : void 0,
 				"data-row-key": rowKey,
 				tabIndex: active ? 0 : -1,
 				className: `dms-model-option${selected ? " dms-model-optionSelected" : ""}`,
@@ -1118,6 +1129,8 @@ window.__ModuleLoader__.load({
 			if (prev.onRowFocus !== next.onRowFocus) return false;
 			if (prev.t !== next.t) return false;
 			if (prev.onChoose !== next.onChoose) return false;
+			if (prev.setsize !== next.setsize) return false;
+			if (prev.posinset !== next.posinset) return false;
 			if (prev.nameHit === next.nameHit) return true;
 			if (prev.nameHit === null || prev.nameHit === void 0) return false;
 			if (next.nameHit === null || next.nameHit === void 0) return false;
@@ -1363,26 +1376,27 @@ window.__ModuleLoader__.load({
 				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) => {
+						const result = await new Promise((resolve, reject) => {
 							let settled = false;
 							const timer = window.setTimeout(() => {
 								if (settled) return;
 								settled = true;
 								reject(new Error(t("notice.selectFailed")));
 							}, EFFORT_COMMIT_TIMEOUT_MS);
-							select(full).then((ok) => {
+							select(full).then((settledResult) => {
 								if (settled) return;
 								settled = true;
 								window.clearTimeout(timer);
-								resolve(ok);
+								resolve(settledResult);
 							}, (cause) => {
 								if (settled) return;
 								settled = true;
 								window.clearTimeout(timer);
 								reject(cause);
 							});
-						})) {
-							const message = directory.getSnapshot().error;
+						});
+						if (result === void 0 || !result.ok) {
+							const message = result !== void 0 ? `${result.error.code}: ${result.error.message}` : directory.getSnapshot().error;
 							showToast(message !== null ? t("error.action", { message }) : t("notice.selectFailed"));
 							return;
 						}
@@ -1472,7 +1486,7 @@ window.__ModuleLoader__.load({
 					close();
 					return;
 				}
-				if (!document.hasFocus()) close();
+				if (document.visibilityState === "hidden") close();
 			};
 			const trigger = dmsTriggerCopy({
 				current: state.current,
@@ -1583,7 +1597,7 @@ window.__ModuleLoader__.load({
 									placeholder: t("search.placeholder"),
 									"aria-label": t("search.placeholder"),
 									role: "combobox",
-									"aria-expanded": hits !== null,
+									"aria-expanded": hits !== null && hits.total > 0,
 									"aria-autocomplete": "list",
 									"aria-controls": emptyState === null ? `${id}-groups` : void 0,
 									autoComplete: "off",
@@ -1635,7 +1649,7 @@ window.__ModuleLoader__.load({
 								role: hits !== null ? "listbox" : "menu",
 								"aria-busy": state.status === "loading" || busy,
 								"aria-label": t("menu.aria"),
-								children: hits !== null ? hits.items.map((hit) => {
+								children: hits !== null ? hits.items.map((hit, index) => {
 									const rowKey = dmsRowKey(hit.group.id, hit.model.id);
 									return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ModelOption, {
 										group: hit.group,
@@ -1648,6 +1662,8 @@ window.__ModuleLoader__.load({
 										searchMode: true,
 										onRowFocus,
 										nameHit: hit.nameHit,
+										setsize: hits.total,
+										posinset: index + 1,
 										t,
 										onChoose: choose
 									}, rowKey);
@@ -1737,7 +1753,7 @@ window.__ModuleLoader__.load({
 					}) : null,
 					toast !== null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Toast, {
 						text: toast.text,
-						icon: toast.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutline16, {}) : void 0,
+						icon: toast.failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconWarningOutlineRegular, { size: 14 }) : void 0,
 						anchor: rootRef.current?.closest("[data-composer-card]") ?? null,
 						onDone: dismissToast
 					}, toast.seq)
@@ -1859,9 +1875,20 @@ window.__ModuleLoader__.load({
   animation-name: dms-menu-in-below;
 }
 
+/* 菜单头部的「非列表」栏（loading / 空态 / 错误条 / 失败条 / 截断提示）：
+   一律允许收缩（flex-shrink 1）且各自限高，让 .dms-groups 始终保住可滚动
+   的最小可视高度。2026-09-21 修复的 P0：向上弹时 useAnchoredMaxHeight 会把
+   maxHeight 钳到「trigger 底缘 - 12px」（底缘固定、向上生长的语义），trigger
+   靠近视口顶部时该值很小；原先这些栏是 flex: 0 0 auto 完全不收缩，头部
+   40-100px 全部占完后 .dms-groups 的可视高度趋近 0，而 .dms-menu 是
+   overflow:hidden —— 用户看到错误条却看不到也滚不到任何模型行。
+   现在给它们统一的上限（相对菜单高度）+ overflow，最坏情况是栏内自己滚动。 */
 .dms-status,
 .dms-empty {
-  flex: 0 0 auto;
+  flex: 0 1 auto;
+  min-height: 0;
+  max-height: 40%;
+  overflow-y: auto;
   padding: 10px;
   color: var(--dsw-alias-label-tertiary);
   font-size: 13px;
@@ -1869,7 +1896,10 @@ window.__ModuleLoader__.load({
 }
 
 .dms-more {
-  flex: 0 0 auto;
+  flex: 0 1 auto;
+  min-height: 0;
+  max-height: 20%;
+  overflow-y: auto;
   padding: 8px 12px;
   border-top: 1px solid var(--dsw-alias-border-l1, transparent);
   color: var(--dsw-alias-label-tertiary);
@@ -1880,15 +1910,18 @@ window.__ModuleLoader__.load({
 /* Provider-load failure strip: capped and scrollable so a long list of failed
    groups can never squeeze the model list out of the menu (E4). */
 .dms-failures {
-  flex: 0 0 auto;
-  max-height: 96px;
+  flex: 0 1 auto;
+  max-height: min(96px, 30%);
   min-height: 0;
   overflow-y: auto;
 }
 
 .dms-error,
 .dms-warning {
-  flex: 0 0 auto;
+  flex: 0 1 auto;
+  min-height: 0;
+  max-height: 40%;
+  overflow-y: auto;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
@@ -1963,7 +1996,10 @@ window.__ModuleLoader__.load({
 /* 图标组件只收 size/className，装饰性 aria-hidden 只能包一层 span；contents 让它不占布局。 */
 .dms-icon-slot { display: contents; }
 
-.dms-groups { flex: 1 1 auto; min-height: 0; overflow-y: auto; contain: content; }
+/* 列表区：菜单里唯一的弹性主体。max-height 被 useAnchoredMaxHeight 钳得很小
+   （trigger 靠近视口顶 + 向上弹）时，32px 保底让「至少见到一行模型」始终成立
+   —— 头部各栏此时按自己的 max-height 百分比上限收缩（见 .dms-status 等）。 */
+.dms-groups { flex: 1 1 auto; min-height: 32px; overflow-y: auto; contain: content; }
 /* 空态占位：空态播报节点在 role=menu 容器外，用与 .dms-groups 同款弹性布局
    补回列表区本来的位置（不挤压其余栏，消息也不会贴到菜单顶部）。 */
 .dms-groupsFill { flex: 1 1 auto; min-height: 0; overflow-y: auto; contain: content; }
@@ -2421,10 +2457,7 @@ body:not([data-ds-dark-theme]) .dms-effort.is-dragging .dms-effort-knob {
 									console.warn("[dsh-model-selector] directory.load failed:", error);
 								});
 							},
-							select: (selection) => available ? directory.select(selection).then(() => true, (error) => {
-								console.warn("[dsh-model-selector] select failed:", error);
-								return false;
-							}) : Promise.resolve(false)
+							select: (selection) => available ? directory.select(selection) : Promise.resolve(void 0)
 						};
 					}
 				}, ModelSelect));
@@ -2435,7 +2468,7 @@ body:not([data-ds-dark-theme]) .dms-effort.is-dragging .dms-effort-knob {
 		exports.apply = apply;
 		exports.inject = inject;
 		return module.exports;
-		/* __DMS_SRC_HASH__ = "eead5888f44285e2028692c6971ab7d6d8cfeb16272176f9c2c392186c440c04" */	}
+		/* __DMS_SRC_HASH__ = "86fa33a484beb4717e3ba62f62d7834bd0be9438ebf41565218cd94a6da91e19" */	}
 });
 
 //# sourceMappingURL=client.js.map