@deepseek-ai/dsh-client-ui-model-selection 0.1.1-rc.2 → 0.1.2-alpha.3

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: 929d23ad4af1fe41e1cc7398ef432e73ca2a7a94
-README.zh.md: 23e786d9e490b0739498a3e83703b42ebc345cbd
+README.md: 3883ebf860b9503e69df770e8d1dc8a8769fa9d0
+README.zh.md: 943a21a6815896e6cee7996bc05b32e938244fe1

package/README.md

@@ -1,22 +1,70 @@
+---
+description: "Model selection for the Web GUI: the /model popup and the composer model seat over one per-session provider-grouped directory; for users and maintainers of model routing."
+kind: "package-reference"
+---
+
 # @deepseek-ai/dsh-client-ui-model-selection
 
 English | [中文](README.zh.md)
 
-Model selection plugin, browser half: TWO entries over ONE per-session directory owned by `ModelDirectoryResolver` (`ctx.modelDirectories`). For ordinary sessions, the `/model` popupSelect contribution (registered through `ctx.commandUi`) and the composer's named `conversation.input.model` seat both load the session's advisory directory through `session.models` and submit through `session.selectModel` via the same `ModelDirectory` instance. The compact composer trigger opens a two-level Model/Effort menu: models stay provider-grouped, while the selected exact model supplies its adapter-owned effort names, descriptions, and default. `/model` applies the selected model's default effort, and the composer can then choose any advertised effort.
+## Summary
+
+This package provides model selection in the Web GUI: the `/model` popup command and the composer's model seat, both over one per-session directory of provider-grouped models. Choosing a model submits the complete selection — provider, model, and reasoning effort — which the Host snapshots at the next prompt-assembly boundary, so the following request uses it while a running step keeps its assembled selection. The composer seat shows a two-level Model/Effort menu: models stay provider-grouped, and the selected exact model supplies its adapter-owned effort names and default. When the Host reports that no adapter serves the session's route, the composer input goes inert until a route becomes available.
+
+## Table of Contents
+
+- [Use this package](#use-this-package)
+- [Understand the implementation](#understand-the-implementation)
+- [Further Exploration](#further-exploration)
+- [Model Experience](#model-experience)
+- [Known Limitations and Deferred Work](#known-limitations-and-deferred-work)
+- [Dev Note](#dev-note)
+
+-----
+
+<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`.
+
+### Model and effort
+
+Models stay grouped by provider. The menu shows model and effort names only; catalog descriptions remain available to other consumers. The `/model` popup applies the selected model's default effort; the composer can then choose any advertised effort. An adapter without reasoning metadata leaves the Effort row absent; there is no arbitrary effort input.
+
+### Unroutable sessions
+
+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.
+
+-----
 
-The Host-reported provider/model/reasoning `ModelSelection` is the single selection fact, but it is echoed only when the exact provider/model pair remains in the advertised groups; an absent catalog row leaves the routable selection intact while the trigger prompts `Select model`, no stale row is synthesized, and no Effort row is shown until the user picks an advertised model. Directory loads and selections share a generation counter so an older response never overwrites a newer one; a connection reset drops every resident projection and repulls the Host-restored selection before display. Provider-local metadata failures list inline while usable groups stay selectable, and selection failures retain the prior selection and directory.
+<a id="understand-the-implementation"></a>
+## Understand the implementation
 
-When the Host reports that no adapter serves the session's route (`session.models.routable`), this plugin raises a composer block through `ctx.conversation.blocks` and the input goes inert with this plugin's own copy; recovering clears it without a reload. It follows `routable` and nothing else: a `null` — before the first load, or after one failed — never blocks, or a slow Host would lock a working composer, and catalog membership never blocks either, because a route serving a model it stopped advertising is missing from the groups yet perfectly usable. The trigger's own `Select model` fallback still covers that case, which is display, not a gate.
+<details>
+<summary>Implementation internals — click to expand</summary>
 
-Directories are per-session, resolved lazily through `ctx.modelDirectories.directoryFor(sessionId)`, and disposed with the session scope. Addressed subagent sessions expose neither entry, and their directory rejects loads, selections, and reconnect refreshes, because ordinary Agent-bound model RPCs would activate persisted child history outside the direct-parent continuation path.
+Two entries over ONE per-session directory owned by `ModelDirectoryResolver` (`ctx.modelDirectories`): the `/model` popupSelect contribution (registered through `ctx.commandUi`) and the composer's named `conversation.input.model` seat both load the session's advisory directory through `session.models` and submit through `session.selectModel` via the same `ModelDirectory` instance, so a switch made in either entry is what the other shows next. Directory loads and selections share a generation counter so an older response never overwrites a newer one; a connection reset drops every resident projection and repulls the Host-restored selection. Directories are per-session, resolved lazily, and disposed with the session scope; addressed subagent sessions expose neither entry. Every resident directory refetches directly on forwarded `llm/adapters-updated` and `settings/document-updated` owner events.
 
-Every resident directory refetches directly on forwarded `llm/adapters-updated` and `settings/document-updated` owner events. Provider topology, provider catalogs, and the default selection therefore converge without the Host or client runtime deriving a separate model-change alias.
+</details>
 
-The `/client` exports are the plugin body (`apply`/`inject`), `ModelDirectoryResolver`, `ModelDirectory` with its state fields, and the seat's injected face type.
+-----
 
+<a id="further-exploration"></a>
+## Further Exploration
+
+Read these pages when the model surface is not enough. They move from the browser surfaces to the command popup shell and the selection contract.
+
+- [ui-commands](../ui-commands/README.md) — the popupSelect shell the `/model` contribution registers into.
+- [ui-conversation](../ui-conversation/README.md) — declares the composer's `conversation.input.model` seat and the composer block.
+- [dsh-agent-default-model](../../core/agent-default-model/README.md) — the default-model service for sessions that never choose.
+- [Client package map](../README.md) — adjacent browser UI packages.
+
+-----
+
+<a id="model-experience"></a>
 ## Model Experience
 
-Indirectly, through the `session.selectModel` RPC available to ordinary sessions, both entries submit the complete `ModelSelection` that the Host snapshots at the next prompt-assembly boundary, so the following request uses the selected provider, model, and effort while a running step keeps its assembled selection; the selection becomes durable only when the existing request header records a request that consumes it, and menu interaction adds no prompt content.
+Indirectly, through the `session.selectModel` selection both entries submit: the Host snapshots the complete `ModelSelection` at the next prompt-assembly boundary and owns the model-visible effect, while a running step keeps its assembled selection.
 
 #### KV Cache effect
 
@@ -24,6 +72,21 @@ Switching the route can reduce or invalidate provider-side cache reuse for subse
 
 ## Known Limitations and Deferred Work
 
+<a id="known-limitations-and-deferred-work"></a>
+
+
+These limits define the current model surface. They are current package constraints, not a general model-router comparison or a task backlog.
+
 - **No create-time or addressed-subagent selection** — both entries require an existing ordinary session's Agent; there is no draft-phase model choice to fold into session creation, and subagent continuation deliberately exposes no independent model-selection contract.
 - **Directory names are presentation-only** — selection and persistence use provider/model/effort ids; a provider whose catalog or exact-model metadata lookup fails lists as an unselectable failure row until reload.
 - **No arbitrary effort input** — the composer offers only the exact model's adapter-advertised levels; an adapter without reasoning metadata leaves the Effort row absent.
+
+<a id="dev-note"></a>
+### Dev Note
+
+<details>
+<summary>Working context for maintainers — click to expand</summary>
+
+None.
+
+</details>

package/README.zh.md

@@ -1,29 +1,92 @@
+---
+description: "Web GUI 的模型选择：/model 弹窗与 composer 模型位共用一份按提供方分组的会话级目录；供模型路由的用户与维护者阅读。"
+kind: "package-reference"
+---
+
 # @deepseek-ai/dsh-client-ui-model-selection
 
 [English](README.md) | 中文
 
-模型选择插件（浏览器侧）：**两个入口共用一份会话级目录**，由 `ModelDirectoryResolver`（`ctx.modelDirectories`）持有。对于普通会话，`/model` popupSelect 贡献项（经 `ctx.commandUi` 注册）与 composer 的具名 `conversation.input.model` slot 都通过同一个 `ModelDirectory` 实例，经 `session.models` 加载会话的建议目录，并经 `session.selectModel` 提交。紧凑型 composer 触发器会打开两级 Model/Effort 菜单：模型仍按提供方分组，所选具体模型则提供由其适配器持有的推理强度名称、说明和默认值。`/model` 应用所选模型的默认推理强度，composer 随后可以选择任一已公布的推理强度。
+## 概述
+
+本包提供 Web GUI 的模型选择：`/model` 弹窗命令与 composer 模型位，两者共用一份按提供方分组的会话级目录。选择模型会提交完整选择——提供方、模型与推理强度——宿主在下一次提示词组装边界对其快照，因此后续请求采用该选择，而运行中的步骤保留已组装选择。composer 位显示两级 Model/Effort 菜单：模型按提供方分组，所选具体模型提供其适配器持有的推理强度名称与默认值。当宿主报告没有适配器服务该会话的路由时，composer 输入停用，直到路由恢复可用。
+
+## 目录
+
+- [使用本包](#use-this-package)
+- [理解实现](#understand-the-implementation)
+- [进一步探索](#further-exploration)
+- [模型体验](#model-experience)
+- [已知限制与延期工作](#known-limitations-and-deferred-work)
+- [开发备注](#dev-note)
+
+-----
+
+<a id="use-this-package"></a>
+## 使用本包
+
+与 `ui-conversation` 及命令包一起挂载本插件；composer 随即在待处理指示器旁显示模型位，`/model` 则以弹窗打开同一份目录。当确切提供方／模型对仍在已公布分组中时，两个表面都显示宿主报告的当前选择；目录行缺席时，可路由的选择保持不变，触发器提示 `Select model`。
+
+### 模型与推理强度
+
+模型按提供方分组。菜单只显示模型与推理强度名称；目录中的说明仍可供其他消费方使用。`/model` 弹窗应用所选模型的默认推理强度；composer 随后可以选择任一已公布的推理强度。适配器没有推理元数据时不显示 Effort 行；不存在任意推理强度输入。
+
+### 不可路由的会话
+
+当宿主报告没有适配器服务该会话的路由时，本插件注册一个 composer 阻塞块，输入随本插件自己的文案停用；恢复后无需重新加载即清除。首次加载之前或加载失败之后的 `null` 绝不阻断；目录成员关系同样不阻断——一条仍在服务、只是不公布该模型的路由不在分组里，却可用。
+
+-----
 
-Host 报告的 `ModelSelection` 是唯一的选择事实，其中包含提供方、模型与推理（reasoning）强度；但只有当该提供方／模型对仍在已公布分组中时才会回显。目录行缺席时，可路由的选择保持不变，但触发器会提示 `Select model`；系统不会合成陈旧行，且在用户选择已公布的模型之前不会显示 Effort 行。目录加载与选择共享一个代次计数器，旧响应不会覆盖新结果；连接重置会丢弃所有常驻目录投影，并在显示前重新拉取 Host 恢复的选择。各提供方的元数据获取失败会内联列出，同时可用分组仍可选择；选择失败会保留先前的选择和目录。
+<a id="understand-the-implementation"></a>
+## 理解实现
 
-当宿主报告没有适配器服务该会话的路由（`session.models.routable`）时，本插件经 `ctx.conversation.blocks` 注册一个 composer 阻塞块，输入框随之停用并显示本插件自己的文案；恢复后无需重新加载即自动清除。它只跟随 `routable`：`null`（首次加载之前，或加载失败之后）绝不阻断，否则一个慢的宿主就会锁死一个本来可用的 composer；目录成员关系同样不阻断，因为一条仍在服务、只是不再公布该模型的路由不在分组里，却完全可用。触发器自己的 `Select model` 回退仍然覆盖那种情形——那是显示，不是闸门。
+<details>
+<summary>实现细节——点击展开</summary>
 
-目录按会话惰性解析（`ctx.modelDirectories.directoryFor(sessionId)`），随会话作用域一并 dispose（资源释放）。已寻址 subagent 会话不公开任一入口，其目录会拒绝加载、选择与重新连接刷新，因为绑定到 agent（智能体）的普通模型 RPC 会在直接 parent 继续执行路径之外激活持久化 child 历史。
+两个入口共用一份由 `ModelDirectoryResolver`（`ctx.modelDirectories`）持有的会话级目录：`/model` popupSelect 贡献项（经 `ctx.commandUi` 注册）与 composer 的具名 `conversation.input.model` 位都经 `session.models` 加载会话的建议目录、经 `session.selectModel` 通过同一个 `ModelDirectory` 实例提交，因此任一人口所做的切换正是另一个入口接下来显示的。目录加载与选择共享一个代次计数器，旧响应不会覆盖新结果；连接重置丢弃所有常驻投影，并在显示前重新拉取宿主恢复的选择。目录按会话惰性解析，随会话作用域一并释放；已寻址 subagent 会话不公开任一入口。每份常驻目录都会直接在转发的 `llm/adapters-updated` 与 `settings/document-updated` owner 事件上重拉。
 
-每一份常驻目录都会直接在转发的 owner 事件 `llm/adapters-updated` 与 `settings/document-updated` 上重拉。因此提供方拓扑、提供方目录与默认选择都能收敛，Host 与 client runtime 无需再派生一个单独的模型变更别名。
+</details>
 
-`/client` 导出面为插件本体（`apply`/`inject`）、`ModelDirectoryResolver`、`ModelDirectory` 及其状态形状、slot 注入面类型。
+-----
 
+<a id="further-exploration"></a>
+## 进一步探索
+
+当模型面不够用时阅读以下页面。它们从浏览器表面进入命令弹窗外壳与选择约定。
+
+- [ui-commands](../ui-commands/README.zh.md)——`/model` 贡献项注册进的 popupSelect 外壳。
+- [ui-conversation](../ui-conversation/README.zh.md)——声明 composer 的 `conversation.input.model` 位与 composer 阻塞块。
+- [dsh-agent-default-model](../../core/agent-default-model/README.zh.md)——为从未选择的会话提供默认模型的默认模型服务。
+- [客户端包映射](../README.zh.md)——相邻的浏览器 UI 包。
+
+-----
+
+<a id="model-experience"></a>
 ## 模型体验
 
-间接影响。两个入口都通过仅供普通会话使用的 `session.selectModel` RPC 提交完整的 `ModelSelection`；Host 会在下一次提示词组装边界对其进行快照，因此后续请求采用所选提供方、模型与推理强度，而运行中的步骤保留已组装选择。只有当现有请求头记录一次实际采用该选择的请求后，选择才会持久化；菜单交互不会添加提示词内容。
+间接影响。两个入口都提交 `session.selectModel` 选择；宿主在下一次提示词组装边界对完整 `ModelSelection` 快照并拥有模型可见效果，而运行中的步骤保留已组装选择。
 
 #### KV Cache 影响
 
 切换路由可能减少提供方侧后续请求的缓存复用，或使其失效；提示词前缀本身不受影响。
 
-## 已知限制与暂缓事项
+## 已知限制与延期工作
+
+<a id="known-limitations-and-deferred-work"></a>
+
+
+这些限制界定了当前模型表面。它们是当前包约束，不是通用模型路由器对比或任务积压。
 
 - **无创建期或已寻址 subagent 选择**——两个入口都要求既有普通会话的 agent；没有可纳入会话创建的草稿阶段模型选择，subagent 继续执行也有意不公开独立的模型选择约定。
 - **目录名仅供呈现**——选择与持久化使用提供方／模型／推理强度 id；目录查询或确切模型元数据查询失败的提供方以不可选失败行列出，重新加载前保持原样。
 - **不能任意输入推理强度**——composer 仅提供确切模型由适配器公布的推理强度；适配器没有推理元数据时不显示 Effort 行。
+
+<a id="dev-note"></a>
+### 开发备注
+
+<details>
+<summary>维护者的工作上下文——点击展开</summary>
+
+无。
+
+</details>

package/lib/client.js

@@ -5,18 +5,99 @@ window.__ModuleLoader__.load({
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let _deepseek_ai_cordis = require("@deepseek-ai/cordis");
-		let _deepseek_ai_dsh_client_runtime_client = require("@deepseek-ai/dsh-client-runtime/client");
+		let _deepseek_ai_dsh_client_store = require("@deepseek-ai/dsh-client-store");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let react = require("react");
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+		//#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. */
+		var ModelCatalogDirectory = class {
+			ctx;
+			/** Current shared catalog value and load lifecycle. */
+			store = (0, _deepseek_ai_dsh_client_store.createSnapshotStore)({
+				value: null,
+				status: "idle",
+				error: null
+			});
+			generation = 0;
+			inflight;
+			/**
+			* @param ctx - the providing plugin's context, whose `remote.session`
+			* namespace carries the Host-generation catalog.
+			*/
+			constructor(ctx) {
+				this.ctx = ctx;
+			}
+			/**
+			* Return the current generation's catalog, sharing its one in-flight load.
+			* @returns the loaded global catalog.
+			*/
+			load() {
+				const state = this.store.getSnapshot();
+				if (state.status === "ready" && state.value !== null) return Promise.resolve(state.value);
+				if (this.inflight !== void 0) return this.inflight;
+				const generation = this.generation;
+				this.store.update((draft) => {
+					draft.status = "loading";
+					draft.error = null;
+				});
+				const operation = this.ctx.remote.session.modelCatalog().then((response) => {
+					if (!response.ok) throw new Error(`${response.error.code}: ${response.error.message}`);
+					if (generation === this.generation) this.store.set({
+						value: response.value,
+						status: "ready",
+						error: null
+					});
+					return response.value;
+				}).catch((error) => {
+					if (generation === this.generation) this.store.update((draft) => {
+						draft.status = "error";
+						draft.error = error instanceof Error ? error.message : String(error);
+					});
+					throw error;
+				}).finally(() => {
+					if (generation === this.generation && this.inflight === operation) this.inflight = void 0;
+				});
+				this.inflight = operation;
+				return operation;
+			}
+			/**
+			* Invalidate the loaded catalog; the next explicit menu read reloads it.
+			* @param clear - whether values from the previous Host generation must be hidden.
+			*/
+			invalidate(clear = false) {
+				this.generation += 1;
+				this.inflight = void 0;
+				const value = clear ? null : this.store.getSnapshot().value;
+				this.store.set({
+					value,
+					status: "idle",
+					error: null
+				});
+			}
+			/** Invalidate and reload the catalog after a Host-side model input changes. */
+			refresh() {
+				this.invalidate();
+				this.load().catch(() => {});
+			}
+			/** Clear Host-specific values and load the replacement Host generation. */
+			resetGeneration() {
+				this.invalidate(true);
+				this.load().catch(() => {});
+			}
+		};
+		//#endregion
 		//#region lib/types/client/directory.js
 		/** One session's shared directory controller; disposed with the session scope. */
 		var ModelDirectory = class {
 			sessions;
 			sessionId;
 			available;
+			catalog;
+			projected;
 			/** The shared snapshot both entries render from (uSES-safe store). */
-			store = (0, _deepseek_ai_dsh_client_runtime_client.createSnapshotStore)({
+			store = (0, _deepseek_ai_dsh_client_store.createSnapshotStore)({
 				current: null,
 				routable: null,
 				groups: [],
@@ -24,58 +105,47 @@ window.__ModuleLoader__.load({
 				status: "idle",
 				error: null
 			});
-			/** Latest operation wins; an older response never overwrites a newer one. */
+			/** Latest selection operation wins; an older response never overwrites a newer one. */
 			generation = 0;
 			disposed = false;
+			resolved = false;
+			unsubscribeCatalog;
+			unsubscribeSelection;
 			/**
 			* @param sessions - the session wire face (captured from the plugin's root connection).
 			* @param sessionId - the owning session.
 			* @param available - whether this session may use Agent-bound model RPCs.
+			* @param catalog - Host-generation catalog shared by every Session.
+			* @param projected - durable model selection projected from Session history.
 			*/
-			constructor(sessions, sessionId, available) {
+			constructor(sessions, sessionId, available, catalog, projected) {
 				this.sessions = sessions;
 				this.sessionId = sessionId;
 				this.available = available;
+				this.catalog = catalog;
+				this.projected = projected;
+				this.unsubscribeCatalog = catalog.store.subscribe(() => {
+					this.syncInputs();
+				});
+				this.unsubscribeSelection = projected.subscribe(() => {
+					this.syncInputs();
+				});
+				this.syncInputs();
 			}
 			/**
-			* Refresh the advisory directory (both entries call this on open).
-			* Failure preserves the last good groups and current selection.
+			* Ensure the Host generation's shared advisory catalog is loaded.
 			* @returns the fresh directory value.
 			*/
 			async load() {
 				this.assertAvailable();
-				const generation = ++this.generation;
-				this.store.update((s) => {
-					s.status = "loading";
-					s.error = null;
-				});
-				const { result } = await this.sessions.models({ sessionId: this.sessionId });
-				if (this.disposed || generation !== this.generation) {
-					if (!result.ok) throw new Error(`${result.error.code}: ${result.error.message}`);
-					return result.value;
-				}
-				if (!result.ok) {
-					this.store.update((s) => {
-						s.status = "error";
-						s.error = `${result.error.code}: ${result.error.message}`;
-					});
-					throw new Error(`session.models failed: ${result.error.code}: ${result.error.message}`);
-				}
-				const { current, routable, groups, failures } = result.value;
-				this.store.update((s) => {
-					s.current = current;
-					s.routable = routable;
-					s.groups = groups;
-					s.failures = failures;
-					s.status = "ready";
-					s.error = null;
-				});
-				return result.value;
+				await this.catalog.load();
+				this.syncInputs();
+				return this.store.getSnapshot();
 			}
 			/**
-			* Select the complete provider/model/reasoning selection (both entries submit through here). Success
-			* updates the shared current; failure surfaces on the store and throws so
-			* each entry's own retry surface engages.
+			* 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.
 			* @param selection - provider, provider-owned model id, and optional adapter-owned effort.
 			*/
 			async select(selection) {
@@ -85,7 +155,7 @@ window.__ModuleLoader__.load({
 					s.status = "selecting";
 					s.error = null;
 				});
-				const { result } = await this.sessions.selectModel({
+				const result = await this.sessions.selectModel({
 					sessionId: this.sessionId,
 					provider: selection.provider,
 					model: selection.model,
@@ -103,39 +173,69 @@ window.__ModuleLoader__.load({
 					throw new Error(`session.selectModel failed: ${result.error.code}: ${result.error.message}`);
 				}
 				this.store.update((s) => {
-					s.current = result.value.selected;
-					s.routable = true;
 					s.status = "ready";
 					s.error = null;
 				});
+				this.syncInputs();
 			}
 			/**
-			* Drop the previous Host generation's projection and repull it. Clearing
-			* first prevents an unconsumed process-local selection from being displayed
-			* while the restarted Host has restored the last logged model selection.
+			* Invalidate an in-flight selection response from the previous Host generation.
 			*/
 			resetConnected() {
 				if (this.disposed) return;
 				++this.generation;
-				this.store.update((s) => {
-					s.current = null;
-					s.routable = null;
-					s.groups = [];
-					s.failures = [];
-					s.status = "idle";
-					s.error = null;
+				this.store.update((state) => {
+					if (state.status === "selecting") state.status = "idle";
+					state.error = null;
 				});
-				if (!this.available()) return;
-				this.load().catch(() => {});
+				this.syncInputs();
 			}
 			/** Scope teardown: late settlements lose write access to the store. */
 			dispose() {
 				this.disposed = true;
+				this.unsubscribeSelection();
+				this.unsubscribeCatalog();
 			}
 			assertAvailable() {
 				if (!this.available()) throw new Error("model selection is unavailable for addressed subagent sessions");
 			}
+			syncInputs() {
+				if (this.disposed) return;
+				const catalog = this.catalog.store.getSnapshot();
+				const projected = modelSelectionProjection(this.projected.getSnapshot());
+				if (catalog.status !== "ready" || catalog.value === null || projected === void 0) {
+					if (this.resolved) {
+						if (catalog.status === "error") this.store.update((state) => {
+							state.status = "error";
+							state.error = catalog.error;
+						});
+						return;
+					}
+					this.store.set({
+						current: null,
+						routable: null,
+						groups: [],
+						failures: [],
+						status: catalog.status === "error" ? "error" : "loading",
+						error: catalog.error
+					});
+					return;
+				}
+				const current = projected.next ?? catalog.value.default;
+				this.resolved = true;
+				this.store.set({
+					current,
+					routable: catalog.value.routableProviders.includes(current.provider),
+					groups: catalog.value.groups,
+					failures: catalog.value.failures,
+					status: this.store.getSnapshot().status === "selecting" ? "selecting" : "ready",
+					error: null
+				});
+			}
 		};
+		function modelSelectionProjection(value) {
+			return value === void 0 ? void 0 : value;
+		}
 		//#endregion
 		//#region lib/types/client/service.js
 		/**
@@ -155,11 +255,12 @@ window.__ModuleLoader__.load({
 		/** The `ctx.modelDirectories` session model-selection service. */
 		var ModelDirectoryResolver = class extends _deepseek_ai_cordis.Service {
 			static inject = [
-				"connection",
 				"sessions",
-				"remote"
+				"remote",
+				"remote.session"
 			];
 			live = { directories: /* @__PURE__ */ new Map() };
+			catalog;
 			/** Localized composer-block copy; this plugin owns the string it raises. */
 			blockReason;
 			/**
@@ -169,14 +270,21 @@ window.__ModuleLoader__.load({
 			constructor(ctx, config) {
 				super(ctx, "modelDirectories");
 				this.blockReason = config.blockReason;
+				this.catalog = new ModelCatalogDirectory(ctx);
+				this.catalog.load().catch(() => {});
 				ctx.on("connection/reset", () => {
+					this.catalog.resetGeneration();
 					for (const directory of this.live.directories.values()) directory.resetConnected();
 				});
-				const refresh = () => {
-					for (const directory of this.live.directories.values()) directory.load().catch(() => void 0);
-				};
-				ctx.remote.$on("llm/adapters-updated", refresh);
-				ctx.remote.$on("settings/document-updated", refresh);
+				ctx.remote.$on("llm/adapters-updated", () => {
+					this.catalog.refresh();
+				});
+				ctx.remote.$on("settings/document-updated", () => {
+					this.catalog.refresh();
+				});
+				ctx.remote.$on("credentials/reference-updated", () => {
+					this.catalog.refresh();
+				});
 			}
 			/**
 			* Resolve the per-session shared directory (lazy; the scope disposer
@@ -188,10 +296,12 @@ window.__ModuleLoader__.load({
 				const { live } = this;
 				const existing = live.directories.get(sessionId);
 				if (existing !== void 0) return existing;
-				const sessions = this.ctx.get("sessions");
+				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 directory = new ModelDirectory(this.ctx.get("connection").api.sessions, sessionId, () => sessions.subagentAddress(sessionId) === void 0);
+				const binding = sessions.binding(sessionId);
+				if (binding === void 0) throw new Error(`ui-model-selection: session "${String(sessionId)}" resolved no binding`);
+				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);
 				const conversation = this.ctx.get("conversation");
 				if (conversation !== void 0) {
@@ -231,7 +341,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0dsh-css:/home/runner/work/deepseek-harness/deepseek-harness/packages/client/ui-model-selection/src/client/ModelSelect.module.css.mjs
-		const css = "._7KE1Ra_root{min-width:0;position:relative}._7KE1Ra_trigger{min-width:0;max-width:min(360px,45cqw);height:28px;color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:24px;outline:none;align-items:center;gap:4px;padding:0 4px 0 8px;font-size:13px;font-weight:500;line-height:20px;display:flex}._7KE1Ra_trigger:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}._7KE1Ra_trigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}._7KE1Ra_trigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}._7KE1Ra_triggerLabel{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}._7KE1Ra_triggerEffort{color:var(--dsw-alias-label-caption);flex:none}._7KE1Ra_chevron{color:var(--dsw-alias-label-caption);flex:none;transition:transform .12s}._7KE1Ra_chevronOpen{transform:rotate(180deg)}._7KE1Ra_menu{z-index:20;border:1px solid var(--dsw-alias-border-inverted);background:var(--dsw-specific-menu);width:max-content;min-width:min(240px,100vw - 32px);max-width:min(420px,100vw - 32px);max-height:min(360px,100vh - 96px);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border-radius:12px;flex-direction:column;padding:4px;display:flex;position:absolute;bottom:calc(100% + 8px);right:0;overflow:hidden}._7KE1Ra_status,._7KE1Ra_empty{color:var(--dsw-alias-label-tertiary);padding:10px;font-size:13px;line-height:20px}._7KE1Ra_error,._7KE1Ra_warning{background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);border-radius:8px;justify-content:space-between;align-items:flex-start;gap:8px;margin-bottom:4px;padding:7px 8px;font-size:12px;line-height:18px;display:flex}._7KE1Ra_warning{background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-state-warn-label)}._7KE1Ra_retry{color:inherit;font:inherit;cursor:pointer;background:0 0;border:none;flex:none;padding:0;font-weight:600}._7KE1Ra_groups{min-height:0;overflow-y:auto}._7KE1Ra_group+._7KE1Ra_group{margin-top:4px}._7KE1Ra_groupTitle{z-index:1;background:var(--dsw-specific-menu);color:var(--dsw-alias-label-tertiary);padding:5px 8px 3px;font-size:12px;font-weight:500;line-height:18px;position:sticky;top:0}._7KE1Ra_option{box-sizing:border-box;width:auto;min-width:100%;min-height:38px;color:inherit;text-align:left;cursor:pointer;background:0 0;border:none;border-radius:10px;outline:none;align-items:center;gap:8px;padding:6px 8px;display:flex}._7KE1Ra_option:hover:not(:disabled),._7KE1Ra_option:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}._7KE1Ra_selected{background:0 0}._7KE1Ra_option:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}._7KE1Ra_optionCopy{flex-direction:column;flex:1;min-width:0;display:flex}._7KE1Ra_modelName{color:inherit;text-overflow:ellipsis;white-space:nowrap;font-size:14px;font-weight:500;line-height:20px;overflow:hidden}._7KE1Ra_description{color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;font-size:12px;line-height:18px;overflow:hidden}._7KE1Ra_check{color:var(--dsw-alias-label-primary);flex:0 0 18px;place-items:center;display:grid}._7KE1Ra_cell{box-sizing:border-box;width:auto;min-width:100%;height:40px;color:var(--dsw-alias-label-primary);cursor:pointer;text-align:left;background:0 0;border:none;border-radius:10px;align-items:center;gap:8px;padding:0 10px;font-size:14px;line-height:22px;display:flex}._7KE1Ra_cell:hover{background:var(--dsw-alias-interactive-bg-hover)}._7KE1Ra_cellLabel{white-space:nowrap;flex:none}._7KE1Ra_cellValue{text-overflow:ellipsis;white-space:nowrap;text-align:right;min-width:0;color:var(--dsw-alias-label-tertiary);flex:auto;overflow:hidden}._7KE1Ra_cellChevron{color:var(--dsw-alias-label-tertiary);flex:none}";
+		const css = "._7KE1Ra_root{min-width:0;position:relative}._7KE1Ra_trigger{min-width:0;max-width:min(360px,45cqw);height:28px;color:var(--dsw-alias-label-secondary);cursor:pointer;background:0 0;border:none;border-radius:24px;outline:none;align-items:center;gap:4px;padding:0 4px 0 8px;font-size:13px;font-weight:500;line-height:20px;display:flex}._7KE1Ra_trigger:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}._7KE1Ra_trigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-alias-border-l3)}._7KE1Ra_trigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}._7KE1Ra_triggerLabel{text-overflow:ellipsis;white-space:nowrap;min-width:0;overflow:hidden}._7KE1Ra_triggerEffort{color:var(--dsw-alias-label-caption);flex:none}._7KE1Ra_chevron{color:var(--dsw-alias-label-caption);flex:none;transition:transform .12s}._7KE1Ra_chevronOpen{transform:rotate(180deg)}._7KE1Ra_menu{z-index:20;border:1px solid var(--dsw-alias-border-inverted);background:var(--dsw-specific-menu);width:max-content;min-width:min(240px,100vw - 32px);max-width:min(420px,100vw - 32px);max-height:min(360px,100vh - 96px);box-shadow:var(--dsw-shadow-lv3);color:var(--dsw-alias-label-primary);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border-radius:12px;flex-direction:column;padding:4px;display:flex;position:absolute;bottom:calc(100% + 8px);right:0;overflow:hidden}._7KE1Ra_status,._7KE1Ra_empty{color:var(--dsw-alias-label-tertiary);padding:10px;font-size:13px;line-height:20px}._7KE1Ra_error,._7KE1Ra_warning{background:var(--dsw-alias-interactive-bg-hover-danger);color:var(--dsw-alias-state-error-primary);border-radius:8px;justify-content:space-between;align-items:flex-start;gap:8px;margin-bottom:4px;padding:7px 8px;font-size:12px;line-height:18px;display:flex}._7KE1Ra_warning{background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-state-warn-label)}._7KE1Ra_retry{color:inherit;font:inherit;cursor:pointer;background:0 0;border:none;flex:none;padding:0;font-weight:600}._7KE1Ra_groups{min-height:0;overflow-y:auto}._7KE1Ra_group+._7KE1Ra_group{margin-top:4px}._7KE1Ra_groupTitle{z-index:1;background:var(--dsw-specific-menu);color:var(--dsw-alias-label-tertiary);padding:5px 8px 3px;font-size:12px;font-weight:500;line-height:18px;position:sticky;top:0}._7KE1Ra_option{box-sizing:border-box;width:auto;min-width:100%;min-height:38px;color:inherit;text-align:left;cursor:pointer;background:0 0;border:none;border-radius:10px;outline:none;align-items:center;gap:8px;padding:6px 8px;display:flex}._7KE1Ra_option:hover:not(:disabled),._7KE1Ra_option:focus-visible{background:var(--dsw-alias-interactive-bg-hover)}._7KE1Ra_selected{background:0 0}._7KE1Ra_option:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}._7KE1Ra_optionCopy{flex-direction:column;flex:1;min-width:0;display:flex}._7KE1Ra_modelName{color:inherit;text-overflow:ellipsis;white-space:nowrap;font-size:14px;font-weight:500;line-height:20px;overflow:hidden}._7KE1Ra_check{color:var(--dsw-alias-label-primary);flex:0 0 18px;place-items:center;display:grid}._7KE1Ra_cell{box-sizing:border-box;width:auto;min-width:100%;height:40px;color:var(--dsw-alias-label-primary);cursor:pointer;text-align:left;background:0 0;border:none;border-radius:10px;align-items:center;gap:8px;padding:0 10px;font-size:14px;line-height:22px;display:flex}._7KE1Ra_cell:hover{background:var(--dsw-alias-interactive-bg-hover)}._7KE1Ra_cellLabel{white-space:nowrap;flex:none}._7KE1Ra_cellValue{text-overflow:ellipsis;white-space:nowrap;text-align:right;min-width:0;color:var(--dsw-alias-label-tertiary);flex:auto;overflow:hidden}._7KE1Ra_cellChevron{color:var(--dsw-alias-label-tertiary);flex:none}";
 		const tagId = "@deepseek-ai/dsh-client-ui-model-selection/ModelSelect.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
@@ -248,7 +358,6 @@ window.__ModuleLoader__.load({
 			"check": "_7KE1Ra_check",
 			"chevron": "_7KE1Ra_chevron",
 			"chevronOpen": "_7KE1Ra_chevronOpen",
-			"description": "_7KE1Ra_description",
 			"empty": "_7KE1Ra_empty",
 			"error": "_7KE1Ra_error",
 			"group": "_7KE1Ra_group",
@@ -319,20 +428,13 @@ window.__ModuleLoader__.load({
 			}] : [], ...reasoning.efforts.map((effort) => ({
 				key: `effort:${effort.id}`,
 				effort: effort.id,
-				label: effort.name,
-				...effort.description === void 0 ? {} : { description: effort.description }
+				label: effort.name
 			}))], [reasoning, t]);
 			const busy = state.status === "selecting";
 			const reload = () => {
 				lastActionRef.current = "load";
 				load();
 			};
-			(0, react.useEffect)(() => {
-				if (available) {
-					lastActionRef.current = "load";
-					load();
-				}
-			}, [available, load]);
 			(0, react.useEffect)(() => {
 				if (!open) return;
 				const closeOutside = (event) => {
@@ -415,9 +517,10 @@ window.__ModuleLoader__.load({
 				lastActionRef.current = "select";
 				select(selection).then(settleSelection);
 			};
-			const modelLabel = currentChoice?.model.name ?? t("trigger.fallback");
+			const waiting = state.current === null && state.status === "loading";
+			const modelLabel = waiting ? t("trigger.loading") : currentChoice?.model.name ?? (state.current === null ? t("trigger.fallback") : `${state.current.provider}/${state.current.model}`);
 			const triggerLabel = effortLabel === void 0 ? modelLabel : `${modelLabel} · ${effortLabel}`;
-			const triggerAria = currentChoice === void 0 ? t("trigger.selectAria") : effortLabel === void 0 ? t("trigger.aria", { model: modelLabel }) : t("trigger.ariaEffort", {
+			const triggerAria = waiting ? t("trigger.loading") : state.current === null ? t("trigger.selectAria") : effortLabel === void 0 ? t("trigger.aria", { model: modelLabel }) : t("trigger.ariaEffort", {
 				model: modelLabel,
 				effort: effortLabel
 			});
@@ -561,15 +664,12 @@ window.__ModuleLoader__.load({
 															model: model.id
 														});
 													},
-													children: [(0, react_jsx_runtime.jsxs)("span", {
+													children: [(0, react_jsx_runtime.jsx)("span", {
 														className: ModelSelect_module_css_default.optionCopy,
-														children: [(0, react_jsx_runtime.jsx)("span", {
+														children: (0, react_jsx_runtime.jsx)("span", {
 															className: ModelSelect_module_css_default.modelName,
 															children: model.name
-														}), model.description !== void 0 && (0, react_jsx_runtime.jsx)("span", {
-															className: ModelSelect_module_css_default.description,
-															children: model.description
-														})]
+														})
 													}), (0, react_jsx_runtime.jsx)("span", {
 														className: ModelSelect_module_css_default.check,
 														children: selected ? (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, {}) : null
@@ -605,15 +705,12 @@ window.__ModuleLoader__.load({
 								onClick: () => {
 									chooseEffort(level.effort);
 								},
-								children: [(0, react_jsx_runtime.jsxs)("span", {
+								children: [(0, react_jsx_runtime.jsx)("span", {
 									className: ModelSelect_module_css_default.optionCopy,
-									children: [(0, react_jsx_runtime.jsx)("span", {
+									children: (0, react_jsx_runtime.jsx)("span", {
 										className: ModelSelect_module_css_default.modelName,
 										children: level.label
-									}), level.description !== void 0 && (0, react_jsx_runtime.jsx)("span", {
-										className: ModelSelect_module_css_default.description,
-										children: level.description
-									})]
+									})
 								}), (0, react_jsx_runtime.jsx)("span", {
 									className: ModelSelect_module_css_default.check,
 									children: effectiveEffort === level.effort ? (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconCheckOutline16, {}) : null
@@ -637,8 +734,8 @@ window.__ModuleLoader__.load({
 		/**
 		* `model` namespace dictionaries.
 		*
-		* `trigger.selectAria` reads identically to `trigger.fallback` today and is
-		* still a separate key: the visible fallback label and the accessible name of
+		* `trigger.selectAria` intentionally matches `trigger.fallback` but remains a
+		* separate key: the visible fallback label and the accessible name of
 		* an unset trigger are free to diverge per locale, and folding it into
 		* `trigger.aria` would announce the degenerate "Select model, current Select
 		* model".
@@ -648,6 +745,7 @@ window.__ModuleLoader__.load({
 			"command.description": "选择本会话使用的模型",
 			"option.loadError": "目录加载失败：{message}",
 			"trigger.fallback": "选择模型",
+			"trigger.loading": "正在加载模型…",
 			"trigger.selectAria": "选择模型",
 			"trigger.aria": "选择模型，当前 {model}",
 			"trigger.ariaEffort": "选择模型，当前 {model}，推理等级 {effort}",
@@ -668,6 +766,7 @@ window.__ModuleLoader__.load({
 			"command.description": "Select the model for this conversation",
 			"option.loadError": "Catalog failed to load: {message}",
 			"trigger.fallback": "Select model",
+			"trigger.loading": "Loading models…",
 			"trigger.selectAria": "Select model",
 			"trigger.aria": "Select model, current {model}",
 			"trigger.ariaEffort": "Select model, current {model}, reasoning effort {effort}",
@@ -696,7 +795,7 @@ window.__ModuleLoader__.load({
 				id: rowId(group.id, model.id),
 				label: model.name,
 				detail: model.description !== void 0 ? `${group.name} · ${model.description}` : group.name,
-				...directory.current.provider === group.id && directory.current.model === model.id ? { active: true } : {}
+				...directory.current !== null && directory.current.provider === group.id && directory.current.model === model.id ? { active: true } : {}
 			});
 			for (const failure of directory.failures) rows.push({
 				id: `failure/${failure.id}`,
@@ -728,11 +827,11 @@ window.__ModuleLoader__.load({
 		/** Required services: the contribution registry, the seat's slot registry, locale, and the service's own faces. */
 		const inject = [
 			"commandUi",
-			"connection",
 			"locale",
 			"sessions",
 			"slots",
-			"remote"
+			"remote",
+			"remote.session"
 		];
 		/**
 		* Client plugin body: mount ModelDirectoryResolver, register the `model` dictionaries,

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

@@ -0,0 +1,38 @@
+/** One Host-generation model catalog shared by every Session selector. */
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
+import type { ModelCatalog } from '@deepseek-ai/dsh-api-remotes/client';
+import { type SnapshotStore } from '@deepseek-ai/dsh-client-store';
+/** Observable lifecycle of the shared model catalog. */
+export interface ModelCatalogState {
+    value: ModelCatalog | null;
+    status: 'idle' | 'loading' | 'ready' | 'error';
+    error: string | null;
+}
+/** Loads at most one model catalog for the current Host generation. */
+export declare class ModelCatalogDirectory {
+    private readonly ctx;
+    /** Current shared catalog value and load lifecycle. */
+    readonly store: SnapshotStore<ModelCatalogState>;
+    private generation;
+    private inflight;
+    /**
+     * @param ctx - the providing plugin's context, whose `remote.session`
+     * namespace carries the Host-generation catalog.
+     */
+    constructor(ctx: ClientContext);
+    /**
+     * Return the current generation's catalog, sharing its one in-flight load.
+     * @returns the loaded global catalog.
+     */
+    load(): Promise<ModelCatalog>;
+    /**
+     * Invalidate the loaded catalog; the next explicit menu read reloads it.
+     * @param clear - whether values from the previous Host generation must be hidden.
+     */
+    private invalidate;
+    /** Invalidate and reload the catalog after a Host-side model input changes. */
+    refresh(): void;
+    /** Clear Host-specific values and load the replacement Host generation. */
+    resetGeneration(): void;
+}
+//# sourceMappingURL=catalog.d.ts.map

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

@@ -1,15 +1,17 @@
 /**
  * Per-session model directory: the ONE state both selection entries share.
- * The /model popup and the composer-seat selector load through the same
- * controller and submit through the same selectModel call, so the host stays
- * the single fact source and the store is one shared echo — a switch made in
- * either entry is what the other shows next.
+ * The /model popup and composer seat combine one shared Host catalog with the
+ * Session's durable selection projection, then submit through the same
+ * selectModel call. A switch made in either entry updates this shared state.
  */
-import type { IApiClient, ModelCatalogFailure, ModelProviderGroup, ModelSelection, SessionId, SessionModels } from '@deepseek-ai/dsh-api-remotes/client';
-import type { SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
+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 { ObservableSnapshot, SnapshotStore } from '@deepseek-ai/dsh-client-store';
+import type { ModelCatalogDirectory } from './catalog.ts';
 /** Directory snapshot both entries render from. */
 export interface ModelDirectoryState {
-    /** Model selection the host reports for the next assembled step; null before the first load. */
+    /** Effective selection: durable next-request projection, then Host default. */
     current: ModelSelection | null;
     /**
      * Whether an adapter serves the current selection's provider, as the host reports
@@ -33,38 +35,43 @@ export declare class ModelDirectory {
     private readonly sessions;
     private readonly sessionId;
     private readonly available;
+    private readonly catalog;
+    private readonly projected;
     /** The shared snapshot both entries render from (uSES-safe store). */
     readonly store: SnapshotStore<ModelDirectoryState>;
-    /** Latest operation wins; an older response never overwrites a newer one. */
+    /** Latest selection operation wins; an older response never overwrites a newer one. */
     private generation;
     private disposed;
+    private resolved;
+    private readonly unsubscribeCatalog;
+    private readonly unsubscribeSelection;
     /**
      * @param sessions - the session wire face (captured from the plugin's root connection).
      * @param sessionId - the owning session.
      * @param available - whether this session may use Agent-bound model RPCs.
+     * @param catalog - Host-generation catalog shared by every Session.
+     * @param projected - durable model selection projected from Session history.
      */
-    constructor(sessions: Pick<IApiClient['sessions'], 'models' | 'selectModel'>, sessionId: SessionId, available: () => boolean);
+    constructor(sessions: Pick<TypertClientRemote['session'], 'selectModel'>, sessionId: SessionId, available: () => boolean, catalog: ModelCatalogDirectory, projected: ObservableSnapshot<unknown>);
     /**
-     * Refresh the advisory directory (both entries call this on open).
-     * Failure preserves the last good groups and current selection.
+     * Ensure the Host generation's shared advisory catalog is loaded.
      * @returns the fresh directory value.
      */
-    load(): Promise<SessionModels>;
+    load(): Promise<ModelDirectoryState>;
     /**
-     * Select the complete provider/model/reasoning selection (both entries submit through here). Success
-     * updates the shared current; failure surfaces on the store and throws so
-     * each entry's own retry surface engages.
+     * 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.
      * @param selection - provider, provider-owned model id, and optional adapter-owned effort.
    */
     select(selection: ModelSelection): Promise<void>;
     /**
-     * Drop the previous Host generation's projection and repull it. Clearing
-     * first prevents an unconsumed process-local selection from being displayed
-     * while the restarted Host has restored the last logged model selection.
+     * Invalidate an in-flight selection response from the previous Host generation.
      */
     resetConnected(): void;
     /** Scope teardown: late settlements lose write access to the store. */
     dispose(): void;
     private assertAvailable;
+    private syncInputs;
 }
 //# sourceMappingURL=directory.d.ts.map

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

@@ -1,4 +1,4 @@
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
 import { type ModelKey } from './locales.ts';
 export { ModelDirectory } from './directory.ts';
 export type { ModelDirectoryState } from './directory.ts';

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

@@ -1,8 +1,8 @@
 /**
  * `model` namespace dictionaries.
  *
- * `trigger.selectAria` reads identically to `trigger.fallback` today and is
- * still a separate key: the visible fallback label and the accessible name of
+ * `trigger.selectAria` intentionally matches `trigger.fallback` but remains a
+ * separate key: the visible fallback label and the accessible name of
  * an unset trigger are free to diverge per locale, and folding it into
  * `trigger.aria` would announce the degenerate "Select model, current Select
  * model".
@@ -12,6 +12,7 @@ export declare const zh: {
     'command.description': string;
     'option.loadError': string;
     'trigger.fallback': string;
+    'trigger.loading': string;
     'trigger.selectAria': string;
     'trigger.aria': string;
     'trigger.ariaEffort': string;
@@ -34,6 +35,7 @@ export declare const en: {
     'command.description': string;
     'option.loadError': string;
     'trigger.fallback': string;
+    'trigger.loading': string;
     'trigger.selectAria': string;
     'trigger.aria': string;
     'trigger.ariaEffort': string;

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

@@ -14,7 +14,7 @@
  */
 import { Service } from '@deepseek-ai/cordis';
 import type { Context } from '@deepseek-ai/cordis';
-import type { SessionId } from '@deepseek-ai/dsh-api-remotes/client';
+import type { SessionId } from '@deepseek-ai/dsh-session/types';
 import { ModelDirectory } from './directory.ts';
 declare module '@deepseek-ai/cordis' {
     interface Context {
@@ -25,6 +25,7 @@ declare module '@deepseek-ai/cordis' {
 export declare class ModelDirectoryResolver extends Service {
     static inject: string[];
     private readonly live;
+    private readonly catalog;
     /** Localized composer-block copy; this plugin owns the string it raises. */
     private readonly blockReason;
     /**

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

@@ -5,7 +5,7 @@
  * merge lives here.
  */
 import type { ModelSelection } from '@deepseek-ai/dsh-api-remotes/client';
-import type { SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client';
+import type { SnapshotStore } from '@deepseek-ai/dsh-client-store';
 import type { ModelDirectoryState } from './directory.ts';
 /** Injected business face of the composer model seat. */
 export interface ModelSelectInjected {
@@ -13,7 +13,7 @@ export interface ModelSelectInjected {
     available: boolean;
     /** The session's shared directory store (same instance the /model popup reads). */
     directory: SnapshotStore<ModelDirectoryState>;
-    /** Refresh the advisory directory (fire-and-forget; errors land on the store). */
+    /** Ensure the shared advisory catalog is loaded (errors land on the store). */
     load: () => void;
     /**
      * Select a complete provider/model/reasoning selection.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-model-selection",
-  "description": "Model selection: the /model popupSelect over session.models / session.selectModel",
-  "version": "0.1.1-rc.2",
+  "description": "Model selection over the shared model catalog, Session projection, and session.selectModel",
+  "version": "0.1.2-alpha.3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,8 +32,8 @@
   "dsh": {
     "client": {
       "inject": [
+        "@deepseek-ai/dsh-api-session-controller",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-commands",
         "@deepseek-ai/dsh-api-remotes"
       ],
@@ -42,31 +42,27 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.1-rc.2"
+    "@deepseek-ai/cordis": "^4.0.2"
   },
   "devDependencies": {
     "@types/react": "~18.3.1",
     "react": "^18.2.0",
-    "@deepseek-ai/dsh-client-connection": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-test-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-commands": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@deepseek-ai/cordis": "^4.0.1"
+    "@deepseek-ai/dsh-api-remotes": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-commands": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-locale": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-test-runtime": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-input-trigger": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-invariants": "^0.1.2-alpha.3",
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-typert-protocol": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-session": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-session": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-store": "^0.1.2-alpha.3"
   },
   "files": [
     "lib/index.js",