@awiki/dsh-plugin 0.3.11-rc.3 → 0.3.12

package/lib/client.js

@@ -8286,13 +8286,22 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}).readonly()
 		})]);
 		const _awiki_dsh_plugin_awiki_sendAttachment_parameter_0$schema = object({
-			"target": union([object({
-				"kind": literal("direct").readonly(),
-				"peer": string().readonly()
-			}), object({
-				"kind": literal("group").readonly(),
-				"group": string().readonly()
-			})]).readonly(),
+			"target": union([
+				object({
+					"kind": literal("direct").readonly(),
+					"peer": string().readonly(),
+					"conversationId": never().readonly().optional()
+				}),
+				object({
+					"kind": literal("direct").readonly(),
+					"conversationId": intersection(string(), unknown()).readonly(),
+					"peer": never().readonly().optional()
+				}),
+				object({
+					"kind": literal("group").readonly(),
+					"group": string().readonly()
+				})
+			]).readonly(),
 			"fileName": string().readonly(),
 			"mimeType": string().readonly(),
 			"bytesBase64": string().readonly(),
@@ -8622,13 +8631,22 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}).readonly()
 		})]);
 		const _awiki_dsh_plugin_awiki_sendText_parameter_0$schema = object({
-			"target": union([object({
-				"kind": literal("direct").readonly(),
-				"peer": string().readonly()
-			}), object({
-				"kind": literal("group").readonly(),
-				"group": string().readonly()
-			})]).readonly(),
+			"target": union([
+				object({
+					"kind": literal("direct").readonly(),
+					"peer": string().readonly(),
+					"conversationId": never().readonly().optional()
+				}),
+				object({
+					"kind": literal("direct").readonly(),
+					"conversationId": intersection(string(), unknown()).readonly(),
+					"peer": never().readonly().optional()
+				}),
+				object({
+					"kind": literal("group").readonly(),
+					"group": string().readonly()
+				})
+			]).readonly(),
 			"text": string().readonly(),
 			"idempotencyKey": string().readonly(),
 			"mentions": array(object({
@@ -13294,7 +13312,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		function targetOf(conversation) {
 			return conversation.kind === "direct" ? {
 				kind: "direct",
-				peer: conversation.peerDid
+				conversationId: conversation.id
 			} : {
 				kind: "group",
 				group: conversation.groupDid
@@ -20853,6 +20871,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		function AwikiUpdates(props) {
 			const { snapshot, t } = props;
 			const desktop = snapshot.desktop;
+			const scopedDesktop = desktop?.schemaVersion === 2 && !snapshot.value.switching && desktop.tenantId === snapshot.value.activeTenantId && desktop.tenantGeneration === snapshot.value.generation && desktop.policyOrigin === snapshot.value.tenants.find((tenant) => tenant.tenantId === snapshot.value.activeTenantId)?.backendBaseUrl;
 			const busy = snapshot.updateStatus === "loading" || snapshot.desktopStatus === "loading";
 			return (0, react_jsx_runtime.jsxs)("div", {
 				className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.panel,
@@ -20884,9 +20903,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							(0, react_jsx_runtime.jsx)("p", {
 								className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
 								role: "status",
-								children: t(snapshot.desktopStatus === "unavailable" || desktop.state === "failed" ? "updateFailed" : desktop.state === "checking" || snapshot.desktopStatus === "loading" ? "updateLoading" : desktop.state === "unchecked" ? "updateUnchecked" : desktop.noRelease ? "desktopNoRelease" : desktop.updateAvailable ? "updateAvailable" : "updateLatest", { version: desktop.latestVersion })
+								children: t(desktop.schemaVersion === 1 ? "desktopLegacyUpdate" : snapshot.value.switching ? "tenantSwitching" : desktop.state === "unavailable" ? "updateNoPolicy" : snapshot.desktopStatus === "unavailable" || desktop.state === "failed" ? "updateFailed" : desktop.state === "checking" || snapshot.desktopStatus === "loading" ? "updateLoading" : desktop.state === "unchecked" ? "updateUnchecked" : desktop.noRelease ? "desktopNoRelease" : desktop.updateAvailable ? "updateAvailable" : "updateLatest", { version: desktop.latestVersion })
 							}),
-							desktop.latestVersion !== void 0 && !desktop.noRelease && (0, react_jsx_runtime.jsx)("p", {
+							scopedDesktop && desktop.updateAvailable && desktop.latestVersion !== void 0 && !desktop.noRelease && (0, react_jsx_runtime.jsx)("p", {
 								className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
 								children: t("updateRecommended", { version: desktop.latestVersion })
 							}),
@@ -20898,16 +20917,15 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 								className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
 								children: t("desktopInstallHelp")
 							}),
-							(0, react_jsx_runtime.jsx)("a", {
+							scopedDesktop && desktop.downloadPageUrl !== void 0 && (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [(0, react_jsx_runtime.jsx)("a", {
 								href: desktop.downloadPageUrl,
 								target: "_blank",
 								rel: "noopener noreferrer",
 								children: t("desktopDownloadPage")
-							}),
-							(0, react_jsx_runtime.jsx)("code", {
+							}), (0, react_jsx_runtime.jsx)("code", {
 								className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.updateCommand,
 								children: desktop.downloadPageUrl
-							})
+							})] })
 						]
 					}),
 					(0, react_jsx_runtime.jsx)(PluginUpdate, { ...props }, `${snapshot.value.activeTenantId}:${snapshot.value.generation}:${snapshot.update?.upgradeCommand ?? ""}:${desktop?.distributionId ?? ""}`)
@@ -20917,15 +20935,16 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		function PluginUpdate({ snapshot, t }) {
 			const [copyState, setCopyState] = (0, react.useState)("idle");
 			const tenant = snapshot.value.tenants.find((value) => value.tenantId === snapshot.value.activeTenantId);
-			const update = snapshot.update?.tenantId === snapshot.value.activeTenantId ? snapshot.update : void 0;
+			const update = snapshot.update?.tenantId === snapshot.value.activeTenantId && snapshot.update.tenantGeneration === snapshot.value.generation ? snapshot.update : void 0;
 			const desktop = snapshot.desktop;
-			const command = desktop === void 0 ? update?.upgradeCommand?.replace(/^dsh plugin add /u, "dsh plugin --profile YOUR_PROFILE add ") : update?.upgradeCommand;
+			const isDesktop = desktop !== void 0 || snapshot.desktopPresent === true;
+			const command = !isDesktop && snapshot.desktopStatus === "ready" ? update?.upgradeCommand?.replace(/^dsh plugin add /u, "dsh plugin --profile YOUR_PROFILE add ") : void 0;
 			const switching = snapshot.value.switching;
 			const state = update?.checkState ?? (update === void 0 ? "unchecked" : update.offline ? "failed" : update.policyUnavailable ? "unavailable" : "ready");
 			let desktopResolves = false;
 			try {
 				const bundled = desktop?.bundledVersions;
-				desktopResolves = desktop?.updateAvailable === true && bundled !== void 0 && update?.recommendedPluginVersion !== void 0 && compareVersions(bundled.plugin, update.recommendedPluginVersion) >= 0 && (update.currentModelProxyVersion === void 0 || update.recommendedModelProxyVersion !== void 0 && bundled.modelProxy !== void 0 && compareVersions(bundled.modelProxy, update.recommendedModelProxyVersion) >= 0);
+				desktopResolves = !switching && desktop?.schemaVersion === 2 && desktop.tenantId === snapshot.value.activeTenantId && desktop.tenantGeneration === snapshot.value.generation && desktop.policyOrigin === tenant?.backendBaseUrl && desktop.updateAvailable === true && bundled !== void 0 && update?.recommendedPluginVersion !== void 0 && compareVersions(bundled.plugin, update.recommendedPluginVersion) >= 0 && (update.currentModelProxyVersion === void 0 || update.recommendedModelProxyVersion !== void 0 && bundled.modelProxy !== void 0 && compareVersions(bundled.modelProxy, update.recommendedModelProxyVersion) >= 0);
 			} catch {}
 			const copy = async () => {
 				if (command === void 0 || switching) return;
@@ -20949,7 +20968,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					}),
 					(0, react_jsx_runtime.jsx)("p", {
 						className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
-						children: t("updateCurrent", { version: update?.currentPluginVersion ?? "0.3.11-rc.3" })
+						children: t("updateCurrent", { version: update?.currentPluginVersion ?? "0.3.12" })
 					}),
 					update !== void 0 && (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: update.currentModelProxyVersion !== void 0 && (0, react_jsx_runtime.jsx)("p", {
 						className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
@@ -20986,13 +21005,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
 						children: t("updateCached")
 					}),
-					desktop !== void 0 && (0, react_jsx_runtime.jsx)("p", {
+					isDesktop && (0, react_jsx_runtime.jsx)("p", {
 						className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
 						children: t(desktopResolves ? "desktopResolvesPlugin" : "desktopPluginHelp")
 					}),
-					state === "ready" && update?.updateAvailable && command === void 0 && (0, react_jsx_runtime.jsx)("p", {
+					!isDesktop && state === "ready" && update?.updateAvailable && command === void 0 && (0, react_jsx_runtime.jsx)("p", {
 						className: _dsh_awiki_css_AwikiSettingsSection_module_css_default.description,
-						children: t("updateNoCommand")
+						children: t(update.upgradeBlockedReason === "host-incompatible" ? "updateHostRequired" : update.upgradeBlockedReason === "identity-incompatible" ? "updateIdentityIncompatible" : "updateNoCommand")
 					}),
 					command !== void 0 && !switching && (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 						(0, react_jsx_runtime.jsx)("code", {
@@ -22467,7 +22486,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		}
 		var produce = new Immer2().produce;
 		//#endregion
-		//#region node_modules/.pnpm/@deepseek-ai+dsh-client-store@0.1.5-rc.1_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-client-store/lib/index.js
+		//#region node_modules/.pnpm/@deepseek-ai+dsh-client-store@0.1.5-rc.2_@deepseek-ai+cordis@4.0.2/node_modules/@deepseek-ai/dsh-client-store/lib/index.js
 		/**
 		* React-free snapshot store engine (zustand vanilla + immer + subscribeWithSelector +
 		* rafFlush middleware + opt-in persist + dev freeze) plus the declarative
@@ -22726,7 +22745,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			desktopNoRelease: "暂未发布适用于当前发行通道的更新。",
 			updateAvailable: "有可用更新。",
 			updateRequired: "当前组件版本不满足服务要求，请升级或切换服务。",
-			updateNoCommand: "该服务暂未提供可用的独立插件升级命令。",
+			updateNoCommand: "当前租户未提供完整的安装兼容信息，请查看安装说明。",
+			updateHostRequired: "当前 DSH 宿主与推荐插件不兼容，请先按安装说明升级 DSH。",
+			updateIdentityIncompatible: "当前 Identity 插件与推荐组合不兼容，请查看安装说明；不会自动降级。",
+			desktopLegacyUpdate: "当前桌面版不支持按租户检查更新，请从当前租户的网站获取新版安装包。",
 			updateCopied: "已复制升级命令。",
 			updateCopyFailed: "复制失败，请选中上方命令手动复制。",
 			updateGuide: "查看发布与安装说明",
@@ -22735,7 +22757,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			desktopUpdateTitle: "DSH Desktop · AWiki",
 			desktopDownloadPage: "前往桌面版下载页面",
 			desktopInstallHelp: "选择适合电脑的完整安装包，完成安装后重新打开应用。",
-			desktopPluginHelp: "桌面用户可前往上方下载页面查看完整桌面版；插件兼容要求由当前服务决定。",
+			desktopPluginHelp: "桌面版通过完整安装包升级内置组件。当前租户未提供能够满足推荐组件要求的整包更新时，请等待兼容版本。",
 			desktopResolvesPlugin: "此桌面更新包含满足当前服务推荐版本要求的插件组件。",
 			updateModelRestricted: "当前模型组件低于最低支持版本 {minimum}，AWiki 模型服务暂不可用。",
 			updateTitle: "插件更新",
@@ -22847,7 +22869,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			desktopNoRelease: "No release is currently available for this channel.",
 			updateAvailable: "An update is available.",
 			updateRequired: "Your component version is unsupported. Update or switch services.",
-			updateNoCommand: "This service has not provided an independent plugin upgrade command.",
+			updateNoCommand: "This tenant has not provided complete installation compatibility information. Read the installation guide.",
+			updateHostRequired: "The recommended plugin requires a different DSH host. Upgrade DSH using the installation guide first.",
+			updateIdentityIncompatible: "The installed Identity plugin is incompatible with the recommended combination. Read the installation guide; no downgrade is performed.",
+			desktopLegacyUpdate: "This Desktop version does not support tenant-scoped updates. Get a newer installer from your current tenant’s website.",
 			updateCopied: "Upgrade command copied.",
 			updateCopyFailed: "Copy failed. Select the command above and copy it manually.",
 			updateGuide: "Release and installation guide",
@@ -22856,7 +22881,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			desktopUpdateTitle: "DSH Desktop · AWiki",
 			desktopDownloadPage: "Visit Desktop Download Page",
 			desktopInstallHelp: "Choose the full installer for your computer, install it, then reopen the app.",
-			desktopPluginHelp: "Desktop users can visit the download page above. Plugin requirements belong to the current service.",
+			desktopPluginHelp: "Upgrade bundled components using a complete Desktop installer. If this tenant has no suitable installer, wait for a compatible release.",
 			desktopResolvesPlugin: "This Desktop update includes components meeting the current service’s recommended versions.",
 			updateModelRestricted: "The model component is below the minimum version {minimum}; the AWiki model service is unavailable.",
 			updateTitle: "Plugin updates",
@@ -22902,18 +22927,34 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		function decodeDesktopDistribution(value) {
 			if (typeof value !== "object" || value === null) return void 0;
 			const view = value;
-			if (view.schemaVersion !== 1 || view.distributionId !== "awiki-dsh-desktop" || typeof view.currentVersion !== "string" || view.channel !== "stable" && view.channel !== "prerelease" || typeof view.downloadPageUrl !== "string" || ![
+			if (view.schemaVersion !== 1 && view.schemaVersion !== 2 || view.distributionId !== "awiki-dsh-desktop" || typeof view.currentVersion !== "string" || view.channel !== "stable" && view.channel !== "prerelease" || view.downloadPageUrl !== void 0 && typeof view.downloadPageUrl !== "string" || ![
 				"unchecked",
 				"checking",
 				"ready",
-				"failed"
+				"failed",
+				"unavailable"
 			].includes(String(view.state)) || typeof view.updateAvailable !== "boolean" || typeof view.usedCache !== "boolean" || view.latestVersion !== void 0 && typeof view.latestVersion !== "string" || view.checkedAt !== void 0 && typeof view.checkedAt !== "string" || view.noRelease !== void 0 && typeof view.noRelease !== "boolean") return void 0;
 			try {
 				assertVersion(view.currentVersion);
+				if (view.schemaVersion === 1) return {
+					schemaVersion: 1,
+					distributionId: "awiki-dsh-desktop",
+					currentVersion: view.currentVersion,
+					channel: view.channel,
+					state: "unavailable",
+					updateAvailable: false,
+					usedCache: false
+				};
+				const hasTenant = view.tenantId !== void 0 || view.policyOrigin !== void 0 || view.tenantGeneration !== void 0;
+				if (hasTenant && (typeof view.tenantId !== "string" || view.tenantId.length === 0 || typeof view.policyOrigin !== "string" || new URL(view.policyOrigin).origin !== view.policyOrigin || new URL(view.policyOrigin).protocol !== "https:" || !Number.isSafeInteger(view.tenantGeneration) || view.tenantGeneration < 0)) return void 0;
+				if (!hasTenant && view.state !== "unavailable") return void 0;
+				if (view.policyRevision !== void 0 && (!Number.isSafeInteger(view.policyRevision) || view.policyRevision < 1)) return void 0;
 				if (view.latestVersion !== void 0) assertVersion(view.latestVersion);
 				if (view.checkedAt !== void 0 && !Number.isFinite(Date.parse(view.checkedAt))) return void 0;
-				const url = new URL(view.downloadPageUrl);
-				if (url.protocol !== "https:" || url.username !== "" || url.password !== "") return void 0;
+				if (typeof view.downloadPageUrl === "string") {
+					const url = new URL(view.downloadPageUrl);
+					if (url.protocol !== "https:" || url.username !== "" || url.password !== "" || url.origin !== view.policyOrigin) return void 0;
+				}
 			} catch {
 				return;
 			}
@@ -22934,11 +22975,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				};
 			}
 			return {
-				schemaVersion: 1,
+				schemaVersion: 2,
 				distributionId: "awiki-dsh-desktop",
 				currentVersion: view.currentVersion,
 				channel: view.channel,
-				downloadPageUrl: view.downloadPageUrl,
+				...typeof view.downloadPageUrl === "string" ? { downloadPageUrl: view.downloadPageUrl } : {},
+				...typeof view.tenantId === "string" ? {
+					tenantId: view.tenantId,
+					policyOrigin: view.policyOrigin,
+					tenantGeneration: view.tenantGeneration
+				} : {},
+				...typeof view.policyRevision === "number" ? { policyRevision: view.policyRevision } : {},
 				state: view.state,
 				updateAvailable: view.updateAvailable,
 				usedCache: view.usedCache,
@@ -23060,6 +23107,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				"failed"
 			].includes(String(value.checkState))) return void 0;
 			if (value.updateAvailable !== void 0 && typeof value.updateAvailable !== "boolean") return void 0;
+			if (value.upgradeBlockedReason !== void 0 && ![
+				"installation-unverified",
+				"host-incompatible",
+				"identity-incompatible"
+			].includes(String(value.upgradeBlockedReason))) return void 0;
 			return value;
 		}
 		//#endregion
@@ -23108,7 +23160,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				this.tenantSnapshot = {
 					status: connection.isLoopback ? "loading" : "unavailable",
 					value: INITIAL_TENANTS,
-					updateStatus: connection.isLoopback ? "loading" : "unavailable"
+					updateStatus: connection.isLoopback ? "loading" : "unavailable",
+					desktopStatus: connection.isLoopback ? "loading" : "unavailable"
 				};
 				this.disposeGeneration = connection.isLoopback ? connection.generation.subscribe(() => {
 					this.load();
@@ -23190,14 +23243,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					const value = result.ok ? decodeAwikiTenantRpcView(result.value) : void 0;
 					if (value === void 0) throw new Error("AWiki tenant catalog is unavailable");
 					const changed = value.activeTenantId !== this.tenantSnapshot.value.activeTenantId || value.generation !== this.tenantSnapshot.value.generation;
-					if (changed) this.updateRequestVersion++;
+					if (changed) {
+						this.updateRequestVersion++;
+						this.desktopRequestVersion++;
+					}
 					this.publishTenants({
 						...this.tenantSnapshot,
 						status: "ready",
 						value,
 						...changed ? {
 							update: void 0,
-							updateStatus: "loading"
+							updateStatus: "loading",
+							desktop: void 0,
+							desktopStatus: "loading"
 						} : {}
 					});
 				} catch {
@@ -23235,7 +23293,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				}
 			}
 			async loadDesktopUpdate(refresh = false) {
-				if (!this.connection.isLoopback || this.disposed) return;
+				if (!this.connection.isLoopback || this.disposed || this.tenantSnapshot.value.switching) return;
+				const tenantId = this.tenantSnapshot.value.activeTenantId;
+				const generation = this.tenantSnapshot.value.generation;
 				const request = ++this.desktopRequestVersion;
 				if (refresh) this.publishTenants({
 					...this.tenantSnapshot,
@@ -23243,14 +23303,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				});
 				try {
 					const result = await this.connection.rpc.call(AWIKI_SETTINGS_RPC_CHANNEL, refresh ? AWIKI_SETTINGS_RPC_ENDPOINTS.refreshDesktopUpdate : AWIKI_SETTINGS_RPC_ENDPOINTS.describeDesktopUpdate, {}, this.abort.signal);
-					if (this.disposed || request !== this.desktopRequestVersion) return;
+					if (this.disposed || request !== this.desktopRequestVersion || tenantId !== this.tenantSnapshot.value.activeTenantId || generation !== this.tenantSnapshot.value.generation) return;
 					if (!result.ok) throw new Error("Desktop update service unavailable");
 					const desktop = result.value === null ? void 0 : decodeDesktopDistribution(result.value);
 					if (result.value !== null && desktop === void 0) throw new Error("Invalid Desktop update response");
+					if (desktop?.schemaVersion === 2 && desktop.tenantId !== void 0) {
+						const tenant = this.tenantSnapshot.value.tenants.find((value) => value.tenantId === tenantId);
+						if (desktop.tenantId !== tenantId || desktop.tenantGeneration !== generation || desktop.policyOrigin !== tenant?.backendBaseUrl) throw new Error("Desktop update scope mismatch");
+					}
 					this.publishTenants({
 						...this.tenantSnapshot,
 						desktopStatus: "ready",
-						desktop
+						desktop,
+						desktopPresent: desktop !== void 0
 					});
 				} catch {
 					if (!this.disposed && request === this.desktopRequestVersion) this.publishTenants({
@@ -23351,12 +23416,15 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				if (switching) {
 					this.updateRequestVersion++;
 					this.tenantRequestVersion++;
+					this.desktopRequestVersion++;
 				}
 				this.publishTenants({
 					...this.tenantSnapshot,
 					...switching ? {
 						update: void 0,
-						updateStatus: "loading"
+						updateStatus: "loading",
+						desktop: void 0,
+						desktopStatus: "loading"
 					} : {},
 					value: {
 						...this.tenantSnapshot.value,
@@ -23376,15 +23444,15 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						value
 					});
 					if (switching) {
-						await this.loadUpdatePolicy();
-						await this.loadUpdatePolicy(true);
+						await Promise.all([this.loadUpdatePolicy(), this.loadDesktopUpdate()]);
+						await Promise.all([this.loadUpdatePolicy(true), this.loadDesktopUpdate(true)]);
 					}
 				} catch (error) {
 					if (!this.disposed) {
 						await this.loadTenants();
 						if (switching) {
-							await this.loadUpdatePolicy();
-							this.loadUpdatePolicy(true);
+							await Promise.all([this.loadUpdatePolicy(), this.loadDesktopUpdate()]);
+							this.refreshUpdatePolicy();
 						}
 					}
 					throw error;