@linxin666/dsh-remote-web-ui 0.3.22 → 0.3.24

package/lib/index.js

@@ -3158,6 +3158,153 @@ var TunnelManager = class {
 		} catch {}
 	}
 };
+//#endregion
+//#region src/public-base.ts
+/**
+* The public base the pairing fence trusts while a tunnel is not running
+* (issue #1547).
+*
+* The fence reads exactly one public host: `service.publicBaseUrl`. Dropping
+* it the instant the tunnel leaves `running` makes every public request from
+* the address still printed in the QR code answer 403 — including
+* `/api/pair/status`, which exists to be callable before pairing. Two of the
+* three tunnel modes never lose their host: a named tunnel keeps its fixed
+* dashboard hostname, and a registered relay keeps its stable subdomain. A
+* quick tunnel does mint a new hostname on restart, so its previous host is
+* kept only for a bounded grace window: Cloudflare's edge can still deliver a
+* connection the phone already opened, and a mobile network reconnects
+* constantly, so an instant drop turns the phone's retry into a silent 403.
+* @module @linxin666/dsh-remote-web-ui/public-base
+*/
+/** How long a quick-tunnel host stays trusted after the tunnel stops running. */
+const PUBLIC_BASE_GRACE_MS = 6e4;
+/**
+* Owns the trusted public base across tunnel and relay transitions.
+*
+* The keeper never decides on its own to widen trust: it only postpones
+* dropping an address the operator (named/relay) or the tunnel (quick) had
+* already published, and it forgets it once the tunnel comes back with the
+* address that actually serves the QR.
+*/
+var PublicBaseKeeper = class {
+	onChange;
+	graceMs;
+	mode = "off";
+	tunnelUrl;
+	relayUrl;
+	graceTimer;
+	/**
+	* @param onChange - receives the base the fence should trust from now on.
+	* @param graceMs - how long a quick-tunnel host outlives its tunnel.
+	*/
+	constructor(onChange, graceMs = PUBLIC_BASE_GRACE_MS) {
+		this.onChange = onChange;
+		this.graceMs = graceMs;
+	}
+	/** The base a fresh fence read should trust: the stable relay origin wins. */
+	current() {
+		return this.relayUrl ?? this.tunnelUrl;
+	}
+	/** The mode that currently owns the public base. */
+	setMode(mode) {
+		this.mode = mode;
+	}
+	/** The last quick-tunnel URL, for callers that must announce it downstream. */
+	quickUrl() {
+		return this.tunnelUrl;
+	}
+	/** A relay registration result; undefined withdraws the stable origin. */
+	setRelay(url) {
+		this.relayUrl = url;
+		this.emit();
+	}
+	/** The tunnel reported a live URL: it supersedes any pending grace. */
+	markRunning(url) {
+		this.cancelGrace();
+		this.tunnelUrl = url;
+		this.emit();
+	}
+	/**
+	* The tunnel left `running` (starting again, or failed). A named tunnel's
+	* fixed hostname stays trusted; a quick tunnel's previous host stays
+	* trusted for the grace window, then is dropped if nothing replaced it.
+	*/
+	markReconnecting() {
+		if (this.mode === "named") return;
+		this.startGrace();
+	}
+	/** Re-publish the current base after a branch change that did not move it. */
+	refresh() {
+		this.emit();
+	}
+	/** Forget everything (teardown, or a mode change that stops the tunnel). */
+	reset() {
+		this.cancelGrace();
+		this.tunnelUrl = void 0;
+		this.relayUrl = void 0;
+		this.emit();
+	}
+	/** Cancel the pending grace timer; the keeper keeps its last base. */
+	dispose() {
+		this.cancelGrace();
+	}
+	startGrace() {
+		if (this.tunnelUrl === void 0) return;
+		if (this.graceTimer !== void 0) return;
+		this.graceTimer = setTimeout(() => {
+			this.graceTimer = void 0;
+			this.tunnelUrl = void 0;
+			this.emit();
+		}, this.graceMs);
+	}
+	cancelGrace() {
+		if (this.graceTimer === void 0) return;
+		clearTimeout(this.graceTimer);
+		this.graceTimer = void 0;
+	}
+	emit() {
+		this.onChange(this.current());
+	}
+};
+//#endregion
+//#region src/console-output.ts
+/** Count the U+FFFD replacement characters one candidate decode produced. */
+function replacementCount(text) {
+	let count = 0;
+	for (const character of text) if (character === "�") count += 1;
+	return count;
+}
+/**
+* Decode one console byte buffer. Strict UTF-8 wins whenever it is valid;
+* otherwise the bytes are not UTF-8 at all and the console wrote its own code
+* page, so the candidate that loses the least text is taken.
+* @param bytes - the captured bytes.
+* @returns the decoded text.
+*/
+function decodeConsoleBytes(bytes) {
+	try {
+		return new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+	} catch {
+		let best;
+		let bestLoss = Number.POSITIVE_INFINITY;
+		for (const label of ["gbk", "utf-8"]) {
+			let text;
+			try {
+				text = new TextDecoder(label).decode(bytes);
+			} catch {
+				continue;
+			}
+			const loss = replacementCount(text);
+			if (loss < bestLoss) {
+				best = text;
+				bestLoss = loss;
+			}
+		}
+		/* v8 ignore next 3 -- reachable only without the legacy code page AND without the lenient pass */
+		if (best === void 0) return Buffer.from(bytes).toString("utf8");
+		return best;
+	}
+}
 /** The aggregate package that is the canonical update entry point. */
 const AGGREGATE_PACKAGE = "@linxin666/dsh-web-all";
 /** Fallback anchor: this plugin's own package when the aggregate is absent. */
