@deepseek-ai/dsh-client-ui-settings-models 0.2.0-rc.2 → 0.2.1-alpha.2

package/README.i18n.yaml

@@ -15,8 +15,8 @@
   en: d152484eb41ac6b4
   zh: 09388d293f9be9cb
 /deepseek-ai-dsh-client-ui-settings-models/use-this-package:
-  en: 9ad8f5243c87c5b9
-  zh: f3b01e25c28ebba2
+  en: db5aaf7f702e1f0c
+  zh: 409a78c14fb2b6e3
 /deepseek-ai-dsh-client-ui-settings-models/use-this-package/api-keys:
   en: c2f2a5c06ef20d5b
   zh: 49a7eb0b66b4ed53
@@ -39,8 +39,8 @@
   en: 74948a88fe1f9aac
   zh: 8ad2200fa74c12c9
 /deepseek-ai-dsh-client-ui-settings-models/understand-the-implementation/concurrency-and-credentials:
-  en: 670b8c066aed9b7a
-  zh: 2bedba9a2e0e3fee
+  en: 6e04c00818f014cd
+  zh: 2d57f8d8944e67ed
 /deepseek-ai-dsh-client-ui-settings-models/understand-the-implementation/onboarding-coordinator:
   en: 46dea666dffe8813
   zh: 6f56fdc365fa3642
@@ -57,5 +57,5 @@
   en: cc69c9934bf22302
   zh: 4ea896f4b54aa203
 /deepseek-ai-dsh-client-ui-settings-models/known-limitations-and-deferred-work/dev-note:
-  en: 4f6749870e661a48
-  zh: 4953f3ea814546a4
+  en: e67f633dc6fe7773
+  zh: 3bb0c20c93f16f98

package/README.md

@@ -35,6 +35,8 @@ Open the Models page from the Settings navigation to see every configured provid
 
 A provider with a stored catalog error remains visible with its diagnostic and edit/delete actions. Add actions are offered only for registered settings namespaces, so an unavailable namespace cannot leave a button that opens no editor. A rejected save leaves the editor open and displays the Host diagnostic.
 
