termdock 1.4.373 → 1.4.374

package/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let c={};const r=e=>i(e,o),d={module:{uri:o},exports:c,require:r};s[o]=Promise.all(n.map(e=>d[e]||r(e))).then(e=>(a(...e),c))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"5f1c94bda5ff80a2e178782ee1c72bec"},{url:"assets/app-window-mac-ClMV30iq.js",revision:null},{url:"assets/app-window-HhRRMsgc.js",revision:null},{url:"assets/app-BckfITLP.js",revision:null},{url:"assets/react-l0sNRNKZ.js",revision:null},{url:"assets/dnd-CYu7YLJF.js",revision:null},{url:"assets/terminal-DaiFCKy_.js",revision:null},{url:"assets/index-BTNj_3HK.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});
+if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const c=e=>i(e,o),d={module:{uri:o},exports:r,require:c};s[o]=Promise.all(n.map(e=>d[e]||c(e))).then(e=>(a(...e),r))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"387eb34317c54ffff64cf4dd690cc855"},{url:"assets/app-window-mac-DICw9L5R.js",revision:null},{url:"assets/app-window-C-hRYXQG.js",revision:null},{url:"assets/app-DTAZ_mHv.js",revision:null},{url:"assets/react-l0sNRNKZ.js",revision:null},{url:"assets/dnd-CYu7YLJF.js",revision:null},{url:"assets/terminal-DaiFCKy_.js",revision:null},{url:"assets/index-Bxti5y6a.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});

package/dist/server/agent/collaborationEndpoints.js

@@ -0,0 +1,27 @@
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+/** Persisted collaboration origins name sessions. Dial only the administrator's
+ * current pinned addresses when available, without weakening their trust mode. */
+export async function withPeerEndpoint(peer, targets, baseDir, connect) {
+    const configured = targets.filter(target => target.serviceId === peer.serviceId);
+    if (!configured.length) {
+        const hostname = new URL(peer.origin).hostname;
+        if (['localhost', '127.0.0.1', '[::1]'].includes(hostname) || hostname.endsWith('.localhost'))
+            throw new Error('WAITING_FOR_PEER_CONNECTION');
+        return connect(peer);
+    }
+    let failure;
+    for (const target of configured) {
+        try {
+            const origin = new URL(target.url.replace(/^wss:/, 'https:')).origin;
+            const node = { serviceId: peer.serviceId, origin, ...(target.caFingerprint256 ? { caFingerprint256: target.caFingerprint256 } : {}) };
+            const ca = target.caPath ? readFileSync(resolve(baseDir, target.caPath)) : undefined;
+            return await connect(node, ca, target.certificateFingerprint256);
+        }
+        catch (error) {
+            failure = error;
+        }
+    }
+    // An explicit saved pin supersedes the legacy origin, including on failure.
+    throw failure;
+}

package/dist/server/agent/collaborationPeerTransport.js

@@ -26,6 +26,14 @@ function localSession(origin, id) {
     const prefix = `remote:${encodeURIComponent(origin)}:`;
     return id.startsWith(prefix) ? decodeURIComponent(id.slice(prefix.length)) : id;
 }
+function mapAlias(id, source, target, peer, local) {
+    for (const [from, to] of [[source, peer], [target, local]]) {
+        const prefix = `remote:${encodeURIComponent(from)}:`;
+        if (id.startsWith(prefix))
+            return remoteSession(to, decodeURIComponent(id.slice(prefix.length)));
+    }
+    return id;
+}
 export function validateCollaborationNode(input) {
     const url = new URL(input.origin);
     if (url.protocol !== 'https:' || url.origin !== input.origin || url.username || url.password
@@ -264,6 +272,16 @@ export class CollaborationPeerTransport {
     receive(subjectId, packet) {
         const b = this.binding(subjectId, String(packet.groupId));
         const store = this.options.store;
+        if (packet.targetServiceId !== undefined) {
+            if (packet.targetServiceId !== this.options.serviceId || typeof packet.sourceOrigin !== 'string' || typeof packet.targetOrigin !== 'string')
+                throw new Error('INVALID_PEER_MESSAGE');
+            validateCollaborationNode({ serviceId: subjectId, origin: packet.sourceOrigin });
+            validateCollaborationNode({ serviceId: this.options.serviceId, origin: packet.targetOrigin });
+            const source = packet.sourceOrigin, target = packet.targetOrigin;
+            const map = (id) => mapAlias(id, source, target, b.peer.origin, b.localOrigin);
+            packet = { ...packet, ...(packet.context ? { context: mapContext(packet.context, map) } : {}),
+                ...(packet.message ? { message: { ...packet.message, toSessionId: map(packet.message.toSessionId) } } : {}) };
+        }
         if (packet.context)
             store.mergeContext(b.groupId, mapContext(packet.context, id => localSession(b.localOrigin, id)));
         if (packet.message) {
@@ -311,7 +329,8 @@ export class CollaborationPeerTransport {
         });
         const group = store.getGroup(b.groupId);
         const activity = this.options.activity?.().filter(item => group.sessionIds.includes(item.sessionId) && !item.sessionId.startsWith('remote:')) ?? [];
-        return { activity, context: mapContext(store.context(b.groupId), id => id.startsWith('remote:') ? id : remoteSession(b.localOrigin, id)), receipts, receivedIds: packet.ids.filter(id => {
+        return { sourceOrigin: b.localOrigin, targetOrigin: b.peer.origin, targetServiceId: b.peer.serviceId,
+            activity, context: mapContext(store.context(b.groupId), id => id.startsWith('remote:') ? id : remoteSession(b.localOrigin, id)), receipts, receivedIds: packet.ids.filter(id => {
                 const message = store.getMessage(id);
                 return message?.groupId === b.groupId && message.fromSessionId?.startsWith(`remote:${encodeURIComponent(b.peer.origin)}:`) && !message.toSessionId.startsWith('remote:');
             }) };
@@ -393,6 +412,7 @@ export class CollaborationPeerTransport {
                 const payloads = requests.length ? requests : [undefined];
                 for (const message of payloads) {
                     const result = await client.request({ type: 'collaboration-exchange', groupId: b.groupId,
+                        sourceOrigin: b.localOrigin, targetOrigin: b.peer.origin, targetServiceId: b.peer.serviceId,
                         context: mapContext(store.context(b.groupId), id => id.startsWith('remote:') ? id : remoteSession(b.localOrigin, id)),
                         ids: batch.map(m => m.id), known: batch.map(m => ({ id: m.id, status: m.status, deliveredAt: m.deliveredAt, hasSnapshot: !!m.snapshot, shellConfirmed: m.shellConfirmed, last_error: store.diagnostic(m.id)?.last_error ?? null })), ...(message ? { message } : {}) });
                     if (Array.isArray(result.activity))
@@ -403,8 +423,18 @@ export class CollaborationPeerTransport {
                             if (store.getGroup(b.groupId)?.sessionIds.includes(id))
                                 store.recordPeerActivity(id, item.last_terminal_output_at, item.activity_observed_at);
                         }
-                    if (result.context)
-                        store.mergeContext(b.groupId, mapContext(result.context, id => localSession(b.localOrigin, id)));
+                    if (result.context) {
+                        let context = result.context;
+                        if (result.targetServiceId !== undefined) {
+                            if (result.targetServiceId !== this.options.serviceId || typeof result.sourceOrigin !== 'string' || typeof result.targetOrigin !== 'string')
+                                throw new Error('INVALID_PEER_MESSAGE');
+                            validateCollaborationNode({ serviceId: b.peer.serviceId, origin: result.sourceOrigin });
+                            validateCollaborationNode({ serviceId: this.options.serviceId, origin: result.targetOrigin });
+                            const source = result.sourceOrigin, target = result.targetOrigin;
+                            context = mapContext(context, id => mapAlias(id, source, target, b.peer.origin, b.localOrigin));
+                        }
+                        store.mergeContext(b.groupId, mapContext(context, id => localSession(b.localOrigin, id)));
+                    }
                     if (Array.isArray(result.receivedIds))
                         for (const item of batch) {
                             if (result.receivedIds.includes(item.id))

package/dist/server/agent/collaborationService.js

@@ -95,6 +95,38 @@ export class CollaborationService {
         this.persist();
     }
     descriptor() { return { ...this.options.node(), ...(this.document.origin ? { origin: this.document.origin } : {}) }; }
+    /** Origins in persisted session ids are local aliases, not service identities.
+     * Retain those aliases across address changes; service id and CA stay pinned.
+     * Namespace loopback peers so two different Macs never share one alias. */
+    canonicalNodes(nodes, origin) {
+        const ids = new Set();
+        return nodes.map(node => {
+            validateCollaborationNode(node);
+            if (ids.has(node.serviceId))
+                throw new Error('DUPLICATE_SERVICE_DIRECTORY');
+            ids.add(node.serviceId);
+            if (node.serviceId === this.options.node().serviceId) {
+                if (node.caFingerprint256 !== this.options.node().caFingerprint256)
+                    throw new Error('LOCAL_NODE_MISMATCH');
+                return { ...node, origin };
+            }
+            const old = this.document.peers.find(peer => peer.serviceId === node.serviceId);
+            if (old) {
+                if (old.caFingerprint256 !== node.caFingerprint256)
+                    throw new Error('PEER_IDENTITY_CHANGED');
+                return { ...old };
+            }
+            const host = new URL(node.origin).hostname;
+            const loopbackCollision = ['localhost', '127.0.0.1', '[::1]'].includes(host)
+                && (node.origin === origin || this.document.peers.some(peer => peer.origin === node.origin)
+                    || nodes.some(other => other.serviceId !== node.serviceId && other.origin === node.origin));
+            const alias = loopbackCollision
+                ? `https://${node.serviceId.toLowerCase()}.localhost` : node.origin;
+            if (alias === origin || this.document.peers.some(peer => peer.origin === alias))
+                throw new Error('PEER_IDENTITY_CHANGED');
+            return { ...node, origin: alias };
+        });
+    }
     /** Only fully paired directory peers may route opaque encrypted traffic to
      * another fully paired peer. A shared-session registration never qualifies. */
     canRoute(subject, target) {
@@ -126,6 +158,17 @@ export class CollaborationService {
     receiveDirect(peer, packet) {
         if (!this.options.deliver || this.effectiveScope(peer.serviceId) !== undefined)
             throw new Error('SESSION_SCOPE_DENIED');
+        if (packet.targetServiceId !== undefined) {
+            if (packet.targetServiceId !== this.options.node().serviceId || typeof packet.targetOrigin !== 'string')
+                throw new Error('INVALID_DIRECT_MESSAGE');
+            validateCollaborationNode({ serviceId: packet.targetServiceId, origin: packet.targetOrigin });
+            const normalize = (id) => {
+                const target = directRemoteAddress(id);
+                return target && target.origin === packet.targetOrigin ? remoteSession(this.node().origin, target.id) : id;
+            };
+            packet = { ...packet, ...(typeof packet.targetSessionId === 'string' ? { targetSessionId: normalize(packet.targetSessionId) } : {}),
+                ...(packet.message ? { message: { ...packet.message, toSessionId: normalize(packet.message.toSessionId) } } : {}) };
+        }
         if (!packet.message) {
             const target = typeof packet.targetSessionId === 'string' ? directRemoteAddress(packet.targetSessionId) : null;
             if (!target || target.origin !== this.node().origin || !directLocalId(packet.fromSessionId)
@@ -198,8 +241,10 @@ export class CollaborationService {
                     try {
                         const client = await this.client(peer);
                         const body = { type: 'collaboration-service', action: 'direct-message', message,
+                            targetServiceId: peer.serviceId, targetOrigin: peer.origin,
                             sourceName: this.options.sessions().find(session => session.sessionId === message.fromSessionId)?.name };
                         let result = previous?.remote_received_at ? await client.request({ type: 'collaboration-service', action: 'direct-message',
+                            targetServiceId: peer.serviceId, targetOrigin: peer.origin,
                             messageId: message.id, fromSessionId: message.fromSessionId, targetSessionId: message.toSessionId, shellConfirmed: message.shellConfirmed === true })
                             : await client.request(body);
                         if (result.directContacts === 1 && result.missing === message.id)
@@ -269,17 +314,9 @@ export class CollaborationService {
         const own = nodes.find(node => node?.serviceId === self.serviceId);
         if (!own || own.origin !== origin || own.caFingerprint256 !== self.caFingerprint256)
             throw new Error('LOCAL_NODE_MISMATCH');
-        const ids = new Set(), origins = new Set();
-        for (const node of nodes) {
-            validateCollaborationNode(node);
-            if (ids.has(node.serviceId) || origins.has(node.origin))
-                throw new Error('DUPLICATE_SERVICE_DIRECTORY');
-            ids.add(node.serviceId);
-            origins.add(node.origin);
-            const old = this.document.peers.find(peer => peer.serviceId === node.serviceId || peer.origin === node.origin);
-            if (old && (old.serviceId !== node.serviceId || old.origin !== node.origin || old.caFingerprint256 !== node.caFingerprint256))
-                throw new Error('PEER_IDENTITY_CHANGED');
-        }
+        nodes = this.canonicalNodes(nodes, origin);
+        if (new Set(nodes.map(node => node.origin)).size !== nodes.length)
+            throw new Error('DUPLICATE_SERVICE_DIRECTORY');
         const removed = new Set(this.document.removedPeers?.map(peer => peer.serviceId));
         const eligible = nodes.filter(node => node.serviceId !== self.serviceId && !removed.has(node.serviceId));
         if (new Set([...this.document.peers.map(peer => peer.serviceId), ...eligible.map(node => node.serviceId)]).size > 63)
@@ -448,7 +485,10 @@ export class CollaborationService {
         }
         if (packet.action === 'group') {
             const canonical = packet.group;
-            if (!canonical?.sessionIds?.some(id => address(id)?.origin === peer.origin) && !this.document.replicas?.[canonical?.id]?.includes(peer.origin))
+            const sender = Array.isArray(packet.nodes) ? packet.nodes.find(node => node.serviceId === subject) : undefined;
+            if (!sender || sender.caFingerprint256 !== peer.caFingerprint256)
+                throw new Error('PEER_IDENTITY_CHANGED');
+            if (!canonical?.sessionIds?.some(id => address(id)?.origin === sender.origin) && !this.document.replicas?.[canonical?.id]?.includes(peer.origin))
                 throw new Error('GROUP_SENDER_NOT_MEMBER');
             this.merge(canonical, packet.nodes, peer);
             return { ok: true };
@@ -474,12 +514,17 @@ export class CollaborationService {
             || canonical.sessionIds.length < 2 || canonical.sessionIds.length > 500 || typeof canonical.name !== 'string' || !canonical.name.trim() || COLLAB_NAME_FORBIDDEN.test(canonical.name)
             || !Number.isFinite(canonical.updatedAt) || canonical.updatedAt > Date.now() + 60_000 || !Array.isArray(nodes) || nodes.length > 65)
             throw new Error('INVALID_GROUP');
-        for (const node of nodes) {
-            validateCollaborationNode(node);
-            const trusted = this.document.peers.find(peer => peer.serviceId === node.serviceId || peer.origin === node.origin);
-            if (trusted && (trusted.serviceId !== node.serviceId || trusted.origin !== node.origin || trusted.caFingerprint256 !== node.caFingerprint256))
-                throw new Error('PEER_IDENTITY_CHANGED');
-        }
+        // Convert the sender's unambiguous aliases through pinned service ids before
+        // comparing membership. Never rewrite stored messages or another peer's CA.
+        if (new Set(nodes.map(node => node?.origin)).size !== nodes.length)
+            throw new Error('DUPLICATE_SERVICE_DIRECTORY');
+        const normalized = this.canonicalNodes(nodes, this.node().origin);
+        const aliases = new Map(nodes.map((node, index) => [node.origin, normalized[index].origin]));
+        canonical = mapGroup(canonical, id => {
+            const target = address(id);
+            return target && aliases.has(target.origin) ? remoteSession(aliases.get(target.origin), target.id) : id;
+        });
+        nodes = normalized;
         const self = this.node(), own = nodes.find(node => node.serviceId === self.serviceId);
         if (!own || own.origin !== self.origin || own.caFingerprint256 !== self.caFingerprint256)
             throw new Error('LOCAL_NODE_MISMATCH');

package/dist/server/entry.js

@@ -19,6 +19,7 @@ import { DirectTargetRegistry } from './federation/directTargetRegistry.js';
 import { secureChannelOriginAllowed } from './federation/originPolicy.js';
 import { RelayRouter } from './federation/relay.js';
 import { DesktopSelfRelay } from './federation/selfRelay.js';
+import { withPeerEndpoint } from './agent/collaborationEndpoints.js';
 import { assertPublicSecurity, securityHeaders } from './utils/publicSecurity.js';
 import { apiCachePolicy } from './utils/apiCachePolicy.js';
 import 'dotenv/config';
@@ -552,7 +553,11 @@ export function startServer(options = {}) {
         },
         listRouteTargets: () => {
             refreshDirectTargets();
-            return routeAccess.configuredTargets().map(target => directTargetRegistry.describe(target));
+            return routeAccess.configuredTargets().map(target => {
+                const description = directTargetRegistry.describe(target);
+                const metadata = routeAccess.selfRelayMetadata(target.serviceId);
+                return { ...metadata, ...description, ...(description.label || metadata.hostname ? { label: description.label || metadata.hostname } : {}) };
+            });
         },
         listRouteAccess: () => routeInvitations?.list() || [],
         grantRouteAccess: async (issuerId, targetServiceId, subjectId, url) => {
@@ -581,7 +586,7 @@ export function startServer(options = {}) {
                 throw new Error(failure);
             return routeAccess.issueRouteTicket(subjectId, serviceId);
         },
-        issueSelfRelayTicket: (serviceId) => routeAccess.issueSelfRelayTicket(serviceId),
+        issueSelfRelayTicket: (serviceId, metadata) => routeAccess.issueSelfRelayTicket(serviceId, metadata),
         hasRouteGrant: (subjectId, serviceId) => routeInvitations?.allows(subjectId, serviceId) === true || collaborationTransport?.canRoute(subjectId, serviceId) === true || collaborationService?.canRoute(subjectId, serviceId) === true,
         createRouteInvitation: (issuerId, serviceId) => {
             if (!routeInvitations)
@@ -606,25 +611,24 @@ export function startServer(options = {}) {
                 return collaborationTransport.receive(subjectId, packet);
             throw new Error('COLLABORATION_UNAVAILABLE');
         };
-        const connectPeer = (peer) => {
-            if (['localhost', '127.0.0.1', '[::1]'].includes(new URL(peer.origin).hostname))
-                throw new Error('WAITING_FOR_PEER_CONNECTION');
-            return connectCollaborationRpc(runtime.identity, peer, undefined, packet => receiveCollaboration(peer.serviceId, packet));
-        };
+        const peerEndpoint = (peer, connect) => withPeerEndpoint(peer, routeAccess.configuredDirectTargets(), path.join(homedir(), '.termdock', 'federation'), connect);
+        const connectPeer = (peer) => peerEndpoint(peer, (node, ca, pin) => connectCollaborationRpc(runtime.identity, node, undefined, packet => receiveCollaboration(peer.serviceId, packet), ca, pin));
         const connectVia = async (peer, via) => {
-            const entry = await connectCollaborationRpc(runtime.identity, via);
-            try {
-                const ticket = await entry.request({ type: 'route-ticket', serviceId: peer.serviceId });
-                if (typeof ticket.routeToken !== 'string')
-                    throw new Error('ROUTE_UNAVAILABLE');
-                const url = new URL('/api/federation/relay', via.origin.replace(/^https:/, 'wss:'));
-                url.searchParams.set('routeToken', ticket.routeToken);
-                // TLS authenticates the entry; Noise pins the final destination.
-                return await connectCollaborationRpc(runtime.identity, { ...via, serviceId: peer.serviceId }, url.href, packet => receiveCollaboration(peer.serviceId, packet));
-            }
-            finally {
-                entry.close();
-            }
+            return peerEndpoint(via, async (endpoint, ca, pin) => {
+                const entry = await connectCollaborationRpc(runtime.identity, endpoint, undefined, undefined, ca, pin);
+                try {
+                    const ticket = await entry.request({ type: 'route-ticket', serviceId: peer.serviceId });
+                    if (typeof ticket.routeToken !== 'string')
+                        throw new Error('ROUTE_UNAVAILABLE');
+                    const url = new URL('/api/federation/relay', endpoint.origin.replace(/^https:/, 'wss:'));
+                    url.searchParams.set('routeToken', ticket.routeToken);
+                    // TLS authenticates the entry; Noise pins the final destination.
+                    return await connectCollaborationRpc(runtime.identity, { ...endpoint, serviceId: peer.serviceId }, url.href, packet => receiveCollaboration(peer.serviceId, packet), ca, pin);
+                }
+                finally {
+                    entry.close();
+                }
+            });
         };
         collaborationTransport = new CollaborationPeerTransport({
             reverse: reverseCollaboration,
@@ -860,7 +864,12 @@ export function startServer(options = {}) {
             }).catch(error => console.warn('[quic] Encrypted WebSocket remains available:', error instanceof Error ? error.message : 'Transport unavailable'));
         }
         const onboardingServerState = scheme === 'https'
-            ? startOnboardingServer({ httpsPort: listeningPort, caCertPath: options.httpsCaPath })
+            ? startOnboardingServer({ httpsPort: listeningPort, caCertPath: options.httpsCaPath,
+                clientPath: app.locals.runtimeClientPath,
+                acceptEncrypted: ws => { void federation.then(runtime => runtime.accept(ws, { allowOpenAccess: false })).catch(() => ws.close(1011, 'Encrypted access unavailable')); },
+                relayPrincipal: token => routeAccess.authenticate(undefined, token),
+                acceptRelay: (ws, principal) => relayRouter.attach(ws, principal),
+            })
             : { server: null, url: null };
         void localAccessManager.start({ host: listeningHost, port: listeningPort, scheme, caCertPath: options.httpsCaPath, onboardingPort: options.onboardingPort ?? listeningPort }).then((state) => {
             const publishState = () => {

package/dist/server/federation/connectionModel.js

@@ -9,9 +9,8 @@ export function normalizeServiceAddress(value) {
         url.protocol = 'https:';
     if (url.protocol === 'ws:')
         url.protocol = 'http:';
-    const loopback = ['localhost', '127.0.0.1', '[::1]'].includes(url.hostname);
-    if (!['https:', 'http:'].includes(url.protocol) || url.protocol === 'http:' && !loopback)
-        throw new Error('请使用 HTTPS 服务地址。');
+    if (!['https:', 'http:'].includes(url.protocol))
+        throw new Error('请使用 HTTP 或 HTTPS 服务地址。');
     if (url.username || url.password || url.search || url.hash || !['/', '/api/federation/secure'].includes(url.pathname))
         throw new Error('请输入服务首页地址，不要包含账号或额外参数。');
     return url.origin;

package/dist/server/federation/routeAccess.js

@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync, mkdirSync, renameSync } from 'node:fs';
 import { dirname } from 'node:path';
 import { createHash, randomBytes, timingSafeEqual } from 'node:crypto';
+import { relayServiceMetadata } from './serviceMetadata.js';
 const validId = (x) => typeof x === 'string' && /^[a-zA-Z0-9_.:-]{1,160}$/.test(x);
 const digest = (s) => createHash('sha256').update(s).digest();
 /** Target directory is re-read on every permission check; invalid config denies all. */
@@ -12,6 +13,8 @@ export class RouteAccess {
     additionalTargetIds;
     tickets = new Map();
     selfRelayTickets = new Map();
+    serviceMetadata = new Map();
+    selfRelayMetadata(serviceId) { return { ...this.serviceMetadata.get(serviceId) }; }
     constructor(filePath, now = Date.now, canRouteSubject = () => false, additionalTargets = () => [], additionalTargetIds = () => []) {
         this.filePath = filePath;
         this.now = now;
@@ -68,7 +71,7 @@ export class RouteAccess {
     /** A Noise-authenticated service can advertise only its own identity. The
      * short-lived token merely transfers that identity onto the relay socket; it
      * grants neither route use nor target-service access. */
-    issueSelfRelayTicket(serviceId) {
+    issueSelfRelayTicket(serviceId, metadata) {
         if (!validId(serviceId))
             throw new Error('INVALID_SELF_RELAY_IDENTITY');
         for (const [key, value] of this.selfRelayTickets)
@@ -78,7 +81,7 @@ export class RouteAccess {
             throw new Error('SELF_RELAY_TICKET_LIMIT');
         const selfRelayToken = randomBytes(32).toString('base64url');
         const expiresAt = this.now() + 30_000;
-        this.selfRelayTickets.set(digest(selfRelayToken).toString('hex'), { serviceId, expiresAt });
+        this.selfRelayTickets.set(digest(selfRelayToken).toString('hex'), { serviceId, expiresAt, metadata: relayServiceMetadata(metadata) });
         return { selfRelayToken, expiresAt };
     }
     /** Single-use, fail-closed transfer from the authenticated Noise channel to
@@ -91,6 +94,12 @@ export class RouteAccess {
         this.selfRelayTickets.delete(key);
         if (!ticket || ticket.expiresAt <= this.now())
             return null;
+        // Publish only after the single-use ticket is consumed. It is bound to the
+        // authenticated service ID, cannot authorize routes, and is never persisted.
+        this.serviceMetadata.delete(ticket.serviceId);
+        if (this.serviceMetadata.size >= 256)
+            this.serviceMetadata.delete(this.serviceMetadata.keys().next().value);
+        this.serviceMetadata.set(ticket.serviceId, ticket.metadata);
         return { kind: 'self-relay', serviceId: ticket.serviceId };
     }
     /** Called once before upgrading. A route ticket is consumed even if expired. */

package/dist/server/federation/runtime.js

@@ -469,7 +469,7 @@ export async function createFederationRuntime(app, directory, handlers, options
                     else if (packet.type === 'self-relay-ticket') {
                         if (!options.issueSelfRelayTicket)
                             throw new Error('SELF_RELAY_UNAVAILABLE');
-                        send({ type: 'result', id: packet.id, serviceId: subjectId, ...options.issueSelfRelayTicket(subjectId) });
+                        send({ type: 'result', id: packet.id, serviceId: subjectId, ...options.issueSelfRelayTicket(subjectId, packet.metadata) });
                     }
                     else if (packet.type === 'route-invite-create') {
                         if (packet.serviceId === serviceId)

package/dist/server/federation/selfRelay.js

@@ -1,6 +1,8 @@
 import WebSocket from 'ws';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
+import { hostname } from 'node:os';
+import { getTermdockVersion } from '../utils/version.js';
 import { desktopDirectTargets } from './desktopTargets.js';
 import { RelayClient } from './relay.js';
 import { openServiceSocket } from './serviceTransport.js';
@@ -103,7 +105,7 @@ export class DesktopSelfRelay {
         const rpc = await connectCollaborationRpc(this.options.identity, peer, undefined, undefined, configuredCa, target.certificateFingerprint256, state.lifetime.signal);
         let selfRelayToken;
         try {
-            const result = await rpc.request({ type: 'self-relay-ticket' });
+            const result = await rpc.request({ type: 'self-relay-ticket', metadata: { hostname: hostname(), platform: process.platform, version: getTermdockVersion() } });
             if (result.serviceId !== this.options.serviceId || typeof result.selfRelayToken !== 'string'
                 || !/^[A-Za-z0-9_-]{43}$/.test(result.selfRelayToken))
                 throw new Error('INVALID_SELF_RELAY_TICKET');

package/dist/server/federation/serviceMetadata.js

@@ -0,0 +1,11 @@
+export function relayServiceMetadata(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return {};
+    const source = value;
+    const text = (key, max) => typeof source[key] === 'string' && source[key].length <= max
+        && !/[\p{Cc}\p{Cf}]/u.test(source[key]) ? source[key].trim() || undefined : undefined;
+    const hostname = text('hostname', 120), platform = text('platform', 24), version = text('version', 48);
+    return { ...(hostname ? { hostname } : {}),
+        ...(['darwin', 'linux', 'win32', 'freebsd', 'openbsd', 'aix', 'sunos', 'android'].includes(platform || '') ? { platform } : {}),
+        ...(version && /^\d+\.\d+\.\d+(?:[-+][\w.-]+)?$/.test(version) ? { version } : {}) };
+}

package/dist/server/federation/serviceTransport.js

@@ -31,6 +31,8 @@ export async function serviceTlsOptions(address, trust = {}, baseDir = process.c
  * entry's ready frame. No business bytes are sent during TLS pin inspection. */
 export async function createServiceSocket(address, trust = {}, options = {}) {
     const url = new URL(address);
+    if (url.protocol === 'ws:' && !['127.0.0.1', 'localhost', '[::1]'].includes(url.hostname))
+        throw new Error('Remote service transport requires HTTPS');
     const origin = normalizeServiceAddress(url.origin.replace(/^wss:/, 'https:').replace(/^ws:/, 'http:'));
     if (!['wss:', 'ws:'].includes(url.protocol) || url.username || url.password || url.hash
         || !['/api/federation/secure', '/api/federation/relay', '/api/federation/relay-target'].includes(url.pathname)

package/dist/server/onboardingPage.js

@@ -55,7 +55,7 @@ ${loadOnboardingTheme()}
 ${Object.entries(instructions).map(([key, value]) => `<ol data-device="${key}"${key === device ? '' : ' hidden'}>${value.steps.map(step => `<li>${escapeHtml(step)}</li>`).join('')}</ol>`).join('')}
 <a id="download" class="action primary" href="/onboarding/ca.crt" download="termdock-ca.crt">下载证书</a><p id="download-status" class="muted" role="status"></p></section>
 <section><h2>2. 返回这里，继续访问</h2><p class="muted">已在系统中完成信任，或以前安装过此证书？可以直接继续。</p><a id="continue" class="action" href="${escapeHtml(target.href)}">继续访问</a><p class="muted">若仍出现证书错误，请返回检查是否已开启信任，不必跳过浏览器警告。</p></section>
-<details><summary>核对证书与安全说明</summary><p>此引导页通过 HTTP 提供，无法单凭这个页面确认设备身份。请通过你已信任的对话渠道，与分享者核对以下 SHA-256 指纹后再安装。</p><code>${escapeHtml(fingerprint)}</code><p>目标地址：<span class="host">${escapeHtml(target.origin)}</span></p><p>下载证书不会自动获得系统信任，也不会自动接受分享邀请。进入 HTTPS 页面后，仍按原分享权限验证。</p><p>不再需要时，可在系统或浏览器的证书管理中移除此根证书；iPhone / iPad 可删除对应的描述文件。</p></details><footer>HTTP 仅用于安装引导。此页不加载终端、聊天或文件内容。</footer></main>
+<details><summary>核对证书与安全说明</summary><p>此引导页通过 HTTP 提供，无法单凭这个页面确认设备身份。请通过你已信任的对话渠道，与分享者核对以下 SHA-256 指纹后再安装。</p><code>${escapeHtml(fingerprint)}</code><p>目标地址：<span class="host">${escapeHtml(target.origin)}</span></p><p>下载证书不会自动获得系统信任，也不会自动接受分享邀请。进入 HTTPS 页面后，仍按原分享权限验证。</p><p>不再需要时，可在系统或浏览器的证书管理中移除此根证书；iPhone / iPad 可删除对应的描述文件。</p></details><footer>证书安装是可选步骤。返回原邀请页可直接通过 HTTP 接受邀请；安装并信任后可使用 HTTPS。</footer></main>
 <script nonce="${nonce}">
 const device=document.getElementById('device');device.addEventListener('change',()=>{document.querySelectorAll('[data-device]').forEach(list=>{list.hidden=list.dataset.device!==device.value;});});
 const next=document.getElementById('continue');const destination=new URL(next.href);if(location.hash.startsWith('#termdock-invite=')&&location.hash.length<=8250)destination.hash=location.hash;next.href=destination.href;

package/dist/server/onboardingServer.js

@@ -6,9 +6,12 @@ import { getLanIPv4Addresses } from './utils/localAccess.js';
 import path from 'node:path';
 import { TERMDOCK_DIR, readJsonFile, writeJsonStateAtomic } from './utils/termdockState.js';
 import { onboardingFingerprint, sendOnboardingPage } from './onboardingPage.js';
+import { WebSocketServer } from 'ws';
+import { isAllowedHost } from './utils/requestSecurity.js';
 let activeServer = null;
 let activeUrl = null;
 let activeFingerprint = null;
+let activeWebSockets = null;
 function canStart(options) {
     return Boolean(options.caCertPath && fs.existsSync(options.caCertPath));
 }
@@ -20,7 +23,13 @@ export function startOnboardingServer(options) {
     const app = express();
     app.disable('x-powered-by');
     app.use((_req, res, next) => { res.setHeader('Cache-Control', 'no-store'); res.setHeader('Referrer-Policy', 'no-referrer'); next(); });
-    app.get(['/', '/connect'], (req, res) => sendOnboardingPage(req, res, options));
+    app.get('/certificates', (req, res) => sendOnboardingPage(req, res, options));
+    app.get(['/', '/connect'], (req, res) => {
+        if (options.clientPath && options.acceptEncrypted)
+            res.sendFile('index.html', { root: options.clientPath });
+        else
+            sendOnboardingPage(req, res, options);
+    });
     app.use('/onboarding', createOnboardingRouter({ port: options.httpsPort, caCertPath: options.caCertPath }));
     app.get('/ca', (_req, res) => {
         if (!options.caCertPath || !fs.existsSync(options.caCertPath)) {
@@ -31,7 +40,55 @@ export function startOnboardingServer(options) {
         res.setHeader('Content-Disposition', 'attachment; filename="termdock-ca.crt"');
         res.send(fs.readFileSync(options.caCertPath));
     });
+    // This listener serves public application code, not plaintext business APIs.
+    // All terminal/chat/files traffic remains inside the authenticated Noise channel.
+    if (options.clientPath && options.acceptEncrypted) {
+        app.use('/api', (_req, res) => { res.status(403).json({ error: 'Encrypted channel required', code: 'ENCRYPTED_CHANNEL_REQUIRED' }); });
+        app.use(express.static(options.clientPath));
+    }
     const server = createServer(app);
+    if (options.acceptEncrypted) {
+        const wss = new WebSocketServer({ noServer: true, maxPayload: 256 * 1024 });
+        activeWebSockets = wss;
+        server.on('upgrade', (req, socket, head) => {
+            const reject = () => { socket.end('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n'); };
+            if (wss.clients.size >= 256 || !isAllowedHost(req.headers.host)) {
+                reject();
+                return;
+            }
+            // HTTP origins are permitted only on this explicit listener, with exact
+            // origin/authority matching. Cookies never authorize these channels.
+            if (req.headers.origin && req.headers.origin !== `http://${req.headers.host}`) {
+                reject();
+                return;
+            }
+            let url;
+            try {
+                url = new URL(req.url || '/', `http://${req.headers.host}`);
+            }
+            catch {
+                reject();
+                return;
+            }
+            if (url.pathname === '/api/federation/secure' && !url.search) {
+                wss.handleUpgrade(req, socket, head, ws => options.acceptEncrypted(ws));
+            }
+            else if (url.pathname === '/api/federation/relay' && options.acceptRelay && options.relayPrincipal
+                && [...url.searchParams.keys()].every(key => key === 'routeToken') && url.searchParams.getAll('routeToken').length === 1) {
+                const principal = options.relayPrincipal(url.searchParams.get('routeToken'));
+                if (!principal) {
+                    reject();
+                    return;
+                }
+                wss.handleUpgrade(req, socket, head, ws => { void options.acceptRelay(ws, principal).then(ok => { if (ok)
+                    ws.send(JSON.stringify({ type: 'ready' })); }).catch(() => ws.close(1011, 'Encrypted relay unavailable')); });
+            }
+            else
+                reject();
+        });
+        server.on('close', () => { for (const ws of wss.clients)
+            ws.terminate(); wss.close(); });
+    }
     const portFile = path.join(TERMDOCK_DIR, `onboarding-${options.httpsPort}.json`);
     const savedPort = readJsonFile(portFile)?.port;
     const preferredPort = Number.isInteger(savedPort) && savedPort > 1024 && savedPort <= 65535 ? savedPort : 0;
@@ -61,7 +118,13 @@ export function startOnboardingServer(options) {
     return { server, get url() { return activeUrl; } };
 }
 export function stopOnboardingServer() {
+    if (activeWebSockets) {
+        for (const socket of activeWebSockets.clients)
+            socket.terminate();
+        activeWebSockets = null;
+    }
     if (activeServer) {
+        activeServer.closeAllConnections();
         try {
             activeServer.close();
         }

package/dist/server/routes/filesystem.js

@@ -2607,6 +2607,7 @@ async function getDirectoryTarget(candidate, entry) {
 async function discoverNestedGitRoots(workspaceRoot, signal) {
     const repositories = [];
     const seen = new Set([workspaceRoot]);
+    const visitedDirectories = new Set();
     const deadline = Date.now() + NESTED_GIT_DISCOVERY_TIMEOUT_MS;
     let truncated = false;
     async function visit(dir) {
@@ -2620,6 +2621,12 @@ async function discoverNestedGitRoots(workspaceRoot, signal) {
         }
         let entries;
         try {
+            // Follow directory links, but walk each physical directory only once so
+            // aliases and links back to ancestors cannot cause repeated scans.
+            const realDirectory = await fs.promises.realpath(dir);
+            if (visitedDirectories.has(realDirectory))
+                return;
+            visitedDirectories.add(realDirectory);
             entries = await fs.promises.readdir(dir, { withFileTypes: true });
         }
         catch {
@@ -2656,15 +2663,16 @@ async function discoverNestedGitRoots(workspaceRoot, signal) {
                 }
                 continue;
             }
-            if (!entry.isSymbolicLink())
-                childDirectories.push({ entry, target });
+            // Keep the lexical path for display and workspace membership checks,
+            // even when a container points outside the workspace through a link.
+            childDirectories.push(candidate);
         }
         for (const child of childDirectories) {
             if (signal)
                 throwIfAborted(signal, 'git.bundle');
             if (truncated)
                 return;
-            await visit(child.target);
+            await visit(child);
         }
     }
     if (signal)