@@ -3512,18 +3659,12 @@ const WIN_CMD_MISSING_RE = /not recognized as an internal or external command|
 /**
 * Decode process output with tolerant decoding:
 * Defaults to UTF-8; if invalid byte sequences are encountered (common on
-* Windows consoles using code page 936/GBK), falls back to GBK via TextDecoder.
+* Windows consoles using code page 936/GBK), falls back to the code page that
+* loses the least text. Bytes are decoded once per whole chunk by the caller's
+* accumulator — decoding per \`data\` event would split multi-byte characters.
 */
 function decodeProcessChunk(chunk) {
-	try {
-		return new TextDecoder("utf-8", { fatal: true }).decode(chunk);
-	} catch {
-		try {
-			return new TextDecoder("gbk").decode(chunk);
-		} catch {
-			return chunk.toString("utf8");
-		}
-	}
+	return decodeConsoleBytes(chunk);
 }
 /**
 * Bypass for pnpm 11's supply-chain gate: `minimumReleaseAge` (default 24 h)
@@ -3859,7 +4000,9 @@ const REMOTE_CHANNEL_RULES = {
 	],
 	deviceHeader: REMOTE_DEVICE_HEADER,
 	deviceKey: "dsh-remote-device",
-	deviceQuery: REMOTE_DEVICE_QUERY
+	deviceQuery: REMOTE_DEVICE_QUERY,
+	uploadPath: "/api/session/uploadFileBinary",
+	uploadHookGlobal: "__DSH_FILE_UPLOAD__"
 };
 /** The window global the boot patch publishes its seat under. */
 const REMOTE_CHANNEL_BOOT_GLOBAL = "__DSH_REMOTE_CHANNEL_BOOT__";
@@ -3884,8 +4027,11 @@ const REMOTE_CHANNEL_BOOT_GLOBAL = "__DSH_REMOTE_CHANNEL_BOOT__";
 * transport hook `__DSH_TRANSPORT__ = { ownsHost: true }` before the
 * connection plugin reads it: the paired remote desktop gets the full
 * settings/credentials/presets surface, and every call still rides the
