@deepseek-ai/dsh-client-ui-model-selection 0.1.6-alpha.1 → 0.1.6-alpha.2

package/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   pnpm run verify-translation-pairing --write packages/client/ui-model-selection/README.md
-README.md: f3c373619fec0482876d8ac540f06e188b5b34d9
-README.zh.md: b8ee9cd73bb3fd5cdf0d0ecd8559b271c5abc933
+README.md: 5e16cdf18d2eccb63097c2a524bfb2d20178d15e
+README.zh.md: a99581e827c5ce66a31f6e4cbad11394e03dde4d

package/README.md

@@ -25,7 +25,7 @@ The Web GUI lets users switch the model and reasoning effort for an existing ses
 <a id="use-this-package"></a>
 ## Use this package
 
-Mount this plugin alongside `ui-conversation` and the commands package; the composer then shows the model seat next to the pending indicator, and `/model` opens the same directory as a popup. Both surfaces show the host-reported current selection when the exact provider/model pair remains in the advertised groups; a missing catalog row leaves the routable selection intact while the trigger prompts `Select model`.
+Mount this plugin alongside `ui-conversation` and the commands package; the composer then shows the model seat next to the pending indicator, and `/model` opens the same directory as a popup. While the seat's menu is open, `↑`/`↓` move focus across the rows of the shown pane, Tab settles the focused row, and Escape and `Shift+Tab` leave a drilled pane first and otherwise close back to the trigger. Drilling lands on the row of the value in use, and going back lands on the cell that opened the pane left. Both surfaces show the host-reported current selection when the exact provider/model pair remains in the advertised groups; a missing catalog row leaves the routable selection intact while the trigger prompts `Select model`.
 
 ### Model and effort
 
@@ -35,6 +35,10 @@ Models stay grouped by provider. The composer menu shows model and effort names
 
 When the Host reports that no adapter serves the session's route, this plugin raises a composer block and the input goes inert with its own copy; recovering clears it without a reload. A `null` before the first load or after one failed never blocks, and catalog membership never blocks either — a route serving a model it does not advertise is missing from the groups yet usable.
 
+### Selection failures
+
+When another writer owns the Session, model-selection failures tell the user to quit other running DSH instances and retry.
+
 -----
 
 <a id="understand-the-implementation"></a>

package/README.zh.md

@@ -25,7 +25,7 @@ Web GUI 允许用户通过 `/model` 弹窗或 composer 模型控件切换既有
 <a id="use-this-package"></a>
 ## 使用本包
 
-与 `ui-conversation` 及命令包一起挂载本插件；composer 随即在待处理指示器旁显示模型位，`/model` 则以弹窗打开同一份目录。当确切提供方／模型对仍在已公布分组中时，两个界面都显示 Host 报告的当前选择；目录行缺席时，可路由的选择保持不变，触发器提示 `Select model`。
+与 `ui-conversation` 及命令包一起挂载本插件；composer 随即在待处理指示器旁显示模型位，`/model` 则以弹窗打开同一份目录。模型位菜单打开期间，`↑`／`↓` 在所显示面板的行间移动焦点，`Tab` 选定聚焦行，Escape 与 `Shift+Tab` 先退出已下钻的面板，否则关闭并回到触发器。下钻落在正在使用的那一行，返回则落在打开该面板的格子上。当确切提供方／模型对仍在已公布分组中时，两个界面都显示 Host 报告的当前选择；目录行缺席时，可路由的选择保持不变，触发器提示 `Select model`。
 
 ### 模型与推理强度
 
@@ -35,6 +35,10 @@ Web GUI 允许用户通过 `/model` 弹窗或 composer 模型控件切换既有
 
 当 Host 报告没有适配器服务该会话的路由时，本插件注册一个 composer 阻塞块，输入框随之停用并显示本插件自己的文案；恢复后无需重新加载即清除。首次加载之前或加载失败之后的 `null` 绝不阻断；目录成员关系同样不阻断——一条仍在服务、只是不公布该模型的路由不在分组里，却可用。
 
+### 选择失败
+
+当会话被其他写句柄占用时，模型选择失败提示用户退出其他正在运行的 DSH 后重试。
+
 -----
 
 <a id="understand-the-implementation"></a>

package/lib/client.js

