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

package/lib/types/index.js

@@ -29,6 +29,7 @@ import { withIdentityEncoding } from "./http.js";
 import { TunnelManager } from "./tunnel.js";
 import { PublicBaseKeeper } from "./public-base.js";
 import { mountOnce } from "./mount-once.js";
+import { runDetached } from "./detached-work.js";
 import { REMOTE_CHANNEL_BOOT_SCRIPT } from "./remote-channel-boot.js";
 import { UUID_POLYFILL_SCRIPT } from "./uuid-polyfill.js";
 /** Stable cordis plugin name. */
@@ -536,18 +537,34 @@ function applyImpl(ctx, config) {
     if (ctx.webServer.host === '0.0.0.0') {
         console.warn('remote-web-ui: LAN-exposed bind — pairing gates the /remote channel; direct /api stays under the harness fence + browser auth (stop() does not revoke an already-redeemed browser credential)');
     }
-    // Apply the effective configuration to the running surfaces once per
-    // activation: the service tunables, the LAN-bind block/firewall, the tunnel
-    // plan, the pairing routes, the presence sweep, and the posture probe.
-    const sync = () => {
-        const value = resolve();
-        service.config = pairingConfigOf(value);
-        // LAN bind toggle: only write the managed patch block once the user has
-        // flipped it (undefined = untouched, never write). Desired host/port come
-        // from the CLI flags when given (flags win), else from the toggle and
-        // the currently bound port. The block takes effect on the next start, so
-        // the re-assert at every boot keeps it in sync with both the toggle and
-        // the flags.
+    // LAN bind toggle: only write the managed patch block once the user has
+    // flipped it (undefined = untouched, never write). Desired host/port come
+    // from the CLI flags when given (flags win), else from the toggle and
+    // the currently bound port. The block takes effect on the next start, so
+    // the re-assert at every boot keeps it in sync with both the toggle and
+    // the flags.
+    //
+    // cordis.patch.yml is exactly the file the Host's HMR config watcher
+    // refreshes from, and a settings save runs inside the Host's exclusive HMR
+    // transaction. Writing that file while the caller's transaction is open makes
+    // the watcher's refresh re-enter it, which the Host refuses with "HMR
+    // transactions cannot be nested" and which surfaces on the user's save
+    // (#1751, #1754).
+    //
+    // Deferring alone does NOT escape that context, and the earlier belt rested
+    // on a premise that measurement disproves: AsyncLocalStorage is propagated
+    // into setImmediate, into node:timers, and into AsyncResource scopes (a
+    // plain resource built while the transaction runs inherits it), so
+    // "setImmediate starts a fresh store" is false. What does start clean is an
+    // AsyncResource created at module scope, before any transaction existed -
+    // see detached-work.ts. scheduleLanBindWork runs the scheduling through it,
+    // so the write lands outside the caller's transaction.
+    //
+    // The assertion is also idempotent on its own: the write is guarded by the
+    // current-vs-desired comparison below, so once the profile carries the block
+    // a coalesced follow-up sync() finds nothing to do. That guard is a second
+    // belt, not the fix.
+    const applyLanBindWork = (value) => {
         if (value.lanBind !== undefined) {
             const startup = ctx.get('webStartup');
             const desiredHost = desiredBindHost(value.lanBind === true, startup?.host);
@@ -589,6 +606,44 @@ function applyImpl(ctx, config) {
                 }
             }
         }
+    };
+    // The LAN bind assertion never blocks the caller: one pending work item is
+    // enough, and it always re-reads the config through `resolve()` at run time
+    // so a toggle flipped twice before the tick lands on the last value.
+    //
+    // The scheduling itself runs through runDetached: the settings save that
+    // drives sync() holds the Host's exclusive HMR transaction in its async
+    // context, and a `setImmediate` scheduled directly from here would inherit
+    // that mark (measured on Node 24), so the write would still land inside the
+    // transaction the watcher then tries to re-enter. Scheduling from the
+    // module-scope resource starts the timer - and therefore the write - with no
+    // store at all.
+    let lanBindWorkPending = false;
+    const scheduleLanBindWork = () => {
+        if (lanBindWorkPending)
+            return;
+        lanBindWorkPending = true;
+        runDetached(() => setImmediate(() => {
+            lanBindWorkPending = false;
+            try {
+                applyLanBindWork(resolve());
+            }
+            catch (error) {
+                // A deferred assertion must never surface as an unhandled rejection:
+                // the settings save that triggered it already answered, and the card
+                // reads the live block state back on its own poll.
+                console.error(`remote-web-ui: the deferred lan-bind assertion failed: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }));
+    };
+    ctx.effect(() => () => { lanBindWorkPending = false; }, 'remote-web-ui: lan-bind work');
+    // Apply the effective configuration to the running surfaces once per
+    // activation: the service tunables, the LAN-bind block/firewall, the tunnel
+    // plan, the pairing routes, the presence sweep, and the posture probe.
+    const sync = () => {
+        const value = resolve();
+        service.config = pairingConfigOf(value);
+        scheduleLanBindWork();
         // The plugin-managed tunnels own the public base while one runs: the URL
         // lands in the service through the tunnel's phase listener (the minted
         // quick URL, or the named tunnel's fixed public hostname). The manual

package/lib/types/lan-bind.d.ts

@@ -30,7 +30,23 @@ export type LanBindHost = '0.0.0.0' | '127.0.0.1';
  * profiles directory.
  */
 export declare function profilePatchFile(profile: string, home?: string): string;
-/** Remove the managed block (and its markers) from patch content. */
+/**
+ * Remove the managed block (its markers and the webserver row this plugin
+ * wrote) from patch content, keeping every other row.
+ *
+ * The markers travel with the file through writers that append rows through
+ * the YAML document API: the appended rows land at the end of the sequence,
+ * which is BEFORE a trailing END comment, so the region between the markers
+ * can hold rows this plugin never wrote. Deleting the whole region silently
+ * removed the user's model, plugin and remote-control rows on the next rewrite
+ * - the remote-control row carries the LAN toggle itself, so the feature reset
+ * to `undefined` and the phone was locked out again after a restart (DSH
+ * Desktop report, 2026-09-30). Only the managed item is removed here; every
+ * foreign row is kept in place and the fresh block is appended after them (the
+ * same-id row last wins).
+ * @param content - the patch file text.
+ * @returns the text with the markers and the managed row removed.
+ */
 export declare function stripManagedBlock(content: string): string;
 /**
  * Render the managed block for one bind state. The values are static: the
@@ -61,9 +77,10 @@ export declare function lanBindState(profile: string, home?: string): {
  * patch file is preserved; the block is rewritten atomically (unique temp
  * file + rename, so concurrent writers can never rename a half-written
  * file) with the original file's permissions preserved. A hand-truncated
- * unterminated block (BEGIN marker without END, which stripManagedBlock
- * cannot match) is truncated at its BEGIN marker first so the rewrite can
- * never stack a second webserver row onto the orphan.
+ * unterminated block (BEGIN marker without END) is consumed by
+ * stripManagedBlock as well - markers and managed row removed, foreign rows
+ * kept - so the rewrite can never stack a second webserver row onto the
+ * orphan.
  *
  * The written file is always exactly one valid YAML document: a base the
  * plugin manager left in flow style is re-emitted as a block sequence before

package/lib/types/lan-bind.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lan-bind.d.ts","sourceRoot":"","sources":["../../src/lan-bind.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAUH,eAAO,MAAM,oBAAoB,mEAAmE,CAAA;AACpG,eAAO,MAAM,kBAAkB,+CAA+C,CAAA;AAE9E,iDAAiD;AACjD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,WAAW,CAAA;AAEjD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAkB,GAAG,MAAM,CAUlF;AAYD,qEAAqE;AACrE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAKzD;AA0DD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAcpE;AAED,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;IACjC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAW3E;AAED,0EAA0E;AAC1E,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAkB,GAAG;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAI/H;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAkB,GAAG,IAAI,CAa7G"}
+{"version":3,"file":"lan-bind.d.ts","sourceRoot":"","sources":["../../src/lan-bind.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAUH,eAAO,MAAM,oBAAoB,mEAAmE,CAAA;AACpG,eAAO,MAAM,kBAAkB,+CAA+C,CAAA;AAE9E,iDAAiD;AACjD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,WAAW,CAAA;AAEjD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAkB,GAAG,MAAM,CAUlF;AAqED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAoBzD;AA0DD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAcpE;AAED,8EAA8E;AAC9E,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;IACjC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAkB3E;AAED,0EAA0E;AAC1E,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAkB,GAAG;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAI/H;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAkB,GAAG,IAAI,CAW7G"}

package/lib/types/lan-bind.js

@@ -49,16 +49,96 @@ function readPatchContent(file) {
         return '';
     return readFileSync(file, 'utf8');
 }
-/** Escape one literal string for embedding into a RegExp pattern. */
-function escapeRegex(text) {
-    return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+/**
+ * Split a block-sequence region into its top-level items. Only a column-0 `-`
+ * starts an item: that is the shape every writer of this file produces - the
+ * managed block itself and the YAML document API's block-style re-emission.
+ * @param region - text between two line boundaries.
+ * @returns the items in source order; text outside them is not returned.
+ */
+function blockItems(region) {
+    const items = [];
+    let start = -1;
+    let offset = 0;
+    for (const line of region.split('\n')) {
+        if (line.startsWith('- ') || line === '-') {
+            if (start !== -1)
+                items.push({ start, end: offset, text: region.slice(start, offset) });
+            start = offset;
+        }
+        offset += line.length + 1;
+    }
+    if (start !== -1)
+        items.push({ start, end: region.length, text: region.slice(start) });
+    return items;
 }
-/** Remove the managed block (and its markers) from patch content. */
+/**
+ * Whether one top-level item is the webserver row this plugin's block owns.
+ * The row id is the whole signal: the markers declare everything inside them
+ * managed, our block always writes `- id: webserver`, and a same-id row later
+ * in the patch replaces this one wholesale anyway - so an id-webserver row
+ * found inside our markers is this plugin's row (a hand-truncated block may
+ * have lost its `name` line).
+ * @param item - one top-level item's text.
+ * @returns true when the item is the managed webserver row.
+ */
+function isManagedWebserverItem(item) {
+    return /^- id:\s*['"]?webserver['"]?[ \t]*(?:\r?\n|$)/.test(item);
+}
+/**
+ * The text between a block's BEGIN and END markers: from the character after
+ * the BEGIN line's terminator to the start of the END marker's line (or to
+ * the end of the content without an END marker).
+ * @param content - the patch file text.
+ * @param begin - index of the BEGIN marker.
+ * @param end - index of the END marker, or -1 when the block is unterminated.
+ * @returns the region's text.
+ */
+function managedRegion(content, begin, end) {
+    const newlineAfterBegin = content.indexOf('\n', begin);
+    const innerStart = newlineAfterBegin === -1 ? content.length : newlineAfterBegin + 1;
+    const endLineStart = end === -1 ? content.length : content.lastIndexOf('\n', end - 1) + 1;
+    return content.slice(innerStart, Math.max(innerStart, endLineStart));
+}
+/**
+ * Remove the managed block (its markers and the webserver row this plugin
+ * wrote) from patch content, keeping every other row.
+ *
+ * The markers travel with the file through writers that append rows through
+ * the YAML document API: the appended rows land at the end of the sequence,
+ * which is BEFORE a trailing END comment, so the region between the markers
+ * can hold rows this plugin never wrote. Deleting the whole region silently
+ * removed the user's model, plugin and remote-control rows on the next rewrite
+ * - the remote-control row carries the LAN toggle itself, so the feature reset
+ * to `undefined` and the phone was locked out again after a restart (DSH
+ * Desktop report, 2026-09-30). Only the managed item is removed here; every
+ * foreign row is kept in place and the fresh block is appended after them (the
+ * same-id row last wins).
+ * @param content - the patch file text.
+ * @returns the text with the markers and the managed row removed.
+ */
 export function stripManagedBlock(content) {
-    const begin = escapeRegex(LAN_BIND_BLOCK_BEGIN);
-    const end = escapeRegex(LAN_BIND_BLOCK_END);
-    const pattern = new RegExp(`\\r?\\n?${begin}[\\s\\S]*?${end}\\r?\\n?`, 'g');
-    return content.replace(pattern, '\n');
+    let text = content;
+    for (;;) {
+        const begin = text.indexOf(LAN_BIND_BLOCK_BEGIN);
+        if (begin === -1)
+            return text;
+        const end = text.indexOf(LAN_BIND_BLOCK_END, begin);
+        const blockStart = text.lastIndexOf('\n', begin - 1) + 1;
+        const newlineAfterEnd = end === -1 ? -1 : text.indexOf('\n', end);
+        const resumeAt = end === -1 ? text.length : (newlineAfterEnd === -1 ? text.length : newlineAfterEnd + 1);
+        const region = managedRegion(text, begin, end);
+        let kept = '';
+        let cursor = 0;
+        for (const item of blockItems(region)) {
+            if (!isManagedWebserverItem(item.text))
+                continue;
+            kept += region.slice(cursor, item.start);
+            cursor = item.end;
+        }
+        kept += region.slice(cursor);
+        text = text.slice(0, blockStart) + kept + text.slice(resumeAt);
+    }
 }
 /**
  * Render the managed block for one bind state. The values are static: the
@@ -149,9 +229,16 @@ export function managedBindOf(content) {
     if (begin === -1)
         return undefined;
     const end = content.indexOf(LAN_BIND_BLOCK_END, begin);
-    const block = end === -1 ? content.slice(begin) : content.slice(begin, end);
-    const hostMatch = /host:\s*'([^']+)'/.exec(block);
-    const portMatch = /port:\s*(\d+)/.exec(block);
+    const region = managedRegion(content, begin, end);
+    // Read the bind out of the managed row itself. A region a YAML writer
+    // displaced holds foreign rows too, and their `host`/`port` keys are not
+    // this block's bind - reading them made the boot re-assert
+    // believe the block was already applied. A region without a recognizable
+    // managed row (hand-edited literals) keeps the historical whole-region read.
+    const items = blockItems(region).filter(item => isManagedWebserverItem(item.text));
+    const scope = items.length > 0 ? items.map(item => item.text).join('') : region;
+    const hostMatch = /host:\s*'([^']+)'/.exec(scope);
+    const portMatch = /port:\s*(\d+)/.exec(scope);
     return {
         host: hostMatch?.[1] ?? '',
         port: portMatch !== null ? Number(portMatch[1]) : undefined,
@@ -169,9 +256,10 @@ export function lanBindState(profile, home = dshHome()) {
  * patch file is preserved; the block is rewritten atomically (unique temp
  * file + rename, so concurrent writers can never rename a half-written
  * file) with the original file's permissions preserved. A hand-truncated
- * unterminated block (BEGIN marker without END, which stripManagedBlock
- * cannot match) is truncated at its BEGIN marker first so the rewrite can
- * never stack a second webserver row onto the orphan.
+ * unterminated block (BEGIN marker without END) is consumed by
+ * stripManagedBlock as well - markers and managed row removed, foreign rows
+ * kept - so the rewrite can never stack a second webserver row onto the
+ * orphan.
  *
  * The written file is always exactly one valid YAML document: a base the
  * plugin manager left in flow style is re-emitted as a block sequence before
@@ -179,9 +267,7 @@ export function lanBindState(profile, home = dshHome()) {
  */
 export function writeLanBind(host, port, profile, home = dshHome()) {
     const file = profilePatchFile(profile, home);
-    const stripped = stripManagedBlock(readPatchContent(file));
-    const orphanBegin = stripped.indexOf(LAN_BIND_BLOCK_BEGIN);
-    const rawBase = (orphanBegin === -1 ? stripped : stripped.slice(0, orphanBegin)).trimEnd();
+    const rawBase = stripManagedBlock(readPatchContent(file)).trimEnd();
     const base = rawBase.replace(/\[\s*\]\s*$/, '').trimEnd();
     const block = managedBlock(host, port);
     const content = mergePatchContent(base, block, file);

package/lib/types/pairing.d.ts.map

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

package/lib/types/pairing.js

@@ -509,6 +509,7 @@ function snapshotsEqual(a, b) {
         && a.publicUrl === b.publicUrl
         && tunnelEqual(a.tunnel, b.tunnel)
         && relayEqual(a.relay, b.relay)
+        && postureEqual(a.posture, b.posture)
         && a.tokenId === b.tokenId
         && a.tokenExpiresAt === b.tokenExpiresAt
         && a.deviceCount === b.deviceCount
@@ -537,6 +538,48 @@ function relayEqual(a, b) {
     return a === b || (a !== undefined && b !== undefined
         && a.state === b.state && a.url === b.url && a.error === b.error);
 }
+/**
+ * Posture equality. A probe round can change this frame while every other field
+ * stays put — the common case, since the probe re-runs on a settings change and
+ * on a tunnel reaching running, and a quick-tunnel restart churns the probed
+ * host set. Leaving the frame out of the comparison suppressed those emits, so
+ * the loopback SSE stream and the desktop panel could sit on a stale "exposed"
+ * (or stale "clean") verdict for as long as the phase and roster stayed put.
+ */
+function postureEqual(a, b) {
+    if (a === b)
+        return true;
+    // A frame that is not an object at all (a hand-built context can pass
+    // anything) counts as changed instead of throwing out of the setter.
+    if (!isPostureFrame(a) || !isPostureFrame(b))
+        return false;
+    return a.checkedAt === b.checkedAt && hostsEqual(a.hosts, b.hosts);
+}
+/** Whether a value has the shape a posture frame is compared on. */
+function isPostureFrame(value) {
+    return typeof value === 'object' && value !== null;
+}
+/**
+ * Per-host posture equality (a round's verdicts, in probe order). Tolerates a
+ * frame that is not the expected shape: this runs inside the emit path, outside
+ * the listener error containment, so a malformed snapshot handed in by another
+ * host-fiber caller must degrade to "changed" instead of throwing out of the
+ * setter that produced it.
+ */
+function hostsEqual(a, b) {
+    if (a === b)
+        return true;
+    if (!Array.isArray(a) || !Array.isArray(b))
+        return false;
+    return a.length === b.length && a.every((host, index) => {
+        const other = b[index];
+        return isPostureHost(host) && isPostureHost(other) && host.host === other.host && host.exposed === other.exposed;
+    });
+}
+/** Whether a value has the shape one probed host is compared on. */
+function isPostureHost(value) {
+    return typeof value === 'object' && value !== null;
+}
 /** Element-wise string list equality (interface order is meaningful). */
 function sameStrings(a, b) {
     return a.length === b.length && a.every((value, index) => value === b[index]);

package/lib/types/remote-api.d.ts

@@ -70,7 +70,19 @@ export declare function pairedDeviceIdOf(req: IncomingMessage, service: PairingS
  */
 export declare function makeRemoteApiRoutes(deps: RemoteApiDeps): WebRoute[];
 /**
- * Map one outer upgrade URL onto the loopback path (query string included).
+ * Map one outer upgrade URL onto the loopback path, dropping the cookieless
+ * device credential on the way in.
+ *
+ * The outer handshake carries the device id as `?device=<id>` because WebSocket
+ * handshakes cannot carry headers from the Web API. That id is a live session
+ * credential — it opens the full host API through this same channel — and the
+ * inner leg is a request the rest of the loopback origin sees (on a WebSocket
+ * leg, a raw handshake request line written to a loopback socket), so forwarding
+ * it handed a working credential to every other observer of the local port for
+ * no benefit: the gate above has already authenticated the caller, and no
+ * upstream route reads the parameter (the gateway mux matches on path alone).
+ * The rest of the query rides through unchanged, so a caller's own parameters
+ * still reach the upstream.
  */
 export declare function upgradeInnerPath(reqUrl: string | undefined, fallbackPath: string): string;
 /**

package/lib/types/remote-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-api.d.ts","sourceRoot":"","sources":["../../src/remote-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,WAAW,CAAA;AAEhE,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAGlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAUhD,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,GAChB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAgBvD,iCAAiC;AACjC,MAAM,WAAW,aAAa;IAC5B,uDAAuD;IACvD,OAAO,EAAE,cAAc,CAAA;IACvB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;OAKG;IACH,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAWD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAUhE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAExE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAQlG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,QAAQ,EAAE,CAwCnE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAWzF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,aAAa,GAAG,eAAe,EAAE,CAyCjF"}
+{"version":3,"file":"remote-api.d.ts","sourceRoot":"","sources":["../../src/remote-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAkB,MAAM,WAAW,CAAA;AAEhE,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAGlD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAUhD,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,EACnB,aAAa,EACb,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,GAChB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAgBvD,iCAAiC;AACjC,MAAM,WAAW,aAAa;IAC5B,uDAAuD;IACvD,OAAO,EAAE,cAAc,CAAA;IACvB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAA;IACZ;;;;;OAKG;IACH,IAAI,CAAC,EAAE,SAAS,CAAA;CACjB;AAWD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAUhE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAExE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,eAAe,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAQlG;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,QAAQ,EAAE,CAwCnE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAYzF;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,aAAa,GAAG,eAAe,EAAE,CAyCjF"}

package/lib/types/remote-api.js

@@ -137,7 +137,19 @@ export function makeRemoteApiRoutes(deps) {
     return [{ kind: 'prefix', path: REMOTE_PREFIX, handler }];
 }
 /**
- * Map one outer upgrade URL onto the loopback path (query string included).
+ * Map one outer upgrade URL onto the loopback path, dropping the cookieless
+ * device credential on the way in.
+ *
+ * The outer handshake carries the device id as `?device=<id>` because WebSocket
+ * handshakes cannot carry headers from the Web API. That id is a live session
+ * credential — it opens the full host API through this same channel — and the
+ * inner leg is a request the rest of the loopback origin sees (on a WebSocket
+ * leg, a raw handshake request line written to a loopback socket), so forwarding
+ * it handed a working credential to every other observer of the local port for
+ * no benefit: the gate above has already authenticated the caller, and no
+ * upstream route reads the parameter (the gateway mux matches on path alone).
+ * The rest of the query rides through unchanged, so a caller's own parameters
+ * still reach the upstream.
  */
 export function upgradeInnerPath(reqUrl, fallbackPath) {
     if (reqUrl === undefined || reqUrl === '')
@@ -152,6 +164,7 @@ export function upgradeInnerPath(reqUrl, fallbackPath) {
     const inner = innerPathOf(url.pathname);
     if (inner === undefined)
         return fallbackPath;
+    url.searchParams.delete(REMOTE_DEVICE_QUERY);
     return `${inner}${url.search}`;
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@linxin666/dsh-remote-web-ui",
   "description": "Scan-to-pair remote access for the dsh web GUI that shares one official interface: a QR beside the settings button pairs phones and PCs into the same Web GUI (a portrait-touch adaptation layer for phones, full desktop on PCs) through one-time tokens and revocable device sessions, with a LAN bind toggle, optional Cloudflare tunnel, and one-click family self-update",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "icon": "icon.svg",
   "type": "module",
   "engines": {
@@ -38,7 +38,7 @@
   "license": "Apache-2.0",
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.7-rc.2"
+      "dsh": ">=0.2.0-rc.2"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -61,28 +61,28 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.7-rc.2",
+    "@deepseek-ai/dsh": ">=0.2.0-rc.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-agent": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-store": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-commands": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.7-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-agent": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-api-remotes": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-api-session-controller": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-api-workspace-controller": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-connection": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-store": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-commands": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-invariants": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.2.0-rc.2",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.20.0",

package/src/client/PluginSettingsCard.tsx

@@ -41,6 +41,13 @@ export interface PluginSettingsCardProps<TKey extends string = string> {
   descriptionKey: TKey
   /** Optional rich header description rendered instead of the plain t(descriptionKey) text (the plain text stays as the tooltip). */
   descriptionNode?: ReactNode
+  /**
+   * Optional leading mark identifying the plugin. A card without one keeps the
+   * plain official header shape, so the chrome stays a readable sibling of the
+   * built-in PluginCard wherever a family plugin lands in the official bundle
+   * seat.
+   */
+  icon?: ReactNode
   /** The card's form state: availability, writability, and what a save would do. */
   state: CardShell
   /** Write every staged edit. */
@@ -91,6 +98,7 @@ export function PluginSettingsCard<TKey extends string = string>(props: PluginSe
   const header = alwaysOpen === true
     ? (
       <div className={css.headerStatic}>
+        {props.icon !== undefined ? <span className={css.mark} aria-hidden="true">{props.icon}</span> : null}
         <span className={css.headText}>
           <span className={css.name} title={title}>{title}</span>
           <span className={css.description} title={description}>{props.descriptionNode ?? description}</span>
@@ -106,6 +114,7 @@ export function PluginSettingsCard<TKey extends string = string>(props: PluginSe
         aria-label={`${props.t(open ? 'settings.collapse' : 'settings.expand')}: ${title}`}
         onClick={() => { setOpen(!open) }}
       >
+        {props.icon !== undefined ? <span className={css.mark} aria-hidden="true">{props.icon}</span> : null}
         <span className={css.headText}>
           <span className={css.name} title={title}>{title}</span>
           <span className={css.description} title={description}>{props.descriptionNode ?? description}</span>

package/src/client/RemoteSettingsCard.tsx

@@ -9,6 +9,7 @@ import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-cli
 import type { ConfigForm } from '@deepseek-ai/dsh-client-ui-settings/client'
 import type { SnapshotStore } from '@deepseek-ai/dsh-client-store'
 import { PluginSettingsCard, ValueField, BooleanField } from './PluginSettingsCard.tsx'
+import { PhoneIcon } from './PhoneIcon.tsx'
 import { CardForm, booleanField, numberField, secretField, textField, type CardActions, type CardShell, type FieldState as CardFieldState } from './settings-form.ts'
 import { LanBindStatusError, readLanBindStatus, shouldStopLanBindPoll, type LanBindFrame } from './pair-api.ts'
 import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots'
@@ -173,6 +174,7 @@ export function RemoteSettingsCard(props: RemoteSettingsCardProps) {
       t={t}
       titleKey="settings.title"
       descriptionKey="settings.description"
+      icon={<PhoneIcon size={18} />}
       defaultOpen={false}
       state={state}
       onSave={props.save}

package/src/client/index.ts

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

package/src/client/locales.ts

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