-* gated /remote channel. The script self-skips on loopback origins and
-* never throws.
+* gated /remote channel. It finally publishes the official pre-Cordis
+* upload hook (`__DSH_FILE_UPLOAD__`), because the background upload
+* transport otherwise runs inside a Web Worker whose own globals the
+* main-thread rewrite cannot reach (issue #1580). The script self-skips on
+* loopback origins and never throws.
 * @module @linxin666/dsh-remote-web-ui/remote-channel-boot
 */
 /**
@@ -3896,7 +4042,7 @@ const REMOTE_CHANNEL_BOOT_GLOBAL = "__DSH_REMOTE_CHANNEL_BOOT__";
 function buildRemoteChannelBootScript(rules = REMOTE_CHANNEL_RULES) {
 	const json = JSON.stringify(rules);
 	const seat = JSON.stringify(REMOTE_CHANNEL_BOOT_GLOBAL);
-	return "(function(){try{var w=window,loc=w.location,h=loc.hostname;if(h==='localhost'||h==='::1'||/^127(\\.\\d{1,3}){3}$/.test(h))return;try{if(w.__DSH_TRANSPORT__===undefined)w.__DSH_TRANSPORT__={};w.__DSH_TRANSPORT__.ownsHost=true}catch(e){}var R=" + json + ";function rdv(){try{return w.sessionStorage.getItem(R.deviceKey)}catch(e){return null}}function att(init){var dv=rdv();if(dv===null)return init;var h=init&&init.headers;if(typeof Headers!==\"undefined\"&&h instanceof Headers){try{h.set(R.deviceHeader,dv)}catch(e){}return init}if(typeof h===\"object\"&&h!==null){var o={};for(var k in h)o[k]=h[k];o[R.deviceHeader]=dv;return Object.assign({},init,{headers:o})}return init}function sf(p){if(p.indexOf(R.pairPrefix)===0)return false;if(p.indexOf(R.updatePrefix)===0)return false;if(p===R.settingsBridgePrefix||p.indexOf(R.settingsBridgePrefix+\"/\")===0)return false;if(p.indexOf(R.apiPrefix)===0)return true;if(p.indexOf(R.sidebarPrefix)===0||p===\"/sidebar\")return true;if(p.indexOf(R.gitPrefix)===0||p===\"/git\")return true;if(p.indexOf(R.petPrefix)===0||p===\"/pet\")return true;return false}function sw(p){return R.wsPaths.indexOf(p)!==-1}function rp(p){return R.remotePrefix+p}function so(u){return u.origin===loc.origin}function rr(raw){var u;try{u=new URL(raw,loc.href)}catch(e){return raw}if(u.origin!==loc.origin)return raw;if(!sf(u.pathname))return raw;u.pathname=rp(u.pathname);if(raw.charAt(0)===\"/\"&&raw.charAt(1)!==\"/\")return u.pathname+u.search+u.hash;return u.href}function uc(v){if(typeof v!==\"object\"||v===null)return undefined;var n=v.result;if(typeof n===\"object\"&&n!==null){var e=n.error;if(typeof e===\"object\"&&e!==null&&typeof e.code===\"string\")return e.code}var t=v.error;if(typeof t===\"object\"&&t!==null&&typeof t.code===\"string\")return t.code;return undefined}var seat={onUnpaired:null,onPaired:null,pendingUnpaired:false,restore:function(){}};function denied(res){if(res.status!==403)return false;return res.clone().json().then(function(b){return uc(b)===\"unpaired\"}).catch(function(){return false})}function signal(unpaired){if(unpaired){if(seat.onUnpaired)seat.onUnpaired();else seat.pendingUnpaired=true}else{seat.pendingUnpaired=false;if(seat.onPaired)seat.onPaired()}}var of=w.fetch;w.fetch=function(input,init){var raw=typeof input===\"string\"||input instanceof URL?input.toString():input.url;var url=new URL(raw,loc.href);if(so(url)&&sf(url.pathname)){var next=new URL(url);next.pathname=rp(url.pathname);var target=typeof input===\"string\"||input instanceof URL?next.toString():new Request(next,input);return Promise.resolve(of.call(w,target,att(init))).then(function(res){void Promise.resolve(denied(res)).then(signal);return res})}return of.call(w,input,init)};var OW=w.WebSocket;w.WebSocket=function(url,protocols){var p=new URL(url.toString(),loc.href);var o=p.protocol===\"wss:\"?\"https://\"+p.host:p.protocol===\"ws:\"?\"http://\"+p.host:\"\";if(o!==\"\"&&o===loc.origin&&sw(p.pathname)){var nx=new URL(p);nx.pathname=rp(p.pathname);var dvv=rdv();if(dvv!==null)nx.searchParams.set(R.deviceQuery,dvv);return protocols!==undefined?new OW(nx,protocols):new OW(nx)}return protocols!==undefined?new OW(url,protocols):new OW(url)};w.WebSocket.prototype=OW.prototype;w.WebSocket.CONNECTING=OW.CONNECTING;w.WebSocket.OPEN=OW.OPEN;w.WebSocket.CLOSING=OW.CLOSING;w.WebSocket.CLOSED=OW.CLOSED;var OE=w.EventSource;if(OE!==undefined){w.EventSource=function(url,cfg){var p=new URL(url.toString(),loc.href);if(so(p)&&sf(p.pathname)){var nx=new URL(p);nx.pathname=rp(p.pathname);var dvv=rdv();if(dvv!==null)nx.searchParams.set(R.deviceQuery,dvv);return new OE(nx,cfg)}return new OE(url,cfg)};w.EventSource.prototype=OE.prototype}var restores=[];function patchSrc(C){if(C===undefined)return;var d=Object.getOwnPropertyDescriptor(C.prototype,\"src\");if(d===undefined||d.configurable===false||d.set===undefined)return;var os=d.set;Object.defineProperty(C.prototype,\"src\",{configurable:true,enumerable:d.enumerable!==false,get:d.get,set:function(v){os.call(this,rr(String(v)))}});restores.push(function(){Object.defineProperty(C.prototype,\"src\",d)})}patchSrc(w.HTMLImageElement);patchSrc(w.HTMLScriptElement);patchSrc(w.HTMLIFrameElement);seat.restore=function(){w.fetch=of;w.WebSocket=OW;if(OE!==undefined)w.EventSource=OE;for(var i=0;i<restores.length;i++)restores[i]();try{delete w[" + seat + "]}catch(e){w[" + seat + "]=undefined}};w[" + seat + "]=seat" + buildBootWatchdogScript() + "}catch(e){}})();";
+	return "(function(){try{var w=window,loc=w.location,h=loc.hostname;if(h==='localhost'||h==='::1'||/^127(\\.\\d{1,3}){3}$/.test(h))return;try{if(w.__DSH_TRANSPORT__===undefined)w.__DSH_TRANSPORT__={};w.__DSH_TRANSPORT__.ownsHost=true}catch(e){}var R=" + json + ";function rdv(){try{return w.sessionStorage.getItem(R.deviceKey)}catch(e){return null}}function att(init){var dv=rdv();if(dv===null)return init;var h=init&&init.headers;if(typeof Headers!==\"undefined\"&&h instanceof Headers){try{h.set(R.deviceHeader,dv)}catch(e){}return init}if(typeof h===\"object\"&&h!==null){var o={};for(var k in h)o[k]=h[k];o[R.deviceHeader]=dv;return Object.assign({},init,{headers:o})}return init}function sf(p){if(p.indexOf(R.pairPrefix)===0)return false;if(p.indexOf(R.updatePrefix)===0)return false;if(p===R.settingsBridgePrefix||p.indexOf(R.settingsBridgePrefix+\"/\")===0)return false;if(p.indexOf(R.apiPrefix)===0)return true;if(p.indexOf(R.sidebarPrefix)===0||p===\"/sidebar\")return true;if(p.indexOf(R.gitPrefix)===0||p===\"/git\")return true;if(p.indexOf(R.petPrefix)===0||p===\"/pet\")return true;return false}function sw(p){return R.wsPaths.indexOf(p)!==-1}function rp(p){return R.remotePrefix+p}function so(u){return u.origin===loc.origin}function rr(raw){var u;try{u=new URL(raw,loc.href)}catch(e){return raw}if(u.origin!==loc.origin)return raw;if(!sf(u.pathname))return raw;u.pathname=rp(u.pathname);if(raw.charAt(0)===\"/\"&&raw.charAt(1)!==\"/\")return u.pathname+u.search+u.hash;return u.href}function uc(v){if(typeof v!==\"object\"||v===null)return undefined;var n=v.result;if(typeof n===\"object\"&&n!==null){var e=n.error;if(typeof e===\"object\"&&e!==null&&typeof e.code===\"string\")return e.code}var t=v.error;if(typeof t===\"object\"&&t!==null&&typeof t.code===\"string\")return t.code;return undefined}var seat={onUnpaired:null,onPaired:null,pendingUnpaired:false,restore:function(){}};function denied(res){if(res.status!==403)return false;return res.clone().json().then(function(b){return uc(b)===\"unpaired\"}).catch(function(){return false})}function signal(unpaired){if(unpaired){if(seat.onUnpaired)seat.onUnpaired();else seat.pendingUnpaired=true}else{seat.pendingUnpaired=false;if(seat.onPaired)seat.onPaired()}}var of=w.fetch;w.fetch=function(input,init){var raw=typeof input===\"string\"||input instanceof URL?input.toString():input.url;var url=new URL(raw,loc.href);if(so(url)&&sf(url.pathname)){var next=new URL(url);next.pathname=rp(url.pathname);var target=typeof input===\"string\"||input instanceof URL?next.toString():new Request(next,input);return Promise.resolve(of.call(w,target,att(init))).then(function(res){void Promise.resolve(denied(res)).then(signal);return res})}return of.call(w,input,init)};var OW=w.WebSocket;w.WebSocket=function(url,protocols){var p=new URL(url.toString(),loc.href);var o=p.protocol===\"wss:\"?\"https://\"+p.host:p.protocol===\"ws:\"?\"http://\"+p.host:\"\";if(o!==\"\"&&o===loc.origin&&sw(p.pathname)){var nx=new URL(p);nx.pathname=rp(p.pathname);var dvv=rdv();if(dvv!==null)nx.searchParams.set(R.deviceQuery,dvv);return protocols!==undefined?new OW(nx,protocols):new OW(nx)}return protocols!==undefined?new OW(url,protocols):new OW(url)};w.WebSocket.prototype=OW.prototype;w.WebSocket.CONNECTING=OW.CONNECTING;w.WebSocket.OPEN=OW.OPEN;w.WebSocket.CLOSING=OW.CLOSING;w.WebSocket.CLOSED=OW.CLOSED;var OE=w.EventSource;if(OE!==undefined){w.EventSource=function(url,cfg){var p=new URL(url.toString(),loc.href);if(so(p)&&sf(p.pathname)){var nx=new URL(p);nx.pathname=rp(p.pathname);var dvv=rdv();if(dvv!==null)nx.searchParams.set(R.deviceQuery,dvv);return new OE(nx,cfg)}return new OE(url,cfg)};w.EventSource.prototype=OE.prototype}var restores=[];function patchSrc(C){if(C===undefined)return;var d=Object.getOwnPropertyDescriptor(C.prototype,\"src\");if(d===undefined||d.configurable===false||d.set===undefined)return;var os=d.set;Object.defineProperty(C.prototype,\"src\",{configurable:true,enumerable:d.enumerable!==false,get:d.get,set:function(v){os.call(this,rr(String(v)))}});restores.push(function(){Object.defineProperty(C.prototype,\"src\",d)})}patchSrc(w.HTMLImageElement);patchSrc(w.HTMLScriptElement);patchSrc(w.HTMLIFrameElement);function uf(u,init){var raw=typeof u===\"string\"?u:u.href;if(typeof raw!==\"string\")return of.call(w,u,init||{});var q=new URL(raw,loc.href);if(so(q)&&q.pathname===R.uploadPath)return w.fetch(raw,init||{});return of.call(w,u,init||{})}try{if(w[R.uploadHookGlobal]===undefined)w[R.uploadHookGlobal]={fetch:uf}}catch(e){}seat.restore=function(){w.fetch=of;w.WebSocket=OW;if(OE!==undefined)w.EventSource=OE;for(var i=0;i<restores.length;i++)restores[i]();try{delete w[" + seat + "]}catch(e){w[" + seat + "]=undefined}};w[" + seat + "]=seat" + buildBootWatchdogScript() + "}catch(e){}})();";
 }
 /** Boot-watchdog latch: one self-reload per session while the boot is broken. */
 const BOOT_WATCHDOG_KEY = "dsh-remote-boot-reload";
@@ -4079,17 +4225,20 @@ function applyImpl(ctx, config) {
 	const service = new PairingService(pairingConfigOf(resolved));
 	const tunnel = new TunnelManager();
 	let relayRegistrar;
-	let relayUrl;
-	let rawTunnelUrl;
+	/**
+	* The public base the pairing fence trusts. A tunnel reconnect must not
+	* strip the host the QR still shows: named and relay hosts never change,
+	* and a quick tunnel's host survives a bounded grace window (issue #1547).
+	*/
+	const publicBase = new PublicBaseKeeper((base) => {
+		service.setPublicBaseUrl(base);
+	});
 	/** The tunnel target the registrar last announced (dedupes sync re-runs). */
 	let relayAnnouncedFor;
-	const setPublicBase = () => {
-		service.setPublicBaseUrl(relayUrl ?? rawTunnelUrl);
-	};
 	const disposeRelayRegistrar = (unregister = false) => {
 		const registrar = relayRegistrar;
 		relayRegistrar = void 0;
-		relayUrl = void 0;
+		publicBase.setRelay(void 0);
 		relayAnnouncedFor = void 0;
 		if (registrar === void 0) return;
 		if (unregister) registrar.unregister().catch(() => void 0);
@@ -4100,10 +4249,9 @@ function applyImpl(ctx, config) {
 		if (relayRegistrar === void 0) try {
 			relayRegistrar = new RelayRegistrar(loadRelayIdentity(resolve().profile), (state) => {
 				service.setRelayStatus(state.state === "off" ? void 0 : state);
-				if (state.state === "running") relayUrl = state.url;
-				else if (state.state === "off") relayUrl = void 0;
+				if (state.state === "running") publicBase.setRelay(state.url);
+				else if (state.state === "off") publicBase.setRelay(void 0);
 				else if (state.state === "failed") console.warn(`remote-web-ui: relay registration failed (${state.error}) — the stable origin may serve its offline page until the retry lands`);
-				setPublicBase();
 			});
 		} catch (error) {
 			console.warn(`remote-web-ui: relay registry unavailable (${error instanceof Error ? error.message : String(error)}) — the quick URL is the QR base`);
@@ -4119,8 +4267,7 @@ function applyImpl(ctx, config) {
 	tunnel.onPhase((info) => {
 		if (tunnelMode === "off") return;
 		if (info.phase === "running" && info.url !== void 0) {
-			rawTunnelUrl = info.url;
-			setPublicBase();
+			publicBase.markRunning(info.url);
 			service.setTunnelStatus({
 				state: "running",
 				url: info.url
@@ -4129,13 +4276,10 @@ function applyImpl(ctx, config) {
 			if (registrar !== void 0) announceRelay(registrar, info.url);
 			runPostureProbe();
 		} else if (info.phase === "starting") {
-			rawTunnelUrl = void 0;
-			relayUrl = void 0;
-			setPublicBase();
+			publicBase.markReconnecting();
 			service.setTunnelStatus({ state: "starting" });
 		} else if (info.phase === "failed") {
-			rawTunnelUrl = void 0;
-			setPublicBase();
+			publicBase.markReconnecting();
 			service.setTunnelStatus(info.error === void 0 ? { state: "failed" } : {
 				state: "failed",
 				error: info.error
@@ -4144,6 +4288,7 @@ function applyImpl(ctx, config) {
 	});
 	ctx.effect(() => () => {
 		disposeRelayRegistrar();
+		publicBase.dispose();
 		tunnel.dispose();
 	}, "remote-web-ui: auto tunnel");
 	if ((ctx.webServer.host === "0.0.0.0" || ctx.webServer.host === "127.0.0.1") && Number.isFinite(ctx.webServer.port)) {
@@ -4391,15 +4536,17 @@ function applyImpl(ctx, config) {
 		}
 		const plan = tunnelPlanOf(value, ctx.webServer.port);
 		tunnelMode = plan.mode;
+		publicBase.setMode(plan.mode);
+		const liveTunnelUrl = publicBase.quickUrl();
 		if (plan.mode !== "quick") {
 			disposeRelayRegistrar();
-			if (plan.mode !== "named") setPublicBase();
+			if (plan.mode !== "named") publicBase.refresh();
 		} else if (value.relay === false) {
 			disposeRelayRegistrar(true);
-			setPublicBase();
-		} else if (rawTunnelUrl !== void 0) {
+			publicBase.refresh();
+		} else if (liveTunnelUrl !== void 0) {
 			const registrar = ensureRelayRegistrar();
-			if (registrar !== void 0) announceRelay(registrar, rawTunnelUrl);
+			if (registrar !== void 0) announceRelay(registrar, liveTunnelUrl);
 		}
 		if (plan.mode === "quick") {
 			for (const ignored of plan.ignored) console.warn(`remote-web-ui: autoTunnel is on — ignoring the configured ${ignored}`);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAA;AAelG,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAmBrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACrE,YAAY,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACnE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,YAAY,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAC/F,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAErE,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,kBAAkB;QAC1B,0CAA0C;QAC1C,MAAM,EAAE,SAAS,CAAA;KAClB;IAED,UAAU,OAAO;QACf;;;;WAIG;QACH;;;;;WAKG;QACH,oBAAoB,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,4BAA4B,CAAA;SAAE,CAAA;KAC3F;CACF;AAED,4GAA4G;AAC5G,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,IAAI,EAAE,OAAO,CAAA;CACd;AAED,mEAAmE;AACnE,MAAM,WAAW,4BAA4B;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;SAAE,CAAA;KAC1E;CACF;AAYD,wCAAwC;AACxC,eAAO,MAAM,MAAM,UAA+D,CAAA;AAElF;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CAiR9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAA;AAelG,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,cAAc,CAAA;AAoBrD,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACrE,YAAY,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AACnE,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAC7C,YAAY,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAC/F,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAErE,OAAO,QAAQ,kCAAkC,CAAC;IAChD,UAAU,kBAAkB;QAC1B,0CAA0C;QAC1C,MAAM,EAAE,SAAS,CAAA;KAClB;IAED,UAAU,OAAO;QACf;;;;WAIG;QACH;;;;;WAKG;QACH,oBAAoB,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,4BAA4B,CAAA;SAAE,CAAA;KAC3F;CACF;AAED,4GAA4G;AAC5G,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,IAAI,EAAE,OAAO,CAAA;CACd;AAED,mEAAmE;AACnE,MAAM,WAAW,4BAA4B;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YAAE,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;SAAE,CAAA;KAC1E;CACF;AAYD,wCAAwC;AACxC,eAAO,MAAM,MAAM,UAA+D,CAAA;AAElF;;;GAGG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CA4Q9C"}

package/lib/types/client/index.js

@@ -19,6 +19,7 @@ import { channelTransition, installRemoteChannel, isLoopbackHostname, remoteChan
 import { FenceNotice } from "./FenceNotice.js";
 import { reportDailyHeartbeat } from "./telemetry.js";
 import { startMobileAdapt } from "./mobile-adapt.js";
+import { installPluginCard } from "./plugin-card-seat.js";
 /** Dictionary namespace owned by this plugin. */
 const NS = 'remote';
 /** Settings namespace the remote-control card edits (the Host plugin registers it). */
@@ -150,26 +151,20 @@ export function apply(ctx) {
         };
     });
     // Plugin configuration card: one staged form over the `remote-web-ui`
-    // settings namespace, contributed to the Web UI plugin group.
+    // settings namespace, contributed to whichever plugin-card seat the running
+    // host declares (the family group's list seat, or the official keyed seat of
+    // the plugin-configuration tab when dsh-web-settings is not installed —
+    // issue #1589).
     const remoteSettings = new RemoteSettingsCardController(settingsScope);
-    ctx.slots.inject('web-ui.plugin.item', () => {
-        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 () => { };
-        }
+    installPluginCard(ctx, {
+        namespace: REMOTE_WEB_UI_NS,
+        id: 'remote-web-ui',
+        order: 90,
+        locale: NS,
+        inject: () => remoteSettings.inject(),
+        component: RemoteSettingsCard,
     });
+    ctx.effect(() => () => { remoteSettings.dispose(); }, 'remote-web-ui: settings card');
     // Phone-side boot flow + heartbeats. Loopback pages (the desktop) never
     // heartbeat; the server ignores unpaired heartbeats anyway. Both run only
     // while the plugin is enabled.

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;AA+PD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CA0zBvC"}
+{"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,CAw0BvC"}

package/lib/types/client/mobile-adapt.js

@@ -40,6 +40,12 @@ const EFFORT_BTN_ID = 'dshRemoteEffortPick';
 const COMPACT_CLASS = 'dsh-remote-compact-picker';
 /** Body class while the header actions are seated in the tabs row. */
 const HEADER_SEATED_CLASS = 'dsh-remote-header-seated';
+/**
+ * Width the seated header actions paint over the tabs row, as a CSS variable
+ * on <html>. The row caps its own width with it (see the v80 rules) instead of
+ * reserving the space with padding.
+ */
+const HEADER_RESERVE_VAR = '--dsh-remote-header-actions-reserve';
 /** Locale-dependent fast path for the official picker cells (zh/en). */
 const PICKER_CELL_PATTERN = {
     model: /模型|Model/, // i18n-allow: matches official picker cell text, not plugin copy
@@ -228,6 +234,20 @@ const ADAPT_CSS = [
     // [class$="_tab"] misses the active tab (its class ends in "_tabActive")
     // — containment so BOTH tabs match.
     '[class$="_header"] [class$="_tabs"] [class*="_tab"]{font-size:12px;white-space:nowrap}',
+    // v80: the tabs row must give the painted actions their width up on its own.
+    // The v67 padding reservation could not do it: the row is a nowrap flex
+    // container, and once the tab labels plus their gaps overflow the reduced
+    // content box the flex items spill over the padding box, so the trailing
+    // tabs render underneath the actions (reported on a phone: a long agent
+    // preset label covered the last tabs). Cap the row against the reserve and
+    // let the labels scroll instead. The value rides a CSS variable on <html>
+    // because the update lands before React re-creates the row node, and an
+    // inline reservation on that node is dropped until the next sync tick.
+    // The 2px bottom padding keeps the active-tab underline inside the clipping
+    // box; the matching negative margin keeps the header height official.
+    `body.${HEADER_SEATED_CLASS} [class$="_header"] [class$="_tabs"]{max-width:max(0px,calc(100% - var(${HEADER_RESERVE_VAR},0px)));overflow-x:auto;overflow-y:hidden;scrollbar-width:none;-webkit-overflow-scrolling:touch;padding-bottom:2px;margin-bottom:-2px}`,
+    `body.${HEADER_SEATED_CLASS} [class$="_header"] [class$="_tabs"]::-webkit-scrollbar{display:none}`,
+    `body.${HEADER_SEATED_CLASS} [class$="_header"] [class$="_tabs"] > [class*="_tab"]{flex:0 0 auto}`,
     // Mobile scope: hide the plugin surfaces that do not fit a phone — the
     // right-hand details column and every desktop-oriented tool surface. The
     // list keys on the L2 semantic roots (data-dsh-plugin, ownership stays
@@ -775,9 +795,14 @@ export function startMobileAdapt() {
         let dx = translate !== null ? parseFloat(translate[1] ?? '0') : 0;
         let dy = translate !== null ? parseFloat(translate[2] ?? '0') : 0;
         const actionsRect = actions.getBoundingClientRect();
-        const tabsRect = tabs.getBoundingClientRect();
-        // Horizontal: the actions' right edge lands on the tabs row's right edge.
-        const rightDiff = tabsRect.right - actionsRect.right;
+        // Horizontal: the actions' right edge lands on the header's content edge,
+        // NOT on the tabs row's right edge. The row caps its own width against the
+        // reserve below (v80), so anchoring to the row would let the pair walk
+        // leftwards on every measurement.
+        const headerRect = header.getBoundingClientRect();
+        const headerStyle = getComputedStyle(header);
+        const contentRight = headerRect.right - (parseFloat(headerStyle.paddingRight) || 0) - (parseFloat(headerStyle.borderRightWidth) || 0);
+        const rightDiff = contentRight - actionsRect.right;
         if (Math.abs(rightDiff) >= 0.5)
             dx = Math.round((dx + rightDiff) * 10) / 10;
         // Vertical: the actions' text bottom lands on the tab text bottom.
@@ -798,18 +823,27 @@ export function startMobileAdapt() {
         const next = `translate(${dx}px, ${dy}px)`;
         if (actions.style.transform !== next)
             actions.style.transform = next;
-        // Reserve the painted width so the tab labels never slide under it.
+        // Reserve the painted width on the row itself, so the tab labels never
+        // slide under it. The value rides a CSS variable on <html>: React
+        // recreates the row node on re-render, which would drop an inline
+        // reservation until the next sync tick, and until then the labels render
+        // underneath the painted actions.
         const reserve = `${Math.ceil(actionsRect.width) + 8}px`;
-        if (tabs.style.paddingRight !== reserve)
-            tabs.style.paddingRight = reserve;
+        const rootStyle = document.documentElement.style;
+        if (rootStyle.getPropertyValue(HEADER_RESERVE_VAR) !== reserve)
+            rootStyle.setProperty(HEADER_RESERVE_VAR, reserve);
     }
     function unseatHeaderActions() {
         document.body.classList.remove(HEADER_SEATED_CLASS);
+        document.documentElement.style.removeProperty(HEADER_RESERVE_VAR);
         const header = document.querySelector('[class$="_header"]');
         const tabs = header !== null ? header.querySelector('[class$="_tabs"]') : null;
         const actions = header !== null ? header.querySelector('[class$="_titleCluster"] [class$="_headerActions"]') : null;
         if (actions instanceof HTMLElement)
             actions.style.transform = '';
+        // The v67 padding reservation is gone with the v80 cap; clearing it keeps a
+        // profile that hot-updated from an older build from keeping a stale inline
+        // width on the row.
         if (tabs instanceof HTMLElement)
             tabs.style.paddingRight = '';
         if (headerObserver !== null) {

package/lib/types/client/plugin-card-seat.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Family plugin-card seat.
+ *
+ * A family plugin contributes its settings card to whichever plugin-card seat
+ * the running host actually renders:
+ *
+ * - `web-ui.plugin.item` — the list seat declared by the dsh-web-settings
+ *   group section (this family's own first-level "Web UI plugins" section);
+ * - `settings.plugin.item` — the official keyed seat of the harness's
+ *   `ui-settings-plugins` tab, keyed by the settings namespace the card edits.
+ *
+ * SEAT SELECTION IS NOT A DECLARATION PROBE. The official `ui-settings-plugins`
+ * row belongs to the harness bundle and its `configurable` tab always declares
+ * `settings.plugin.item` before any external plugin's `apply()` runs, so
+ * "is the official seat declared?" answers yes even in the deployment whose
+ * whole point is the family group. Choosing on that probe sends every family
+ * card to the official Plugins tab and leaves the group's own section
+ * permanently empty — the family of reports where the section renders its
+ * heading and zero cards.
+ *
+ * The signal that actually distinguishes the two deployments is whether
+ * dsh-web-settings is loaded: it is the package that owns the group section and
+ * it publishes the `webUiSettings` service during `apply()`, which every
+ * family plugin already reads for its settings scope. Group loaded -> the family
+ * seat; group absent -> the official seat.
+ *
+ * The decision is re-evaluated on every `slots/changed` because the group may
+ * apply after this plugin (the family aggregate orders it first, a profile that
+ * installs the group separately need not): the initial contribution goes to the
+ * official seat, then moves to the family seat the moment the group's section
+ * registers. The entry is disposed before the replacement is registered, so a
+ * card is never in two seats at once.
+ *
+ * The shared tree has no client-SDK dependency, so this module reads its
+ * context through the structural shape below; callers pass the plugin's own
+ * `ctx`.
+ */
+/** The family list seat key. */
+export declare const FAMILY_PLUGIN_CARD_SEAT = "web-ui.plugin.item";
+/** The official keyed plugin-card seat key. */
+export declare const OFFICIAL_PLUGIN_CARD_SEAT = "settings.plugin.item";
+/** The service dsh-web-settings publishes while it is loaded. */
+export declare const FAMILY_GROUP_SERVICE = "webUiSettings";
+/** The slot-registry member this helper uses (structurally satisfied by ctx.slots). */
+export interface PluginCardSlots {
+    /** Contribution of one card entry. */
+    register(options: never, component: never): unknown;
+}
+/** The slice of the client context a card contribution needs. */
+export interface PluginCardContext {
+    slots: PluginCardSlots;
+    /** Service lookup; absent on a context double that only models the slots. */
+    get?(name: string): unknown;
+    /** Event subscription seat; absent on an event-less test double. */
+    on?(event: string, listener: (...args: never[]) => void): unknown;
+}
+/** Owner share of a plugin card (both seats supply nothing). */
+export interface SettingsPluginItemOwnerProps {
+    /** Marker field: card owner props are intentionally empty. */
+    children?: never;
+}
+/** One family plugin's card contribution. */
+export interface PluginCardSeat {
+    /** Settings namespace the card edits (the official seat's dispatch key). */
+    namespace: string;
+    /** Family list-seat entry id. */
+    id: string;
+    /** Family list-seat sort order. */
+    order?: number;
+    /** Family list-seat display label; the official keyed seat carries none. */
+    label?: () => string;
+    /** Locale namespace the card renders with. */
+    locale: string;
+    /** Business-face factory of the registration. */
+    inject?: () => object;
+    /**
+     * The card component. Its props type is the seat's composed shape, which is
+     * chosen at runtime, so the helper takes it erased; the registrant keeps its
+     * own precise typing at the call site.
+     */
+    component: unknown;
+}
+/**
+ * Whether the family group (dsh-web-settings) is loaded in this page. The
+ * service is the group package's own contract, so the probe cannot be fooled
+ * by a harness release that starts declaring the official seat differently.
+ */
+export declare function familyGroupLoaded(ctx: PluginCardContext): boolean;
+/**
+ * Contribute one family plugin card to the seat this host renders, following
+ * the group if it loads later. The entry is disposed and re-registered on a
+ * seat change, never duplicated.
+ * @param ctx - client context (its slot registry decides the seat).
+ * @param seat - the card contribution.
+ */
+export declare function installPluginCard(ctx: PluginCardContext, seat: PluginCardSeat): void;
+//# sourceMappingURL=plugin-card-seat.d.ts.map

package/lib/types/client/plugin-card-seat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-card-seat.d.ts","sourceRoot":"","sources":["../../../src/client/plugin-card-seat.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,gCAAgC;AAChC,eAAO,MAAM,uBAAuB,uBAAuB,CAAA;AAE3D,+CAA+C;AAC/C,eAAO,MAAM,yBAAyB,yBAAyB,CAAA;AAE/D,iEAAiE;AACjE,eAAO,MAAM,oBAAoB,kBAAkB,CAAA;AAEnD,uFAAuF;AACvF,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,GAAG,OAAO,CAAA;CACpD;AAED,iEAAiE;AACjE,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,eAAe,CAAA;IACtB,6EAA6E;IAC7E,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3B,oEAAoE;IACpE,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,IAAI,GAAG,OAAO,CAAA;CAClE;AAED,gEAAgE;AAChE,MAAM,WAAW,4BAA4B;IAC3C,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,KAAK,CAAA;CACjB;AAED,6CAA6C;AAC7C,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,SAAS,EAAE,MAAM,CAAA;IACjB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAA;IACV,mCAAmC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,4EAA4E;IAC5E,KAAK,CAAC,EAAE,MAAM,MAAM,CAAA;IACpB,8CAA8C;IAC9C,MAAM,EAAE,MAAM,CAAA;IACd,iDAAiD;IACjD,MAAM,CAAC,EAAE,MAAM,MAAM,CAAA;IACrB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAUjE;AAWD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CA4DpF"}