@linxin666/dsh-remote-web-ui 0.4.3 → 0.4.5

package/lib/index.js

@@ -13,6 +13,7 @@ import { spawn, spawnSync } from "node:child_process";
 import { parseDocument } from "yaml";
 import { EventEmitter } from "node:events";
 import { Tunnel, bin, install } from "cloudflared";
+import { AsyncResource } from "node:async_hooks";
 //#region src/pairing.ts
 /**
 * Pairing state machine: one active one-time token, a device-session table,
@@ -479,7 +480,7 @@ var PairingService = class {
 };
 /** Structural equality over the snapshot's wire fields. */
 function snapshotsEqual(a, b) {
-	return a.phase === b.phase && a.lanAvailable === b.lanAvailable && sameStrings(a.lanAddresses, b.lanAddresses) && a.publicUrl === b.publicUrl && tunnelEqual(a.tunnel, b.tunnel) && relayEqual(a.relay, b.relay) && a.tokenId === b.tokenId && a.tokenExpiresAt === b.tokenExpiresAt && a.deviceCount === b.deviceCount && a.onlineCount === b.onlineCount && devicesEqual(a.devices, b.devices);
+	return a.phase === b.phase && a.lanAvailable === b.lanAvailable && sameStrings(a.lanAddresses, b.lanAddresses) && a.publicUrl === b.publicUrl && tunnelEqual(a.tunnel, b.tunnel) && relayEqual(a.relay, b.relay) && postureEqual(a.posture, b.posture) && a.tokenId === b.tokenId && a.tokenExpiresAt === b.tokenExpiresAt && a.deviceCount === b.deviceCount && a.onlineCount === b.onlineCount && devicesEqual(a.devices, b.devices);
 }
 /** Per-device roster equality (order is pairing time). */
 function devicesEqual(a, b) {
@@ -496,6 +497,42 @@ function tunnelEqual(a, b) {
 function relayEqual(a, b) {
 	return a === b || a !== void 0 && b !== void 0 && a.state === b.state && a.url === b.url && a.error === b.error;
 }
+/**
+* Posture equality. A probe round can change this frame while every other field
+* stays put — the common case, since the probe re-runs on a settings change and
+* on a tunnel reaching running, and a quick-tunnel restart churns the probed
+* host set. Leaving the frame out of the comparison suppressed those emits, so
+* the loopback SSE stream and the desktop panel could sit on a stale "exposed"
+* (or stale "clean") verdict for as long as the phase and roster stayed put.
+*/
+function postureEqual(a, b) {
+	if (a === b) return true;
+	if (!isPostureFrame(a) || !isPostureFrame(b)) return false;
+	return a.checkedAt === b.checkedAt && hostsEqual(a.hosts, b.hosts);
+}
+/** Whether a value has the shape a posture frame is compared on. */
+function isPostureFrame(value) {
+	return typeof value === "object" && value !== null;
+}
+/**
+* Per-host posture equality (a round's verdicts, in probe order). Tolerates a
+* frame that is not the expected shape: this runs inside the emit path, outside
+* the listener error containment, so a malformed snapshot handed in by another
+* host-fiber caller must degrade to "changed" instead of throwing out of the
+* setter that produced it.
+*/
+function hostsEqual(a, b) {
+	if (a === b) return true;
+	if (!Array.isArray(a) || !Array.isArray(b)) return false;
+	return a.length === b.length && a.every((host, index) => {
+		const other = b[index];
+		return isPostureHost(host) && isPostureHost(other) && host.host === other.host && host.exposed === other.exposed;
+	});
+}
+/** Whether a value has the shape one probed host is compared on. */
+function isPostureHost(value) {
+	return typeof value === "object" && value !== null;
+}
 /** Element-wise string list equality (interface order is meaningful). */
 function sameStrings(a, b) {
 	return a.length === b.length && a.every((value, index) => value === b[index]);
@@ -2184,7 +2221,19 @@ function makeRemoteApiRoutes(deps) {
 	}];
 }
 /**
-* Map one outer upgrade URL onto the loopback path (query string included).
+* Map one outer upgrade URL onto the loopback path, dropping the cookieless
+* device credential on the way in.
+*
+* The outer handshake carries the device id as `?device=<id>` because WebSocket
+* handshakes cannot carry headers from the Web API. That id is a live session
+* credential — it opens the full host API through this same channel — and the
+* inner leg is a request the rest of the loopback origin sees (on a WebSocket
+* leg, a raw handshake request line written to a loopback socket), so forwarding
+* it handed a working credential to every other observer of the local port for
+* no benefit: the gate above has already authenticated the caller, and no
+* upstream route reads the parameter (the gateway mux matches on path alone).
+* The rest of the query rides through unchanged, so a caller's own parameters
+* still reach the upstream.
 */
 function upgradeInnerPath(reqUrl, fallbackPath) {
 	if (reqUrl === void 0 || reqUrl === "") return fallbackPath;
@@ -2196,6 +2245,7 @@ function upgradeInnerPath(reqUrl, fallbackPath) {
 	}
 	const inner = innerPathOf(url.pathname);
 	if (inner === void 0) return fallbackPath;
+	url.searchParams.delete(REMOTE_DEVICE_QUERY);
 	return `${inner}${url.search}`;
 }
 /**
@@ -2697,16 +2747,100 @@ function readPatchContent(file) {
 	if (!existsSync(file)) return "";
 	return readFileSync(file, "utf8");
 }
-/** Escape one literal string for embedding into a RegExp pattern. */
-function escapeRegex(text) {
-	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+/**
+* Split a block-sequence region into its top-level items. Only a column-0 `-`
+* starts an item: that is the shape every writer of this file produces - the
+* managed block itself and the YAML document API's block-style re-emission.
+* @param region - text between two line boundaries.
+* @returns the items in source order; text outside them is not returned.
+*/
+function blockItems(region) {
+	const items = [];
+	let start = -1;
+	let offset = 0;
+	for (const line of region.split("\n")) {
+		if (line.startsWith("- ") || line === "-") {
+			if (start !== -1) items.push({
+				start,
+				end: offset,
+				text: region.slice(start, offset)
+			});
+			start = offset;
+		}
+		offset += line.length + 1;
+	}
+	if (start !== -1) items.push({
+		start,
+		end: region.length,
+		text: region.slice(start)
+	});
+	return items;
+}
+/**
+* Whether one top-level item is the webserver row this plugin's block owns.
+* The row id is the whole signal: the markers declare everything inside them
+* managed, our block always writes `- id: webserver`, and a same-id row later
+* in the patch replaces this one wholesale anyway - so an id-webserver row
+* found inside our markers is this plugin's row (a hand-truncated block may
+* have lost its `name` line).
+* @param item - one top-level item's text.
+* @returns true when the item is the managed webserver row.
+*/
+function isManagedWebserverItem(item) {
+	return /^- id:\s*['"]?webserver['"]?[ \t]*(?:\r?\n|$)/.test(item);
+}
+/**
+* The text between a block's BEGIN and END markers: from the character after
+* the BEGIN line's terminator to the start of the END marker's line (or to
+* the end of the content without an END marker).
+* @param content - the patch file text.
+* @param begin - index of the BEGIN marker.
+* @param end - index of the END marker, or -1 when the block is unterminated.
+* @returns the region's text.
+*/
+function managedRegion(content, begin, end) {
+	const newlineAfterBegin = content.indexOf("\n", begin);
+	const innerStart = newlineAfterBegin === -1 ? content.length : newlineAfterBegin + 1;
+	const endLineStart = end === -1 ? content.length : content.lastIndexOf("\n", end - 1) + 1;
+	return content.slice(innerStart, Math.max(innerStart, endLineStart));
 }
-/** Remove the managed block (and its markers) from patch content. */
+/**
+* Remove the managed block (its markers and the webserver row this plugin
+* wrote) from patch content, keeping every other row.
+*
+* The markers travel with the file through writers that append rows through
+* the YAML document API: the appended rows land at the end of the sequence,
+* which is BEFORE a trailing END comment, so the region between the markers
+* can hold rows this plugin never wrote. Deleting the whole region silently
+* removed the user's model, plugin and remote-control rows on the next rewrite
+* - the remote-control row carries the LAN toggle itself, so the feature reset
+* to `undefined` and the phone was locked out again after a restart (DSH
+* Desktop report, 2026-09-30). Only the managed item is removed here; every
+* foreign row is kept in place and the fresh block is appended after them (the
+* same-id row last wins).
+* @param content - the patch file text.
+* @returns the text with the markers and the managed row removed.
+*/
 function stripManagedBlock(content) {
-	const begin = escapeRegex(LAN_BIND_BLOCK_BEGIN);
-	const end = escapeRegex(LAN_BIND_BLOCK_END);
-	const pattern = new RegExp(`\\r?\\n?${begin}[\\s\\S]*?${end}\\r?\\n?`, "g");
-	return content.replace(pattern, "\n");
+	let text = content;
+	for (;;) {
+		const begin = text.indexOf(LAN_BIND_BLOCK_BEGIN);
+		if (begin === -1) return text;
+		const end = text.indexOf(LAN_BIND_BLOCK_END, begin);
+		const blockStart = text.lastIndexOf("\n", begin - 1) + 1;
+		const newlineAfterEnd = end === -1 ? -1 : text.indexOf("\n", end);
+		const resumeAt = end === -1 ? text.length : newlineAfterEnd === -1 ? text.length : newlineAfterEnd + 1;
+		const region = managedRegion(text, begin, end);
+		let kept = "";
+		let cursor = 0;
+		for (const item of blockItems(region)) {
+			if (!isManagedWebserverItem(item.text)) continue;
+			kept += region.slice(cursor, item.start);
+			cursor = item.end;
+		}
+		kept += region.slice(cursor);
+		text = text.slice(0, blockStart) + kept + text.slice(resumeAt);
+	}
 }
 /**
 * Render the managed block for one bind state. The values are static: the
@@ -2778,10 +2912,11 @@ function managedBlock(host, port) {
 function managedBindOf(content) {
 	const begin = content.indexOf(LAN_BIND_BLOCK_BEGIN);
 	if (begin === -1) return void 0;
-	const end = content.indexOf(LAN_BIND_BLOCK_END, begin);
-	const block = end === -1 ? content.slice(begin) : content.slice(begin, end);
-	const hostMatch = /host:\s*'([^']+)'/.exec(block);
-	const portMatch = /port:\s*(\d+)/.exec(block);
+	const region = managedRegion(content, begin, content.indexOf(LAN_BIND_BLOCK_END, begin));
+	const items = blockItems(region).filter((item) => isManagedWebserverItem(item.text));
+	const scope = items.length > 0 ? items.map((item) => item.text).join("") : region;
+	const hostMatch = /host:\s*'([^']+)'/.exec(scope);
+	const portMatch = /port:\s*(\d+)/.exec(scope);
 	return {
 		host: hostMatch?.[1] ?? "",
 		port: portMatch !== null ? Number(portMatch[1]) : void 0
@@ -2802,9 +2937,10 @@ function lanBindState(profile, home = dshHome()) {
 * patch file is preserved; the block is rewritten atomically (unique temp
 * file + rename, so concurrent writers can never rename a half-written
 * file) with the original file's permissions preserved. A hand-truncated
-* unterminated block (BEGIN marker without END, which stripManagedBlock
-* cannot match) is truncated at its BEGIN marker first so the rewrite can
-* never stack a second webserver row onto the orphan.
+* unterminated block (BEGIN marker without END) is consumed by
+* stripManagedBlock as well - markers and managed row removed, foreign rows
+* kept - so the rewrite can never stack a second webserver row onto the
+* orphan.
 *
 * The written file is always exactly one valid YAML document: a base the
 * plugin manager left in flow style is re-emitted as a block sequence before
@@ -2812,9 +2948,7 @@ function lanBindState(profile, home = dshHome()) {
 */
 function writeLanBind(host, port, profile, home = dshHome()) {
 	const file = profilePatchFile(profile, home);
-	const stripped = stripManagedBlock(readPatchContent(file));
-	const orphanBegin = stripped.indexOf(LAN_BIND_BLOCK_BEGIN);
-	const content = mergePatchContent((orphanBegin === -1 ? stripped : stripped.slice(0, orphanBegin)).trimEnd().replace(/\[\s*\]\s*$/, "").trimEnd(), managedBlock(host, port), file);
+	const content = mergePatchContent(stripManagedBlock(readPatchContent(file)).trimEnd().replace(/\[\s*\]\s*$/, "").trimEnd(), managedBlock(host, port), file);
 	const mode = existsSync(file) ? statSync(file).mode & 511 : 384;
 	mkdirSync(dirname(file), { recursive: true });
 	const temp = `${file}.remote-web-ui-tmp-${process.pid.toString(36)}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
@@ -3862,6 +3996,61 @@ function mountOnce(packageName, fn) {
 	return mount;
 }
 //#endregion
+//#region src/detached-work.ts
+/**
+* Run one piece of work outside the caller's async context.
+*
+* The Host performs a settings mutation inside `hmr.runExclusive`, which marks
+* the running async context with an AsyncLocalStorage store. Side effects that
+* live on that path - writing `cordis.patch.yml`, the very file the HMR config
+* watcher refreshes from - must not run under that mark, or the watcher's
+* refresh can re-enter the exclusive transaction and be refused with "HMR
+* transactions cannot be nested" (#1751, #1754).
+*
+* Deferring is NOT enough, and the earlier belt that this one replaces was
+* built on a disproven premise: Node propagates an AsyncLocalStorage store into
+* `setImmediate`, into `node:timers`, into promise continuations, and into any
+* AsyncResource scoped to the current async id. Measured on Node 24:
+*
+* ```
+* als.run(true, () => setImmediate(() => als.getStore()))   // -> true
+* ```
+*
+* What DOES start clean is an AsyncResource whose `triggerAsyncId` is not the
+* transaction. A resource created once at module scope - that is, before any
+* transaction existed - carries no store, and everything it schedules inherits
+* that emptiness rather than the caller's mark:
+*
+* ```
+* const detached = new AsyncResource('...')      // module scope
+* als.run(true, () => detached.runInAsyncScope(() => setImmediate(() => als.getStore())))
+* // -> undefined
+* ```
+*
+* @module
+*/
+/**
+* The escape hatch, created at module scope on purpose: a resource built while
+* a transaction is running would capture that transaction, so this single
+* instance is the only one the module ever needs. It carries no context of its
+* own, so every job run through it starts from the process's root context.
+*/
+const DETACHED = new AsyncResource("dsh-remote-web-ui:detached-work", { triggerAsyncId: 0 });
+/**
+* Run `work` outside the caller's AsyncLocalStorage context.
+*
+* The call itself is synchronous - this schedules, it does not defer. Work that
+* must not block the caller should schedule its own `setImmediate` inside
+* `work`, which then also starts clean because it inherits this resource's
+* empty context rather than the caller's.
+*
+* @param work - the side effect to detach from the caller's async context.
+* @returns whatever `work` returns.
+*/
+function runDetached(work) {
+	return DETACHED.runInAsyncScope(work);
+}
+//#endregion
 //#region src/remote-channel-boot.ts
 /**
 * Parse-time remote-channel boot patch (issue #987): the browser-half patch
@@ -4341,9 +4530,7 @@ function applyImpl(ctx, config) {
 		console.log(`remote-web-ui: the paired Web GUI is reachable on LAN at ${urls}`);
 	}
 	if (ctx.webServer.host === "0.0.0.0") console.warn("remote-web-ui: LAN-exposed bind — pairing gates the /remote channel; direct /api stays under the harness fence + browser auth (stop() does not revoke an already-redeemed browser credential)");
-	const sync = () => {
-		const value = resolve();
-		service.config = pairingConfigOf(value);
+	const applyLanBindWork = (value) => {
 		if (value.lanBind !== void 0) {
 			const startup = ctx.get("webStartup");
 			const desiredHost = desiredBindHost(value.lanBind === true, startup?.host);
@@ -4369,6 +4556,27 @@ function applyImpl(ctx, config) {
 				else console.error("remote-web-ui: the host firewall rule could not be updated (admin rights required on managed platforms)");
 			}
 		}
+	};
+	let lanBindWorkPending = false;
+	const scheduleLanBindWork = () => {
+		if (lanBindWorkPending) return;
+		lanBindWorkPending = true;
+		runDetached(() => setImmediate(() => {
+			lanBindWorkPending = false;
+			try {
+				applyLanBindWork(resolve());
+			} catch (error) {
+				console.error(`remote-web-ui: the deferred lan-bind assertion failed: ${error instanceof Error ? error.message : String(error)}`);
+			}
+		}));
+	};
+	ctx.effect(() => () => {
+		lanBindWorkPending = false;
+	}, "remote-web-ui: lan-bind work");
+	const sync = () => {
+		const value = resolve();
+		service.config = pairingConfigOf(value);
+		scheduleLanBindWork();
 		const plan = tunnelPlanOf(value, ctx.webServer.port);
 		tunnelMode = plan.mode;
 		publicBase.setMode(plan.mode);

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

@@ -24,6 +24,13 @@ export interface PluginSettingsCardProps<TKey extends string = string> {
     descriptionKey: TKey;
     /** Optional rich header description rendered instead of the plain t(descriptionKey) text (the plain text stays as the tooltip). */
     descriptionNode?: ReactNode;
+    /**
+     * Optional leading mark identifying the plugin. A card without one keeps the
+     * plain official header shape, so the chrome stays a readable sibling of the
+     * built-in PluginCard wherever a family plugin lands in the official bundle
+     * seat.
+     */
+    icon?: ReactNode;
     /** The card's form state: availability, writability, and what a save would do. */
     state: CardShell;
     /** Write every staged edit. */

package/lib/types/client/PluginSettingsCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/PluginSettingsCard.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PluginSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/PluginSettingsCard.tsx"],"names":[],"mappings":"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"}

package/lib/types/client/PluginSettingsCard.js

@@ -40,8 +40,8 @@ export function PluginSettingsCard(props) {
     // With alwaysOpen the nav entry already provides the selection, so the
     // header is a static title row instead of a disclosure button.
     const header = alwaysOpen === true
-        ? (_jsxs("div", { className: css.headerStatic, children: [_jsxs("span", { className: css.headText, children: [_jsx("span", { className: css.name, title: title, children: title }), _jsx("span", { className: css.description, title: description, children: props.descriptionNode ?? description })] }), state.dirty ? _jsx("span", { className: css.pending, title: props.t('settings.unsaved'), children: props.t('settings.unsaved') }) : null] }))
-        : (_jsxs("button", { type: "button", className: css.header, "aria-expanded": open, "aria-label": `${props.t(open ? 'settings.collapse' : 'settings.expand')}: ${title}`, onClick: () => { setOpen(!open); }, children: [_jsxs("span", { className: css.headText, children: [_jsx("span", { className: css.name, title: title, children: title }), _jsx("span", { className: css.description, title: description, children: props.descriptionNode ?? description })] }), state.dirty ? _jsx("span", { className: css.pending, title: props.t('settings.unsaved'), children: props.t('settings.unsaved') }) : null, _jsx("svg", { width: "14", height: "14", viewBox: "0 0 14 14", fill: "none", xmlns: "http://www.w3.org/2000/svg", className: open ? `${css.chevron} ${css.chevronOpen}` : css.chevron, children: _jsx("path", { d: "M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5Z", fill: "currentColor" }) })] }));
+        ? (_jsxs("div", { className: css.headerStatic, children: [props.icon !== undefined ? _jsx("span", { className: css.mark, "aria-hidden": "true", children: props.icon }) : null, _jsxs("span", { className: css.headText, children: [_jsx("span", { className: css.name, title: title, children: title }), _jsx("span", { className: css.description, title: description, children: props.descriptionNode ?? description })] }), state.dirty ? _jsx("span", { className: css.pending, title: props.t('settings.unsaved'), children: props.t('settings.unsaved') }) : null] }))
+        : (_jsxs("button", { type: "button", className: css.header, "aria-expanded": open, "aria-label": `${props.t(open ? 'settings.collapse' : 'settings.expand')}: ${title}`, onClick: () => { setOpen(!open); }, children: [props.icon !== undefined ? _jsx("span", { className: css.mark, "aria-hidden": "true", children: props.icon }) : null, _jsxs("span", { className: css.headText, children: [_jsx("span", { className: css.name, title: title, children: title }), _jsx("span", { className: css.description, title: description, children: props.descriptionNode ?? description })] }), state.dirty ? _jsx("span", { className: css.pending, title: props.t('settings.unsaved'), children: props.t('settings.unsaved') }) : null, _jsx("svg", { width: "14", height: "14", viewBox: "0 0 14 14", fill: "none", xmlns: "http://www.w3.org/2000/svg", className: open ? `${css.chevron} ${css.chevronOpen}` : css.chevron, children: _jsx("path", { d: "M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5Z", fill: "currentColor" }) })] }));
     // The namespace exists but the Host does not serve it to this client (the
     // official settings allowlist omits third-party namespaces): show a card
     // that explains the gap instead of vanishing, so a missing card never

package/lib/types/client/RemoteSettingsCard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RemoteSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/RemoteSettingsCard.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAElE,OAAO,EAA+D,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAIrK,+EAA+E;AAC/E,MAAM,WAAW,cAAc;IAC7B,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,qEAAqE;IACrE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,6FAA6F;IAC7F,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,qEAAqE;IACrE,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,4CAA4C;AAC5C,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,qBAAqB;IACrB,OAAO,EAAE,cAAc,CAAA;IACvB,sBAAsB;IACtB,UAAU,EAAE,cAAc,CAAA;IAC1B,gCAAgC;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,yBAAyB;IACzB,UAAU,EAAE,cAAc,CAAA;IAC1B,0BAA0B;IAC1B,YAAY,EAAE,cAAc,CAAA;IAC5B,0BAA0B;IAC1B,UAAU,EAAE,cAAc,CAAA;IAC1B,sBAAsB;IACtB,oBAAoB,EAAE,cAAc,CAAA;IACpC,kCAAkC;IAClC,aAAa,EAAE,cAAc,CAAA;IAC7B,iCAAiC;IACjC,UAAU,EAAE,cAAc,CAAA;IAC1B,wDAAwD;IACxD,WAAW,EAAE,cAAc,CAAA;IAC3B,kCAAkC;IAClC,KAAK,EAAE,cAAc,CAAA;IACrB,uBAAuB;IACvB,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,gEAAgE;AAChE,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACzD,KAAK,EAAE;QACL,oEAAoE;QACpE,kBAAkB,EAAE,aAAa,CAAC,uBAAuB,CAAC,CAAA;KAC3D,CAAA;CACF;AAED,oEAAoE;AACpE,qBAAa,4BAA4B;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwC;IAE9D,2EAA2E;gBAC/D,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC;IAkB7C,OAAO,CAAC,UAAU;IAkBlB;;;OAGG;IACH,MAAM,IAAI,sBAAsB;IAIhC;;;OAGG;IACH,OAAO,IAAI,IAAI;CAGhB;AAED,4DAA4D;AAC5D,MAAM,MAAM,uBAAuB,GACjC,YAAY,CAAC,oBAAoB,CAAC,GAChC,WAAW,CAAC,QAAQ,CAAC,GACrB,UAAU,CAAC,sBAAsB,CAAC,CAAA;AAEtC;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,+BAwJhE"}
+{"version":3,"file":"RemoteSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/RemoteSettingsCard.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAA;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAGlE,OAAO,EAA+D,KAAK,WAAW,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,IAAI,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAIrK,+EAA+E;AAC/E,MAAM,WAAW,cAAc;IAC7B,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,yDAAyD;IACzD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,qEAAqE;IACrE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,6FAA6F;IAC7F,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,qEAAqE;IACrE,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,8EAA8E;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IACf;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,4CAA4C;AAC5C,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACxD,qBAAqB;IACrB,OAAO,EAAE,cAAc,CAAA;IACvB,sBAAsB;IACtB,UAAU,EAAE,cAAc,CAAA;IAC1B,gCAAgC;IAChC,cAAc,EAAE,cAAc,CAAA;IAC9B,yBAAyB;IACzB,UAAU,EAAE,cAAc,CAAA;IAC1B,0BAA0B;IAC1B,YAAY,EAAE,cAAc,CAAA;IAC5B,0BAA0B;IAC1B,UAAU,EAAE,cAAc,CAAA;IAC1B,sBAAsB;IACtB,oBAAoB,EAAE,cAAc,CAAA;IACpC,kCAAkC;IAClC,aAAa,EAAE,cAAc,CAAA;IAC7B,iCAAiC;IACjC,UAAU,EAAE,cAAc,CAAA;IAC1B,wDAAwD;IACxD,WAAW,EAAE,cAAc,CAAA;IAC3B,kCAAkC;IAClC,KAAK,EAAE,cAAc,CAAA;IACrB,uBAAuB;IACvB,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,gEAAgE;AAChE,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACzD,KAAK,EAAE;QACL,oEAAoE;QACpE,kBAAkB,EAAE,aAAa,CAAC,uBAAuB,CAAC,CAAA;KAC3D,CAAA;CACF;AAED,oEAAoE;AACpE,qBAAa,4BAA4B;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwC;IAE9D,2EAA2E;gBAC/D,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC;IAkB7C,OAAO,CAAC,UAAU;IAkBlB;;;OAGG;IACH,MAAM,IAAI,sBAAsB;IAIhC;;;OAGG;IACH,OAAO,IAAI,IAAI;CAGhB;AAED,4DAA4D;AAC5D,MAAM,MAAM,uBAAuB,GACjC,YAAY,CAAC,oBAAoB,CAAC,GAChC,WAAW,CAAC,QAAQ,CAAC,GACrB,UAAU,CAAC,sBAAsB,CAAC,CAAA;AAEtC;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,+BAyJhE"}

package/lib/types/client/RemoteSettingsCard.js

@@ -6,6 +6,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { useEffect, useState } from 'react';
 import { PluginSettingsCard, ValueField, BooleanField } from "./PluginSettingsCard.js";
+import { PhoneIcon } from "./PhoneIcon.js";
 import { CardForm, booleanField, numberField, secretField, textField } from "./settings-form.js";
 import { LanBindStatusError, readLanBindStatus, shouldStopLanBindPoll } from "./pair-api.js";
 /** Bridges the `remote-web-ui` form onto the card's staged form. */
@@ -77,7 +78,7 @@ export function RemoteSettingsCard(props) {
         invalidLabel: t('settings.invalidNumber'),
         disabled,
     };
-    return (_jsxs(PluginSettingsCard, { t: t, titleKey: "settings.title", descriptionKey: "settings.description", defaultOpen: false, state: state, onSave: props.save, onDiscard: props.discard, children: [_jsx(BooleanField, { id: "settings-remote-enabled", label: t('settings.enabled'), hint: t('settings.enabledHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.enabled, onEdit: (text) => { props.edit('enabled', text); }, onReset: () => { props.resetField('enabled'); } }), _jsx(ValueField, { id: "settings-remote-token-ttl", label: t('settings.tokenTtlMs'), hint: t('settings.tokenTtlMsHint'), numeric: true, ...fieldProps, ...state.tokenTtlMs, onEdit: (text) => { props.edit('tokenTtlMs', text); }, onReset: () => { props.resetField('tokenTtlMs'); } }), _jsx(ValueField, { id: "settings-remote-offline", label: t('settings.offlineAfterMs'), hint: t('settings.offlineAfterMsHint'), numeric: true, ...fieldProps, ...state.offlineAfterMs, onEdit: (text) => { props.edit('offlineAfterMs', text); }, onReset: () => { props.resetField('offlineAfterMs'); } }), _jsx(ValueField, { id: "settings-remote-max-devices", label: t('settings.maxDevices'), hint: t('settings.maxDevicesHint'), numeric: true, ...fieldProps, ...state.maxDevices, onEdit: (text) => { props.edit('maxDevices', text); }, onReset: () => { props.resetField('maxDevices'); } }), _jsx(ValueField, { id: "settings-remote-idle-expire", label: t('settings.idleExpireMs'), hint: t('settings.idleExpireMsHint'), numeric: true, ...fieldProps, ...state.idleExpireMs, onEdit: (text) => { props.edit('idleExpireMs', text); }, onReset: () => { props.resetField('idleExpireMs'); } }), _jsx(ValueField, { id: "settings-remote-cookie", label: t('settings.cookieName'), hint: t('settings.cookieNameHint'), ...fieldProps, ...state.cookieName, onEdit: (text) => { props.edit('cookieName', text); }, onReset: () => { props.resetField('cookieName'); } }), _jsx(BooleanField, { id: "settings-remote-fence", label: t('settings.requirePairingForLan'), hint: t('settings.requirePairingForLanHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.requirePairingForLan, onEdit: (text) => { props.edit('requirePairingForLan', text); }, onReset: () => { props.resetField('requirePairingForLan'); } }), _jsx(ValueField, { id: "settings-remote-public-base", label: t('settings.publicBaseUrl'), hint: t('settings.publicBaseUrlHint'), placeholder: "https://example.trycloudflare.com", ...fieldProps, ...state.publicBaseUrl, onEdit: (text) => { props.edit('publicBaseUrl', text); }, onReset: () => { props.resetField('publicBaseUrl'); } }), _jsx(BooleanField, { id: "settings-remote-auto-tunnel", label: t('settings.autoTunnel'), hint: t('settings.autoTunnelHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.autoTunnel, onEdit: (text) => { props.edit('autoTunnel', text); }, onReset: () => { props.resetField('autoTunnel'); } }), _jsx(ValueField, { id: "settings-remote-tunnel-token", label: t('settings.tunnelToken'), hint: t('settings.tunnelTokenHint'), placeholder: "eyJ...", ...fieldProps, ...state.tunnelToken, onEdit: (text) => { props.edit('tunnelToken', text); }, onReset: () => { props.resetField('tunnelToken'); } }), _jsx(BooleanField, { id: "settings-remote-relay", label: t('settings.relay'), hint: t('settings.relayHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.relay, onEdit: (text) => { props.edit('relay', text); }, onReset: () => { props.resetField('relay'); } }), _jsx(LanBindStatus, { t: t }), _jsx(BooleanField, { id: "settings-remote-lan-bind", label: t('settings.lanBind'), hint: t('settings.lanBindHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.lanBind, onEdit: (text) => { props.edit('lanBind', text); }, onReset: () => { props.resetField('lanBind'); } })] }));
+    return (_jsxs(PluginSettingsCard, { t: t, titleKey: "settings.title", descriptionKey: "settings.description", icon: _jsx(PhoneIcon, { size: 18 }), defaultOpen: false, state: state, onSave: props.save, onDiscard: props.discard, children: [_jsx(BooleanField, { id: "settings-remote-enabled", label: t('settings.enabled'), hint: t('settings.enabledHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.enabled, onEdit: (text) => { props.edit('enabled', text); }, onReset: () => { props.resetField('enabled'); } }), _jsx(ValueField, { id: "settings-remote-token-ttl", label: t('settings.tokenTtlMs'), hint: t('settings.tokenTtlMsHint'), numeric: true, ...fieldProps, ...state.tokenTtlMs, onEdit: (text) => { props.edit('tokenTtlMs', text); }, onReset: () => { props.resetField('tokenTtlMs'); } }), _jsx(ValueField, { id: "settings-remote-offline", label: t('settings.offlineAfterMs'), hint: t('settings.offlineAfterMsHint'), numeric: true, ...fieldProps, ...state.offlineAfterMs, onEdit: (text) => { props.edit('offlineAfterMs', text); }, onReset: () => { props.resetField('offlineAfterMs'); } }), _jsx(ValueField, { id: "settings-remote-max-devices", label: t('settings.maxDevices'), hint: t('settings.maxDevicesHint'), numeric: true, ...fieldProps, ...state.maxDevices, onEdit: (text) => { props.edit('maxDevices', text); }, onReset: () => { props.resetField('maxDevices'); } }), _jsx(ValueField, { id: "settings-remote-idle-expire", label: t('settings.idleExpireMs'), hint: t('settings.idleExpireMsHint'), numeric: true, ...fieldProps, ...state.idleExpireMs, onEdit: (text) => { props.edit('idleExpireMs', text); }, onReset: () => { props.resetField('idleExpireMs'); } }), _jsx(ValueField, { id: "settings-remote-cookie", label: t('settings.cookieName'), hint: t('settings.cookieNameHint'), ...fieldProps, ...state.cookieName, onEdit: (text) => { props.edit('cookieName', text); }, onReset: () => { props.resetField('cookieName'); } }), _jsx(BooleanField, { id: "settings-remote-fence", label: t('settings.requirePairingForLan'), hint: t('settings.requirePairingForLanHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.requirePairingForLan, onEdit: (text) => { props.edit('requirePairingForLan', text); }, onReset: () => { props.resetField('requirePairingForLan'); } }), _jsx(ValueField, { id: "settings-remote-public-base", label: t('settings.publicBaseUrl'), hint: t('settings.publicBaseUrlHint'), placeholder: "https://example.trycloudflare.com", ...fieldProps, ...state.publicBaseUrl, onEdit: (text) => { props.edit('publicBaseUrl', text); }, onReset: () => { props.resetField('publicBaseUrl'); } }), _jsx(BooleanField, { id: "settings-remote-auto-tunnel", label: t('settings.autoTunnel'), hint: t('settings.autoTunnelHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.autoTunnel, onEdit: (text) => { props.edit('autoTunnel', text); }, onReset: () => { props.resetField('autoTunnel'); } }), _jsx(ValueField, { id: "settings-remote-tunnel-token", label: t('settings.tunnelToken'), hint: t('settings.tunnelTokenHint'), placeholder: "eyJ...", ...fieldProps, ...state.tunnelToken, onEdit: (text) => { props.edit('tunnelToken', text); }, onReset: () => { props.resetField('tunnelToken'); } }), _jsx(BooleanField, { id: "settings-remote-relay", label: t('settings.relay'), hint: t('settings.relayHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.relay, onEdit: (text) => { props.edit('relay', text); }, onReset: () => { props.resetField('relay'); } }), _jsx(LanBindStatus, { t: t }), _jsx(BooleanField, { id: "settings-remote-lan-bind", label: t('settings.lanBind'), hint: t('settings.lanBindHint'), inheritLabel: t('settings.inherit'), onLabel: t('settings.on'), offLabel: t('settings.off'), ...fieldProps, ...state.lanBind, onEdit: (text) => { props.edit('lanBind', text); }, onReset: () => { props.resetField('lanBind'); } })] }));
 }
 /**
  * Live LAN-bind facts above the toggle: the managed block's host, the live

package/lib/types/client/index.js

@@ -151,9 +151,9 @@ export function apply(ctx) {
     }
     const t = ctx.locale.bind(NS);
     // Hand the `remote` translate seat to the module-scope adaptation layer:
-    // the whale/compact-picker labels were rendered with the English fallback
-    // before any dictionary existed; the wiring plus the layer's own sync tick
-    // re-render them in the active locale.
+    // the whale label was rendered with the English fallback before any
+    // dictionary existed; the wiring plus the layer's own sync tick re-renders
+    // it in the active locale.
     if (adapt !== undefined)
         adapt.translate = t;
     // The settings form this card edits. The family group's binder resolves a

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

@@ -3,8 +3,6 @@
 export declare const zh: {
     'entry.label': string;
     'mobile.whale.open': string;
-    'mobile.composer.pickModel': string;
-    'mobile.composer.pickEffort': string;
     title: string;
     subtitle: string;
     'card.title': string;
@@ -129,8 +127,6 @@ export type SettingsCardKey = RemoteKey;
 export declare const en: {
     'entry.label': string;
     'mobile.whale.open': string;
-    'mobile.composer.pickModel': string;
-    'mobile.composer.pickEffort': string;
     title: string;
     subtitle: string;
     'card.title': string;

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

@@ -1 +1 @@
-{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../../src/client/locales.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,mEAAmE;AACnE,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0HmB,CAAA;AAElC,sCAAsC;AACtC,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,EAAE,CAAA;AAEvC,wDAAwD;AACxD,MAAM,MAAM,eAAe,GAAG,SAAS,CAAA;AAEvC,mEAAmE;AACnE,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0HsB,CAAA"}
+{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../../src/client/locales.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,mEAAmE;AACnE,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwHmB,CAAA;AAElC,sCAAsC;AACtC,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,EAAE,CAAA;AAEvC,wDAAwD;AACxD,MAAM,MAAM,eAAe,GAAG,SAAS,CAAA;AAEvC,mEAAmE;AACnE,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwHsB,CAAA"}

package/lib/types/client/locales.js

@@ -3,8 +3,6 @@
 export const zh = {
     'entry.label': '远程访问',
     'mobile.whale.open': '打开侧边栏',
-    'mobile.composer.pickModel': '选择模型',
-    'mobile.composer.pickEffort': '选择推理等级',
     'title': '远程访问',
     'subtitle': '通过手机或另一台电脑配对，远程使用同一份 Web 界面（官方界面 + 移动端适配）',
     'card.title': '设备配对',
@@ -14,7 +12,7 @@ export const zh = {
     'status.disconnected': '已配对设备离线',
     'status.stopped': '已停止远程访问',
     'status.lanRequired': '此功能需要局域网绑定或公网地址才能使用',
-    'status.lanRequiredHint': '当前服务仅绑定在 127.0.0.1 且未配置公网地址，手机无法访问。请在本插件的设置卡片中打开“局域网访问”（装在全家桶里时在「设置 → Web 插件 → 远程访问设置」，单独安装时在设置 → 插件 → 本插件行），或用 dsh web --host 0.0.0.0 重新启动，或填写内网穿透的公网地址。',
+    'status.lanRequiredHint': '当前服务仅绑定在 127.0.0.1 且未配置公网地址，手机无法访问。请在本插件的设置卡片中打开“局域网访问”（装在全家桶里时在「设置 → Web 插件 → 远程访问」，单独安装时在设置 → 插件 → 本插件行），或用 dsh web --host 0.0.0.0 重新启动，或填写内网穿透的公网地址。',
     'status.loopbackRequired': '配对面板仅限本机使用',
     'status.loopbackRequiredHint': '请通过 http://127.0.0.1 打开此页面后重试；手机请使用配对链接访问。',
     'status.unreachable': '无法连接配对服务',
@@ -71,8 +69,8 @@ export const zh = {
     'relay.failed': '固定域名同步失败：{error}。正在自动重试，期间二维码可能使用临时地址。',
     'close.label': '关闭远程访问面板',
     // 插件设置卡片（家族 list 席位，或官方 plugins.bundle.config 席位）。
-    'settings.title': '远程访问设置',
-    'settings.description': '配对安全与设备限额。',
+    'settings.title': '远程访问',
+    'settings.description': '手机配对、公网隧道与设备限额。',
     'settings.enabled': '启用远程访问',
     'settings.enabledHint': '关闭后移除侧边栏入口并停用配对路由与局域网栅栏。',
     'settings.tokenTtlMs': '配对令牌有效期（毫秒）',
@@ -127,8 +125,6 @@ export const zh = {
 export const en = {
     'entry.label': 'Remote access',
     'mobile.whale.open': 'Open sidebar',
-    'mobile.composer.pickModel': 'Pick model',
-    'mobile.composer.pickEffort': 'Pick reasoning effort',
     'title': 'Remote access',
     'subtitle': 'Pair a phone or another computer to share the same Web GUI (official UI + mobile adaptation)',
     'card.title': 'Pair a device',
@@ -195,8 +191,8 @@ export const en = {
     'relay.failed': 'Stable-hostname sync failed: {error}. Retrying automatically; the QR may use the ephemeral address meanwhile.',
     'close.label': 'Close remote access panel',
     // Plugin settings card (the family list seat, or the official bundle-config seat).
-    'settings.title': 'Remote access settings',
-    'settings.description': 'Pairing security and device limits.',
+    'settings.title': 'Remote access',
+    'settings.description': 'Phone pairing, public tunnel and device limits.',
     'settings.enabled': 'Enable remote access',
     'settings.enabledHint': 'When off, the sidebar entry is removed and pairing routes plus the LAN fence stop.',
     'settings.tokenTtlMs': 'Pairing token lifetime (ms)',

package/lib/types/client/mobile-adapt.d.ts

@@ -30,8 +30,8 @@ export interface RemoteAdaptGlobal {
     closeDetails: (() => void) | null;
     /**
      * Wired by the plugin apply once the `remote` locale namespace is bound:
-     * the translate seat the injected surfaces (whale, compact picker) read
-     * their labels from. Null until then; label reads fall back to English
+     * the translate seat the injected surface (the whale) reads its label
+     * from. Null until then; label reads fall back to English
      * (the SDK's universal fallback) and the 600ms sync tick re-renders the
      * labels once the seat is wired.
      */

package/lib/types/client/mobile-adapt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mobile-adapt.d.ts","sourceRoot":"","sources":["../../../src/client/mobile-adapt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,0EAA0E;AAC1E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,yDAAyD;IACzD,aAAa,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;IAClC,yDAAyD;IACzD,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;IACjC;;;;;;OAMG;IACH,SAAS,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IAC9C,wEAAwE;IACxE,UAAU,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAAA;IAC7B,4GAA4G;IAC5G,iBAAiB,IAAI,IAAI,CAAA;CAC1B;AAmRD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAq5BvC"}
+{"version":3,"file":"mobile-adapt.d.ts","sourceRoot":"","sources":["../../../src/client/mobile-adapt.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,0EAA0E;AAC1E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,yDAAyD;IACzD,aAAa,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;IAClC,yDAAyD;IACzD,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;IACjC;;;;;;OAMG;IACH,SAAS,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IAC9C,wEAAwE;IACxE,UAAU,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAAA;IAC7B,4GAA4G;IAC5G,iBAAiB,IAAI,IAAI,CAAA;CAC1B;AAoQD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAi8BvC"}