@linxin666/dsh-remote-web-ui 0.2.9 → 0.3.1

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:
 #   node scripts/verify-docs.mjs --write <dir>
-README.md: d3195d3b8a3dc58cf077538b0e18455b7d1706a6
-README.zh.md: c0a06bf7ae0b49460e6f4aa250b42f2c227b4e0a
+README.md: edd272ef9b98700efc6ff465c5cb0dcc2e2d9648
+README.zh.md: 53f1f72524ad3072ba2526108f7fc650403a5e0a

package/README.md

@@ -53,18 +53,45 @@ that probes and runs the update.
   itself — pairing does not gate `/api` (no plugin can; the fence is the
   SDK's own seam). The posture probe below reports that stance when `/api`
   is reachable without pairing.
+- **Paired model catalog**: authenticated paired devices can use `GET
+  /api/pair/model-catalog`, `POST /api/pair/model-catalog/discover`, and
+  `POST /api/pair/model-catalog/upsert` to inspect and adopt models for an
+  existing active `llm-pi-ai` provider only. The capability fixes the
+  provider settings address internally and cannot create providers or read or
+  change credentials, general settings, endpoints, headers, or arbitrary
+  configuration. The exact routes are served ahead of the connection
+  plugin's `/api` prefix, so a paired LAN or tunnel client may call them
+  directly, and they carry the same Host/Origin trust fence as the sibling
+  `/api/pair` endpoints: loopback, the advertised LAN literals, or the
+  configured public base URL. Through the `/remote` desktop channel all
+  `/api/pair/*` paths stay loopback-only. Adoption is refused while the
+  provider's live model catalog is unavailable or unknown. A provider whose
+  resolved `models` list is absent or empty keeps inheriting its installed
+  catalog until an unknown custom model must materialize that catalog;
+  existing model overrides are preserved and translated into the resulting
+  entries. Malformed or conflicting model profiles are refused instead of
+  being destructively rewritten. Stop or device
+  revocation disables it immediately; the
+  generic `settings.*`, `credentials.*`, and `llm.discoverModels` RPC methods
+  remain loopback-only.
 - **Remote desktop channel**: with `requirePairingForLan` on (default), a
   desktop Web GUI opened at the LAN URL or through the tunnel transparently
-  rides `/remote` — the same UI, gated by the same pairing cookie. Browser
+  rides `/remote` — the same UI, gated by the same pairing cookie. The
+  rewrite installs twice-removed from the race it fixes: the host inlines a
+  small classic script right after the opening `<head>` tag
+  (`webserver/index-inject`), so fetch/WebSocket/EventSource and resource
+  `src` rewrites are active before any boot entry (the connection plugin
+  opens its event streams first); the browser half then adopts the installed
+  seat instead of patching twice. Loopback origins skip the patch entirely. Browser
   requests under `/api`, `/sidebar`, `/git`, and `/pet`, including the known
   event, terminal, and SSH WebSockets, are re-issued to the local web server
   without forwarding the remote Origin or pairing cookie; the authenticated
   proxy supplies its own same-origin browser marker for sibling route fences. The
   SDK's loopback-only privileged methods (native dialogs, the settings and
-  credentials plane) stay unreachable from a paired remote desktop, and the
-  `/api/pair/*`, `/api/update/*`, `/api/plugin-manager/*`,
-  `/api/dsh-desktop-launcher/*` and `/api/dsh-web-ui-settings/*` control
-  endpoints stay loopback-only. Unpaired desktop browsers get a persistent
+  credentials plane) stay unreachable from a paired remote desktop;
+  `/api/pair/*` (including the paired model-catalog routes),
+  `/api/update/*`, `/api/plugin-manager/*`, `/api/dsh-desktop-launcher/*`
+  and `/api/dsh-web-ui-settings/*` control endpoints stay loopback-only. Unpaired desktop browsers get a persistent
   full-page block instead of data (the page keys off the `unpaired` error
   code, not every 403). The block retires once a gated call succeeds or the
   channel itself is torn down — turning `requirePairingForLan` off (or the
@@ -223,9 +250,16 @@ need **no harness source changes** — the phone's RPC calls ride the
 plugin's `/m/api` proxy (which delegates to the host ApiProxy service and
 pages `session.list` itself), so the tunneled Host never has to enter the
 connection plugin's trust fence. The phone is gated by its paired-device
