@deepseek-ai/dsh-client-ui-commands 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-commands/README.md
-README.md: f802179e08009cd4db8a3b786e52e81b26bb21da
-README.zh.md: 1dee58ab42d67a62099d57d4e631e440d3349f21
+README.md: f8cba29179f9960042a4a9e67e86496591a76d08
+README.zh.md: 1cea3ae7aea857f2b2d219abf0a7192c2f222792

package/README.md

@@ -25,7 +25,7 @@ Typing a `/` command opens a registered popup, a client action, a host command's
 <a id="use-this-package"></a>
 ## Use this package
 
-Mount this plugin alongside `ui-input-trigger` and `ui-conversation`; the `/` source then appears in the trigger menu, and business packages register their command surfaces through `ctx.commandUi`. Typing `/model` opens the registered popup; a host command with an argument claim opens its input or executes directly. The composer's `+` button and a typed `/` open the same menu: an Add section (File, Goal, Plan, Feedback) and a Commands section (Compact, Permission, Model, Export) in usage order, each row with a glyph, a localized title and description, and the command name as an alias where the localized title differs from it.
+Mount this plugin alongside `ui-input-trigger` and `ui-conversation`; the `/` source then appears in the trigger menu, and business packages register their command surfaces through `ctx.commandUi`. Typing `/model` opens the registered popup; a host command with an argument claim opens its input or executes directly. The popup holds composer focus: typing filters the loaded rows locally, `↑`/`↓` walk them, Enter and `Tab` accept the highlighted row, and Escape and `Shift+Tab` return to the composer. The highlight opens on the row the options mark as the session's current value, so accepting on a freshly opened panel confirms it. The composer's `+` button and a typed `/` open the same menu: an Add section (File, Goal, Plan, Feedback) and a Commands section (Compact, Permission, Model, Export) in usage order, each row with a glyph, a localized title and description, and the command name as an alias where the localized title differs from it.
 
 ### Kinds and decorations
 

package/README.zh.md

@@ -25,7 +25,7 @@ kind: "package-reference"
 <a id="use-this-package"></a>
 ## 使用本包
 
-与 `ui-input-trigger` 及 `ui-conversation` 一起挂载本插件；`/` source 随即出现在触发菜单中，业务包经 `ctx.commandUi` 注册自己的命令表面。键入 `/model` 打开已注册的弹窗；带参数声明的宿主命令打开其输入或直接执行。composer 的 `+` 按钮与键入的 `/` 打开同一个菜单：「添加」小节（文件、目标、计划、反馈）与「指令」小节（压缩、权限、模型、下载日志）按使用频次排列，每行带图标、本地化的标题与说明，本地化标题与命令名不同时还显示命令名作为别名。
+与 `ui-input-trigger` 及 `ui-conversation` 一起挂载本插件；`/` source 随即出现在触发菜单中，业务包经 `ctx.commandUi` 注册自己的命令表面。键入 `/model` 打开已注册的弹窗；带参数声明的宿主命令打开其输入或直接执行。弹窗持有 composer 焦点：键入即在已加载的行上本地筛选，`↑`／`↓` 在行间移动，回车与 `Tab` 接受高亮行，Escape 与 `Shift+Tab` 把焦点还给 composer。高亮落在选项标记为会话当前值的行上，因此在刚打开的弹窗上接受即确认当前值。composer 的 `+` 按钮与键入的 `/` 打开同一个菜单：「添加」小节（文件、目标、计划、反馈）与「指令」小节（压缩、权限、模型、下载日志）按使用频次排列，每行带图标、本地化的标题与说明，本地化标题与命令名不同时还显示命令名作为别名。
 
 ### 种类与装饰
 

package/lib/client.js

