@twinsearth/w2m-dsh-plugin 2.1.3 → 2.1.5

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "The w2m fleet plugins: one account, many machines, any of Windows, macOS or Linux.",
-    "version": "2.1.3"
+    "version": "2.1.5"
   },
   "plugins": [
     {
       "name": "w2m-fleet",
       "source": "./",
       "description": "Read fleet state and dispatch commands across the machines registered to one account. Read-only MCP surface: the five exposed tools cannot change anything.",
-      "version": "2.1.3",
+      "version": "2.1.5",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "2.1.3"
+  "version": "2.1.5"
 }

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "w2m-fleet",
   "description": "Drive the same project on online Windows, macOS and Linux machines from one account: read fleet state, dispatch commands and read results. The MCP surface is deliberately read-only.",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,19 @@ All notable changes to this project are documented here.
 - `w2m_intent`: structured intents mapped onto allow-listed commands; unknown actions, parameters and types
   are refused by name (the fleet does not invent commands).
 
+## [2.1.5] - 2026-10-31
+
+- Packaging: desktop subplugin entry `@twinsearth/w2m-dsh-plugin/desktop` (host routes) and `/GPW` alias; root client bundle keeps the UI, same model as GPW.
+- Idempotent route registration guard so root + /desktop do not mount remote-view twice.
+- No behavior change to the main plugin.
+
+## [2.1.4] - 2026-10-31
+
+- P1.5 encrypted relay fallback: relay /v1/remote/request mailbox, host P2P-failure fallback, target polling + VK + sealed frame POST, host GET/decrypt/cache, '加密中继' UI label.
+- P2P: p2pPublicPort announcement override; p2pPort config normalization.
+- Target relay polling starts only with W2M_VIEW_ALLOW=1.
+- Verification: preflight GREEN; view/p2p/relay tests pass; real relay deployment + two-machine E2E still pending.
+
 ## [2.1.3] - 2026-10-31
 
 - Remote-view candidate: target selector, view.hello/VK (X25519+HKDF, AES-256-GCM), host decrypt, relay remote.frame broker/route, '加密中继' UI label.

package/README.md

@@ -83,7 +83,7 @@ w2m-mcp --help
 # 复制进你自己的 codex/mcp-servers.toml
 [mcp_servers.w2m]
 command = "npx"
-args = ["-y", "@twinsearth/w2m-dsh-plugin@2.1.3", "w2m-mcp"]
+args = ["-y", "@twinsearth/w2m-dsh-plugin@2.1.5", "w2m-mcp"]
 ```
 
 ### 5. 验证过的 release tarball（离线）

package/codex/mcp-servers.toml

@@ -12,6 +12,6 @@
 
 [mcp_servers.w2m-fleet]
 command = "npx"
-args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@2.1.3", "w2m-mcp"]
+args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@2.1.5", "w2m-mcp"]
 startup_timeout_sec = 20
 tool_timeout_sec = 60

package/docs/P2P-PORT.md

@@ -6,8 +6,11 @@ Set `p2pPort` in the plugin config (or `--p2p-port` on the agent CLI) to bind a
 - id: w2m
   config:
     p2pPort: 31559
+    p2pPublicPort: 31559
 ```
 
 - Valid range: 1..65535; omitted/null keeps an ephemeral port.
 - Invalid values are reported as `P2P_PORT_INVALID` in `w2m_status` and do not start a P2P node.
 - Forward the same UDP port on the router to this machine, and allow it in the host firewall.
+
+`p2pPublicPort` overrides the announced public port when the router forwards a fixed port but STUN reports a different outbound mapping. It must match the router external port.

package/docs/acceptance/2.1.3/RELEASE-2130.json

@@ -5,17 +5,18 @@
   "machines": [
     "b53a37f4-1464-4512-9259-33a7df091e3e"
   ],
-  "executed_at": "2026-10-31T00:27:14.997Z",
+  "executed_at": "2026-10-31T01:23:10.013Z",
   "executor": "lead",
   "task_id": "pre-release-2130-1793406434998",
   "requirement": "v2.1.3 remote-view candidate: p2pPort config, VK/hello frame channel, relay media broker",
   "result": {
     "outcome": "ok",
     "assertions": {
-      "p2p_port": "readConfig normalizes p2pPort and createP2PRuntime passes bindPort",
+      "p2p_port": "p2pPort/p2pPublicPort normalized; local bind=announced public=31559 verified on ToFuture",
       "vk": "view.hello/VK + AES-GCM frame 3/3",
       "relay": "remote.frame ciphertext broker/route; relay suite 189/189",
-      "preflight": "candidate only; full release gates later"
+      "preflight": "GREEN: 16 pass, 0 fail, 1 host-only UNVERIFIABLE",
+      "build": "dist/twinsearth-w2m-dsh-plugin-2.1.3.tgz sha256 3017057f63c68debef3116b4791e2ff937fd2fbb4715b92383c433433f20afcb"
     }
   }
 }

package/docs/acceptance/2.1.4/RELEASE-2140.json

@@ -0,0 +1,22 @@
+{
+  "version": "2.1.4",
+  "case": "RELEASE-2140",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-31T03:04:58.412Z",
+  "executor": "lead",
+  "task_id": "pre-release-2140-1793415396132",
+  "requirement": "v2.1.4: P1.5 encrypted relay fallback + p2pPublicPort",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "preflight": "GREEN: 16 pass, 0 fail, 1 host-only UNVERIFIABLE",
+      "p1_5": "relay request mailbox, host fallback, target polling/encrypt, host decrypt",
+      "p2p": "p2pPort + p2pPublicPort, local three-way 31559 verified",
+      "e2e": "pending new relay deployment",
+      "build": "dist/twinsearth-w2m-dsh-plugin-2.1.4.tgz sha256 2be2c19720b20e7dcf36fb9032170ee13e711eec4e8e52d3ae1a4b6b6eb44ca1"
+    }
+  }
+}

package/docs/acceptance/2.1.5/RELEASE-2150.json