+After Apply closes an editor, its saved status appears when the current provider, settings, and credential snapshot is ready. Opening any row's editor, adding a provider, and opening a removal confirmation wait for that refresh. A newly opened Models section, or one retrying after a page-load failure, waits for a ready snapshot before mounting editors. A background refresh preserves an open draft while its editor remains mounted; a failed page load or provider removal can close it.
+
 Host configuration `credentialOnboarding` defaults to `true`. The Electron preload marker suppresses automatic credential onboarding and the Web welcome notice; Models settings and explicit API-key editing remain available. The [account plugin](../ui-settings-account/README.md#desktop-onboarding) owns the Desktop introduction. Other native shells can disable only the credential step with `credentialOnboarding: false`. Host publishes this public boolean through `webserver/index-inject`, and Client validates it before registering dialogs. It is page initialization data, not a durable completion marker.
 
 ### API keys
@@ -83,6 +85,8 @@ A typed API key is judged on its own field: after trimming, it must be non-empty
 
 Each settings write carries the card's current `revision`, so a concurrent write from another tab or an external `cordis.patch.yml` edit is refused as `settings/conflict`. After settings commit, the card adopts the returned redacted user subtree and revision before storing the credential, so a failed credential stage retries only that stage. Deletion removes a configured, writable credential only when the profile names the page's derived `<ROUTE>_API_KEY` target, then unsets the profile; both operations are idempotent. Once loaded, the page subscribes to forwarded `settings/document-updated`, `credentials/reference-updated`, and `llm/adapters-updated` owner events, plus local `connection/reset`, so external edits converge without polling.
 
+Concurrent `ModelsSettingsStore.load()` callers resolve after the current refresh publishes its ready or error snapshot, including callers whose reads were superseded. Older responses cannot publish or settle callers; a refresh started synchronously by a snapshot subscriber owns the waiting callers. Expected Remote failures remain snapshot diagnostics, while an unexpected rejection of the current read rejects its waiting callers.
+
 ### Onboarding coordinator
 
 The notice step owns its exact copy in `src/client/locales.ts` and its acknowledgement version in `src/onboarding-copy.ts`; on loopback it compares and writes `ui-settings-general.welcomeNoticeVersion` through the shared configuration form, and only an explicit Continue records the current version. Users who acknowledged an earlier version see the current notice again. A non-loopback browser cannot use that Host-only namespace, so acknowledgement is process-local and the notice returns after reload. The DeepSeek step targets `deepseek-official` in `llm-deepseek` and renders the existing `ProviderEditor` in credential-only mode inside the shared onboarding modal; `credentials.set` stays the only secret write, and no provider settings are changed.
@@ -138,5 +142,3 @@ These limits define the editor's field coverage and the page's reach; they are c
 None.
 
 </details>
-
-**Runtime invariant:** No companion is published. A nav-entry-only section plugin rendering a fixed empty content column — it emits no cordis events and owns no cross-plugin mutable relation.

package/README.zh.md

@@ -35,6 +35,8 @@ kind: "package-reference"
 
 存在已存储目录错误的提供商仍显示诊断以及编辑、删除入口。添加操作只面向已注册的 settings 命名空间，因此不可用的命名空间不会留下无法打开编辑器的按钮。保存被拒绝时，编辑器保持打开并展示 Host 诊断。
 
+应用设置并关闭编辑器后，当前提供商、settings 与凭据快照就绪时才显示保存状态。打开任一行的编辑器、添加提供商和打开移除确认都会等待该刷新。新打开的 Models 区域或页面加载失败后的重试会等到 ready 快照后才挂载编辑器。后台刷新期间，只要编辑器仍挂载，已打开的草稿就会保留用户的修改；页面加载失败或提供商被移除可能关闭编辑器。
+
 Host 配置 `credentialOnboarding` 默认为 `true`。Electron preload 标记会抑制自动凭证引导和 Web 欢迎须知；模型设置页与显式 API Key 编辑仍然可用。[账号插件](../ui-settings-account/README.zh.md#desktop-onboarding)负责 Desktop 引导。其他原生壳可以通过 `credentialOnboarding: false` 仅禁用凭证步骤。Host 通过 `webserver/index-inject` 发布这个公开的布尔值，Client 在注册弹窗前校验它。它是页面初始化数据，不是持久化的完成标记。
 
 ### API 密钥
@@ -83,6 +85,8 @@ Models 页面包含 **DeepSeek 账号**（`deepseek-account`，英文为 **DeepS
 
 每次 settings 写入都携带卡片当前的 `revision`，因此来自另一个标签页或外部 `cordis.patch.yml` 编辑的并发写入会以 `settings/conflict` 被拒绝。settings 提交后，卡片会在存储凭据前采纳返回的脱敏用户子树与 revision，因此失败的凭据阶段只重试该阶段。删除只会在 profile 指名本页派生的 `<ROUTE>_API_KEY` 目标时移除已配置且可写的凭据，然后 unset 该 profile；两个操作都幂等。加载完成后，页面订阅转发的 `settings/document-updated`、`credentials/reference-updated` 与 `llm/adapters-updated` 属主事件，以及本地 `connection/reset`，因此外部编辑无需轮询即可收敛。
 
+并发的 `ModelsSettingsStore.load()` 调用会在当前刷新发布 ready 或 error 快照后 resolve，包括读取已被后续刷新取代的调用。旧响应不能发布快照或完成等待中的调用；快照订阅者同步发起的刷新负责等待中的调用。预期的 Remote 失败仍作为快照诊断展示，当前读取的意外拒绝则会拒绝所有等待中的调用。
+
 ### 引导协调器
 
 预览版说明在 `src/client/locales.ts` 中持有精确文案，并在 `src/onboarding-copy.ts` 中持有确认版本；回环时它通过既有 settings API 比较并写入 `ui-settings-general.welcomeNoticeVersion`，且只有显式点击「继续」才会记录当前版本。已确认旧版的用户会再次看到当前说明。非回环浏览器无法使用这个仅限宿主的 namespace，因此确认只保留在进程内，刷新后说明会再次出现。DeepSeek 步骤面向 `llm-deepseek` 中的 `deepseek-official`，在共享引导模态框内以仅凭据模式渲染既有 `ProviderEditor`；`credentials.set` 仍是唯一的机密写入，且不改变任何提供商设置。
@@ -138,5 +142,3 @@ Models 页面包含 **DeepSeek 账号**（`deepseek-account`，英文为 **DeepS
 无。
 
 </details>
-
-**运行时不变式：** 不发布伴生入口。这是只贡献 nav entry 的 section 插件，渲染固定空 content column，不发出 Cordis 事件，也不持有跨插件可变关系。

package/lib/client.js

@@ -981,6 +981,8 @@ window.__ModuleLoader__.load({
 			});
 			/** Latest load wins; an older response never overwrites a newer one. */
 			generation = 0;
+			/** Callers follow the current refresh's outcome, including callers whose read was superseded. */
+			pendingLoads = /* @__PURE__ */ new Set();
 			/**
 			* @param ctx - the page plugin's context, whose `remote.llm` and
 			* `remote.credentials` namespaces carry the directory and credential reads.
@@ -997,11 +999,28 @@ window.__ModuleLoader__.load({
 			* settings answer in parallel, then one batched credential describe over
 			* every referenced ref. Provider failure or absence of an initial settings
 			* answer keeps the last good rows and surfaces an error; a failed settings
-			* refresh reuses the mirror's held view.
-			* @returns nothing; the snapshot carries the outcome.
+			* refresh reuses the mirror's held view. Concurrent callers resolve only
+			* after the current refresh publishes its ready or error snapshot.
+			* @returns resolution after the current snapshot is published.
+			* @throws the current read's unexpected rejection; superseded rejections are ignored.
 			*/
-			async load() {
+			load() {
+				const pending = Promise.withResolvers();
+				this.pendingLoads.add(pending);
 				const generation = ++this.generation;
+				this.read(generation).then(() => {
+					this.settleLoads(generation, (load) => {
+						load.resolve();
+					});
+				}, (error) => {
+					this.settleLoads(generation, (load) => {
+						load.reject(error);
+					});
+				});
+				return pending.promise;
+			}
+			/** Publish one joined answer; stale answers leave the current refresh in charge. */
+			async read(generation) {
 				this.store.update((s) => {
 					s.status = "loading";
 					s.error = null;
@@ -1011,17 +1030,18 @@ window.__ModuleLoader__.load({
 					this.ctx.remote.llm.listConfigurableProviders(),
 					this.describeFace.ensure()
 				]);
+				if (generation !== this.generation) return;
 				if (!registered.ok) {
-					this.failLoad(generation, registered.error.message);
+					this.failLoad(registered.error.message);
 					return;
 				}
 				if (!declared.ok) {
-					this.failLoad(generation, declared.error.message);
+					this.failLoad(declared.error.message);
 					return;
 				}
 				const mirrored = this.describeFace.getSnapshot();
 				if (mirrored.view === void 0) {
-					this.failLoad(generation, mirrored.error ?? "settings are unavailable in this browser");
+					this.failLoad(mirrored.error ?? "settings are unavailable in this browser");
 					return;
 				}
 				const providers = joinProviderDirectory(registered.value, declared.value);
@@ -1069,9 +1089,15 @@ window.__ModuleLoader__.load({
 					s.namespaces = namespaces;
 				});
 			}
-			/** Publish one load's failure text, unless a newer load already took over. */
-			failLoad(generation, message) {
+			/** Settle callers only while this read still owns the current refresh. */
+			settleLoads(generation, settle) {
 				if (generation !== this.generation) return;
+				const pending = [...this.pendingLoads];
+				this.pendingLoads.clear();
+				for (const load of pending) settle(load);
+			}
+			/** Publish the current joined read's failure text. */
+			failLoad(message) {
 				this.store.update((s) => {
 					s.status = "error";
 					s.error = message;
@@ -1973,6 +1999,10 @@ window.__ModuleLoader__.load({
 					}
 				} : row)
 			};
+			/** A new or failed surface waits for a current snapshot; background refreshes preserve its drafts. */
+			const [hasReadySnapshot, setHasReadySnapshot] = (0, react.useState)(state.status === "ready");
+			if (state.status === "ready" && !hasReadySnapshot) setHasReadySnapshot(true);
+			if (state.status === "error" && hasReadySnapshot) setHasReadySnapshot(false);
 			const [editing, setEditing] = (0, react.useState)(void 0);
 			const [addOpen, setAddOpen] = (0, react.useState)(false);
 			const [addMode, setAddMode] = (0, react.useState)("catalog");
@@ -2060,6 +2090,16 @@ window.__ModuleLoader__.load({
 					})]
 				});
 			}
+			if (!hasReadySnapshot && state.status !== "ready") return (0, react_jsx_runtime.jsxs)("div", {
+				className: ModelsSection_module_css_default["section"],
+				children: [(0, react_jsx_runtime.jsx)("h2", {
+					className: ModelsSection_module_css_default["title"],
+					children: t("title")
+				}), (0, react_jsx_runtime.jsx)("p", {
+					className: ModelsSection_module_css_default["intro"],
+					children: t("intro")
+				})]
+			});
 			const savedRow = savedTarget === void 0 ? void 0 : state.rows.find((row) => row.entry.provider === savedTarget.provider);
 			const savedIdentity = savedRow === void 0 ? savedTarget : {
 				provider: savedRow.entry.provider,
@@ -2191,7 +2231,9 @@ window.__ModuleLoader__.load({
 												type: "button",
 												className: ModelsSection_module_css_default["secondaryButton"],
 												"aria-label": providerCopy(t("editProvider"), target),
+												disabled: !open && state.status !== "ready",
 												onClick: () => {
+													if (!open && controller.store.getSnapshot().status !== "ready") return;
 													setSavedTarget(void 0);
 													setAddOpen(false);
 													setEditing(open ? void 0 : target);
@@ -2201,8 +2243,9 @@ window.__ModuleLoader__.load({
 												type: "button",
 												className: ModelsSection_module_css_default["dangerButton"],
 												"aria-label": providerCopy(t("removeProvider"), target),
-												disabled: !state.writable,
+												disabled: !state.writable || state.status !== "ready",
 												onClick: () => {
+													if (controller.store.getSnapshot().status !== "ready") return;
 													setSavedTarget(void 0);
 													setDeleteFailure(void 0);
 													setDeleteTarget(target);
@@ -2351,8 +2394,9 @@ window.__ModuleLoader__.load({
 							children: (0, react_jsx_runtime.jsxs)("button", {
 								type: "button",
 								className: ModelsSection_module_css_default["addButton"],
-								disabled: !state.writable || !catalogEnabled && !customEnabled,
+								disabled: !state.writable || state.status !== "ready" || !catalogEnabled && !customEnabled,
 								onClick: () => {
+									if (controller.store.getSnapshot().status !== "ready") return;
 									const first = addable[0];
 									const initial = catalogEnabled ? "catalog" : "custom";
 									setSavedTarget(void 0);

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

@@ -91,6 +91,8 @@ export declare class ModelsSettingsStore {
     readonly store: SnapshotStore<ModelsSettingsState>;
     /** Latest load wins; an older response never overwrites a newer one. */
     private generation;
+    /** Callers follow the current refresh's outcome, including callers whose read was superseded. */
+    private readonly pendingLoads;
     /**
      * @param ctx - the page plugin's context, whose `remote.llm` and
      * `remote.credentials` namespaces carry the directory and credential reads.
@@ -103,11 +105,17 @@ export declare class ModelsSettingsStore {
      * settings answer in parallel, then one batched credential describe over
      * every referenced ref. Provider failure or absence of an initial settings
      * answer keeps the last good rows and surfaces an error; a failed settings
-     * refresh reuses the mirror's held view.
-     * @returns nothing; the snapshot carries the outcome.
+     * refresh reuses the mirror's held view. Concurrent callers resolve only
+     * after the current refresh publishes its ready or error snapshot.
+     * @returns resolution after the current snapshot is published.
+     * @throws the current read's unexpected rejection; superseded rejections are ignored.
      */
     load(): Promise<void>;
-    /** Publish one load's failure text, unless a newer load already took over. */
+    /** Publish one joined answer; stale answers leave the current refresh in charge. */
+    private read;
+    /** Settle callers only while this read still owns the current refresh. */
+    private settleLoads;
+    /** Publish the current joined read's failure text. */
     private failLoad;
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@deepseek-ai/dsh-client-ui-settings-models",
   "description": "Models settings and shared product-onboarding dialogs over existing settings and credential joins",
-  "version": "0.2.0-rc.2",
+  "version": "0.2.1-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -37,27 +37,27 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@deepseek-ai/cordis": "~4.0.4"
+    "@deepseek-ai/cordis": "~4.0.5-alpha.1"
   },
   "devDependencies": {
+    "@deepseek-ai/dsh-host-webserver": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-api-remotes": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-store": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-test-runtime": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-ui-slots": "0.2.1-alpha.2",
     "@types/react": "~18.3.1",
+    "@deepseek-ai/cordis": "~4.0.5-alpha.1",
     "react": "^18.2.0",
-    "@deepseek-ai/dsh-host-webserver": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-api-remotes": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-locale": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-store": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-test-runtime": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "0.2.0-rc.2",
-    "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-util-values": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-remote-mock": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-product-analytics": "0.2.0-rc.2"
+    "@deepseek-ai/dsh-client-ui-renderer": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-util-values": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-remote-mock": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-client-product-analytics": "0.2.1-alpha.2"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "~3.18.4"
+    "@deepseek-ai/schemastery": "~3.18.5-alpha.1"
   },
   "files": [
     "lib/index.js",