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

package/lib/types/update.d.ts

@@ -219,7 +219,11 @@ export interface UpdateRunDeps {
     timeoutMs?: number;
     /** Platform override (defaults to process.platform; test seam). */
     platform?: NodeJS.Platform;
+    /** Process-group kill seam (defaults to process.kill; test seam). */
+    killImpl?: KillImpl;
 }
+/** Seam for the process-group kill (tests inject a recorder). */
+export type KillImpl = (pid: number, signal: NodeJS.Signals) => void;
 /**
  * Run the update inside the profile directory. Tries pnpm first, falls back
  * to corepack and then npx when the previous command is missing (ENOENT);

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

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

package/lib/types/update.js

@@ -11,7 +11,8 @@
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { spawn } from 'node:child_process';
-import { decodeConsoleBytes } from "./console-output.js";
+import { createOutputCapture } from "./console-output.js";
+import { withIdentityEncoding } from "./http.js";
 /** npm registry base used for version probes. */
 export const NPM_REGISTRY = 'https://registry.npmjs.org';
 /** The family scope every dsh-web package is published under. */
@@ -230,7 +231,7 @@ export async function fetchLatestVersion(name, fetchImpl, timeoutMs = 10_000) {
         const controller = new AbortController();
         const timer = setTimeout(() => { controller.abort(); }, timeoutMs);
         try {
-            const response = await fetchImpl(NPM_REGISTRY + '/' + name.replace('/', '%2F') + '/latest', { signal: controller.signal });
+            const response = await fetchImpl(NPM_REGISTRY + '/' + name.replace('/', '%2F') + '/latest', withIdentityEncoding({ signal: controller.signal }));
             if (!response.ok)
                 return undefined;
             const body = await response.json();
@@ -313,10 +314,10 @@ export async function fetchGitHubReleaseNotes(version, fetchImpl = fetch, timeou
     const controller = new AbortController();
     const timer = setTimeout(() => { controller.abort(); }, timeoutMs);
     try {
-        const response = await fetchImpl(`https://api.github.com/repos/${UPDATE_RELEASE_REPO}/releases/tags/v${version}`, {
+        const response = await fetchImpl(`https://api.github.com/repos/${UPDATE_RELEASE_REPO}/releases/tags/v${version}`, withIdentityEncoding({
             headers: { accept: 'application/vnd.github+json', 'user-agent': 'dsh-web-update' },
             signal: controller.signal,
-        });
+        }));
         if (!response.ok)
             return undefined;
         const body = await response.json();
@@ -425,6 +426,13 @@ export async function checkUpdates(deps) {
 }
 /** Cap on captured pnpm output (keeps error payloads bounded). */
 const OUTPUT_CAP = 16 * 1024;
+/**
+ * Characters a package name may contain before it is handed to the update
+ * command line. Deliberately looser than the strict family shape (the tests
+ * and future callers use short names) but it admits no whitespace, quotes,
+ * shell metacharacters, or path separators beyond the scope slash.
+ */
+const SHELL_SAFE_PACKAGE_RE = /^@?[A-Za-z0-9][A-Za-z0-9._/-]*$/;
 /**
  * Windows cmd command-not-found stderr. With shell:true a missing shim
  * exits with code 1 or 9009 (cmd cannot report ENOENT), so the fallback chain
@@ -433,14 +441,14 @@ const OUTPUT_CAP = 16 * 1024;
  */
 const WIN_CMD_MISSING_RE = /not recognized as an internal or external command|不是内部或外部命令/i;
 /**
- * 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 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.
+ * Fold one decoded candidate output into the running total under the display
+ * cap (the tail carries the failure reason).
+ * @param output - the accumulated text.
+ * @param text - the candidate's decoded text.
  */
-function decodeProcessChunk(chunk) {
-    return decodeConsoleBytes(chunk);
+function capOutput(output, text) {
+    const combined = output + text;
+    return combined.length > OUTPUT_CAP ? combined.slice(combined.length - OUTPUT_CAP) : combined;
 }
 /**
  * Bypass for pnpm 11's supply-chain gate: `minimumReleaseAge` (default 24 h)
@@ -462,16 +470,24 @@ const MIN_RELEASE_AGE_OVERRIDE = '--config.minimumReleaseAge=0';
 export function runUpdate(deps) {
     return new Promise((resolve) => {
         const spawnImpl = deps.spawnImpl ?? spawn;
-        const packages = deps.packages;
         const platform = deps.platform ?? process.platform;
+        // The names come from the profile/anchor manifests and the win32 candidate
+        // runs through a shell, so anything outside the npm name shape is dropped
+        // instead of being concatenated into a command line (a dependency key
+        // containing shell metacharacters would otherwise run as a second command).
+        const packages = deps.packages.filter(name => SHELL_SAFE_PACKAGE_RE.test(name));
         // Windows ships pnpm/corepack/npx as .cmd shims; Node's spawn cannot
         // start .cmd files directly (ENOENT even when installed), so route
         // them through cmd.exe there. POSIX spawns stay shell-free.
+        // POSIX: the child leads its own process group (detached) so the timeout
+        // can signal pnpm's whole tree — pnpm spawns lifecycle-script children that
+        // a direct SIGTERM to the wrapper leaves running against the profile.
         const spawnOptions = {
             cwd: deps.profileDir,
             stdio: ['ignore', 'pipe', 'pipe'],
-            ...(platform === 'win32' ? { shell: true } : {}),
+            ...(platform === 'win32' ? { shell: true } : { detached: true }),
         };
+        const killImpl = deps.killImpl ?? process.kill;
         // Ordered fallback chain: each is tried only when the previous one is
         // missing on PATH (ENOENT on the spawn error event, never on close).
         // `--latest` is required: dsh plugin writes exact-version specs (e.g.
@@ -492,16 +508,22 @@ export function runUpdate(deps) {
         // (its tail is subject to OUTPUT_CAP). The win32 missing-command test must
         // run against `currentOutput` so a previous candidate's 'not recognized'
         // stderr cannot misclassify a real failure in the next one.
+        // Each candidate accumulates raw bytes and is decoded exactly once
+        // (console-output.ts): decoding per `data` event splits a multi-byte
+        // character that straddles two reads into replacement characters, which is
+        // what the panel then shows as garbled pnpm diagnostics.
         let output = '';
-        let currentOutput = '';
-        const append = (chunk) => {
-            const text = decodeProcessChunk(chunk);
-            output += text;
-            if (output.length > OUTPUT_CAP)
-                output = output.slice(output.length - OUTPUT_CAP);
-            currentOutput += text;
-            if (currentOutput.length > OUTPUT_CAP)
-                currentOutput = currentOutput.slice(currentOutput.length - OUTPUT_CAP);
+        let capture = createOutputCapture(OUTPUT_CAP);
+        let candidateFolded = false;
+        const append = (chunk) => { capture.push(chunk); };
+        /** This candidate's decoded text (idempotent). */
+        const candidateText = () => capture.read();
+        /** Fold this candidate's text into the running output exactly once. */
+        const foldCandidate = () => {
+            if (candidateFolded)
+                return;
+            candidateFolded = true;
+            output = capOutput(output, capture.read());
         };
         let currentChild;
         // Terminal guard: once a result is produced the promise is settled and no
@@ -524,7 +546,11 @@ export function runUpdate(deps) {
                 const pid = currentChild?.pid;
                 if (pid !== undefined && pid > 0) {
                     try {
-                        spawnImpl('taskkill', ['/pid', String(pid), '/t', '/f'], { stdio: 'ignore' });
+                        // A spawn failure arrives as an asynchronous 'error' event, which
+                        // the try/catch cannot see; an emitter with no error listener throws
+                        // and would take the host process down on this path.
+                        const killer = spawnImpl('taskkill', ['/pid', String(pid), '/t', '/f'], { stdio: 'ignore' });
+                        killer.on?.('error', () => { });
                     }
                     catch {
                         // Best-effort kill; fall through to the timeout result.
@@ -532,8 +558,26 @@ export function runUpdate(deps) {
                 }
             }
             else {
-                currentChild?.kill('SIGTERM');
+                // Detached child: its process-group id is its pid, so the negative pid
+                // reaches pnpm's grandchildren too. A group kill throws when the child
+                // already exited; fall back to the direct kill.
+                const pid = currentChild?.pid;
+                if (pid !== undefined && pid > 0) {
+                    try {
+                        killImpl(-pid, 'SIGTERM');
+                    }
+                    catch {
+                        try {
+                            currentChild?.kill('SIGTERM');
+                        }
+                        catch { /* already gone */ }
+                    }
+                }
+                else {
+                    currentChild?.kill('SIGTERM');
+                }
             }
+            foldCandidate();
             finish({ ok: false, exitCode: null, output, error: 'update timed out; install process killed', errorCode: 'timeout' });
         }, deps.timeoutMs ?? 10 * 60_000);
         const runCandidate = (index) => {
@@ -550,7 +594,8 @@ export function runUpdate(deps) {
                 return;
             }
             const candidate = candidates[index];
-            currentOutput = '';
+            capture = createOutputCapture(OUTPUT_CAP);
+            candidateFolded = false;
             const child = spawnImpl(candidate.command, candidate.args, spawnOptions);
             currentChild = child;
             let settled = false;
@@ -564,6 +609,7 @@ export function runUpdate(deps) {
             child.stderr?.on('data', append);
             child.on('error', (error) => {
                 once(() => {
+                    foldCandidate();
                     if (error.code === 'ENOENT') {
                         // Command missing: try the next candidate in the chain.
                         runCandidate(index + 1);
@@ -580,11 +626,13 @@ export function runUpdate(deps) {
                 // 'not recognized' or localized message instead of ENOENT — keep the
                 // chain going. Checked against this candidate's own output so a prior
                 // fallback's stderr cannot misclassify a real failure here.
-                if (platform === 'win32' && (code === 9009 || (code !== 0 && WIN_CMD_MISSING_RE.test(currentOutput)))) {
+                if (platform === 'win32' && (code === 9009 || (code !== 0 && WIN_CMD_MISSING_RE.test(candidateText())))) {
+                    foldCandidate();
                     runCandidate(index + 1);
                     return;
                 }
                 settled = true;
+                foldCandidate();
                 finish({
                     ok: code === 0,
                     exitCode: code,

package/package.json

@@ -1,7 +1,8 @@
 {
   "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.3.24",
+  "version": "0.4.1",
+  "icon": "icon.svg",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -31,12 +32,13 @@
     "lib/**/*.d.ts.map",
     "src",
     "assets",
-    "cordis.patch.yml"
+    "cordis.patch.yml",
+    "icon.svg"
   ],
   "license": "Apache-2.0",
   "dsh": {
     "engines": {
-      "dsh": ">=0.1.5-rc.1"
+      "dsh": ">=0.1.7-rc.1"
     },
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -58,27 +60,28 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
+    "@deepseek-ai/dsh": ">=0.1.7-rc.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-agent": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-api-remotes": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-api-session-controller": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-connection": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-locale": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-store": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-commands": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.1",
+    "@deepseek-ai/cordis": "^4.0.4",
+    "@deepseek-ai/dsh-agent": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-remotes": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-workspace-controller": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-connection": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-store": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-commands": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-invariants": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-settings": "^0.1.7-rc.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/node": "^22.20.0",

package/src/client/FenceNotice.tsx

@@ -62,8 +62,6 @@ export function FenceNotice({ t, onRetry, onAccept = acceptPair }: FenceNoticePr
       }
       if (result.code === 'invalid') {
         setErrorMsg(t('fence.unpaired.tokenInvalid'))
-      } else if (result.code === 'used') {
-        setErrorMsg(t('fence.unpaired.tokenUsed'))
       } else {
         setErrorMsg(t('fence.unpaired.tokenFailed'))
       }

package/src/client/PluginSettingsCard.tsx

@@ -64,6 +64,10 @@ export interface PluginSettingsCardProps<TKey extends string = string> {
    * edits, so the footer would sit there permanently disabled.
    */
   hideFooter?: boolean
+  /** Render children even when the settings namespace is not exposed by the host. */
+  renderChildrenWhenNotExposed?: boolean
+  /** Hide the 'not exposed' warning banner when the settings namespace is not exposed. */
+  hideNotExposedNotice?: boolean
   /** The plugin's controls. */
   children: ReactNode
 }
@@ -126,14 +130,15 @@ export function PluginSettingsCard<TKey extends string = string>(props: PluginSe
   // official settings allowlist omits third-party namespaces): show a card
   // that explains the gap instead of vanishing, so a missing card never
   // reads as a missing plugin.
-  if (!state.exposed) {
+  if (!state.exposed && props.renderChildrenWhenNotExposed !== true) {
+    const showNotice = props.hideNotExposedNotice !== true
     return (
       <li className={cardClass}>
         {header}
         {expanded
           ? (
             <div className={css.body}>
-              <p className={css.notExposed} role="status">{props.t('settings.notExposed')}</p>
+              {showNotice ? <p className={css.notExposed} role="status">{props.t('settings.notExposed')}</p> : null}
             </div>
           )
           : null}

package/src/client/RemoteEntry.tsx

@@ -181,18 +181,23 @@ export function RemoteEntry({ wide, t }: RemoteEntryProps) {
   useEffect(() => closeEventSource, [closeEventSource])
 
   const handleStop = useCallback(() => {
-    // A failed stop request is harmless: the optimistic phase flip below
-    // keeps the UI honest, and the status stream confirms the stopped phase.
-    void stopPair().catch(() => {})
-    // Optimistic fallback; the status stream confirms with the stopped phase.
-    setState(previous => previous.kind === 'ready' ? { ...previous, phase: 'stopped' as PairingPhase, devices: [] } : previous)
+    // The phase flip lands only once the server accepted the stop. A refused
+    // stop changes nothing server-side and the service emits no state change
+    // (notify dedupes identical snapshots), so an optimistic flip would stick
+    // and claim a revocation that never happened.
+    void stopPair().then(() => {
+      setState(previous => previous.kind === 'ready' ? { ...previous, phase: 'stopped' as PairingPhase, devices: [] } : previous)
+    }).catch(() => {})
   }, [])
 
   const handleRevoke = useCallback((deviceId: string) => {
-    void revokePair(deviceId).catch(() => {})
-    setState(previous => previous.kind === 'ready'
-      ? { ...previous, devices: previous.devices.filter(device => device.id !== deviceId) }
-      : previous)
+    // Same rule as stop: a refused unpair must leave the row, or the panel
+    // claims a still-live session is gone.
+    void revokePair(deviceId).then(() => {
+      setState(previous => previous.kind === 'ready'
+        ? { ...previous, devices: previous.devices.filter(device => device.id !== deviceId) }
+        : previous)
+    }).catch(() => {})
   }, [])
 
   const handleRefresh = useCallback(() => {

package/src/client/RemotePanel.tsx

@@ -5,9 +5,10 @@
  * actions arrive through props from the entry's behavior component.
  */
 import clsx from 'clsx'
+import { memo } from 'react'
 import { QRCodeSVG } from 'qrcode.react'
 import {
-  IconCloseOutline16, IconCopyOutline16, IconRefreshOutline16, IconStopFill16,
+  IconCloseOutlineRegular, IconCopyOutlineRegular, IconRefreshOutlineRegular, IconStopFillRegular,
 } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots'
 import type { PairingPhase } from '../pairing.ts'
@@ -22,6 +23,15 @@ import {
 import { deviceNameFromUserAgent } from './device-name.ts'
 import css from './remote.module.css'
 
+/**
+ * The QR symbol, memoized on the link: the panel re-renders on every SSE state
+ * frame (a paired phone heartbeats every 10s), and qrcode.react rebuilds the
+ * SVG path and element tree on each render.
+ */
+const PairQrCode = memo(function PairQrCode({ url, className }: { url: string; className: string }) {
+  return <QRCodeSVG value={url} size={184} level="M" marginSize={1} className={className} />
+})
+
 /** The panel's view state, owned by the entry component. */
 export type PanelState =
   | { kind: 'lan-required'; tunnel?: TunnelStatusFrame }
@@ -115,7 +125,7 @@ export function RemotePanel({
           <p className={css.subtitle}>{t('subtitle')}</p>
         </div>
         <button type="button" className={css.close} aria-label={t('close.label')} onClick={onClose}>
-          <IconCloseOutline16 size={14} />
+          <IconCloseOutlineRegular size={14} />
         </button>
       </div>
 
@@ -155,7 +165,7 @@ export function RemotePanel({
               </span>
             </div>
             <div className={css.qrWrap} data-testid="remote-qr">
-              <QRCodeSVG value={state.url} size={184} level="M" marginSize={1} className={css.qr} />
+              <PairQrCode url={state.url} className={css.qr} />
             </div>
             {state.expired
               ? <p className={css.expired}>{t('pair.expired')}</p>
@@ -170,7 +180,7 @@ export function RemotePanel({
                 <code className={css.link} title={state.url}>{state.url}</code>
               </div>
               <button type="button" className={css.copyLink} onClick={() => onCopy(state.url)}>
-                <IconCopyOutline16 size={14} />
+                <IconCopyOutlineRegular size={14} />
                 {copied ? t('action.copied') : t('action.copyLink')}
               </button>
             </div>
@@ -185,7 +195,7 @@ export function RemotePanel({
                   className={css.copyLink}
                   onClick={() => onCopyToken ? onCopyToken(state.token!) : onCopy(state.token!)}
                 >
-                  <IconCopyOutline16 size={14} />
+                  <IconCopyOutlineRegular size={14} />
                   {copiedToken ? t('action.copiedToken') : t('action.copyToken')}
                 </button>
               </div>
@@ -246,11 +256,11 @@ export function RemotePanel({
 
           <div className={css.actions}>
             <button type="button" className={css.action} onClick={onStop}>
-              <IconStopFill16 size={14} />
+              <IconStopFillRegular size={14} />
               {t('action.stop')}
             </button>
             <button type="button" className={css.action} onClick={onRefresh}>
-              <IconRefreshOutline16 size={14} />
+              <IconRefreshOutlineRegular size={14} />
               {t('action.refresh')}
             </button>
           </div>

package/src/client/RemoteSettingsCard.tsx

@@ -1,16 +1,16 @@
 /**
  * The remote-control settings card: pairing security and device limits.
  * Registers into the `web-ui.plugin.item` child slot the Web UI plugin group
- * renders, bound to the `remote-web-ui` settings namespace.
+ * renders, bound to the `remote-web-ui` profile entry's configuration form.
  */
 
 import { useEffect, useState } from 'react'
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
-import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client'
+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 { CardForm, booleanField, numberField, secretField, textField, type CardActions, type CardShell, type FieldState as CardFieldState } from './settings-form.ts'
-import { readLanBindStatus, type LanBindFrame } from './pair-api.ts'
+import { LanBindStatusError, readLanBindStatus, shouldStopLanBindPoll, type LanBindFrame } from './pair-api.ts'
 import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots'
 
 /** The remote-control fields this card edits (the namespace's full schema). */
@@ -88,13 +88,13 @@ export interface RemoteSettingsCardFace extends CardActions {
   }
 }
 
-/** Bridges the `remote-web-ui` scope onto the card's staged form. */
+/** Bridges the `remote-web-ui` form onto the card's staged form. */
 export class RemoteSettingsCardController {
   private readonly form: CardForm<RemoteSettings>
   private readonly store: SnapshotStore<RemoteSettingsCardState>
 
-  /** @param scope - the bound settings scope for the `remote-web-ui` namespace. */
-  constructor(scope: SettingsScope<RemoteSettings>) {
+  /** @param scope - the configuration form for the `remote-web-ui` entry. */
+  constructor(scope: ConfigForm<RemoteSettings>) {
     this.form = new CardForm(scope, [
       booleanField('enabled'),
       numberField('tokenTtlMs'),
@@ -139,7 +139,7 @@ export class RemoteSettingsCardController {
   }
 
   /**
-   * Release the card's scope subscription and bound stores; the slot
+   * Release the card's form subscription and bound stores; the slot
    * disposer calls this on teardown.
    */
   dispose(): void {
@@ -175,6 +175,8 @@ export function RemoteSettingsCard(props: RemoteSettingsCardProps) {
       descriptionKey="settings.description"
       defaultOpen={false}
       state={state}
+      renderChildrenWhenNotExposed
+      hideNotExposedNotice
       onSave={props.save}
       onDiscard={props.discard}
     >
@@ -325,10 +327,15 @@ function LanBindStatus({ t }: { t: TranslateNS<'remote'> }) {
     const read = (): void => {
       void readLanBindStatus().then((value) => {
         if (alive) setFrame(value)
-      }).catch(() => {})
+      }).catch((error: unknown) => {
+        // The endpoint is loopback-only: a 401/403 means this origin (a paired
+        // phone) can never read it, so the 10s poll stops instead of retrying a
+        // known refusal for as long as the card stays expanded.
+        if (error instanceof LanBindStatusError && shouldStopLanBindPoll(error.status)) window.clearInterval(timer)
+      })
     }
-    read()
     const timer = window.setInterval(read, 10_000)
+    read()
     return () => {
       alive = false
       window.clearInterval(timer)

package/src/client/UpdateEntry.tsx

@@ -9,7 +9,7 @@
 import { useCallback, useEffect, useRef, useState } from "react"
 import { createPortal } from "react-dom"
 import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots'
-import { IconDownloadOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconDownloadOutlineRegular } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { UpdateStatus } from '../update.ts'
 import { fetchUpdateStatus, runUpdate, UpdateStatusError } from "./update-api.ts"
 import { UpdatePanel, type UpdateView } from "./UpdatePanel.tsx"
@@ -128,7 +128,7 @@ export function UpdateEntry({ wide, t }: UpdateEntryProps) {
         title={updateLabel}
         onClick={openPanel}
       >
-        <IconDownloadOutline16 size={wide ? 16 : 18} />
+        <IconDownloadOutlineRegular size={wide ? 16 : 18} />
         {updateAvailable && wide && (
           <span className={css.updateBadgeText}>{t("update.badge")}</span>
         )}

package/src/client/UpdatePanel.tsx

@@ -5,7 +5,7 @@
  * through props from the entry behavior component.
  */
 import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots'
-import { IconCloseOutline16, IconRefreshOutline16 } from '@deepseek-ai/dsh-client-ui-primitives'
+import { IconCloseOutlineRegular, IconRefreshOutlineRegular } from '@deepseek-ai/dsh-client-ui-primitives'
 import type { UpdateReleaseNotes, UpdateRunResult, UpdateStatus } from '../update.ts'
 import css from "./remote.module.css"
 
@@ -55,7 +55,7 @@ export function UpdatePanel({ t, view, onClose, onRecheck, onStartUpdate }: Upda
           {subtitle !== undefined && <p className={css.subtitle}>{subtitle}</p>}
         </div>
         <button type="button" className={css.close} aria-label={t("update.close")} onClick={onClose}>
-          <IconCloseOutline16 />
+          <IconCloseOutlineRegular />
         </button>
       </div>
       {view.kind === "checking" && <p className={css.updateStatus}>{t("update.checking")}</p>}
@@ -86,7 +86,7 @@ export function UpdatePanel({ t, view, onClose, onRecheck, onStartUpdate }: Upda
       {(view.kind === "done" || view.kind === "error") && (
         <div className={css.updateActions}>
           <button type="button" className={css.updateRetry} onClick={onRecheck}>
-            <IconRefreshOutline16 /> {t("update.retry")}
+            <IconRefreshOutlineRegular /> {t("update.retry")}
           </button>
         </div>
       )}

package/src/client/deep-link.ts

@@ -70,8 +70,8 @@ async function runAccept(token: string, page: PageSurface): Promise<void> {
   } catch {
     sessionStorage.setItem(PAIR_FAILED_MARKER, 'failed')
   }
-  // Drop the token from the URL either way: an accepted token is consumed
-  // (a re-scan would 409), and a failed one must not loop.
+  // Drop the token from the URL either way: it is spent for this tab (the
+  // session is established), and a failed one must not loop.
   const url = new URL(page.href)
   url.searchParams.delete('pair')
   page.replaceState(`${url.pathname}${url.search}${url.hash}`)