@linxin666/dsh-remote-web-ui 0.1.15 → 0.1.17

package/lib/index.js

@@ -981,6 +981,10 @@ function makeRoutes(deps) {
 function mobileBundlePath() {
 	return fileURLToPath(new URL("../lib/mobile.js", import.meta.url));
 }
+/** The apple-touch-icon shipped with the package (iOS home-screen icon, 180x180 PNG). */
+function appleTouchIconPath() {
+	return fileURLToPath(new URL("../assets/apple-touch-icon.png", import.meta.url));
+}
 /** The mobile page shell: minimal, offline-safe, no external assets. */
 function pageHtml(bundleUrl) {
 	return [
@@ -991,6 +995,7 @@ function pageHtml(bundleUrl) {
 		"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover\">",
 		"<meta name=\"theme-color\" content=\"#f3f5f9\">",
 		"<meta name=\"referrer\" content=\"no-referrer\">",
+		"<link rel=\"apple-touch-icon\" href=\"/m/apple-touch-icon.png\">",
 		"<title>移动端远程控制</title>",
 		"</head>",
 		"<body>",
@@ -1009,6 +1014,15 @@ function writeStatic(res, status, type, body) {
 	});
 	res.end(body);
 }
+/** Send the PNG icon as a binary body (unlike text assets, the PNG must not be decoded to utf-8). */
+function writePng(res, status, body) {
+	res.writeHead(status, {
+		"content-type": "image/png",
+		"cache-control": "public, max-age=31536000, immutable",
+		"referrer-policy": "no-referrer"
+	});
+	res.end(body);
+}
 /**
 * Build the mobile page routes.
 * @returns the two exact routes to register on webServer.
@@ -1029,15 +1043,35 @@ function makeMobileRoutes() {
 			writeStatic(res, 500, "text/plain", "failed to read the mobile bundle");
 		}
 	};
-	return [{
-		kind: "exact",
-		path: "/m",
-		handler: handlePage
-	}, {
-		kind: "exact",
-		path: "/m/mobile.js",
-		handler: handleBundle
-	}];
+	const handleIcon = async (_req, res) => {
+		const path = appleTouchIconPath();
+		if (!existsSync(path)) {
+			writeStatic(res, 404, "text/plain", "apple-touch-icon not found");
+			return;
+		}
+		try {
+			writePng(res, 200, await readFile(path));
+		} catch {
+			writeStatic(res, 500, "text/plain", "failed to read the apple-touch-icon");
+		}
+	};
+	return [
+		{
+			kind: "exact",
+			path: "/m",
+			handler: handlePage
+		},
+		{
+			kind: "exact",
+			path: "/m/mobile.js",
+			handler: handleBundle
+		},
+		{
+			kind: "exact",
+			path: "/m/apple-touch-icon.png",
+			handler: handleIcon
+		}
+	];
 }
 //#endregion
 //#region src/mobile-api.ts
@@ -1096,10 +1130,22 @@ const MOBILE_API_METHOD_PREFIX = `${MOBILE_API_PREFIX}/`;
 function makeMobileApiRoutes(deps) {
 	const { service, apiProxy, mobileEnterToSend } = deps;
 	const eventsHeartbeatMs = deps.eventsHeartbeatMs ?? DEFAULT_EVENTS_HEARTBEAT_MS;
+	/**
+	* Refresh the paired device's presence and report whether it is live.
+	* The mobile surface (unlike the desktop Web UI) has no `/api/pair/heartbeat`
+	* sender, so any activity on the mobile channel — a gated RPC, or the live
+	* SSE stream staying open — must count as presence. Without this, an
+	* idle-but-connected phone ages past `offlineAfterMs` and the desktop panel
+	* wrongly reports it as disconnected.
+	*/
+	const touchDeviceFor = (req) => {
+		const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
+		if (deviceId === void 0) return false;
+		return service.touchDevice(deviceId);
+	};
 	/** The phone gate: a live paired-device cookie, or nothing else proceeds. */
 	const gateOk = (req) => {
-		const deviceId = readCookie(req.headers.cookie, service.config.cookieName);
-		return deviceId !== void 0 && service.hasDevice(deviceId);
+		return touchDeviceFor(req);
 	};
 	const writeJson = (res, status, body) => {
 		res.writeHead(status, { "content-type": "application/json; charset=utf-8" });
@@ -1219,6 +1265,7 @@ function makeMobileApiRoutes(deps) {
 		let closed = false;
 		const heartbeat = setInterval(() => {
 			if (closed) return;
+			touchDeviceFor(req);
 			try {
 				res.write(": ping\n\n");
 			} catch {}
@@ -1633,13 +1680,16 @@ function isLinkedSpec(spec) {
 }
 /**
 * Resolve the anchor package's manifest path. The aggregate package is the
-* canonical entry point; this plugin's own package is the fallback.
+* canonical entry point; this plugin's own package is the fallback. Both a
+* throwing resolve and an undefined return mean "not installed" and move on
+* to the next candidate.
 * @param resolve - a Node resolve implementation scoped to the host process.
 * @returns the absolute manifest path, or undefined when neither is installed.
 */
 function resolveAnchorManifest(resolve) {
 	for (const name of [AGGREGATE_PACKAGE, SELF_PACKAGE]) try {
-		return resolve(name + "/package.json");
+		const path = resolve(name + "/package.json");
+		if (path !== void 0) return path;
 	} catch {}
 }
 /**
@@ -1701,14 +1751,21 @@ async function fetchLatestVersion(name, fetchImpl, timeoutMs = 1e4) {
 		return;
 	}
 }
+/**
+* Sentinel for an installed version that could not be read (missing manifest
+* or resolve failure). It is a real-looking version so `checkUpdates` can
+* render the affected row, but the verified-update comparison must never
+* treat it as evidence — a read failure is not a version that "moved".
+*/
+const VERSION_UNKNOWN = "0.0.0";
 /** The resolved current version of one family package (probe failure tolerated). */
 function readInstalledVersion(resolve, name) {
 	try {
 		const path = resolve(name + "/package.json");
 		const version = path === void 0 ? void 0 : readManifest(path)?.version;
-		return typeof version === "string" ? version : "0.0.0";
+		return typeof version === "string" ? version : VERSION_UNKNOWN;
 	} catch {
-		return "0.0.0";
+		return VERSION_UNKNOWN;
 	}
 }
 /**
@@ -1777,6 +1834,16 @@ const OUTPUT_CAP = 16 * 1024;
 */
 const WIN_CMD_MISSING_RE = /not recognized as an internal or external command/i;
 /**
+* Bypass for pnpm 11's supply-chain gate: `minimumReleaseAge` (default 24 h)
+* silently skips same-day releases — `pnpm update --latest` then exits 0
+* without moving anything and the post-run verification would misreport a
+* stale no-op. The update here is explicitly user-initiated and the panel
+* shows exactly which versions are being installed, so the gate only adds a
+* confusing silent no-op; override it per-invocation instead of asking every
+* user to edit the profile's pnpm-workspace.yaml.
+*/
+const MIN_RELEASE_AGE_OVERRIDE = "--config.minimumReleaseAge=0";
+/**
 * Run the update inside the profile directory. Tries pnpm first, falls back
 * to corepack and then npx when the previous command is missing (ENOENT);
 * all candidates share one hard timeout and keep accumulating output.
@@ -1800,13 +1867,20 @@ function runUpdate(deps) {
 		const candidates = [
 			{
 				command: "pnpm",
-				args: ["update", ...packages]
+				args: [
+					"update",
+					"--latest",
+					MIN_RELEASE_AGE_OVERRIDE,
+					...packages
+				]
 			},
 			{
 				command: "corepack",
 				args: [
 					"pnpm",
 					"update",
+					"--latest",
+					MIN_RELEASE_AGE_OVERRIDE,
 					...packages
 				]
 			},
@@ -1816,6 +1890,8 @@ function runUpdate(deps) {
 					"--yes",
 					"pnpm",
 					"update",
+					"--latest",
+					MIN_RELEASE_AGE_OVERRIDE,
 					...packages
 				]
 			}
@@ -1912,6 +1988,72 @@ function runUpdate(deps) {
 		runCandidate(0);
 	});
 }
+/**
+* Run the update, then verify the installed versions actually moved. pnpm
+* exits 0 even when it silently kept the installed versions — runUpdate
+* overrides pnpm 11's `minimumReleaseAge` gate (default 24 h) with
+* `--config.minimumReleaseAge=0`, but an older pnpm without the override or
+* another silent no-op can still keep versions in place — so a green exit
+* alone must not report a misleading "update complete". Re-read the
+* installed versions afterwards and surface a `stale` failure (with the
+* captured pnpm output) when nothing moved, so the panel can tell the user
+* how to unblock the gate instead of claiming success.
+*
+* The stale decision anchors on the pre-run installed versions, not on the
+* registry latest: under a lenient gate pnpm may move 0.1.12 -> 0.1.13 while
+* latest stays 0.1.15 — that is a real update, not stale. The post-run anchor
+* path is re-resolved rather than reused from boot time: pnpm removes the old
+* version's .pnpm directory on update, so a boot-time captured path would
+* fail to read and collapse a successful update into a bogus 'missing'.
+*
+* A green exit whose verification has nothing to compare (registry probe
+* outage, missing anchor, non-npm mode) is reported as `verify-failed` — it
+* must never read as success. A green exit where no package moved but the
+* post-run check could not prove the install is fully current (a partial
+* probe failure hides whether a gate kept something back) is also
+* `verify-failed`: it must not collapse into a success either.
+* @param deps - the run and check seams.
+* @returns the run result; `stale` when exit 0 left every version in place,
+* `verify-failed` when the post-run check could not verify anything.
+*/
+async function runUpdateVerified(deps) {
+	const before = /* @__PURE__ */ new Map();
+	for (const name of deps.run.packages) {
+		const version = readInstalledVersion(deps.check.resolve, name);
+		if (version !== VERSION_UNKNOWN) before.set(name, version);
+	}
+	const result = await runUpdate(deps.run);
+	if (!result.ok) return result;
+	const anchorManifestPath = resolveAnchorManifest(deps.check.resolve) ?? deps.check.anchorManifestPath;
+	const status = await checkUpdates({
+		...deps.check,
+		anchorManifestPath
+	});
+	if (status.error !== void 0 || status.mode !== "npm") return {
+		...result,
+		ok: false,
+		errorCode: "verify-failed",
+		error: "pnpm exited 0 but the post-run version check could not verify the install"
+	};
+	if (status.packages.some((packageStatus) => {
+		const beforeVersion = before.get(packageStatus.name);
+		if (beforeVersion === void 0 || packageStatus.current === VERSION_UNKNOWN) return false;
+		return packageStatus.current !== beforeVersion;
+	})) return result;
+	if (status.outdated) return {
+		...result,
+		ok: false,
+		errorCode: "stale",
+		error: "pnpm exited 0 but the installed versions did not change"
+	};
+	if (status.packages.some((packageStatus) => packageStatus.latest === void 0)) return {
+		...result,
+		ok: false,
+		errorCode: "verify-failed",
+		error: "pnpm exited 0 but the post-run version check could not verify the install"
+	};
+	return result;
+}
 //#endregion
 //#region src/update-routes.ts
 /** Route paths (exact matches under /api). */
@@ -2093,11 +2235,17 @@ function apply(ctx, config) {
 	const apiProxy = ctx.get("apiProxy");
 	if (apiProxy === void 0) console.warn("remote-web-ui: apiProxy service unavailable — the mobile data channel is disabled");
 	const requireFromHost = createRequire(import.meta.url);
-	const anchorManifestPath = resolveAnchorManifest((specifier) => requireFromHost.resolve(specifier));
+	const resolveAnchorPath = () => resolveAnchorManifest((specifier) => {
+		try {
+			return requireFromHost.resolve(specifier);
+		} catch {
+			return;
+		}
+	});
 	const updateRoutes = makeUpdateRoutes({
 		fence: (request) => isTrustedApiRequest(request, []),
 		check: () => checkUpdates({
-			anchorManifestPath,
+			anchorManifestPath: resolveAnchorPath(),
 			resolve: (specifier) => {
 				try {
 					return requireFromHost.resolve(specifier);
@@ -2108,7 +2256,7 @@ function apply(ctx, config) {
 			fetchLatest: (name) => fetchLatestVersion(name, fetch)
 		}),
 		run: async () => {
-			const target = resolveUpdateTarget({ anchorManifestPath });
+			const target = resolveUpdateTarget({ anchorManifestPath: resolveAnchorPath() });
 			if ("error" in target) {
 				const code = target.error;
 				return {
@@ -2119,9 +2267,22 @@ function apply(ctx, config) {
 					errorCode: code
 				};
 			}
-			return runUpdate({
-				profileDir: target.profileDir,
-				packages: target.packages
+			return runUpdateVerified({
+				run: {
+					profileDir: target.profileDir,
+					packages: target.packages
+				},
+				check: {
+					anchorManifestPath: resolveAnchorPath(),
+					resolve: (specifier) => {
+						try {
+							return requireFromHost.resolve(specifier);
+						} catch {
+							return;
+						}
+					},
+					fetchLatest: (name) => fetchLatestVersion(name, fetch)
+				}
 			});
 		}
 	});

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

@@ -1 +1 @@
-{"version":3,"file":"PluginSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/PluginSettingsCard.tsx"],"names":[],"mappings":"AACA;;;;;;;GAOG;AAEH,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAGnD,oGAAoG;AACpG,eAAO,MAAM,cAAc,kMAUjB,CAAA;AAEV,6CAA6C;AAC7C,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;AAEzD,oEAAoE;AACpE,MAAM,MAAM,eAAe,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,IAAI,IAAI,GAAG,WAAW,CAAA;AAE9E,wDAAwD;AACxD,MAAM,WAAW,uBAAuB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM;IACnE,0CAA0C;IAC1C,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAA;IACnF,uCAAuC;IACvC,QAAQ,EAAE,IAAI,CAAA;IACd,4EAA4E;IAC5E,cAAc,EAAE,IAAI,CAAA;IACpB,kFAAkF;IAClF,KAAK,EAAE,SAAS,CAAA;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,6BAA6B;IAC7B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,uBAAuB,CAAC,IAAI,CAAC,sCA2GpG;AAED,oEAAoE;AACpE,MAAM,WAAW,UAAU;IACzB,wDAAwD;IACxD,EAAE,EAAE,MAAM,CAAA;IACV,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAA;IACZ,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,sEAAsE;IACtE,UAAU,EAAE,OAAO,CAAA;IACnB,6DAA6D;IAC7D,OAAO,EAAE,OAAO,CAAA;IAChB,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAA;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,kEAAkE;IAClE,YAAY,EAAE,MAAM,CAAA;IACpB,gFAAgF;IAChF,QAAQ,EAAE,OAAO,CAAA;IACjB,wBAAwB;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,oEAAoE;IACpE,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB;AAED,kHAAkH;AAClH,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG;IAC7C,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,+BAqCA;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG;IAC/C,mCAAmC;IACnC,YAAY,EAAE,MAAM,CAAA;IACpB,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;CACjB,+BAmCA;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG;IAC9C,oEAAoE;IACpE,YAAY,EAAE,MAAM,CAAA;IACpB,mEAAmE;IACnE,OAAO,EAAE,aAAa,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACzD,+BAsCA"}
+{"version":3,"file":"PluginSettingsCard.d.ts","sourceRoot":"","sources":["../../../src/client/PluginSettingsCard.tsx"],"names":[],"mappings":"AACA;;;;;;;GAOG;AAEH,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAGnD,oGAAoG;AACpG,eAAO,MAAM,cAAc,kMAUjB,CAAA;AAEV,6CAA6C;AAC7C,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,CAAC,CAAA;AAEzD,oEAAoE;AACpE,MAAM,MAAM,eAAe,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,IAAI,IAAI,GAAG,WAAW,CAAA;AAE9E,wDAAwD;AACxD,MAAM,WAAW,uBAAuB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM;IACnE,0CAA0C;IAC1C,CAAC,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAA;IACnF,uCAAuC;IACvC,QAAQ,EAAE,IAAI,CAAA;IACd,4EAA4E;IAC5E,cAAc,EAAE,IAAI,CAAA;IACpB,kFAAkF;IAClF,KAAK,EAAE,SAAS,CAAA;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,6BAA6B;IAC7B,QAAQ,EAAE,SAAS,CAAA;CACpB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,uBAAuB,CAAC,IAAI,CAAC,sCAiHpG;AAED,oEAAoE;AACpE,MAAM,WAAW,UAAU;IACzB,wDAAwD;IACxD,EAAE,EAAE,MAAM,CAAA;IACV,qBAAqB;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAA;IACZ,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,sEAAsE;IACtE,UAAU,EAAE,OAAO,CAAA;IACnB,6DAA6D;IAC7D,OAAO,EAAE,OAAO,CAAA;IAChB,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAA;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,kEAAkE;IAClE,YAAY,EAAE,MAAM,CAAA;IACpB,gFAAgF;IAChF,QAAQ,EAAE,OAAO,CAAA;IACjB,wBAAwB;IACxB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B,oEAAoE;IACpE,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB;AAED,kHAAkH;AAClH,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG;IAC7C,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,kDAAkD;IAClD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,+BAqCA;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG;IAC/C,mCAAmC;IACnC,YAAY,EAAE,MAAM,CAAA;IACpB,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;CACjB,+BAmCA;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG;IAC9C,oEAAoE;IACpE,YAAY,EAAE,MAAM,CAAA;IACpB,mEAAmE;IACnE,OAAO,EAAE,aAAa,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACzD,+BAsCA"}

package/lib/types/client/PluginSettingsCard.js

@@ -46,7 +46,9 @@ export function PluginSettingsCard(props) {
                     : null] }));
     }
     return (_jsxs("li", { className: cardClass, children: [_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: 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" }) })] }), open
-                ? (_jsxs("div", { className: css.body, children: [!state.writable ? _jsx("p", { className: css.readOnly, role: "status", children: props.t('settings.readOnly') }) : null, props.children, _jsxs("div", { className: css.footer, children: [state.failed ? _jsx("p", { className: css.failed, role: "status", children: props.t('settings.saveFailed') }) : null, _jsx("button", { type: "button", className: css.discard, disabled: !state.dirty || state.saving, onClick: props.onDiscard, children: props.t('settings.discard') }), _jsx("button", { type: "button", className: css.save, disabled: blocked, onClick: props.onSave, children: props.t(!state.saving ? 'settings.save' : 'settings.saving') })] })] }))
+                ? (_jsxs("div", { className: css.body, children: [!state.writable ? _jsx("p", { className: css.readOnly, role: "status", children: props.t('settings.readOnly') }) : null, props.children, _jsxs("div", { className: css.footer, children: [state.failed
+                                    ? (_jsxs("p", { className: css.failed, role: "status", children: [props.t('settings.saveFailed'), state.failedReason ? ' - ' + state.failedReason : ''] }))
+                                    : null, _jsx("button", { type: "button", className: css.discard, disabled: !state.dirty || state.saving, onClick: props.onDiscard, children: props.t('settings.discard') }), _jsx("button", { type: "button", className: css.save, disabled: blocked, onClick: props.onSave, children: props.t(!state.saving ? 'settings.save' : 'settings.saving') })] })] }))
                 : null] }));
 }
 /** A staged value field. `numeric` only hints the keypad: which drafts a field accepts is decided by its spec. */

package/lib/types/client/UpdatePanel.js

@@ -77,6 +77,8 @@ function errorMessageOf(t, result) {
         case "not-found": return t("update.error.notFound");
         case "link": return t("update.error.link");
         case "pnpm-failed": return t("update.error.pnpmFailed", { code: String(result.exitCode ?? "?") });
+        case "stale": return t("update.error.stale");
+        case "verify-failed": return t("update.error.verifyFailed");
         default: return result.error ?? t("update.error.unknown");
     }
 }

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

@@ -99,6 +99,8 @@ export declare const zh: {
     'update.error.notFound': string;
     'update.error.link': string;
     'update.error.pnpmFailed': string;
+    'update.error.stale': string;
+    'update.error.verifyFailed': string;
     'update.error.unknown': string;
 };
 /** The remote namespace key union. */
@@ -205,6 +207,8 @@ export declare const en: {
     'update.error.notFound': string;
     'update.error.link': string;
     'update.error.pnpmFailed': string;
+    'update.error.stale': string;
+    'update.error.verifyFailed': string;
     'update.error.unknown': string;
 };
 //# sourceMappingURL=locales.d.ts.map

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,+EAA+E;AAE/E,mEAAmE;AACnE,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsGmB,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsGsB,CAAA"}
+{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../../src/client/locales.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAE/E,mEAAmE;AACnE,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwGmB,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwGsB,CAAA"}

package/lib/types/client/locales.js

@@ -101,6 +101,8 @@ export const zh = {
     'update.error.notFound': '未找到 dsh-web-ui 聚合包安装，无法更新。',
     'update.error.link': '当前为本地开发模式（链接安装），无法自动更新。',
     'update.error.pnpmFailed': '更新执行失败（pnpm 退出码 {code}），详见下方输出。',
+    'update.error.stale': '更新命令已执行，但安装版本未变化。常见原因：pnpm 11 的 minimumReleaseAge 门禁会静默跳过发布不足 24 小时的新版本。请在 profile 目录（~/.dsh/profiles/<profile>）的 pnpm-workspace.yaml 中配置 minimumReleaseAgeExclude（例如 "@linxin666/*"）或 minimumReleaseAge: 0 后重新点击更新。',
+    'update.error.verifyFailed': '更新命令已执行，但无法核对安装后的版本（可能是 registry 探测失败或安装路径变化）。请查看下方输出，或稍后重试。',
     'update.error.unknown': '更新失败，请重试。',
 };
 /** English dictionary, checked complete against the zh key set. */
@@ -205,5 +207,7 @@ export const en = {
     'update.error.notFound': 'The dsh-web-ui aggregate package is not installed; nothing to update.',
     'update.error.link': 'Local development mode (link install) — automatic update is unavailable.',
     'update.error.pnpmFailed': 'The update failed (pnpm exited with code {code}); see the output below.',
+    'update.error.stale': 'The update command ran but the installed versions did not change. Likely cause: the pnpm 11 minimumReleaseAge gate silently skips releases published less than 24 hours ago. Add minimumReleaseAgeExclude (e.g. "@linxin666/*") or set minimumReleaseAge: 0 in pnpm-workspace.yaml under the profile directory (~/.dsh/profiles/<profile>), then run the update again.',
+    'update.error.verifyFailed': 'The update command ran but the installed versions could not be verified afterwards (registry probe failed or the install path changed). Inspect the output below, or retry later.',
     'update.error.unknown': 'Update failed; try again.',
 };

package/lib/types/client/settings-form.d.ts

@@ -18,6 +18,14 @@ export type FieldWrite = {
 export interface FieldSpec {
     /** Field name inside the namespace section. */
     field: string;
+    /**
+     * Whether the Host treats this field as a secret and redacts its value from
+     * the read-back (role('secret') in the section schema). Redacted secrets are
+     * never compared against the draft on save; the field lands when the scope
+     * reports the write succeeded (its secret-set marker under the bridge), so
+     * a successful secret save is not misreported as failed.
+     */
+    secret?: boolean;
     /** Render a stored value as draft text; the empty string when the section carries none. */
     format: (value: unknown) => string;
     /**
@@ -57,6 +65,12 @@ export interface CardShell {
     saving: boolean;
     /** Whether the last save did not land as staged; cleared by the next edit or save. */
     failed: boolean;
+    /**
+     * The rejection code/message the Host returned for the last failed save,
+     * surfaced next to the generic failure text. Undefined while no save has
+     * failed (or the failure carried no server reason).
+     */
+    failedReason?: string;
 }
 /** The write actions the card's slot entry injects. */
 export interface CardActions {
@@ -69,6 +83,37 @@ export interface CardActions {
     /** Drop every staged edit. */
     discard: () => void;
 }
+/** One durable write a batched settings scope performs. */
+export interface BatchedWrite {
+    /** Field this entry writes. */
+    field: string;
+    /** set stores a value; unset drops the leaf. */
+    op: 'set' | 'unset';
+    /** Value for op set (absent for unset). */
+    value?: unknown;
+}
+/** Per-field outcome of one batched scope write. */
+export interface BatchedFieldResult {
+    /** Field this entry writes. */
+    field: string;
+    /** Whether the Host accepted this field's write (per the read-back view). */
+    landed: boolean;
+}
+/**
+ * Result of a batched scope write. The bridge scope posts every planned write
+ * in one /mutate so the Host validate hook judges baseURL+model together; a
+ * batched refusal fails the whole save rather than per-field.
+ */
+export interface BatchResult {
+    /** Whether the whole mutate was accepted. */
+    ok: boolean;
+    /** Per-field success, in the request order (always present when ok). */
+    fields: BatchedFieldResult[];
+    /** Host rejection code (mutate refused). */
+    code?: string;
+    /** Host rejection message (mutate refused). */
+    message?: string;
+}
 /** Constraints a numeric field's accepted drafts must satisfy, mirroring the host schema. */
 export interface NumberConstraints {
     /** The accepted value must be a whole number. */
@@ -80,6 +125,13 @@ export interface NumberConstraints {
 export declare function numberField(field: string, constraints?: NumberConstraints): FieldSpec;
 /** A free-text field. An empty draft clears the field. */
 export declare function textField(field: string): FieldSpec;
+/**
+ * A free-text field the Host treats as a secret and redacts from the read-back
+ * (role('secret') in the section schema). The card still edits it like text,
+ * but a save never compares the redacted value back and relies on the scope
+ * reporting the write landed.
+ */
+export declare function secretField(field: string): FieldSpec;
 /** A boolean field, edited through true/false draft text. */
 export declare function booleanField(field: string): FieldSpec;
 /** An enumerated string field; only the listed choices are accepted. An empty draft clears the field. */
@@ -99,6 +151,7 @@ export declare class CardForm<T> {
     private readonly listeners;
     private saving;
     private failed;
+    private failedReason;
     /** @param scope - the bound settings scope for this card's namespace. */
     constructor(scope: SettingsScope<T>, specs: FieldSpec[]);
     /** Publish a projection of this form, rebuilt whenever the scope or a draft changes. */
@@ -111,9 +164,18 @@ export declare class CardForm<T> {
     actions(): CardActions;
     /**
      * Write every staged edit, then re-seed from what the Host accepted.
+     *
+     * When the scope carries the optional batch surface (the dsh-web-ui
+     * bridge scope), every planned write rides one mutation so cross-field
+     * validate hooks (baseURL+model) judge the batch as a unit instead of
+     * deadlocking on per-field writes. Otherwise the per-field loop runs.
+     * A field lands only when the Host reports it held the staged value; a
+     * landed field's draft is dropped, a failed one stays staged for the user.
      * @returns settlement after every write and the read-back.
      */
     save(): Promise<void>;
+    /** The scope's batch surface when it supports one; undefined conservatively otherwise. */
+    private batchedScope;
     /**
      * Every staged edit a save would write. An entry whose draft is not a value
      * its field accepts carries no write: the form is still dirty, and the save

package/lib/types/client/settings-form.d.ts.map

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