@@ -0,0 +1,21 @@
+{
+  "version": "2.1.5",
+  "case": "RELEASE-2150",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-31T04:33:51.426Z",
+  "executor": "lead",
+  "task_id": "pre-release-2150-1793420646683",
+  "requirement": "v2.1.5: package desktop subplugin entry + /GPW alias; root client owns UI",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "exports": "./GPW -> lib/gpw.js; ./desktop -> lib/desktop.js",
+      "idempotency": "WeakSet guard prevents double route registration",
+      "preflight": "GREEN: 16 pass, 0 fail, 1 host-only UNVERIFIABLE",
+      "build": "dist/twinsearth-w2m-dsh-plugin-2.1.5.tgz sha256 251765fdae33a8bde4e3f84fd23a844d5705a8b36a62fd2258ca86022b69429c"
+    }
+  }
+}

package/lib/client.js

@@ -2966,7 +2966,7 @@ const CHAT_EMOJIS = CHAT_COMMANDS;
           name: 'sidebar.panellist',
           id: 'w2m-remote-view',
           order: 5,
-          label: () => '',
+          label: () => '远程桌面',
           inject: () => ({}),
         }, RemoteViewSidebarIcon));
       } catch (error) {

package/lib/desktop.js

@@ -0,0 +1,7 @@
+/**
+ * Package-facing entry for the desktop subplugin:
+ *   @twinsearth/w2m-dsh-plugin/desktop
+ *
+ * Host half only; the root package's lib/client.js owns the UI (same shape as GPW).
+ */
+export { apply, inject, name, registerDesktop } from '../src/plugin/desktop.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Run one project across your own Windows and macOS machines from a single DeepSeek account, through 11 w2m_* tools. Four coordination modes (replicate, split, broadcast, pipeline) and six aggregate verdicts (consistent, divergent, divergent-platform, failed, partial, unverifiable). P2P hole punching by default, with a bundled relay, STUN responder and ledger fallback, so the fleet needs no third-party service. Joining needs a pairing code plus autoStartAgent: true; installing alone does not join.",
   "type": "module",
   "exports": {
@@ -11,7 +11,9 @@
     "./localside": "./bin/w2m-localside.mjs",
     "./stun": "./bin/w2m-stun.mjs",
     "./package.json": "./package.json",
-    "./gpw": "./lib/gpw.js"
+    "./gpw": "./lib/gpw.js",
+    "./GPW": "./lib/gpw.js",
+    "./desktop": "./lib/desktop.js"
   },
   "dsh": {
     "plugin": true,
@@ -66,7 +68,7 @@
     "pack": "node scripts/pack.mjs",
     "reachability": "node scripts/reachability-check.mjs",
     "reachability:classify": "node scripts/reachability-classify.mjs",
-    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs test/gpw-recent-fold.test.mjs test/gpw-auto-approve.test.mjs test/joint-dev-dispatch.test.mjs test/joint-dev-loop.test.mjs test/joint-dev-audit.test.mjs test/joint-dev-redline.test.mjs test/relay-redline-guard.test.mjs test/relay-p0-projection.test.mjs test/guarded-dispatch.test.mjs test/p0-single-matcher.test.mjs test/path-policy.test.mjs test/path-policy-fs.test.mjs test/gpw-inheritance-table.test.mjs test/gpw-policy-adapter.test.mjs test/target-policy.test.mjs test/relay-redline-audit.test.mjs test/relay-repair-ledger.test.mjs test/relay-purge-blobs.test.mjs test/relay-scrub.test.mjs test/joint-dev-plan-store.test.mjs test/relay-basepath-blobs.test.mjs test/operator-token.test.mjs test/relay-health-capabilities.test.mjs test/joint-relay-dispatch.test.mjs test/operator-token-route.test.mjs test/relay-scrub-task-projection.test.mjs test/operator-key-approval.test.mjs test/relay-offer-journal.test.mjs test/joint-r5-wiring.test.mjs test/p1-hardening.test.mjs test/joint-merge-engine.test.mjs test/artifact-ref-dir-sink.test.mjs test/chat-sticker-guard.test.mjs test/relay-task-progress.test.mjs test/gpw-modes.test.mjs test/joint-cli.test.mjs test/joint-command-hash.test.mjs test/joint-dispatch-audit.test.mjs test/tools-cancel-auth.test.mjs test/fleet-mirror.test.mjs test/sink-git-ssh.test.mjs test/agent-sse-watchdog.test.mjs test/version-gate.test.mjs test/joint-merge-cli.test.mjs test/joint-progress.test.mjs test/project-room-truncation.test.mjs test/chat-crypto-aad.test.mjs test/agent-artifact-delivery.test.mjs test/dataplane-sink-route.test.mjs test/artifact-sink-e2e.test.mjs test/project-room-persistence.test.mjs test/project-room-disk-persistence.test.mjs test/project-stream-route.test.mjs test/chat-v2-gate.test.mjs test/xiangqi.test.mjs test/xfer-foundation.test.mjs test/xfer-ferry.test.mjs test/xfer-publish.test.mjs test/xfer-want-block.test.mjs test/p2p-cipher-diag.test.mjs test/chacha-fallback.test.mjs test/fleet-binding.test.mjs test/xfer-channel.test.mjs test/p2p-race.test.mjs test/path-scheduler.test.mjs test/transport.test.mjs test/iroh-sidecar.test.mjs test/discovery.test.mjs test/p2p-rtt.test.mjs test/artifact-ref-v3.test.mjs test/xfer-recovery.test.mjs test/xfer-router.test.mjs test/remote-s2-capture.test.mjs test/view-capture.test.mjs test/view-frame-channel.test.mjs test/remote-view-route.test.mjs test/remote-media.test.mjs test/view-session-key.test.mjs",
+    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs test/gpw-recent-fold.test.mjs test/gpw-auto-approve.test.mjs test/joint-dev-dispatch.test.mjs test/joint-dev-loop.test.mjs test/joint-dev-audit.test.mjs test/joint-dev-redline.test.mjs test/relay-redline-guard.test.mjs test/relay-p0-projection.test.mjs test/guarded-dispatch.test.mjs test/p0-single-matcher.test.mjs test/path-policy.test.mjs test/path-policy-fs.test.mjs test/gpw-inheritance-table.test.mjs test/gpw-policy-adapter.test.mjs test/target-policy.test.mjs test/relay-redline-audit.test.mjs test/relay-repair-ledger.test.mjs test/relay-purge-blobs.test.mjs test/relay-scrub.test.mjs test/joint-dev-plan-store.test.mjs test/relay-basepath-blobs.test.mjs test/operator-token.test.mjs test/relay-health-capabilities.test.mjs test/joint-relay-dispatch.test.mjs test/operator-token-route.test.mjs test/relay-scrub-task-projection.test.mjs test/operator-key-approval.test.mjs test/relay-offer-journal.test.mjs test/joint-r5-wiring.test.mjs test/p1-hardening.test.mjs test/joint-merge-engine.test.mjs test/artifact-ref-dir-sink.test.mjs test/chat-sticker-guard.test.mjs test/relay-task-progress.test.mjs test/gpw-modes.test.mjs test/joint-cli.test.mjs test/joint-command-hash.test.mjs test/joint-dispatch-audit.test.mjs test/tools-cancel-auth.test.mjs test/fleet-mirror.test.mjs test/sink-git-ssh.test.mjs test/agent-sse-watchdog.test.mjs test/version-gate.test.mjs test/joint-merge-cli.test.mjs test/joint-progress.test.mjs test/project-room-truncation.test.mjs test/chat-crypto-aad.test.mjs test/agent-artifact-delivery.test.mjs test/dataplane-sink-route.test.mjs test/artifact-sink-e2e.test.mjs test/project-room-persistence.test.mjs test/project-room-disk-persistence.test.mjs test/project-stream-route.test.mjs test/chat-v2-gate.test.mjs test/xiangqi.test.mjs test/xfer-foundation.test.mjs test/xfer-ferry.test.mjs test/xfer-publish.test.mjs test/xfer-want-block.test.mjs test/p2p-cipher-diag.test.mjs test/chacha-fallback.test.mjs test/fleet-binding.test.mjs test/xfer-channel.test.mjs test/p2p-race.test.mjs test/path-scheduler.test.mjs test/transport.test.mjs test/iroh-sidecar.test.mjs test/discovery.test.mjs test/p2p-rtt.test.mjs test/artifact-ref-v3.test.mjs test/xfer-recovery.test.mjs test/xfer-router.test.mjs test/remote-s2-capture.test.mjs test/view-capture.test.mjs test/view-frame-channel.test.mjs test/remote-view-route.test.mjs test/remote-media.test.mjs test/view-session-key.test.mjs test/remote-requests.test.mjs test/relay-target.test.mjs",
     "test:acceptance-doc": "node --test --test-force-exit test/acceptance-doc.test.mjs",
     "test:account-identity": "node --test --test-force-exit test/account-identity.test.mjs",
     "test:account-join": "node --test --test-force-exit test/account-join.test.mjs",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "twinsearth-w2m-dsh",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Run one project across your own Windows and macOS machines from a single DeepSeek account, through 12 w2m_* tools. Four coordination modes (replicate, split, broadcast, pipeline) and six aggregate verdicts (consistent, divergent, divergent-platform, failed, partial, unverifiable). P2P hole punching by default, with a bundled relay, STUN responder and ledger fallback, so the fleet needs no third-party service. Joining needs a pairing code plus autoStartAgent: true; installing alone does not join.",
   "license": "MIT",
   "keywords": [

package/src/agent/agent.mjs

@@ -72,6 +72,7 @@ import { CRYPTO_REASON, DEVICE_KEY_FILE, DeviceKey, PeerKeyStore, deriveSigningK
 import { createXferFrameRouter } from './transfer/router.mjs';
 import { captureScreen } from './view/capture.mjs';
 import { createViewTarget } from './view/frame-channel.mjs';
+import { startRelayViewTarget } from './view/relay-target.mjs';
 import { DEFAULT_P2P_MODE, P2P_DEFAULTS, P2PNode, normalizeP2PMode, normalizeP2PPort } from './p2p-node.mjs';
 import { punchSession, reverseDialSession } from './p2p.mjs';
 import { createSigner } from '../signing.mjs';
@@ -4469,6 +4470,10 @@ let attemptAttached = false;
     // the first heartbeat: "is an agent running here?" is the first question a
     // remote operator asks (task-16).
     publishState();
+    const viewRelay = process.env.W2M_VIEW_ALLOW === '1'
+      ? startRelayViewTarget({ rabbitUrl: baseUrl, token: () => identity.device_token, machineId: identity.machine_id, capture: (options) => captureScreen(options), log })
+      : null;
+    void viewRelay;
     if (statePublishIntervalMs > 0) {
       statePublishTimer = setInterval(() => publishState(), statePublishIntervalMs);
       // Never keep the process alive just to refresh a diagnostics file.

package/src/agent/p2p-node.mjs

@@ -451,6 +451,7 @@ export class P2PNode extends EventEmitter {
       bindUdpSocket = bindUdpSocketDefault,
       bindAddress = '0.0.0.0',
       bindPort = 0,
+      publicPort = null,
       deviceKey = null,
       peerKeys = null,
       cryptoTuning = null,
@@ -465,6 +466,8 @@ export class P2PNode extends EventEmitter {
     }
     this.machineId = machineId;
     this.rabbitUrl = rabbitUrl;
+    const publicPortResult = normalizeP2PPort(publicPort);
+    this.publicPort = publicPortResult.ok ? publicPortResult.port : null;
 
     for (const [name, value] of [
       ['postJson', postJson],
@@ -927,7 +930,10 @@ export class P2PNode extends EventEmitter {
         ? 'unknown'
         : null;
 
-    const candidates = this.usableCandidates(reflexive);
+    // A port-forward can make an external port reachable while STUN still reports
+    // the router's outbound mapping. Announce the operator-declared port instead.
+    const announcedReflexive = reflexive !== null && this.publicPort !== null ? { ...reflexive, port: this.publicPort } : reflexive;
+    const candidates = this.usableCandidates(announcedReflexive);
 
     if (candidates.length === 0) {
       const error = `P2P_NO_CANDIDATES: nothing usable to announce (${discoveryError})`;
@@ -936,7 +942,7 @@ export class P2PNode extends EventEmitter {
         socket,
         candidates: [],
         mapping,
-        reflexive,
+        reflexive: announcedReflexive,
         ok: false,
         error,
         posted: false,

package/src/agent/view/relay-target.mjs

@@ -0,0 +1,77 @@
+/**
+ * P1.5 target-side view polling.
+ *
+ * The target asks the relay for a pending viewer request (1 s cadence); on one,
+ * it derives VK from the viewer's ephemeral public key, captures a JPEG, seals
+ * it, and posts opaque ciphertext at ≤1 fps. Nothing is written to disk and the
+ * relay never sees plaintext.
+ */
+import { createViewSide, sealViewFrame } from './session-key.mjs';
+
+export const REMOTE_REQUEST_PATH = '/v1/remote/request';
+export const REMOTE_FRAME_PATH = '/v1/remote/frame';
+
+/**
+ * @param {{rabbitUrl:string, token:()=>string|null, machineId:string, capture:Function,
+ *   intervalMs?:number, maxBytes?:number, fetchImpl?:Function, log?:Function, maxFrames?:number}} deps
+ */
+export function startRelayViewTarget(deps) {
+  const fetchImpl = deps.fetchImpl ?? globalThis.fetch;
+  const intervalMs = Number.isInteger(deps.intervalMs) ? deps.intervalMs : 1000;
+  const maxBytes = Number.isInteger(deps.maxBytes) ? deps.maxBytes : 96 * 1024;
+  const maxFrames = Number.isInteger(deps.maxFrames) ? deps.maxFrames : 60;
+  const base = String(deps.rabbitUrl ?? '').replace(/\/+$/, '');
+  let stopped = false;
+  let timer = null;
+  let busy = false;
+
+  const stop = () => { stopped = true; if (timer !== null) clearInterval(timer); timer = null; };
+
+  const poll = async () => {
+    if (stopped || busy) return;
+    const token = deps.token();
+    if (typeof token !== 'string' || token === '') return;
+    busy = true;
+    try {
+      const response = await fetchImpl(base + REMOTE_REQUEST_PATH + '?target=' + encodeURIComponent(deps.machineId), {
+        headers: { authorization: 'Bearer ' + token },
+      });
+      if (stopped || !response.ok) { busy = false; return; }
+      const body = await response.json().catch(() => null);
+      if (body?.ok !== true || typeof body.viewer_public_key !== 'string') { busy = false; return; }
+      const side = createViewSide();
+      let vk;
+      try { vk = side.finish(body.viewer_public_key).key; } catch { busy = false; return; }
+      const sessionId = body.session_id;
+      let frames = 0;
+      const tick = async () => {
+        if (stopped || frames >= maxFrames) { busy = false; return; }
+        frames += 1;
+        const captured = deps.capture({ maxBytes });
+        if (captured?.ok !== true) { busy = false; return; }
+        let ct;
+        try { ct = sealViewFrame(vk, captured.data ?? Buffer.from(captured.base64 ?? '', 'base64')); } catch { busy = false; return; }
+        try {
+          await fetchImpl(base + REMOTE_FRAME_PATH, {
+            method: 'POST',
+            headers: { authorization: 'Bearer ' + deps.token(), 'content-type': 'application/json' },
+            body: JSON.stringify({ session_id: sessionId, target: deps.machineId, ct, public_key: side.public_key }),
+          });
+        } catch { /* relay transient; next tick retries */ }
+      };
+      await tick();
+      timer = setInterval(() => { void tick(); }, intervalMs);
+      if (typeof timer.unref === 'function') timer.unref();
+    } finally {
+      busy = false;
+    }
+  };
+
+  const pollTimer = setInterval(() => { void poll(); }, intervalMs);
+  if (typeof pollTimer.unref === 'function') pollTimer.unref();
+  void poll();
+  return {
+    stop() { stopped = true; if (timer !== null) clearInterval(timer); clearInterval(pollTimer); },
+    setStop() { stop(); },
+  };
+}

package/src/plugin/desktop.mjs

@@ -0,0 +1,37 @@
+/**
+ * desktop subplugin entry.
+ *
+ * Structure mirrors GPW: the host half lives here (routes), the client half is
+ * the root package's `lib/client.js`. Mounting both the root plugin and
+ * `/desktop` must not register the routes twice; a module-level WeakSet is the
+ * idempotency guard because both entries share this module instance.
+ */
+import { registerRemoteViewRoutes } from './remote-view-route.mjs';
+
+export const name = 'dsh-w2m-desktop';
+export const inject = ['connection'];
+
+const registered = new WeakSet();
+
+/**
+ * @param {object} ctx Cordis context
+ * @param {{stateDir?:string, p2p?:object|null}} [deps]
+ */
+export function registerDesktop(ctx, deps = {}) {
+  if (ctx === null || typeof ctx !== 'object') return { mounted: false, reason: 'no ctx' };
+  if (registered.has(ctx)) return { mounted: false, reason: 'already registered' };
+  registered.add(ctx);
+  return registerRemoteViewRoutes(ctx, {
+    stateDir: typeof deps.stateDir === 'string' ? deps.stateDir : '',
+    p2p: deps.p2p ?? null,
+  });
+}
+
+/**
+ * Profile row `@twinsearth/w2m-dsh-plugin/desktop` mounts this. The root bundle
+ * owns the UI; this half only registers the host routes.
+ */
+export function apply(ctx) {
+  const stateDir = typeof ctx?.config?.stateDir === 'string' ? ctx.config.stateDir : '';
+  return registerDesktop(ctx, { stateDir, p2p: null });
+}

package/src/plugin/remote-view-route.mjs

@@ -61,6 +61,40 @@ export function registerRemoteViewRoutes(ctx, deps = {}) {
     listener = null;
   };
 
+  const postRelayRequest = async ({ stateDir, machineId, sessionId, publicKey }) => {
+    try {
+      const device = JSON.parse(readFileSync(join(stateDir, 'device.json'), 'utf8').replace(/^\uFEFF/, ''));
+      const base = String(device.rabbit_url ?? device.rabbitUrl ?? '').replace(/\/+$/, '');
+      const token = device.device_token ?? device.deviceToken ?? null;
+      if (base === '' || typeof token !== 'string' || token === '') return { ok: false, error: 'device.json has no relay url/token' };
+      const response = await fetch(base + '/v1/remote/request', {
+        method: 'POST',
+        headers: { authorization: 'Bearer ' + token, 'content-type': 'application/json' },
+        body: JSON.stringify({ session_id: sessionId, target: machineId, viewer_public_key: publicKey }),
+      });
+      const body = await response.json().catch(() => null);
+      if (!response.ok || body?.ok !== true) return { ok: false, error: body?.error?.code ?? ('HTTP ' + response.status) };
+      return { ok: true, ttl_ms: body.ttl_ms ?? null };
+    } catch (error) {
+      return { ok: false, error: error instanceof Error ? error.message : String(error) };
+    }
+  };
+
+  const fetchRelayFrame = async ({ stateDir, sessionId, machineId }) => {
+    try {
+      const device = JSON.parse(readFileSync(join(stateDir, 'device.json'), 'utf8').replace(/^\uFEFF/, ''));
+      const base = String(device.rabbit_url ?? device.rabbitUrl ?? '').replace(/\/+$/, '');
+      const token = device.device_token ?? device.deviceToken ?? null;
+      if (base === '' || typeof token !== 'string') return { ok: false };
+      const url = base + '/v1/remote/frame?session_id=' + encodeURIComponent(sessionId) + '&target=' + encodeURIComponent(machineId);
+      const response = await fetch(url, { headers: { authorization: 'Bearer ' + token } });
+      if (!response.ok) return { ok: false, waiting: response.status === 404 };
+      const body = await response.json().catch(() => null);
+      if (body?.ok !== true || typeof body.ct !== 'string') return { ok: false };
+      return { ok: true, ct: body.ct, public_key: body.public_key ?? null };
+    } catch { return { ok: false }; }
+  };
+
   ctx.inject(['connection'], (webCtx) => {
     const registry = webCtx?.connection?.fetch;
     if (registry === undefined || typeof registry.register !== 'function') { status.reason = 'the connection service carries no fetch registry'; return; }
@@ -89,39 +123,50 @@ export function registerRemoteViewRoutes(ctx, deps = {}) {
         try { body = await request.json(); } catch { /* refused below */ }
         const machineId = typeof body?.machine_id === 'string' ? body.machine_id : '';
         if (machineId === '') return Response.json({ ok: false, error: 'a JSON body with {"machine_id": "..."} is required' }, { status: 400, headers: NO_STORE });
-        if (p2p?.node === null || p2p?.node === undefined) return Response.json({ ok: false, code: 'P2P_UNAVAILABLE', error: 'no P2P node on this host' }, { status: 503, headers: NO_STORE });
         await stopActive();
-        try { await p2p.node.start?.(); } catch (error) {
-          return Response.json({ ok: false, code: 'P2P_UNAVAILABLE', error: error instanceof Error ? error.message : String(error) }, { status: 503, headers: NO_STORE });
-        }
-        const dialled = await p2p.node.dial(machineId, {});
-        if (dialled?.ok !== true) return Response.json({ ok: false, code: 'P2P_UNAVAILABLE', error: dialled?.error ?? 'P2P_DIAL_FAILED' }, { status: 502, headers: NO_STORE });
+        const side = createViewSide();
         const sessionId = 'view-' + Date.now().toString(36);
-        active = { machineId, sessionId, channel: dialled.channel, side: createViewSide(), vk: null, encrypted: dialled.channel?.encryption?.encrypted === true, latest: null, error: null, startedAt: Date.now() };
-        listener = (event) => {
-          const frame = payloadJson(event?.payload);
-          if (frame === null || frame?.session_id !== sessionId) return;
-          if (frame.type === 'view.hello_ack') {
-            try {
-              active.vk = active.side.finish(frame.public_key).key;
-              active.encrypted = true;
-              void active.channel.send(JSON.stringify({ type: 'view.request', session_id: sessionId, machine_id: machineId, fps: 1, max_bytes: maxBytes }));
-            } catch { active.error = 'VIEW_VK_BAD'; }
-            return;
-          }
-          if (frame.type === 'view.frame') {
-            if (active.vk === null) { active.error = 'VIEW_VK_REQUIRED'; return; }
-            let plaintext;
-            try { plaintext = openViewFrame(active.vk, frame.ct); } catch { active.error = 'VIEW_VK_BAD'; return; }
-            if (plaintext.length > maxBytes) { active.error = 'VIEW_FRAME_TOO_LARGE'; return; }
-            active.latest = { seq: frame.seq ?? null, mime: frame.mime ?? 'image/jpeg', bytes: plaintext.length, data_base64: plaintext.toString('base64'), at: new Date().toISOString(), encrypted: true };
-          } else if (frame.type === 'view.error') {
-            active.error = frame.code ?? 'VIEW_ERROR';
-          }
-        };
-        p2p.node.on('message', listener);
-        await dialled.channel.send(JSON.stringify({ type: 'view.hello', session_id: sessionId, public_key: active.side.public_key }));
-        return Response.json({ ok: true, machine_id: machineId, session_id: sessionId, encrypted: active.encrypted, channel: 'p2p' }, { headers: NO_STORE });
+        let dialled = null;
+        let p2pError = null;
+        if (p2p?.node === null || p2p?.node === undefined) p2pError = 'no P2P node on this host';
+        else {
+          try { await p2p.node.start?.(); dialled = await p2p.node.dial(machineId, {}); } catch (error) { p2pError = error instanceof Error ? error.message : String(error); }
+          if (dialled?.ok !== true) p2pError = dialled?.error ?? 'P2P_DIAL_FAILED';
+        }
+        if (dialled?.ok === true) {
+          active = { mode: 'p2p', machineId, sessionId, channel: dialled.channel, side, vk: null, encrypted: dialled.channel?.encryption?.encrypted === true, latest: null, error: null, startedAt: Date.now() };
+          listener = (event) => {
+            const frame = payloadJson(event?.payload);
+            if (frame === null || frame?.session_id !== sessionId) return;
+            if (frame.type === 'view.hello_ack') {
+              try {
+                active.vk = active.side.finish(frame.public_key).key;
+                active.encrypted = true;
+                void active.channel.send(JSON.stringify({ type: 'view.request', session_id: sessionId, machine_id: machineId, fps: 1, max_bytes: maxBytes }));
+              } catch { active.error = 'VIEW_VK_BAD'; }
+              return;
+            }
+            if (frame.type === 'view.frame') {
+              if (active.vk === null) { active.error = 'VIEW_VK_REQUIRED'; return; }
+              let plaintext;
+              try { plaintext = openViewFrame(active.vk, frame.ct); } catch { active.error = 'VIEW_VK_BAD'; return; }
+              if (plaintext.length > maxBytes) { active.error = 'VIEW_FRAME_TOO_LARGE'; return; }
+              active.latest = { seq: frame.seq ?? null, mime: frame.mime ?? 'image/jpeg', bytes: plaintext.length, data_base64: plaintext.toString('base64'), at: new Date().toISOString(), encrypted: true };
+            } else if (frame.type === 'view.error') {
+              active.error = frame.code ?? 'VIEW_ERROR';
+            }
+          };
+          p2p.node.on('message', listener);
+          await dialled.channel.send(JSON.stringify({ type: 'view.hello', session_id: sessionId, public_key: active.side.public_key }));
+          return Response.json({ ok: true, machine_id: machineId, session_id: sessionId, encrypted: active.encrypted, channel: 'p2p' }, { headers: NO_STORE });
+        }
+        // P1.5: P2P failed, so ask the relay to carry an opaque frame later.
+        const relayRequest = await postRelayRequest({ stateDir: deps.stateDir, machineId, sessionId, publicKey: side.public_key });
+        if (relayRequest.ok !== true) {
+          return Response.json({ ok: false, code: 'P2P_UNAVAILABLE', error: p2pError, relay_error: relayRequest.error ?? null }, { status: 502, headers: NO_STORE });
+        }
+        active = { mode: 'relay', machineId, sessionId, channel: null, side, vk: null, encrypted: true, latest: null, error: null, startedAt: Date.now() };
+        return Response.json({ ok: true, machine_id: machineId, session_id: sessionId, encrypted: true, channel: 'relay', relay_ttl_ms: relayRequest.ttl_ms ?? null }, { headers: NO_STORE });
       },
     });
 
@@ -137,6 +182,19 @@ export function registerRemoteViewRoutes(ctx, deps = {}) {
       fetch: async () => {
         if (readConfig(file).enabled !== true) return Response.json({ ok: false, code: 'VIEW_DISABLED' }, { status: 403, headers: NO_STORE });
         if (active !== null) {
+          if (active.mode === 'relay' && active.latest === null) {
+            const got = await fetchRelayFrame({ stateDir: deps.stateDir, sessionId: active.sessionId, machineId: active.machineId });
+            if (got.ok === true) {
+              try {
+                if (active.vk === null) {
+                  if (typeof got.public_key !== 'string') { active.error = 'VIEW_VK_REQUIRED'; return Response.json({ ok: false, code: active.error }, { status: 502, headers: NO_STORE }); }
+                  active.vk = active.side.finish(got.public_key).key;
+                }
+                const plaintext = openViewFrame(active.vk, got.ct);
+                if (plaintext.length <= maxBytes) active.latest = { seq: null, mime: 'image/jpeg', bytes: plaintext.length, data_base64: plaintext.toString('base64'), at: new Date().toISOString(), encrypted: true, channel: 'relay' };
+              } catch { active.error = 'VIEW_VK_BAD'; }
+            }
+          }
           if (active.latest !== null) return Response.json({ ok: true, ...active.latest }, { headers: NO_STORE });
           if (active.error !== null) return Response.json({ ok: false, code: active.error }, { status: 502, headers: NO_STORE });
           return Response.json({ ok: false, code: 'VIEW_WAITING_FOR_FRAME', machine_id: active.machineId }, { status: 202, headers: NO_STORE });

package/src/plugin/tools.mjs

@@ -200,7 +200,7 @@ import { planProgress } from './joint-dev/progress.mjs';
 import { registerJointTools } from './tools-joint.mjs';
 import { fingerprintOf, readOperatorToken } from './operator-token.mjs';
 import { registerCaptureRoutes } from './capture-route.mjs';
-import { registerRemoteViewRoutes } from './remote-view-route.mjs';
+import { registerDesktop } from './desktop.mjs';
 import { defaultExecCapabilityFile } from '../util/exec-capability.mjs';
 import { createFleetCouncil, fleetCouncilThread } from './council-fleet.mjs';
 import { renderMemoryView } from './memory-view.mjs';
@@ -293,7 +293,7 @@ const MAX_STAGES = 16;
  * `package.json` during `scripts/pack.mjs` rather than hand-maintained, and `W2M_PLUGIN_VERSION`
  * overrides it at runtime for tests and packagers.
  */
-const PLUGIN_VERSION = '2.1.3';
+const PLUGIN_VERSION = '2.1.5';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
@@ -744,7 +744,8 @@ function readConfig(config = {}) {
   // silent default when a value *is* supplied.
   const p2p = resolveP2PMode(config);
   const p2pMode = p2p.mode;
-  const p2pPortResult = normalizeP2PPort(config.p2pPort);
+  const p2pPortResult = normalizeP2PPort(config.p2pPort);
+  const p2pPublicPortResult = normalizeP2PPort(config.p2pPublicPort);
   const stun = resolveStunServers(config);
   const stunList = stun.servers;
 
@@ -933,7 +934,8 @@ function readConfig(config = {}) {
       : (typeof process.env.W2M_BOOTSTRAP_OPERATOR_KEY === 'string' && process.env.W2M_BOOTSTRAP_OPERATOR_KEY.trim() !== '' ? process.env.W2M_BOOTSTRAP_OPERATOR_KEY : DEFAULT_BOOTSTRAP_OPERATOR_KEY_PEM),
     p2pMode,
     p2pPort: p2pPortResult.ok ? p2pPortResult.port : null,
-    p2pPortError: p2pPortResult.ok ? null : `P2P_PORT_INVALID: ${p2pPortResult.reason}`,
+    p2pPortError: p2pPortResult.ok ? null : `P2P_PORT_INVALID: ${p2pPortResult.reason}`,
+    p2pPublicPort: p2pPublicPortResult.ok ? p2pPublicPortResult.port : null,
     stunServers: stunList,
   };
 }
@@ -2035,7 +2037,8 @@ async function initP2P(ctx, cfg, runtime, block) {
     getJson: transport.getJson,
     stunServers: cfg.stunServers,
     log: (line) => ctx?.logger?.info?.(`w2m ${line}`),
-    ...(Number.isInteger(cfg.p2pPort) ? { bindPort: cfg.p2pPort } : {}),
+    ...(Number.isInteger(cfg.p2pPort) ? { bindPort: cfg.p2pPort } : {}),
+    ...(Number.isInteger(cfg.p2pPublicPort) ? { publicPort: cfg.p2pPublicPort } : {}),
     ...(keyLoad.key === null ? {} : { deviceKey: keyLoad.key }),
     ...block,
   });
@@ -3616,7 +3619,7 @@ export async function apply(ctx, config = {}) {
   // renderer getDisplayMedia/navigator.clipboard, so the chat panel needs a host route that does not
   // depend on those permissions.
   registerCaptureRoutes(ctx);
-  const remoteViewRoutes = registerRemoteViewRoutes(ctx, { stateDir: cfg.stateDir ?? '', p2p });
+  const remoteViewRoutes = registerDesktop(ctx, { stateDir: cfg.stateDir ?? '', p2p });
   if (remoteViewRoutes.mounted !== true) {
     ctx.logger?.info?.('w2m: remote-view routes inactive — ' + remoteViewRoutes.reason);
   }

package/src/relay/remote-media.mjs

@@ -48,14 +48,14 @@ export function createRemoteMediaBroker(options = {}) {
       return { ok: true, code: REMOTE_MEDIA_CODE.OK, session_id: sessionId, target: targetMachineId };
     },
     /** Store one opaque ciphertext frame (latest wins). */
-    put(sessionId, targetMachineId, ciphertext) {
+    put(sessionId, targetMachineId, ciphertext, publicKey = null) {
       prune();
       const entry = sessions.get(sessionId);
       if (entry === undefined) return { ok: false, code: REMOTE_MEDIA_CODE.NOT_FOUND };
       if (entry.target !== targetMachineId) return { ok: false, code: REMOTE_MEDIA_CODE.BAD_SESSION };
       if (!(ciphertext instanceof Uint8Array) || ciphertext.byteLength === 0) return { ok: false, code: REMOTE_MEDIA_CODE.BAD_PAYLOAD };
       if (ciphertext.byteLength > maxBytes) return { ok: false, code: REMOTE_MEDIA_CODE.TOO_LARGE };
-      entry.frame = { ciphertext: Buffer.from(ciphertext), bytes: ciphertext.byteLength, at: now() };
+      entry.frame = { ciphertext: Buffer.from(ciphertext), bytes: ciphertext.byteLength, public_key: typeof publicKey === 'string' ? publicKey : null, at: now() };
       entry.expiresAt = now() + ttlMs;
       return { ok: true, code: REMOTE_MEDIA_CODE.OK, bytes: ciphertext.byteLength };
     },
@@ -81,7 +81,8 @@ export function parseRemoteFrame(body) {
   if (typeof body.session_id !== 'string' || body.session_id === '') return { ok: false, code: REMOTE_MEDIA_CODE.BAD_SESSION };
   if (typeof body.target !== 'string' || body.target === '') return { ok: false, code: REMOTE_MEDIA_CODE.BAD_SESSION };
   if (typeof body.ct !== 'string' || body.ct === '') return { ok: false, code: REMOTE_MEDIA_CODE.BAD_PAYLOAD };
+  if (body.public_key !== undefined && (typeof body.public_key !== 'string' || Buffer.from(body.public_key, 'base64').length !== 32)) return { ok: false, code: REMOTE_MEDIA_CODE.BAD_PAYLOAD };
   let ciphertext;
   try { ciphertext = Buffer.from(body.ct, 'base64'); } catch { return { ok: false, code: REMOTE_MEDIA_CODE.BAD_PAYLOAD }; }
-  return { ok: true, session_id: body.session_id, target: body.target, ciphertext };
+  return { ok: true, session_id: body.session_id, target: body.target, ciphertext, public_key: body.public_key ?? null };
 }

package/src/relay/remote-requests.mjs

@@ -0,0 +1,55 @@
+/**
+ * P1.5 remote-view request mailbox (relay memory only).
+ *
+ * A viewer posts one request per target; the target consumes it. No disk, no
+ * logs, no plaintext media. Every entry expires, and the newest request wins so
+ * a stale viewer cannot pin a target forever.
+ */
+export const REMOTE_REQUEST_CODE = Object.freeze({
+  OK: 'REMOTE_REQUEST_OK',
+  BAD: 'REMOTE_REQUEST_BAD',
+  TOO_LARGE: 'REMOTE_REQUEST_TOO_LARGE',
+  NOT_FOUND: 'REMOTE_REQUEST_NOT_FOUND',
+  EXPIRED: 'REMOTE_REQUEST_EXPIRED',
+});
+
+export const DEFAULT_REMOTE_REQUEST_TTL_MS = 15_000;
+
+function isObject(value) { return value !== null && typeof value === 'object' && !Array.isArray(value); }
+
+export function createRemoteRequestBroker(options = {}) {
+  const ttlMs = Number.isInteger(options.ttlMs) ? options.ttlMs : DEFAULT_REMOTE_REQUEST_TTL_MS;
+  const now = typeof options.now === 'function' ? options.now : Date.now;
+  const requests = new Map();
+
+  const prune = () => { const at = now(); for (const [key, entry] of requests) if (entry.expiresAt <= at) requests.delete(key); };
+
+  return {
+    post(body) {
+      prune();
+      if (!isObject(body)) return { ok: false, code: REMOTE_REQUEST_CODE.BAD };
+      if (typeof body.session_id !== 'string' || body.session_id === '') return { ok: false, code: REMOTE_REQUEST_CODE.BAD };
+      if (typeof body.target !== 'string' || body.target === '') return { ok: false, code: REMOTE_REQUEST_CODE.BAD };
+      if (typeof body.viewer_public_key !== 'string' || body.viewer_public_key === '') return { ok: false, code: REMOTE_REQUEST_CODE.BAD };
+      const key = Buffer.from(body.viewer_public_key, 'base64');
+      if (key.length !== 32) return { ok: false, code: REMOTE_REQUEST_CODE.BAD };
+      requests.set(body.target, {
+        session_id: body.session_id,
+        target: body.target,
+        viewer_public_key: body.viewer_public_key,
+        expiresAt: now() + ttlMs,
+        at: now(),
+      });
+      return { ok: true, code: REMOTE_REQUEST_CODE.OK, target: body.target, ttl_ms: ttlMs };
+    },
+    /** Consume the pending request for one target; the target is the only reader. */
+    take(target) {
+      prune();
+      const entry = requests.get(target);
+      if (entry === undefined) return { ok: false, code: REMOTE_REQUEST_CODE.NOT_FOUND };
+      requests.delete(target);
+      return { ok: true, code: REMOTE_REQUEST_CODE.OK, session_id: entry.session_id, target: entry.target, viewer_public_key: entry.viewer_public_key, at: entry.at };
+    },
+    stats() { prune(); return { targets: requests.size, ttl_ms: ttlMs }; },
+  };
+}

package/src/relay/server.mjs

@@ -34,6 +34,7 @@ export const RELAY_FEATURES = Object.freeze([
   'relay-version-v1',
   'chat-text-only-v1',
   'chat-enc-v2',
+  'remote-view-v1',
 ]);
 import fs from 'node:fs';
 import os from 'node:os';
@@ -61,6 +62,7 @@ export const BLOB_FRAME_BYTES = 16 * 1024 * 1024; // 16 MiB per blob frame -- th
 // the JSON frame limit stays 64 KiB for every other route.
 import { createFleetMessages } from './fleet-messages.mjs';
 import { createRemoteMediaBroker, parseRemoteFrame } from './remote-media.mjs';
+import { createRemoteRequestBroker } from './remote-requests.mjs';
 import { can as mayAct } from '../util/policy-matrix.mjs';
 import { createFleetMemory } from './fleet-memory.mjs';
 import { createJoinChallenges } from './join-challenge.mjs';
@@ -1451,6 +1453,30 @@ export class RelayServer {
     this.fleetMessages ??= createFleetMessages({ now: () => this.state.nowMs() });
     this.fleetMemory ??= createFleetMemory({ now: () => this.state.nowMs() });
 
+    if (path === '/v1/remote/request') {
+      // P1.5 signalling: one pending request per target, relay memory only.
+      this.remoteRequests ??= createRemoteRequestBroker();
+      if (method === 'POST') {
+        const body = takeJson();
+        const target = typeof body?.target === 'string' ? body.target : '';
+        const targetDevice = target === '' ? null : this.state.devices.get(target);
+        if (targetDevice === undefined || targetDevice === null || targetDevice.fleet_id !== device.fleet_id) {
+          return sendJson(res, 403, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: 'REMOTE_REQUEST_BAD', message: 'target is not in this fleet' } });
+        }
+        const posted = this.remoteRequests.post(body);
+        if (posted.ok !== true) return sendJson(res, 400, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: posted.code, message: 'remote.request refused' } });
+        return sendJson(res, 200, { protocol_version: PROTOCOL_VERSION, ok: true, target: posted.target, ttl_ms: posted.ttl_ms });
+      }
+      if (method === 'GET') {
+        const target = url.searchParams.get('target');
+        if (target !== device.machine_id) return sendJson(res, 403, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: 'REMOTE_REQUEST_BAD', message: 'only the target may read its request' } });
+        const taken = this.remoteRequests.take(target);
+        if (taken.ok !== true) return sendJson(res, 404, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: taken.code, message: 'remote.request unavailable' } });
+        return sendJson(res, 200, { protocol_version: PROTOCOL_VERSION, ok: true, ...taken });
+      }
+      return sendJson(res, 405, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: 'METHOD_NOT_ALLOWED', message: 'GET or POST only' } });
+    }
+
     if (path === '/v1/remote/frame') {
       // P1.5: opaque ciphertext only. The body is never logged, parsed as media
       // or persisted; the broker keeps one newest frame per session with a TTL.
@@ -1466,7 +1492,7 @@ export class RelayServer {
         }
         const opened = this.remoteMedia.open(parsed.session_id, parsed.target);
         if (opened.ok !== true) return sendJson(res, 400, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: opened.code, message: 'remote.frame refused' } });
-        const stored = this.remoteMedia.put(parsed.session_id, parsed.target, parsed.ciphertext);
+        const stored = this.remoteMedia.put(parsed.session_id, parsed.target, parsed.ciphertext, parsed.public_key);
         if (stored.ok !== true) return sendJson(res, 413, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: stored.code, message: 'remote.frame refused' } });
         return sendJson(res, 200, { protocol_version: PROTOCOL_VERSION, ok: true, bytes: stored.bytes });
       }
@@ -1475,7 +1501,7 @@ export class RelayServer {
         const target = url.searchParams.get('target');
         const taken = this.remoteMedia.take(sessionId, target);
         if (taken.ok !== true) return sendJson(res, 404, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: taken.code, message: 'remote.frame unavailable' } });
-        return sendJson(res, 200, { protocol_version: PROTOCOL_VERSION, ok: true, ct: taken.ciphertext.toString('base64'), bytes: taken.bytes, at_ms: taken.at });
+        return sendJson(res, 200, { protocol_version: PROTOCOL_VERSION, ok: true, ct: taken.ciphertext.toString('base64'), public_key: taken.public_key ?? null, bytes: taken.bytes, at_ms: taken.at });
       }
       return sendJson(res, 405, { protocol_version: PROTOCOL_VERSION, ok: false, error: { code: 'METHOD_NOT_ALLOWED', message: 'GET or POST only' } });
     }