-cookie and an explicit method allowlist (settings/credentials/host-action
-domains are never reachable from the phone; model reads/writes are limited
-to the advisory `session.models` / `session.selectModel` pair, agent preset
+cookie and an explicit method allowlist. The allowlist constrains the
+`/m/api` proxy alone: the paired-device cookie itself also passes the global
+api/gate, so a paired device is a full-control credential for the host `/api`
+surface — settings/credentials/host-action domains stay unreachable only
+because the SDK pins those privileged methods to loopback. Pairing is full
+device trust; the `/m/api` proxy's model
+reads/writes are limited to the advisory `session.models` /
+`session.selectModel` pair. Separately, the exact paired-only model-catalog
+routes may adopt models for an existing eligible `llm-pi-ai` provider; they
+cannot create providers or access credentials or general settings. Agent preset
 access to read-only `agentPreset.list`, creation to `session.create`
 (workspace id plus an optional id from that roster — the phone never names a
 working directory of its own), and the permission picker only ever sends the
@@ -458,6 +492,10 @@ accept → UI. Only `publicBaseUrl` (plugin config) names the tunneled host;
 `--trusted-host` is not part of this pairing flow. The desktop panel still
 opens at `http://127.0.0.1`.
 
+## Security model
+
+- Mobile unary routes and the mux event stream require a live paired-device session. A missing or revoked session receives HTTP 403 with a JSON rejection carrying `error.code: "unpaired"`; the browser's `EventSource` API exposes only the stream failure, not that response body.
+
 ## Known Limitations and Deferred Work
 
 - **Revocation is per-request**: a paired phone whose request is already in

package/README.zh.md

@@ -13,7 +13,8 @@
 - **手机侧**：扫码将手机与一次性、限时令牌绑定，并落地到 **`/m/` 独立移动端界面**——一款专为小屏设计的轻客户端（见[截图](#截图)），而不是把桌面 UI 塞进手机。该页面可安装为 PWA；每个已安装应用使用自己的已配对设备 cookie，存储隔离的移动端 Web App 需要在该上下文打开新的二维码链接，或粘贴桌面端新复制的链接完成配对。链接携带 `workspace` 参数，手机落地到桌面正在查看的同一工作区。
 - **PC 侧（远程桌面配对）**：同一份二维码链接和配对令牌也能配对 PC 浏览器——把手机侧配对流扩展到桌面 Web GUI。从面板复制链接，在另一台电脑的浏览器打开（局域网 URL 或隧道 URL 均可）；接受往返后，完整 Web GUI 在那台设备上运行——工作区、会话、聊天、切模型——受围栏保护的同源流量走门控的 `/remote` 通道，而不是直接调用仅 loopback 的 host 路由。手机进 `/m/`，PC 进桌面 UI：一枚令牌、一套配对流、两种界面。未配对的 PC 只看到不渲染底层数据的完整阻断页，其中提供电脑配对步骤与「重新检测」操作。
 - **安全**：一个有效的一次性令牌（刷新会使旧链接失效；已接受的令牌不可复用；令牌会过期）。停止会撤销每一台已配对设备与当前令牌——已配对设备在下一次请求时被切断。配对是本插件对自己远程通道的访问控制：手机走 `/m/api`，非 loopback origin 打开的桌面浏览器走 `/remote`。未配对调用方在 `requirePairingForLan` 开启（默认）时会在读取请求体之前就被 `/remote` 拒绝。loopback（127.0.0.1）继续直接使用 `/api`。默认的远程桌面路径不使用 `--trusted-host`：连接插件的 `/api` 围栏对公网和局域网主机保持关闭，已配对 PC 改走 `/remote`。`--trusted-host` 是 SDK 的另一种用法，会让该主机被信任访问 `/api` 本身——配对不门控 `/api`（任何插件都无法做到；围栏是 SDK 自己的接缝）。当 `/api` 无需配对即可到达时，下方姿态探测会报告该姿态。
-- **远程桌面通道**：`requirePairingForLan` 开启（默认）时，经局域网 URL 或隧道打开的桌面 Web GUI 透明地改走 `/remote`——同一套 UI，同一枚配对 cookie 门控。浏览器中 `/api`、`/sidebar`、`/git`、`/pet` 下的请求，以及已知的事件、终端与 SSH WebSocket，会在不转发远程 Origin 或配对 cookie 的前提下重新发给本机 Web Server；认证反代会为兄弟路由围栏提供自己生成的同源浏览器标记。SDK 的 loopback 专属特权方法（原生对话框、settings 与 credentials 面）对已配对远程桌面保持不可达，`/api/pair/*`、`/api/update/*`、`/api/plugin-manager/*`、`/api/dsh-desktop-launcher/*` 与 `/api/dsh-web-ui-settings/*` 控制端点保持仅 loopback。未配对的桌面浏览器看到持久的全页阻断界面而不是数据（阻断页按错误码 `unpaired` 触发，不是任意 403）。阻断页在任一门控调用成功后，或通道本身被拆除时退出——把 `requirePairingForLan` 关掉（或关闭插件）也会清掉通道短暂激活期间弹出的提示。
+- **已配对模型目录**：已认证的已配对设备可使用 `GET /api/pair/model-catalog`、`POST /api/pair/model-catalog/discover` 和 `POST /api/pair/model-catalog/upsert`，仅查看并采纳一个现有、活跃的 `llm-pi-ai` provider 的模型。该能力在内部固定 provider 的 settings 地址，不能创建 provider，也不能读取或修改凭据、通用 settings、端点、header 或任意配置。这三条精确路由在 connection 插件的 `/api` 前缀之前匹配，已配对的局域网或隧道客户端可直接调用，并套用与 `/api/pair` 兄弟端点相同的 Host/Origin 信任围栏：仅接受 loopback、广告的局域网字面量或配置的公网 base URL。经 `/remote` 桌面通道访问时，所有 `/api/pair/*` 路径仍保持仅 loopback。当 provider 的实时模型目录不可用或未知时，采纳会被拒绝。解析后的 `models` 列表缺失或为空时，provider 会继续继承已安装目录；只有加入未知的自定义模型时才会实体化完整目录，现有模型 override 会保留并转换到对应条目。格式错误或相互冲突的模型配置会被拒绝，不会被破坏性重写。停止或撤销设备会立即禁用它；通用 `settings.*`、`credentials.*` 和 `llm.discoverModels` RPC 方法仍然仅限 loopback。
+- **远程桌面通道**：`requirePairingForLan` 开启（默认）时，经局域网 URL 或隧道打开的桌面 Web GUI 透明地改走 `/remote`——同一套 UI，同一枚配对 cookie 门控。改写补丁在解析期即生效：宿主把一段内联 classic script 注入到 `<head>` 开标签之后（`webserver/index-inject`），使 fetch/WebSocket/EventSource 与资源 `src` 改写在任何启动条目执行前就绪（连接插件最先打开事件流）；浏览器半边随后接管已安装的 seat 而非重复打补丁。loopback 来源完全跳过该补丁。浏览器中 `/api`、`/sidebar`、`/git`、`/pet` 下的请求，以及已知的事件、终端与 SSH WebSocket，会在不转发远程 Origin 或配对 cookie 的前提下重新发给本机 Web Server；认证反代会为兄弟路由围栏提供自己生成的同源浏览器标记。SDK 的 loopback 专属特权方法（原生对话框、settings 与 credentials 面）对已配对远程桌面保持不可达；`/api/pair/*`（包括三条模型目录路由）、`/api/update/*`、`/api/plugin-manager/*`、`/api/dsh-desktop-launcher/*` 与 `/api/dsh-web-ui-settings/*` 控制端点保持仅 loopback。未配对的桌面浏览器看到持久的全页阻断界面而不是数据（阻断页按错误码 `unpaired` 触发，不是任意 403）。阻断页在任一门控调用成功后，或通道本身被拆除时退出——把 `requirePairingForLan` 关掉（或关闭插件）也会清掉通道短暂激活期间弹出的提示。
 - **姿态探测**：插件用伪造 Host 头（公网 base 与每个 LAN base）探测 SDK 的 `/api` 围栏。403 是默认姿态（围栏关闭，远程访问走配对）。任何非 403 结果——`--trusted-host`，或 `--host 0.0.0.0` 下 SDK 的局域网自动信任——都会以 CRITICAL 日志与配对面板红色横幅呈现，因此 SDK 的 `/api` 信任姿态是被看见的，而不是被假设的。探测失败会丢掉进行中的目标缓存，相同 origin 会在下次触发时重试。
 - **实时状态**：桌面面板经 SSE 流实时镜像配对状态（等待 → 已连接 → 已断开），并展示已授权设备名单。
 - **远程更新**：侧边栏加载后，底部的下载触发按钮（手机图标左侧）会静默探测 npm registry 上已安装的 `@linxin666/dsh-*` 全家桶版本；发现可自动更新的新版本时，按钮显示圆点并提供“发现新版本，检查更新”提示。点击按钮打开更新面板；未安装聚合包时，检查和更新覆盖 profile 中 registry 管理的全部 `@linxin666/*` 直接依赖，本地 link / file 开发依赖会被跳过。当存在较新版本时，面板展示版本对比并等待确认——点击「开始更新」后执行更新（在所属 dsh profile 内 `pnpm update --latest`；pnpm 缺失时依次回退 `corepack pnpm`、`npx --yes pnpm`，Windows 上经 `cmd.exe` 执行以解析 npm 安装的 `.cmd` shim；由仅 loopback 的 `/api/update/status` + `/api/update/run` 端点驱动）并请求重启 dsh web 以生效。pnpm 绿色退出后还会对照 registry 复核已装版本：绿色退出但版本纹丝不动（例如 pnpm 的 `minimumReleaseAge` 门禁静默跳过同日发布的新版本）会报告为「未更新成功」并附配置指引，而不是误报成功。锚点自身是本地 link 安装（开发模式）时，只报告 npm 状态而不更新。
@@ -71,7 +72,7 @@ dsh plugin --profile web add link:$(pwd)/packages/dsh-remote-web-ui
  6. 桌面徽标实时翻到 已连接；手机离开时回落到离线/断开。
  7. 刷新二维码 使旧链接失效并铸一枚新的。停止 撤销移动端访问：已配对设备下一次请求 403，包括其实时流。
 
-该移动端界面完全自包含在本插件内：`/m/` 页面及其数据通道（`/m/api`）由插件自己的路由伺服，**无需任何 harness 源码改动**——手机的 RPC 调用走插件的 `/m/api` 代理（它委托给 host 的 ApiProxy 服务并自己分页 `session.list`），因此被隧道化的 Host 永远不必进入连接插件的信任围栏。手机受其已配对设备 cookie 与显式方法白名单门控（settings/credentials/host-action 域手机永远不可达；模型读写限制于建议性的 `session.models` / `session.selectModel` 对，Agent 预设访问限制于只读 `agentPreset.list`，创建限制于 `session.create`（工作区 id 加清单中的可选 id——手机绝不自命名工作目录），权限选择器只通过已放行的 `session.prompt` 发送模式无关的 `/permission` 命令）；实时流在 `/m/api/events.mux` 上经 Server-Sent Events 送达。规范的 `/m/` 页面拥有同 scope 的 manifest 与 Service Worker；其缓存仅包含静态壳和离线页，绝不包含移动端 API 响应、会话数据或命令。
+该移动端界面完全自包含在本插件内：`/m/` 页面及其数据通道（`/m/api`）由插件自己的路由伺服，**无需任何 harness 源码改动**——手机的 RPC 调用走插件的 `/m/api` 代理（它委托给 host 的 ApiProxy 服务并自己分页 `session.list`），因此被隧道化的 Host 永远不必进入连接插件的信任围栏。手机受其已配对设备 cookie 与 `/m/api` 显式方法白名单门控（白名单只约束 `/m/api` 代理本身：该 cookie 同时通过全局 api/gate，对宿主 `/api` 面是全量控制凭证——settings/credentials/host-action 域仅因 SDK 把这些特权方法钉为仅 loopback 才不可达。配对即对设备的完全信任；`/m/api` 代理的模型读写限制于建议性的 `session.models` / `session.selectModel` 对；另外，精确的已配对模型目录路由可为一个现有、合格的 `llm-pi-ai` provider 采纳模型，但不能创建 provider，也不能访问凭据或通用 settings；Agent 预设访问限制于只读 `agentPreset.list`，创建限制于 `session.create`（工作区 id 加清单中的可选 id——手机绝不自命名工作目录），权限选择器只通过已放行的 `session.prompt` 发送模式无关的 `/permission` 命令）；实时流在 `/m/api/events.mux` 上经 Server-Sent Events 送达。规范的 `/m/` 页面拥有同 scope 的 manifest 与 Service Worker；其缓存仅包含静态壳和离线页，绝不包含移动端 API 响应、会话数据或命令。
 
 ### 行为说明
 
@@ -168,6 +169,10 @@ pnpm run build
 
 公网路径是经隧道的同一往返（见「通过互联网远程访问」）：loopback mint → 手机或 PC 打开公网二维码 URL → accept → UI。只有 `publicBaseUrl`（插件配置）命名隧道主机；`--trusted-host` 不属于这条配对流。桌面面板仍在 `http://127.0.0.1` 打开。
 
+## 安全模型
+
+- 移动端普通接口与 mux 事件流都要求有效的已配对设备会话。会话缺失或已撤销时返回 HTTP 403，并使用带 `error.code: "unpaired"` 的 JSON 拒绝信封；浏览器 `EventSource` API 只暴露事件流失败，不暴露该响应体。
+
 ## 已知限制与待办
 
 - **撤销是逐请求的**：已配对手机请求已在 停止 落地时在途，完成该请求；下一个 403。

package/lib/client.js

@@ -3781,6 +3781,38 @@ window.__ModuleLoader__.load({
 			page.replaceState(`${url.pathname}${url.search}${url.hash}`);
 		}
 		//#endregion
+		//#region src/remote-channel-rules.ts
+		/**
+		* The remote-channel rewrite contract as pure data (issue #987): both the
+		* browser patch (client/remote-channel.ts) and the parse-time boot patch
+		* (remote-channel-boot.ts, inlined into index.html by the host) decide from
+		* these tables, so the two can never drift apart.
+		* @module @linxin666/dsh-remote-web-ui/remote-channel-rules
+		*/
+		/** The gated mirror prefix (must match src/remote-methods.ts). */
+		const REMOTE_PREFIX = "/remote";
+		/** The live rule set. */
+		const REMOTE_CHANNEL_RULES = {
+			remotePrefix: REMOTE_PREFIX,
+			apiPrefix: "/api/",
+			pairPrefix: "/api/pair/",
+			updatePrefix: "/api/update/",
+			desktopLauncherPrefix: "/api/dsh-desktop-launcher",
+			settingsBridgePrefix: "/api/dsh-web-ui-settings",
+			sidebarPrefix: "/sidebar/",
+			gitPrefix: "/git/",
+			petPrefix: "/pet/",
+			wsPaths: [
+				"/api/events.mux",
+				"/api/events.host",
+				"/sidebar/ws/terminal",
+				"/sidebar/ws/agent-terminals",
+				"/api/dsh-ssh/terminal"
+			]
+		};
+		/** The window global the boot patch publishes its seat under. */
+		const REMOTE_CHANNEL_BOOT_GLOBAL = "__DSH_REMOTE_CHANNEL_BOOT__";
+		//#endregion
 		//#region src/client/remote-channel.ts
 		/**
 		* The remote desktop channel — browser half. On a non-loopback origin (LAN
@@ -3807,23 +3839,7 @@ window.__ModuleLoader__.load({
 		* Pure helpers are exported for unit tests; `installRemoteChannel` patches
 		* the given window and returns their restore.
 		*/
-		/** The gated mirror prefix (must match src/remote-methods.ts). */
-		const REMOTE_PREFIX = "/remote";
-		const API_PREFIX = "/api/";
-		const PAIR_PREFIX = "/api/pair/";
-		const UPDATE_PREFIX = "/api/update/";
-		const DESKTOP_LAUNCHER_PREFIX = "/api/dsh-desktop-launcher";
-		const SETTINGS_BRIDGE_PREFIX = "/api/dsh-web-ui-settings";
-		const SIDEBAR_PREFIX = "/sidebar/";
-		const GIT_PREFIX = "/git/";
-		const PET_PREFIX = "/pet/";
-		const WS_PATHS = /* @__PURE__ */ new Set([
-			"/api/events.mux",
-			"/api/events.host",
-			"/sidebar/ws/terminal",
-			"/sidebar/ws/agent-terminals",
-			"/api/dsh-ssh/terminal"
-		]);
+		const RULES = REMOTE_CHANNEL_RULES;
 		/** Decide whether a remote desktop channel is required from local or host policy. */
 		function remoteChannelRequired(hostname, snapshot, hostPairingPolicy) {
 			if (isLoopbackHostname(hostname)) return false;
@@ -3847,14 +3863,14 @@ window.__ModuleLoader__.load({
 		* @param pathname - the request URL pathname.
 		*/
 		function shouldRewriteFetchPath(pathname) {
-			if (pathname.startsWith(PAIR_PREFIX)) return false;
-			if (pathname.startsWith(UPDATE_PREFIX)) return false;
-			if (pathname === DESKTOP_LAUNCHER_PREFIX || pathname.startsWith(`${DESKTOP_LAUNCHER_PREFIX}/`)) return false;
-			if (pathname === SETTINGS_BRIDGE_PREFIX || pathname.startsWith(`${SETTINGS_BRIDGE_PREFIX}/`)) return false;
-			if (pathname.startsWith(API_PREFIX)) return true;
-			if (pathname.startsWith(SIDEBAR_PREFIX) || pathname === "/sidebar") return true;
-			if (pathname.startsWith(GIT_PREFIX) || pathname === "/git") return true;
-			if (pathname.startsWith(PET_PREFIX) || pathname === "/pet") return true;
+			if (pathname.startsWith(RULES.pairPrefix)) return false;
+			if (pathname.startsWith(RULES.updatePrefix)) return false;
+			if (pathname === RULES.desktopLauncherPrefix || pathname.startsWith(`${RULES.desktopLauncherPrefix}/`)) return false;
+			if (pathname === RULES.settingsBridgePrefix || pathname.startsWith(`${RULES.settingsBridgePrefix}/`)) return false;
+			if (pathname.startsWith(RULES.apiPrefix)) return true;
+			if (pathname.startsWith(RULES.sidebarPrefix) || pathname === "/sidebar") return true;
+			if (pathname.startsWith(RULES.gitPrefix) || pathname === "/git") return true;
+			if (pathname.startsWith(RULES.petPrefix) || pathname === "/pet") return true;
 			return false;
 		}
 		/**
@@ -3862,7 +3878,7 @@ window.__ModuleLoader__.load({
 		* @param pathname - the WebSocket URL pathname.
 		*/
 		function shouldRewriteWsPath(pathname) {
-			return WS_PATHS.has(pathname);
+			return RULES.wsPaths.includes(pathname);
 		}
 		/** The gated twin of one fenced path (`/remote` + original pathname). */
 		function rewritePath(pathname) {
@@ -4098,10 +4114,16 @@ window.__ModuleLoader__.load({
 		* @param ctx - client root context.
 		*/
 		function apply(ctx) {
-			ctx.effect(() => ctx.locale.register(NS, {
-				zh,
-				en
-			}), "remote-web-ui: dictionaries");
+			ctx.effect(() => {
+				try {
+					return ctx.locale.register(NS, {
+						zh,
+						en
+					});
+				} catch {
+					return () => {};
+				}
+			}, "remote-web-ui: dictionaries");
 			const t = ctx.locale.bind(NS);
 			const settingsScope = (ctx.get("webUiSettings") ?? ctx.settingsScope).bind({ namespace: REMOTE_WEB_UI_NS });
 			const enabled = () => {
@@ -4111,10 +4133,12 @@ window.__ModuleLoader__.load({
 			ctx.slots.inject("sidebar.remote", () => {
 				let disposeEntry;
 				const syncEntry = () => {
-					if (enabled() && disposeEntry === void 0) disposeEntry = ctx.slots.register({
-						name: "sidebar.remote",
-						locale: NS
-					}, RemoteEntry);
+					if (enabled() && disposeEntry === void 0) try {
+						disposeEntry = ctx.slots.register({
+							name: "sidebar.remote",
+							locale: NS
+						}, RemoteEntry);
+					} catch {}
 					else if (!enabled() && disposeEntry !== void 0) {
 						disposeEntry();
 						disposeEntry = void 0;
@@ -4130,11 +4154,13 @@ window.__ModuleLoader__.load({
 			ctx.slots.inject("sidebar.footer.action", () => {
 				let disposeEntry;
 				const syncEntry = () => {
-					if (enabled() && disposeEntry === void 0) disposeEntry = ctx.slots.register({
-						name: "sidebar.footer.action",
-						id: "remote-web-ui",
-						locale: NS
-					}, FooterRemoteEntry);
+					if (enabled() && disposeEntry === void 0) try {
+						disposeEntry = ctx.slots.register({
+							name: "sidebar.footer.action",
+							id: "remote-web-ui",
+							locale: NS
+						}, FooterRemoteEntry);
+					} catch {}
 					else if (!enabled() && disposeEntry !== void 0) {
 						disposeEntry();
 						disposeEntry = void 0;
@@ -4149,17 +4175,21 @@ window.__ModuleLoader__.load({
 			});
 			const remoteSettings = new RemoteSettingsCardController(settingsScope);
 			ctx.slots.inject("web-ui.plugin.item", () => {
-				const unregister = ctx.slots.register({
-					name: "web-ui.plugin.item",
-					id: "remote-web-ui",
-					order: 90,
-					locale: NS,
-					inject: () => remoteSettings.inject()
-				}, RemoteSettingsCard);
-				return () => {
-					remoteSettings.dispose();
-					unregister();
-				};
+				try {
+					const unregister = ctx.slots.register({
+						name: "web-ui.plugin.item",
+						id: "remote-web-ui",
+						order: 90,
+						locale: NS,
+						inject: () => remoteSettings.inject()
+					}, RemoteSettingsCard);
+					return () => {
+						remoteSettings.dispose();
+						unregister();
+					};
+				} catch {
+					return () => {};
+				}
 			});
 			let disposeRuntime;
 			const syncRuntime = () => {
@@ -4216,19 +4246,34 @@ window.__ModuleLoader__.load({
 				showFenceNotice();
 			};
 			const channelActive = () => remoteChannelRequired(window.location.hostname, settingsScope.getSnapshot(), hostPairingPolicy);
+			const bootSeat = () => window[REMOTE_CHANNEL_BOOT_GLOBAL];
 			const syncChannel = () => {
 				const transition = channelTransition(channelActive(), disposeChannel !== void 0);
-				if (transition === "install") disposeChannel = ctx.effect(() => {
-					return installRemoteChannel(window, {
-						onUnpaired: handleUnpaired,
-						onPaired: hideFenceNotice
-					});
-				}, "remote-web-ui: remote desktop channel");
-				else if (transition === "retire" && disposeChannel !== void 0) {
+				if (transition === "install") {
+					const seat = bootSeat();
+					if (seat !== void 0) {
+						seat.onUnpaired = handleUnpaired;
+						seat.onPaired = hideFenceNotice;
+						if (seat.pendingUnpaired) {
+							seat.pendingUnpaired = false;
+							handleUnpaired();
+						}
+						disposeChannel = ctx.effect(() => () => {
+							seat.onUnpaired = null;
+							seat.onPaired = null;
+						}, "remote-web-ui: remote desktop channel (boot patch)");
+					} else disposeChannel = ctx.effect(() => {
+						return installRemoteChannel(window, {
+							onUnpaired: handleUnpaired,
+							onPaired: hideFenceNotice
+						});
+					}, "remote-web-ui: remote desktop channel");
+				} else if (transition === "retire" && disposeChannel !== void 0) {
 					disposeChannel();
 					disposeChannel = void 0;
+					bootSeat()?.restore();
 					hideFenceNotice();
-				}
+				} else if (transition === "none" && !channelActive()) bootSeat()?.restore();
 			};
 			settingsScope.subscribe(syncChannel);
 			syncChannel();