@@ -10,6 +10,69 @@ window.__ModuleLoader__.load({
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let react = require("react");
 		let react_dom = require("react-dom");
+		//#region ../../util/values/src/index.ts
+		/**
+		* Weak-key lookup with a strongly retained iterable set of associated values.
+		*
+		* Each value must belong to only one key. The container performs no automatic
+		* cleanup; owners delete associations or clear the container at lifecycle end.
+		*/
+		var WeakMapWithValues = class {
+			keys = /* @__PURE__ */ new WeakMap();
+			valueSet = /* @__PURE__ */ new Set();
+			/** Live strongly retained values in insertion order. */
+			values = this.valueSet;
+			/**
+			* Read the value associated with a key.
+			* @param key - weakly held lookup key.
+			* @returns the associated value, or absence.
+			*/
+			get(key) {
+				return this.keys.get(key);
+			}
+			/**
+			* Test whether a key has an association.
+			* @param key - weakly held lookup key.
+			* @returns whether the key is present.
+			*/
+			has(key) {
+				return this.keys.has(key);
+			}
+			/**
+			* Associate one key with one caller-unique value.
+			* @param key - weakly held lookup key.
+			* @param value - strongly retained value that belongs to no other key.
+			* @returns this container.
+			*/
+			set(key, value) {
+				if (this.keys.has(key)) {
+					const previous = this.keys.get(key);
+					if (previous === value) return this;
+					this.valueSet.delete(previous);
+				}
+				this.keys.set(key, value);
+				this.valueSet.add(value);
+				return this;
+			}
+			/**
+			* Remove one association and its strongly retained value.
+			* @param key - weakly held lookup key.
+			* @returns whether an association was removed.
+			*/
+			delete(key) {
+				if (!this.keys.has(key)) return false;
+				const value = this.keys.get(key);
+				const deleted = this.keys.delete(key);
+				this.valueSet.delete(value);
+				return deleted;
+			}
+			/** Remove every association and strongly retained value. */
+			clear() {
+				this.keys = /* @__PURE__ */ new WeakMap();
+				this.valueSet.clear();
+			}
+		};
+		//#endregion
 		//#region lib/types/client/catalog.js
 		/** One Host-generation model catalog shared by every Session selector. */
 		/** Loads at most one model catalog for the current Host generation. */
@@ -146,8 +209,9 @@ window.__ModuleLoader__.load({
 			/**
 			* Select the complete provider/model/reasoning selection. The durable
 			* projection frame updates the shared current; failures surface on the store
-			* and throw so each entry's own retry surface engages.
+			* and return with the operation so each entry can present its own failure.
 			* @param selection - provider, provider-owned model id, and optional adapter-owned effort.
+			* @returns the selection outcome, including the original Remote failure.
 			*/
 			async select(selection) {
 				this.assertAvailable();
@@ -162,22 +226,26 @@ window.__ModuleLoader__.load({
 					model: selection.model,
 					...selection.reasoningEffort === void 0 ? {} : { reasoningEffort: selection.reasoningEffort }
 				});
-				if (this.disposed || generation !== this.generation) {
-					if (!result.ok) throw new Error(`${result.error.code}: ${result.error.message}`);
-					return;
-				}
+				if (this.disposed || generation !== this.generation) return result.ok ? {
+					ok: true,
+					value: void 0
+				} : result;
 				if (!result.ok) {
 					this.store.update((s) => {
 						s.status = "error";
 						s.error = `${result.error.code}: ${result.error.message}`;
 					});
-					throw new Error(`session.selectModel failed: ${result.error.code}: ${result.error.message}`);
+					return result;
 				}
 				this.store.update((s) => {
 					s.status = "ready";
 					s.error = null;
 				});
 				this.syncInputs();
+				return {
+					ok: true,
+					value: void 0
+				};
 			}
 			/**
 			* Invalidate an in-flight selection response from the previous Host generation.
@@ -260,7 +328,7 @@ window.__ModuleLoader__.load({
 				"remote",
 				"remote.session"
 			];
-			live = { directories: /* @__PURE__ */ new Map() };
+			live = { directories: new WeakMapWithValues() };
 			catalog;
 			/** Localized composer-block copy; this plugin owns the string it raises. */
 			blockReason;
@@ -275,7 +343,7 @@ window.__ModuleLoader__.load({
 				this.catalog.load().catch(() => {});
 				ctx.on("connection/reset", () => {
 					this.catalog.resetGeneration();
-					for (const directory of this.live.directories.values()) directory.resetConnected();
+					for (const directory of this.live.directories.values) directory.resetConnected();
 				});
 				ctx.remote.$on("llm/adapters-updated", () => {
 					this.catalog.refresh();
@@ -295,15 +363,15 @@ window.__ModuleLoader__.load({
 			*/
 			directoryFor(sessionId) {
 				const { live } = this;
-				const existing = live.directories.get(sessionId);
-				if (existing !== void 0) return existing;
 				const sessions = this.ctx.sessions;
 				const actx = sessions.scope(sessionId);
 				if (actx === void 0) throw new Error(`ui-model-selection: session "${String(sessionId)}" resolved no scope`);
 				const binding = sessions.binding(sessionId);
 				if (binding === void 0) throw new Error(`ui-model-selection: session "${String(sessionId)}" resolved no binding`);
+				const existing = live.directories.get(binding);
+				if (existing !== void 0) return existing;
 				const directory = new ModelDirectory(this.ctx.remote.session, sessionId, () => sessions.subagentAddress(sessionId) === void 0, this.catalog, binding.session.projections.faceOf("modelSelection"));
-				live.directories.set(sessionId, directory);
+				live.directories.set(binding, directory);
 				const conversation = this.ctx.get("conversation");
 				if (conversation !== void 0) {
 					const publish = () => {
@@ -320,7 +388,7 @@ window.__ModuleLoader__.load({
 				}
 				actx.effect(() => () => {
 					directory.dispose();
-					live.directories.delete(sessionId);
+					live.directories.delete(binding);
 				}, "ui-model-selection: session directory");
 				return directory;
 			}
@@ -387,11 +455,17 @@ window.__ModuleLoader__.load({
 		* each drilling into its own list — the provider-grouped model list over
 		* the shared directory, and the effort levels. The trigger (313:14108's
 		* ToggleButton) shows both: model name + effort in the caption tone.
-		* Data and submission ride the SAME per-session ModelDirectory as the
-		* /model popup; exact-model reasoning metadata and the selected effort come
-		* from the Host rather than a client-owned vocabulary. A rejected selection
-		* announces through the shared transient Toast anchored to the composer
-		* card; the in-menu strip with Retry remains the catalog-load surface.
+		* While open, ↑/↓ move focus across the rows of the shown pane (wrapping; a
+		* step taken while the trigger still holds focus enters at the near end), Tab
+		* settles like Enter, and Escape and Shift+Tab leave a drilled pane first and
+		* otherwise close back to the trigger. A drilled pane hands focus to the row
+		* of the value in use, and returning to the root pane hands it back to the
+		* cell that opened it. Data and submission ride the SAME per-session
+		* ModelDirectory as the /model popup; exact-model reasoning metadata and the
+		* selected effort come from the Host rather than a client-owned vocabulary. A
+		* rejected selection announces through the shared transient Toast anchored to
+		* the composer card; the in-menu strip with Retry remains the catalog-load
+		* surface.
 		*/
 		/** Unplaced portal card: hidden but laid out at a fixed origin so offsetWidth/offsetHeight are real (Menu primitive's measure pass). */
 		const MEASURE_STYLE = {
@@ -457,6 +531,18 @@ window.__ModuleLoader__.load({
 					document.removeEventListener("mousedown", closeOutside);
 				};
 			}, [open]);
+			const paneFocus = (0, react.useRef)(null);
+			(0, react.useEffect)(() => {
+				const intent = paneFocus.current;
+				paneFocus.current = null;
+				if (!open || intent === null) return;
+				if (intent === "drill") {
+					(menuRef.current?.querySelector("[role=\"menuitemradio\"][aria-checked=\"true\"]:not([disabled])") ?? itemRefs.current.find((item) => item !== null && !item.disabled) ?? triggerRef.current)?.focus();
+					return;
+				}
+				const cell = itemRefs.current[intent === "effort" ? 1 : 0];
+				(cell !== null && cell !== void 0 && !cell.disabled ? cell : triggerRef.current)?.focus();
+			}, [open, pane]);
 			(0, react.useLayoutEffect)(() => {
 				if (!open) {
 					setMenuPos(null);
@@ -503,20 +589,48 @@ window.__ModuleLoader__.load({
 					triggerRef.current?.focus();
 				});
 			};
+			const drill = (next) => {
+				paneFocus.current = "drill";
+				setPane(next);
+			};
+			/** Leave a drilled pane for the root one, handing the keyboard back to its cell. */
+			const back = (from) => {
+				paneFocus.current = from;
+				setPane("root");
+			};
 			const moveFocus = (offset) => {
 				const items = itemRefs.current.filter((item) => item !== null);
 				if (items.length === 0) return;
 				const active = items.findIndex((item) => item === document.activeElement);
-				items[(Math.max(active, 0) + offset + items.length) % items.length]?.focus();
+				items[active === -1 ? offset > 0 ? 0 : items.length - 1 : (active + offset + items.length) % items.length]?.focus();
 			};
 			const onRootKeyDown = (event) => {
 				if (event.key === "Escape" && open) {
 					event.preventDefault();
-					if (pane !== "root") setPane("root");
+					if (pane !== "root") back(pane);
 					else close(true);
 					return;
 				}
 				if (!open) return;
+				if (event.key === "Tab") {
+					if (event.shiftKey) {
+						event.preventDefault();
+						if (pane !== "root") back(pane);
+						else close(true);
+						return;
+					}
+					const focused = document.activeElement;
+					const rows = itemRefs.current.filter((item) => item !== null);
+					if (focused instanceof HTMLButtonElement && rows.includes(focused)) {
+						event.preventDefault();
+						focused.click();
+						return;
+					}
+					if (focused !== triggerRef.current) return;
+					event.preventDefault();
+					(menuRef.current?.querySelector("[role=\"menuitemradio\"][aria-checked=\"true\"]:not([disabled])") ?? rows.find((item) => !item.disabled))?.focus();
+					return;
+				}
 				if (event.key === "ArrowDown" || event.key === "ArrowUp") {
 					event.preventDefault();
 					moveFocus(event.key === "ArrowDown" ? 1 : -1);
@@ -526,19 +640,18 @@ window.__ModuleLoader__.load({
 				if (event.relatedTarget instanceof Node && (rootRef.current?.contains(event.relatedTarget) === true || menuRef.current?.contains(event.relatedTarget) === true)) return;
 				close();
 			};
-			const settleSelection = (accepted) => {
-				if (accepted) {
+			const settleSelection = (result) => {
+				if (result === void 0) return;
+				if (result.ok) {
 					if (rootRef.current !== null) close(true);
 					return;
 				}
-				const message = directory.getSnapshot().error;
-				if (message !== null) {
-					toastSeq.current += 1;
-					setToast({
-						seq: toastSeq.current,
-						text: t("error.action", { message })
-					});
-				}
+				const { error } = result;
+				toastSeq.current += 1;
+				setToast({
+					seq: toastSeq.current,
+					text: error.code === "session/writer-held" ? t("error.sessionInUse") : t("error.action", { message: `${error.code}: ${error.message}` })
+				});
 			};
 			const choose = (selection) => {
 				if (state.current?.provider === selection.provider && state.current.model === selection.model) {
@@ -628,7 +741,7 @@ window.__ModuleLoader__.load({
 								role: "menuitem",
 								className: ModelSelect_module_css_default.cell,
 								onClick: () => {
-									setPane("model");
+									drill("model");
 								},
 								children: [
 									(0, react_jsx_runtime.jsx)("span", {
@@ -647,7 +760,7 @@ window.__ModuleLoader__.load({
 								role: "menuitem",
 								className: ModelSelect_module_css_default.cell,
 								onClick: () => {
-									setPane("effort");
+									drill("effort");
 								},
 								children: [
 									(0, react_jsx_runtime.jsx)("span", {
@@ -809,6 +922,7 @@ window.__ModuleLoader__.load({
 			"effort.providerDefault": "Default",
 			"status.loading": "正在刷新模型列表…",
 			"error.action": "模型操作失败：{message}",
+			"error.sessionInUse": "当前会话已被占用，可能是其他正在运行的 DSH 导致的（如其他 dsh web、桌面端），请退出其他正在运行的 DSH 后重试。",
 			"action.reload": "重新加载",
 			"warning.groupLoad": "{name} 加载失败：{message}",
 			"empty.models": "没有可用的模型。",
@@ -833,6 +947,7 @@ window.__ModuleLoader__.load({
 			"effort.providerDefault": "Default",
 			"status.loading": "Refreshing model list…",
 			"error.action": "Model operation failed: {message}",
+			"error.sessionInUse": "This session is already in use, possibly by another running DSH instance (such as dsh web or the desktop app). Quit other running DSH instances and try again.",
 			"action.reload": "Reload",
 			"warning.groupLoad": "{name} failed to load: {message}",
 			"empty.models": "No models available.",
@@ -935,7 +1050,11 @@ window.__ModuleLoader__.load({
 							const directory = models.directoryFor(session.sessionId);
 							const selection = selectionOf(directory.store.getSnapshot(), option.id);
 							if (selection === void 0) throw new Error("this provider's catalog failed to load — pick a model from a loaded group");
-							await directory.select(selection);
+							const result = await directory.select(selection);
+							if (!result.ok) {
+								if (result.error.code === "session/writer-held") throw new Error(t("error.sessionInUse"));
+								throw result.error;
+							}
 						}
 					}
 				}), "ui-model-selection: /model contribution");
@@ -955,7 +1074,7 @@ window.__ModuleLoader__.load({
 							load: () => {
 								if (available) directory.load().catch(() => {});
 							},
-							select: (selection) => available ? directory.select(selection).then(() => true, () => false) : Promise.resolve(false)
+							select: (selection) => available ? directory.select(selection) : Promise.resolve(void 0)
 						};
 					}
 				}, ModelSelect));

package/lib/types/client/directory.d.ts

@@ -6,7 +6,7 @@
  */
 import type { ModelCatalogFailure, ModelProviderGroup, ModelSelection } from '@deepseek-ai/dsh-api-session-controller/types';
 import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client';
-import type { TypertClientRemote } from '@deepseek-ai/dsh-typert-protocol';
+import type { RemoteResult, TypertClientRemote } from '@deepseek-ai/dsh-typert-protocol';
 import type { ObservableSnapshot, SnapshotStore } from '@deepseek-ai/dsh-client-store';
 import type { ModelCatalogDirectory } from './catalog.ts';
 /** Directory snapshot both entries render from. */
@@ -61,10 +61,11 @@ export declare class ModelDirectory {
     /**
      * Select the complete provider/model/reasoning selection. The durable
      * projection frame updates the shared current; failures surface on the store
-     * and throw so each entry's own retry surface engages.
+     * and return with the operation so each entry can present its own failure.
      * @param selection - provider, provider-owned model id, and optional adapter-owned effort.
-   */
-    select(selection: ModelSelection): Promise<void>;
+     * @returns the selection outcome, including the original Remote failure.
+     */
+    select(selection: ModelSelection): Promise<RemoteResult<void>>;
     /**
      * Invalidate an in-flight selection response from the previous Host generation.
      */

package/lib/types/client/locales.d.ts

@@ -25,6 +25,7 @@ export declare const zh: {
     'effort.providerDefault': string;
     'status.loading': string;
     'error.action': string;
+    'error.sessionInUse': string;
     'action.reload': string;
     'warning.groupLoad': string;
     'empty.models': string;
@@ -51,6 +52,7 @@ export declare const en: {
     'effort.providerDefault': string;
     'status.loading': string;
     'error.action': string;
+    'error.sessionInUse': string;
     'action.reload': string;
     'warning.groupLoad': string;
     'empty.models': string;

package/lib/types/client/slots.d.ts

@@ -4,6 +4,7 @@
  * entry; this package only contributes the single occupant, so no SlotMap
  * merge lives here.
  */
+import type { RemoteResult } from '@deepseek-ai/dsh-typert-protocol';
 import type { ModelSelection } from '@deepseek-ai/dsh-api-remotes/client';
 import type { SnapshotStore } from '@deepseek-ai/dsh-client-store';
 import type { ModelDirectoryState } from './directory.ts';
@@ -18,8 +19,8 @@ export interface ModelSelectInjected {
     /**
      * Select a complete provider/model/reasoning selection.
      * @param selection - model selection and optional adapter-owned effort.
-     * @returns whether the host accepted the selection.
+     * @returns the Host outcome, or undefined when this Session cannot select a model.
      */
-    select: (selection: ModelSelection) => Promise<boolean>;
+    select: (selection: ModelSelection) => Promise<RemoteResult<void> | undefined>;
 }
 //# sourceMappingURL=slots.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-model-selection",
   "description": "Model selection over the shared model catalog, Session projection, and session.selectModel",
-  "version": "0.1.6-alpha.1",
+  "version": "0.1.6-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -46,21 +46,22 @@
     "react-dom": "^18.2.0",
     "@types/react-dom": "~18.3.0",
     "clsx": "^2.1.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-test-runtime": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-test-runtime": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.6-alpha.2",
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-session": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-typert-protocol": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-session": "^0.1.6-alpha.1"
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-store": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-util-values": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-session": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.6-alpha.2"
   },
   "files": [
     "lib/index.js",