@@ -9,6 +9,69 @@ window.__ModuleLoader__.load({
 		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let react = require("react");
+		//#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/locales.js
 		/**
 		* `command` namespace dictionaries: the composer menu's section headings,
@@ -307,6 +370,19 @@ window.__ModuleLoader__.load({
 			if (query === "") return options;
 			return options.filter((o) => o.label.toLowerCase().includes(query) || (o.detail?.toLowerCase().includes(query) ?? false));
 		}
+		/**
+		* Highlight index for a freshly loaded row list: the row marked as the current
+		* value when the live search still shows it, else the top row. Opening parks
+		* the highlight on the value the session already uses, so an accept gesture
+		* made without looking confirms that value instead of the topmost row.
+		* @param options - the loaded rows.
+		* @param search - the shell's live filter text (non-empty after a retry).
+		* @returns index into the filtered rows.
+		*/
+		function currentIndex(options, search) {
+			const at = filterOptions(options, search).findIndex((option) => option.active === true);
+			return at === -1 ? 0 : at;
+		}
 		/** The shell's error-strip line for a settlement failure. */
 		function errorText(error) {
 			return error instanceof Error ? error.message : String(error);
@@ -358,11 +434,12 @@ window.__ModuleLoader__.load({
 			load(binding) {
 				binding.spec.options(binding.context, binding.abort.signal).then((options) => {
 					if (this.binding !== binding) return;
+					const current = this.state.getSnapshot();
 					this.state.set({
-						...this.state.getSnapshot(),
+						...current,
 						status: "ready",
 						options,
-						active: 0,
+						active: currentIndex(options, current.search),
 						error: null
 					});
 				}, (error) => {
@@ -391,7 +468,8 @@ window.__ModuleLoader__.load({
 			}
 			/**
 			* Replace the local search text (pure local filter — the provider is never
-			* re-queried) and rebase the highlight onto the new filtered list.
+			* re-queried) and rebase the highlight to the top of the new filtered list:
+			* typing searches for something other than the current value.
 			* @param search - the shell search input's text.
 			*/
 			setSearch(search) {
@@ -645,7 +723,7 @@ window.__ModuleLoader__.load({
 			live = {
 				contributions: /* @__PURE__ */ new Map(),
 				decorations: /* @__PURE__ */ new Map(),
-				popups: /* @__PURE__ */ new Map()
+				popups: new WeakMapWithValues()
 			};
 			/** `command`-namespace translator (composer refusal notices). */
 			t;
@@ -731,24 +809,27 @@ window.__ModuleLoader__.load({
 			* @param name - command name without the leading slash.
 			*/
 			dismiss(name) {
-				for (const popup of this.live.popups.values()) if (popup.state.getSnapshot().command === name) popup.dismiss();
+				for (const popup of this.live.popups.values) if (popup.state.getSnapshot().command === name) popup.dismiss({ focusComposer: true });
 			}
 			/**
 			* Resolve the per-session popup controller (lazy; dies with the session
 			* scope). The controller's consume callback dispatches the scoped
 			* consume-token event back to this session; focusComposer reaches the
-			* composer through the overlay slot currency.
+			* session's composer through the conversation input face.
 			* @param actx - session-scope ctx.
 			* @returns the resident controller.
+			* @throws when the Context no longer belongs to a retained Session generation.
 			*/
 			popupFor(actx) {
-				const id = this.sessions().scopeOf(actx);
-				if (id === void 0) throw new Error("command.popupFor requires a session scope");
+				const sessions = this.sessions();
+				const session = sessions.sessionOf(actx);
+				const binding = session === void 0 ? void 0 : sessions.binding(session.sessionId);
+				if (binding === void 0 || binding.session !== session) throw new Error("command.popupFor requires a retained Session scope");
 				const { popups } = this.live;
-				const existing = popups.get(id);
+				const existing = popups.get(binding);
 				if (existing !== void 0) return existing;
 				const controller = new PopupSelectController({
-					consume: (segment) => actx.bail(actx, "slash/input-consume-token", { guard: segment.via === "menu" ? {
+					consume: (segment) => binding.ctx.bail(binding.ctx, "slash/input-consume-token", { guard: segment.via === "menu" ? {
 						kind: "span",
 						span: segment.span
 					} : {
@@ -756,31 +837,16 @@ window.__ModuleLoader__.load({
 						token: segment.token
 					} }) === true,
 					focusComposer: () => {
-						this.focusHooks.get(id)?.();
+						binding.ctx.get("conversation")?.input.for(binding.ctx).focus();
 					}
 				});
-				popups.set(id, controller);
-				actx.effect(() => () => {
+				popups.set(binding, controller);
+				binding.ctx.effect(() => () => {
 					controller.dispose();
-					popups.delete(id);
-					this.focusHooks.delete(id);
+					popups.delete(binding);
 				}, "command: session popup");
 				return controller;
 			}
-			/** Composer focus hooks by session (the overlay wiring binds the textarea focus here). */
-			focusHooks = /* @__PURE__ */ new Map();
-			/**
-			* Bind one session's composer-focus hook (overlay slot wiring; unbind on unmount).
-			* @param id - session id.
-			* @param focus - textarea focus callback.
-			* @returns the unbind disposer.
-			*/
-			bindComposerFocus(id, focus) {
-				this.focusHooks.set(id, focus);
-				return () => {
-					if (this.focusHooks.get(id) === focus) this.focusHooks.delete(id);
-				};
-			}
 			/**
 			* Menu candidates: host catalog + contribution availability, built-in rows
 			* localized, then position filtering; sections for an empty query, the
@@ -1087,11 +1153,12 @@ window.__ModuleLoader__.load({
 		* store into the conversation.input.overlay anchor. Unlike the slash menu
 		* (combobox — textarea keeps focus), this shell HOLDS focus while open: the
 		* inner search input takes focus, plain typing filters the loaded options
-		* locally, Enter/↑↓ drive the filtered highlight (scrolled into view), Escape
-		* dismisses back to the composer, and ←→ keep the search input's native
-		* caret. Any pointer interaction outside the box dismisses (the click's own
-		* target takes focus). Closed state renders null; the overlay slot stays
-		* mounted. The card height clamps to the space above the composer.
+		* locally, Enter and Tab accept the filtered highlight, ↑↓ walk it (wrapping,
+		* scrolled into view), and Escape and Shift+Tab dismiss back to the composer.
+		* ←→ keep the search input's native caret. Any pointer interaction outside the
+		* box dismisses (the click's own target takes focus). Closed state renders
+		* null; the overlay slot stays mounted. The card height clamps to the space
+		* above the composer.
 		*/
 		/** Design cap on the card height (same MenuDropdown family as the slash menu). */
 		const MAX_HEIGHT = 320;
@@ -1145,6 +1212,12 @@ window.__ModuleLoader__.load({
 						ev.preventDefault();
 						popup.select(state.active);
 						return;
+					case "Tab":
+						if (!ev.shiftKey && (state.status !== "ready" || rows.length === 0)) return;
+						ev.preventDefault();
+						if (ev.shiftKey) popup.dismiss({ focusComposer: true });
+						else popup.select(state.active);
+						return;
 					case "Escape":
 						ev.preventDefault();
 						popup.dismiss({ focusComposer: true });

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

@@ -22,6 +22,12 @@ export interface SelectOption {
     /** Optional short marker rendered as a superscript beside the label. */
     readonly badge?: string;
     readonly detail?: string;
+    /**
+     * The row the shell's highlight parks on when the panel opens, so an accept
+     * gesture made without looking confirms the value in use. A business package
+     * that marks a row `active` for presentation alone would make that row the
+     * default pick.
+     */
     readonly active?: boolean;
     /** Optional in-page risk gate owned by the shared popup shell. */
     readonly confirmation?: SelectConfirmation;

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

@@ -51,7 +51,12 @@ export interface PopupState {
     readonly options: readonly SelectOption[];
     /** Local filter text over the loaded options. */
     readonly search: string;
-    /** Highlight index into the filtered row list (0 when empty/pending). */
+    /**
+     * Highlight index into the filtered row list: 0 until options land; afterwards
+     * the row the loaded list marks as the current value
+     * ({@link SelectOption.active}), else 0. A search rebases it to the top of the
+     * filtered rows.
+     */
     readonly active: number;
     /** A select() settlement is in flight: further select/search/highlight no-op until it settles. */
     readonly submitting: boolean;
@@ -101,7 +106,8 @@ export declare class PopupSelectController<TCtx = unknown> {
     retry(): void;
     /**
      * Replace the local search text (pure local filter — the provider is never
-     * re-queried) and rebase the highlight onto the new filtered list.
+     * re-queried) and rebase the highlight to the top of the new filtered list:
+     * typing searches for something other than the current value.
      * @param search - the shell search input's text.
      */
     setSearch(search: string): void;

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

@@ -68,20 +68,12 @@ export declare class CommandUiRuntime extends Service implements CommandUiContra
      * Resolve the per-session popup controller (lazy; dies with the session
      * scope). The controller's consume callback dispatches the scoped
      * consume-token event back to this session; focusComposer reaches the
-     * composer through the overlay slot currency.
+     * session's composer through the conversation input face.
      * @param actx - session-scope ctx.
      * @returns the resident controller.
+     * @throws when the Context no longer belongs to a retained Session generation.
      */
     popupFor(actx: ClientContext): PopupSelectController<ClientSessionContext>;
-    /** Composer focus hooks by session (the overlay wiring binds the textarea focus here). */
-    private readonly focusHooks;
-    /**
-     * Bind one session's composer-focus hook (overlay slot wiring; unbind on unmount).
-     * @param id - session id.
-     * @param focus - textarea focus callback.
-     * @returns the unbind disposer.
-     */
-    bindComposerFocus(id: SessionId, focus: () => void): () => void;
     /**
      * Menu candidates: host catalog + contribution availability, built-in rows
      * localized, then position filtering; sections for an empty query, the

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-commands",
   "description": "Client command surface: global directory cache, '/' source, three command UI kinds, popupSelect registry",
-  "version": "0.1.6-alpha.1",
+  "version": "0.1.6-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -44,21 +44,22 @@
     "@types/react": "~18.3.1",
     "react": "^18.2.0",
     "clsx": "^2.0.0",
-    "@deepseek-ai/dsh-api-remotes": "^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-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-client-connection": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-commands": "^0.1.6-alpha.1",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-connection": "^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-conversation": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^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-commands": "^0.1.6-alpha.2",
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-session": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-session": "^0.1.6-alpha.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.6-alpha.1"
+    "@deepseek-ai/dsh-api-session-controller": "^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-renderer": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-client-ui-session": "^0.1.6-alpha.2"
   },
   "files": [
     "lib/index.js",