dsh-mobile 0.5.0 → 0.5.2

package/lib/client.js

@@ -664,6 +664,9 @@ window.__ModuleLoader__.load({
 			frpVhostProbeFailed: "The VPS address could not be checked. Confirm DNS and retry.",
 			frpLaunchFailed: "frpc failed to start.",
 			frpTimeout: "The public endpoint did not become ready. Check frps, Caddy, DNS, and firewall.",
+			frpProxyNameInUse: "The frps already has a proxy with this installation name in use — usually another DSH computer, or a session that has not expired yet. Disable self-hosted FRP on that machine, or remove that proxy on the frps, then retry.",
+			frpRemotePortInUse: "Another proxy on the frps already owns this public entry port. Choose a different entry port and retry.",
+			frpProxyStartFailed: "The frps refused frpc's proxy registration. Check its allowPorts, the ports already in use, and its log.",
 			frpDiscoveryMismatch: "The public domain points to another DSH computer. Check the Caddy and frps mappings.",
 			frpDiscoveryInvalid: "The public domain did not return a valid DSH Mobile discovery response.",
 			frpStopped: "The FRP connection stopped.",
@@ -751,6 +754,9 @@ window.__ModuleLoader__.load({
 			frpVhostProbeFailed: "Impossibile controllare il VPS. Verifica il DNS e riprova.",
 			frpLaunchFailed: "Avvio di frpc non riuscito.",
 			frpTimeout: "Endpoint pubblico non pronto. Controlla frps, Caddy, DNS e firewall.",
+			frpProxyNameInUse: "Sul frps è già in uso un proxy con il nome di questa installazione — di solito un altro computer DSH o una sessione non ancora scaduta. Disattiva l’FRP autogestito su quella macchina, oppure rimuovi quel proxy sul frps, e riprova.",
+			frpRemotePortInUse: "Un altro proxy sul frps occupa già questa porta di ingresso pubblica. Scegli un’altra porta di ingresso e riprova.",
+			frpProxyStartFailed: "Il frps ha rifiutato la registrazione del proxy da parte di frpc. Controlla allowPorts, le porte già in uso e il log del server.",
 			frpDiscoveryMismatch: "Il dominio pubblico punta a un altro computer DSH. Controlla Caddy e frps.",
 			frpDiscoveryInvalid: "Il dominio pubblico non ha restituito una risposta DSH Mobile valida.",
 			frpStopped: "Connessione FRP arrestata.",
@@ -838,6 +844,9 @@ window.__ModuleLoader__.load({
 			frpVhostProbeFailed: "无法检查 VPS 地址，请确认 DNS 后重试。",
 			frpLaunchFailed: "frpc 未能启动。",
 			frpTimeout: "公网端点未能就绪，请检查 frps、Caddy、DNS 和防火墙。",
+			frpProxyNameInUse: "该 frps 上已有本机安装名对应的 FRP 代理在使用中——通常来自另一台 DSH 电脑，或尚未过期的旧连接。请在那台机器上关闭自建 FRP，或在 frps 上移除该代理后重试。",
+			frpRemotePortInUse: "该公网入口端口已被 frps 上的其他代理占用，请改用其他入口端口后重试。",
+			frpProxyStartFailed: "frps 拒绝了 frpc 的代理注册，请检查 frps 的 allowPorts、端口占用与服务器日志。",
 			frpDiscoveryMismatch: "公开域名连接到了另一台 DSH 电脑，请检查 Caddy 与 frps 映射。",
 			frpDiscoveryInvalid: "公开域名没有返回有效的 DSH Mobile 发现信息。",
 			frpStopped: "FRP 连接已停止。",
@@ -2040,13 +2049,39 @@ window.__ModuleLoader__.load({
 			return JSON.stringify(value);
 		}
 		/**
+		* Legacy proxy name, kept only as the default of {@link createFrpcToml}.
+		*
+		* A shared frps accepts one proxy per name across *all* its clients, so a fixed
+		* name let any other DSH installation — or a not yet reaped session of this one —
+		* own `dsh-mobile` first. frpc then logged `start error: proxy name [dsh-mobile]
+		* is already in use`, kept running without publishing the entry port, and the
+		* start-up self-check ended in `frp_start_timeout` ("the public endpoint did not
+		* become ready"). Product callers therefore pass an installation-derived name
+		* from {@link frpProxyName}; this constant only keeps the exported API and the
+		* byte-for-byte compatibility test working for legacy callers.
+		*/
+		const FRP_DEFAULT_PROXY_NAME = "dsh-mobile";
+		/**
+		* Validate a proxy name for the generated frpc configuration.
+		*
+		* frps accepts one proxy per name on the whole server, so the name must be a
+		* single safe token: no whitespace, no quotes, no path or bracket characters.
+		*/
+		function validateFrpProxyName(value) {
+			if (typeof value !== "string" || value.length < 1 || value.length > 128 || !/^[A-Za-z0-9._-]+$/u.test(value)) throw new Error("frp_proxy_name_invalid");
+			return value;
+		}
+		/**
 		* Build the single-purpose frpc configuration for the current loopback gateway.
 		*
 		* The default (public-CA) entry is an HTTP vhost behind Caddy and is emitted byte
 		* for byte as before. The self-signed entry cannot use a vhost at all: frps only
 		* forwards raw TCP, and the gateway terminates TLS on that connection.
+		*
+		* `proxyName` defaults to the legacy fixed name only for legacy callers; the
+		* provider and the attach preview always pass {@link frpProxyName}.
 		*/
-		function createFrpcToml(settings, localPort) {
+		function createFrpcToml(settings, localPort, proxyName = FRP_DEFAULT_PROXY_NAME) {
 			if (!Number.isSafeInteger(localPort) || localPort < 1 || localPort > 65535) throw new Error("frp_local_port_invalid");
 			const header = [
 				`serverAddr = ${tomlString(settings.serverAddress)}`,
@@ -2056,7 +2091,7 @@ window.__ModuleLoader__.load({
 				"transport.tls.enable = true",
 				"",
 				"[[proxies]]",
-				"name = \"dsh-mobile\""
+				`name = ${tomlString(validateFrpProxyName(proxyName))}`
 			];
 			if (isFrpSelfSignedIngress(settings)) return [
 				...header,
@@ -2125,7 +2160,7 @@ window.__ModuleLoader__.load({
 		* the provider writes stays byte-for-byte identical to the upstream output.
 		*/
 		function createFrpAttachFrpcToml(settings, options = {}) {
-			const frpcToml = createFrpcToml(settings, attachLocalPort(options));
+			const frpcToml = createFrpcToml(settings, attachLocalPort(options), options.proxyName ?? "dsh-mobile");
 			return options.revealToken === true ? frpcToml : redactFrpcTomlToken(frpcToml);
 		}
 		const DEFAULT_ATTACH_CONFIG_FILE = "<DSH Mobile 私有目录>/remote/frp/config/frpc.toml";
@@ -2792,6 +2827,48 @@ window.__ModuleLoader__.load({
 		function firstByClassSuffix(root, suffix) {
 			return Array.from(root.querySelectorAll("[class]")).find((element) => classToken(element, suffix));
 		}
+		/**
+		* Whether this composer is the landing hero rather than the composer of an open
+		* conversation. DSH marks the hero composer's root with a `_hero` class and drops
+		* it once a session owns the surface, which is the only difference available
+		* without the layout's session id.
+		*/
+		function composerIsLandingHero(composer, depth = 4) {
+			let node = composer;
+			for (let step = 0; step < depth && node !== null; step += 1) {
+				if (classToken(node, "_hero")) return true;
+				node = node.parentElement;
+			}
+			return false;
+		}
+		/** Resolve only identities published by the current conversation or selected session row. */
+		function resolveComposerSessionOrigin(composer, selectedRow, selectedRowToken) {
+			const conversationRoot = composer?.closest("[data-conversation-session]") ?? null;
+			const conversationId = conversationRoot?.getAttribute("data-conversation-session");
+			if (conversationRoot !== null && conversationId) return {
+				sessionRoot: conversationRoot,
+				sessionId: conversationId
+			};
+			const dedicatedRoot = composer?.closest("[data-dsh-mobile-session]") ?? null;
+			const dedicatedId = dedicatedRoot?.getAttribute("data-dsh-mobile-session");
+			if (dedicatedRoot !== null && dedicatedId) return {
+				sessionRoot: dedicatedRoot,
+				sessionId: dedicatedId
+			};
+			if (selectedRow === null) return {
+				sessionRoot: null,
+				sessionId: null
+			};
+			const identity = selectedRow.getAttribute("data-session-id") ?? selectedRow.getAttribute("aria-label") ?? selectedRow.textContent?.trim() ?? "";
+			return {
+				sessionRoot: selectedRow,
+				sessionId: `${selectedRowToken(selectedRow)}:${identity}`
+			};
+		}
+		/** An id-less non-hero composer still accepts App soft-keyboard line breaks, but not camera results. */
+		function activeSessionForSoftEnter(composer, sessionId) {
+			return sessionId !== null || composer !== null && composer.closest(".dshm-main") !== null && !composerIsLandingHero(composer);
+		}
 		/** Find the stock DSH application frame without mistaking a feature card for the shell. */
 		function resolveNativeMobileFrame(root, dedicatedCenter) {
 			if (dedicatedCenter !== void 0) return void 0;
@@ -2962,6 +3039,38 @@ window.__ModuleLoader__.load({
 		function drawerScrimVisible(sidebarCollapsed, overlayActive) {
 			return !sidebarCollapsed && overlayActive;
 		}
+		/** Let the stock page close one visible layer before Android navigates its WebView. */
+		function installStockMobileBack(view, current, actions) {
+			const onBack = (event) => {
+				if (!event.cancelable || event.defaultPrevented) return;
+				const layers = current();
+				if (layers === null) return;
+				if (layers.detailsOpen) {
+					event.preventDefault();
+					actions.closeDetails();
+				} else if (layers.drawerOpen) {
+					event.preventDefault();
+					actions.closeDrawer();
+				} else if (layers.mainPanelOpen) {
+					event.preventDefault();
+					actions.closeMainPanel();
+				}
+			};
+			view.addEventListener("dsh-mobile:native-back", onBack);
+			return () => {
+				view.removeEventListener("dsh-mobile:native-back", onBack);
+			};
+		}
+		function stockLayoutBackControl(value) {
+			return typeof value === "object" && value !== null ? value : void 0;
+		}
+		/** Whether the stock layout can return from a selected main panel. */
+		function stockMainPanelOpen(value) {
+			const layout = stockLayoutBackControl(value);
+			if (typeof layout?.selectPanel !== "function" || typeof layout.panelInfo?.getSnapshot !== "function") return false;
+			const snapshot = layout.panelInfo.getSnapshot();
+			return typeof snapshot === "object" && snapshot !== null && typeof snapshot.activePanelId === "string";
+		}
 		/** Only a known on-screen keyboard in an active App composer may change Enter into a line break. */
 		function isSoftKeyboardEnterLineBreak(event, context) {
 			if (context.nativeState?.imeVisible !== true || context.nativeState.noHardwareKeyboard !== true || !context.editable || !context.activeSession || context.commandMenuOpen || context.recentlyComposing) return false;
@@ -3009,7 +3118,7 @@ window.__ModuleLoader__.load({
 			return !current.disposed && origin.generation === current.generation && origin.href === current.href && origin.composer !== null && current.composerConnected && origin.composer === current.composer && origin.sessionRoot !== null && origin.sessionRoot === current.sessionRoot && origin.sessionId !== null && origin.sessionId === current.sessionId;
 		}
 		/** Add mobile semantics without replacing feature trees. */
-		function installNativeMobileSurface() {
+		function installNativeMobileSurface(backServices) {
 			document.documentElement.classList.add("dsh-native-mobile-active");
 			const browserLanguages = navigator.languages.length > 0 ? navigator.languages : [navigator.language];
 			const language = resolveNativeMobileLanguage(document.documentElement.lang, browserLanguages);
@@ -3106,27 +3215,15 @@ window.__ModuleLoader__.load({
 			const sessionTokens = /* @__PURE__ */ new WeakMap();
 			let nextSessionToken = 0;
 			const currentSessionOrigin = () => {
-				const dedicatedRoot = boundComposer?.closest("[data-dsh-mobile-session]") ?? null;
-				const dedicatedId = dedicatedRoot?.getAttribute("data-dsh-mobile-session");
-				if (dedicatedRoot !== null && typeof dedicatedId === "string" && dedicatedId !== "") return {
-					sessionRoot: dedicatedRoot,
-					sessionId: dedicatedId
-				};
 				const selectedRow = document.querySelector("[role=\"treeitem\"][aria-selected=\"true\"]");
-				if (selectedRow === null) return {
-					sessionRoot: null,
-					sessionId: null
-				};
-				let token = sessionTokens.get(selectedRow);
-				if (token === void 0) {
-					token = `stock-${String(++nextSessionToken)}`;
-					sessionTokens.set(selectedRow, token);
-				}
-				const identity = selectedRow.getAttribute("data-session-id") ?? selectedRow.getAttribute("aria-label") ?? selectedRow.textContent?.trim() ?? "";
-				return {
-					sessionRoot: selectedRow,
-					sessionId: `${token}:${identity}`
-				};
+				return resolveComposerSessionOrigin(boundComposer, selectedRow, (row) => {
+					let token = sessionTokens.get(row);
+					if (token === void 0) {
+						token = `stock-${String(++nextSessionToken)}`;
+						sessionTokens.set(row, token);
+					}
+					return token;
+				});
 			};
 			const mediaRequestContext = () => {
 				const session = currentSessionOrigin();
@@ -3472,7 +3569,7 @@ window.__ModuleLoader__.load({
 				disposeEnterBinding = editor === null || composerCard === null ? void 0 : bindComposerSoftEnter(editor, () => ({
 					nativeState: window.__DSH_MOBILE_NATIVE__ === void 0 ? null : window.__DSH_MOBILE_KEYBOARD_STATE__,
 					editable: editor.isConnected && editor.getAttribute("contenteditable") === "true" && editor.getAttribute("aria-disabled") !== "true" && editor.getAttribute("aria-haspopup") !== "menu" && composerCard.getAttribute("aria-busy") !== "true",
-					activeSession: currentSessionOrigin().sessionId !== null,
+					activeSession: activeSessionForSoftEnter(composerCard, currentSessionOrigin().sessionId),
 					commandMenuOpen: composerCard.querySelector("[data-trigger-menu],button[aria-haspopup=\"listbox\"][aria-expanded=\"true\"]") !== null
 				}));
 			};
@@ -3621,6 +3718,33 @@ window.__ModuleLoader__.load({
 				if (sidebar?.dataset.open === "true") toggle?.click();
 			});
 			sync();
+			const stopStockBack = installStockMobileBack(window, () => {
+				if (frame?.isConnected !== true) return null;
+				const lastColumn = frame.style.gridTemplateColumns.trim().split(/\s+/).at(-1);
+				return {
+					detailsOpen: overlayQuery.matches && lastColumn !== void 0 && lastColumn !== "" && lastColumn !== "0px" && lastColumn !== "0",
+					drawerOpen: overlayQuery.matches && sidebarRoot?.isConnected === true && toggle?.isConnected === true && !classToken(sidebarRoot, "_collapsed"),
+					mainPanelOpen: stockMainPanelOpen(backServices.getLayout())
+				};
+			}, {
+				closeDetails: () => {
+					const layout = stockLayoutBackControl(backServices.getLayout());
+					if (typeof layout?.closeRightbar !== "function") return;
+					const sidebarRight = backServices.getSidebarRight();
+					if (typeof sidebarRight === "object" && sidebarRight !== null) {
+						const control = sidebarRight;
+						if (typeof control.isExpanded === "function" && typeof control.toggleExpanded === "function" && control.isExpanded()) control.toggleExpanded();
+					}
+					layout.closeRightbar();
+				},
+				closeDrawer: () => {
+					toggle?.click();
+				},
+				closeMainPanel: () => {
+					const layout = stockLayoutBackControl(backServices.getLayout());
+					if (typeof layout?.selectPanel === "function") layout.selectPanel(null);
+				}
+			});
 			const disposeTaskWatcher = installTaskCompletionWatcher({
 				completionFallback: false,
 				label: (kind, sessionLabel) => kind === "done" ? {
@@ -3633,6 +3757,7 @@ window.__ModuleLoader__.load({
 			});
 			return () => {
 				disposed = true;
+				stopStockBack();
 				disposeTaskWatcher();
 				mediaRequestGeneration += 1;
 				mediaPickerAbortController.abort();
@@ -3737,6 +3862,64 @@ window.__ModuleLoader__.load({
 		function parseMobileRemoteProvider(value) {
 			return value === "cpolar" || value === "cloudflared" || value === "frp" || value === "origin" ? value : "tailscale";
 		}
+		/**
+		* Set a surface's visibility; opening a page or overlay brings it to the front.
+		* @param container - the registered surface element.
+		* @param open - whether to show it.
+		*/
+		function setMobileSurfaceOpen(container, open) {
+			container.hidden = !open;
+			if (open && container.isConnected && (container.dataset.dshMobileSurfacePlacement === "page" || container.dataset.dshMobileSurfacePlacement === "overlay")) container.parentElement?.append(container);
+		}
+		function visibleBackLayer(view, element) {
+			if (!element.isConnected || element.hidden || element.closest("[hidden],[inert],[aria-hidden=\"true\"]") !== null) return false;
+			const style = view.getComputedStyle(element);
+			return style.display !== "none" && style.visibility !== "hidden" && element.getClientRects().length > 0;
+		}
+		/**
+		* Consume page-level surfaces and dismissible DSH overlays before layout navigation.
+		* @param view - the page window receiving the native Back request.
+		* @param page - the current DSH document.
+		* @param blocked - feedback for a foreground layer without a safe close action.
+		* @returns a disposer for the capture listener.
+		*/
+		function installMobileNativeBack(view, page, blocked) {
+			const onBack = (event) => {
+				if (!event.cancelable || event.defaultPrevented) return;
+				const claim = () => {
+					event.preventDefault();
+					event.stopImmediatePropagation();
+				};
+				const surface = [...page.querySelectorAll("[data-dsh-mobile-surface-placement=\"page\"], [data-dsh-mobile-surface-placement=\"overlay\"]")].filter((element) => visibleBackLayer(view, element)).at(-1);
+				if (surface !== void 0) {
+					setMobileSurfaceOpen(surface, false);
+					claim();
+					return;
+				}
+				const layers = [...page.querySelectorAll("[role=\"dialog\"][aria-modal=\"true\"], [role=\"menu\"]")].filter((element) => visibleBackLayer(view, element));
+				const top = layers.at(-1);
+				if (top === void 0) return;
+				claim();
+				if (top.getAttribute("role") === "dialog") {
+					const wrapper = top.parentElement;
+					const mask = wrapper?.firstElementChild;
+					const maskStyle = mask === void 0 || mask === null ? void 0 : view.getComputedStyle(mask);
+					if (wrapper?.getAttribute("role") === "presentation" && wrapper.children.length === 2 && wrapper.lastElementChild === top && mask?.tagName === "DIV" && mask.getAttribute("aria-hidden") === "true" && mask.isConnected && !mask.hidden && maskStyle?.display !== "none" && maskStyle?.visibility !== "hidden" && mask.getClientRects().length > 0) {
+						mask.click();
+						return;
+					}
+				} else if (top.getAttribute("data-menu-material") === "translucent" && layers.filter((layer) => layer.getAttribute("role") === "menu").length === 1) {
+					page.dispatchEvent(new Event("pointerdown", { bubbles: true }));
+					return;
+				}
+				blocked();
+			};
+			const capture = { capture: true };
+			view.addEventListener("dsh-mobile:native-back", onBack, capture);
+			return () => {
+				view.removeEventListener("dsh-mobile:native-back", onBack, capture);
+			};
+		}
 		const queuedDefinitions = [];
 		let queuedLegacyMount;
 		if (typeof window !== "undefined" && window.dshMobile === void 0) window.dshMobile = {
@@ -3757,6 +3940,18 @@ window.__ModuleLoader__.load({
 		function selectedMobileControlLocale() {
 			return selectMobileControlLocale(document.documentElement.lang, navigator.languages?.length ? navigator.languages : [navigator.language]);
 		}
+		/**
+		* Guidance when an open third-party layer has no safe close action.
+		* @param locale - current Mobile UI language.
+		* @returns localized guidance.
+		*/
+		function mobileBackBlockedMessage(locale) {
+			return {
+				en: "Close the open panel first.",
+				it: "Chiudi prima il pannello aperto.",
+				zh: "请先关闭当前弹层。"
+			}[locale];
+		}
 		/** Remount one plugin-owned surface when DSH changes the document language. */
 		function installDshLanguageBoundSurface(install) {
 			let locale = selectedMobileControlLocale();
@@ -4205,6 +4400,9 @@ window.__ModuleLoader__.load({
 			frp_vhost_probe_failed: "frpVhostProbeFailed",
 			frp_launch_failed: "frpLaunchFailed",
 			frp_start_timeout: "frpTimeout",
+			frp_proxy_name_in_use: "frpProxyNameInUse",
+			frp_remote_port_in_use: "frpRemotePortInUse",
+			frp_proxy_start_failed: "frpProxyStartFailed",
 			frp_discovery_mismatch: "frpDiscoveryMismatch",
 			frp_discovery_invalid: "frpDiscoveryInvalid",
 			frp_stopped: "frpStopped",
@@ -4266,6 +4464,9 @@ window.__ModuleLoader__.load({
 			"frp_vhost_probe_failed",
 			"frp_launch_failed",
 			"frp_start_timeout",
+			"frp_proxy_name_in_use",
+			"frp_remote_port_in_use",
+			"frp_proxy_start_failed",
 			"frp_discovery_mismatch",
 			"frp_discovery_invalid",
 			"frp_stopped",
@@ -4812,10 +5013,12 @@ window.__ModuleLoader__.load({
 			frpCopyAttachPlan.type = "button";
 			frpCopyAttachPlan.textContent = t("frpAttachPlan");
 			frpCopyAttachPlan.hidden = true;
+			frpCopyAttachPlan.disabled = true;
 			const frpCopyAttachToken = element("button", "dsh-mobile-control__secondary dsh-mobile-control__frp-action");
 			frpCopyAttachToken.type = "button";
 			frpCopyAttachToken.textContent = t("frpAttachToken");
 			frpCopyAttachToken.hidden = true;
+			frpCopyAttachToken.disabled = true;
 			const frpSelfCheckButton = element("button", "dsh-mobile-control__secondary dsh-mobile-control__frp-action");
 			frpSelfCheckButton.type = "button";
 			frpSelfCheckButton.textContent = t("frpAttachSelfCheck");
@@ -5395,6 +5598,8 @@ window.__ModuleLoader__.load({
 			let configuredFrpOrigin = "";
 			let configuredFrpVhostPort = 7080;
 			let configuredFrpPublicPort = 33080;
+			/** Proxy name the host writes into its frpc.toml; the local clipboard copy must match. */
+			let configuredFrpProxyName;
 			let frpConfiguredMode = "deploy";
 			let frpConfiguredEntryTls = "public-ip-cert";
 			let frpModeDraft = false;
@@ -5825,6 +6030,7 @@ window.__ModuleLoader__.load({
 				if (frpConfigured && !frpEntryTlsDraft) frpEntryTls.value = configuredFrpEntryTls;
 				if (typeof frpConfiguration.vhostHttpPort === "number") configuredFrpVhostPort = frpConfiguration.vhostHttpPort;
 				if (typeof frpConfiguration.publicPort === "number") configuredFrpPublicPort = frpConfiguration.publicPort;
+				configuredFrpProxyName = typeof frpConfiguration.proxyName === "string" && frpConfiguration.proxyName !== "" ? frpConfiguration.proxyName : void 0;
 				if (!frpVhostDraft) {
 					if (frpMode.value === "attach" && configuredFrpMode === "attach" && configuredFrpEntryTls === "public-ip-cert") {
 						frpVhostPort.value = String(configuredFrpVhostPort);
@@ -5835,12 +6041,14 @@ window.__ModuleLoader__.load({
 				const attachSelected = frpMode.value === "attach";
 				const selfSignedSelected = attachSelected && frpEntryTls.value === "self-signed";
 				frpStep2Title.textContent = t(attachSelected ? "frpStep2TitleAttach" : "frpStep2Title");
-				frpStep2Text.textContent = t(attachSelected ? "frpStep2TextAttach" : "frpStep2Text");
+				frpStep2Text.textContent = attachSelected && configuredFrpProxyName === void 0 ? t("loadingRemoteStatus") : t(attachSelected ? "frpStep2TextAttach" : "frpStep2Text");
 				frpStep4Text.textContent = t(attachSelected ? "frpStep4TextAttach" : "frpStep4Text");
 				frpAppRequirement.textContent = t(selfSignedSelected ? "frpAppRequirementSelfSigned" : "frpAppRequirement");
 				frpCopyTemplate.hidden = attachSelected;
 				frpCopyAttachPlan.hidden = !attachSelected;
 				frpCopyAttachToken.hidden = !attachSelected;
+				frpCopyAttachPlan.disabled = remoteProviderBusy || configuredFrpProxyName === void 0;
+				frpCopyAttachToken.disabled = remoteProviderBusy || configuredFrpProxyName === void 0;
 				frpSelfCheckButton.hidden = !frpConfigured;
 				frpVhostPort.disabled = selfSignedSelected;
 				frpVhostLabel.hidden = selfSignedSelected;
@@ -6318,6 +6526,13 @@ window.__ModuleLoader__.load({
 				}
 				remoteStatus.textContent = message;
 			};
+			const frpClipboardProxyName = () => {
+				if (configuredFrpProxyName === void 0) {
+					remoteStatus.textContent = t("loadingRemoteStatus");
+					loadRemote();
+				}
+				return configuredFrpProxyName;
+			};
 			frpCopyAttachPlan.addEventListener("click", () => {
 				const form = frpForm();
 				if (!validFrpServer(form.serverAddress) || !Number.isSafeInteger(form.serverPort) || form.serverPort < 1 || form.serverPort > 65535 || form.publicOrigin === "") {
@@ -6331,7 +6546,9 @@ window.__ModuleLoader__.load({
 						showFrpAttachError(code);
 						return;
 					}
-					navigator.clipboard.writeText(createFrpAttachTemplateForClipboard(attachForm)).then(() => {
+					const proxyName = frpClipboardProxyName();
+					if (proxyName === void 0) return;
+					navigator.clipboard.writeText(createFrpAttachTemplateForClipboard(attachForm, { proxyName })).then(() => {
 						remoteStatus.textContent = t("frpAttachPlanCopied");
 					}, () => {
 						remoteStatus.textContent = t("frpAttachPlanFailed", { error: t("templateCopyFailed") });
@@ -6359,7 +6576,7 @@ window.__ModuleLoader__.load({
 					remoteStatus.textContent = t("frpAttachPlanFailed", { error: String(error) });
 				}).finally(() => {
 					remoteProviderBusy = false;
-					frpCopyAttachPlan.disabled = false;
+					frpCopyAttachPlan.disabled = configuredFrpProxyName === void 0;
 				});
 			});
 			/** Copy a token-bearing frpc.toml only from the token the user just typed. */
@@ -6376,7 +6593,12 @@ window.__ModuleLoader__.load({
 						showFrpAttachError(code);
 						return;
 					}
-					navigator.clipboard.writeText(createFrpAttachFrpcTomlForClipboard(attachForm, { revealToken: true })).then(() => {
+					const proxyName = frpClipboardProxyName();
+					if (proxyName === void 0) return;
+					navigator.clipboard.writeText(createFrpAttachFrpcTomlForClipboard(attachForm, {
+						revealToken: true,
+						proxyName
+					})).then(() => {
 						remoteStatus.textContent = t("frpAttachTokenCopied");
 					}, () => {
 						remoteStatus.textContent = t("frpAttachTokenFailed", { error: t("templateCopyFailed") });
@@ -7880,6 +8102,9 @@ window.__ModuleLoader__.load({
 				shellLayer().append(node);
 				window.setTimeout(() => node.remove(), 2600);
 			};
+			const stopNativeBack = installMobileNativeBack(window, document, () => {
+				toast(mobileBackBlockedMessage(selectedMobileControlLocale()));
+			});
 			const materializeNativeFile = (value) => {
 				if (typeof value !== "object" || value === null || !("base64" in value) || !("name" in value)) return value;
 				const candidate = value;
@@ -8012,6 +8237,7 @@ window.__ModuleLoader__.load({
 					return registerUniqueDisposable(surfaces, surfaceIds, surface.id, () => {
 						const container = element("section");
 						container.dataset.dshMobileSurface = surface.id;
+						container.dataset.dshMobileSurfacePlacement = surface.placement;
 						container.hidden = surface.placement === "page" || surface.placement === "overlay";
 						container.style.cssText = surface.placement === "page" || surface.placement === "overlay" ? "position:absolute;inset:0;overflow:auto;background:var(--dsw-alias-bg-layer-1,#fff);padding:16px;pointer-events:auto" : "pointer-events:auto";
 						const host = () => surface.placement === "page" || surface.placement === "overlay" ? shellLayer() : surfaceHost(surface.placement) ?? shellLayer();
@@ -8064,12 +8290,12 @@ window.__ModuleLoader__.load({
 						open: (surfaceId) => {
 							ensureCurrent();
 							const entry = surfaces.get(surfaceId);
-							if (entry !== void 0) entry.container.hidden = false;
+							if (entry !== void 0) setMobileSurfaceOpen(entry.container, true);
 						},
 						close: (surfaceId) => {
 							ensureCurrent();
 							const entry = surfaces.get(surfaceId);
-							if (entry !== void 0) entry.container.hidden = true;
+							if (entry !== void 0) setMobileSurfaceOpen(entry.container, false);
 						},
 						toast: (message) => {
 							ensureCurrent();
@@ -8441,6 +8667,7 @@ window.__ModuleLoader__.load({
 			});
 			return () => {
 				disposed = true;
+				stopNativeBack();
 				stopEvents();
 				stopRefresh();
 				started = false;
@@ -8560,7 +8787,10 @@ window.__ModuleLoader__.load({
 						};
 					});
 					const removeCustom = installCustomAssets();
-					const removeSurface = installDshLanguageBoundSurface(installNativeMobileSurface);
+					const removeSurface = installDshLanguageBoundSurface(() => installNativeMobileSurface({
+						getLayout: () => ctx.get("layout"),
+						getSidebarRight: () => ctx.get("sidebarRight")
+					}));
 					return () => {
 						removeSettingsAction();
 						removeCustom();
@@ -8643,6 +8873,8 @@ window.__ModuleLoader__.load({
 		exports.handleMissingExtensionManifest = handleMissingExtensionManifest;
 		exports.inject = inject;
 		exports.installDshLanguageBoundSurface = installDshLanguageBoundSurface;
+		exports.installMobileNativeBack = installMobileNativeBack;
+		exports.mobileBackBlockedMessage = mobileBackBlockedMessage;
 		exports.normalizeDiagnosticOverall = normalizeDiagnosticOverall;
 		exports.normalizeDiagnosticStatus = normalizeDiagnosticStatus;
 		exports.parseMobileExtensionManifest = parseMobileExtensionManifest;
@@ -8653,6 +8885,7 @@ window.__ModuleLoader__.load({
 		exports.renderDiagnosticPayloadSafely = renderDiagnosticPayloadSafely;
 		exports.selectMobileControlLocale = selectMobileControlLocale;
 		exports.selectedMobileControlLocale = selectedMobileControlLocale;
+		exports.setMobileSurfaceOpen = setMobileSurfaceOpen;
 		exports.startExtensionChangeStream = startExtensionChangeStream;
 		exports.startLifecycleRefreshScheduler = startLifecycleRefreshScheduler;
 		exports.trustAuthenticatedGatewayConnection = trustAuthenticatedGatewayConnection;