termdock 1.4.245 → 1.4.247

package/dist/client/index.html

@@ -188,7 +188,7 @@
          里为空，不声明，避免无谓的字体回退查找。
          Regular + Bold 两种变体自托管，替代 xterm 合成 bold CJK。 */
     </style>
-    <script type="module" crossorigin src="/assets/app-DiN3Jz4F.js"></script>
+    <script type="module" crossorigin src="/assets/app-Cs_Q5pAC.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/react-XDCjal2T.js">
     <link rel="modulepreload" crossorigin href="/assets/dnd-BCFAPC0L.js">
     <link rel="modulepreload" crossorigin href="/assets/terminal-C7X98Amf.js">

package/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,o)=>{const a=e||("document"in self?document.currentScript.src:"")||location.href;if(s[a])return;let c={};const r=e=>n(e,a),d={module:{uri:a},exports:c,require:r};s[a]=Promise.all(i.map(e=>d[e]||r(e))).then(e=>(o(...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:"4201c2eac3125164637917ca18f6bcae"},{url:"assets/app-DiN3Jz4F.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-BCFAPC0L.js",revision:null},{url:"assets/terminal-C7X98Amf.js",revision:null},{url:"assets/index-fjWWhVQp.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:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{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 n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,o)=>{const a=e||("document"in self?document.currentScript.src:"")||location.href;if(s[a])return;let c={};const r=e=>n(e,a),d={module:{uri:a},exports:c,require:r};s[a]=Promise.all(i.map(e=>d[e]||r(e))).then(e=>(o(...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:"7a1b8ea45b07e7de857a9dc039051c63"},{url:"assets/app-Cs_Q5pAC.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-BCFAPC0L.js",revision:null},{url:"assets/terminal-C7X98Amf.js",revision:null},{url:"assets/index-fjWWhVQp.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:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{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/collaborationCli.js

@@ -107,7 +107,12 @@ cleanup without --confirm prints the plan and refuses (also 1);
 Message limit: ${COLLAB_LIMITS.message_bytes} UTF-8 bytes; metadata: ${COLLAB_LIMITS.metadata_bytes} bytes.
 Idempotency retention: 7 days. Terminal delivery, ACK and result never imply each other.
 Delivery semantics: delivered = written to the terminal — never proof of
-reading or task completion; a timeout stops waiting, it does not cancel delivery.`;
+reading or task completion; a timeout stops waiting, it does not cancel delivery.
+The service cannot see whether the recipient's agent consumed a message. To
+judge for yourself, use --wait-until delivered and read the recipient-screen
+snapshot in the receipt: if your message is not visible on that screen, send it
+again (a fresh send is a new message and will be written again); if it is
+visible but unanswered, the recipient may simply not have started yet.`;
 /** One roster row: prefer the member's human name, keep the full session id
  * reachable for role set/unset targeting, mark unset members explicitly. */
 function roleLine(member, role) {
@@ -308,6 +313,25 @@ export function waitSatisfied(receipt, stage, reply) {
     const reached = stage === 'queued' || (stage === 'delivered' && ['delivered', 'read'].includes(receipt.status));
     return reached && (!reply || (reply === 'ack' ? receipt.ack_at != null : reply === 'result' ? receipt.result_ids?.length > 0 : receipt.reply_ids?.length > 0));
 }
+/** Delivery diagnoses a sender can act on. `delivered` means the bytes reached
+ *  the recipient's pty — never that anything consumed them; these map the
+ *  machine reasons onto what the sender should do next, so a settled-but-
+ *  unconsumed message is not mistaken for a lost one (or a good one). */
+const DELIVERY_DIAGNOSTICS = {
+    AGENT_CONSUME_UNCONFIRMED: '消息已写入对方终端，但未确认被对方消费；它可能尚未开始处理，可用 capture 查看当前屏幕或重发',
+    SHELL_CONFIRMATION_REQUIRED: '目标当前是 shell，消息可能被当命令执行；确认请运行 message confirm-shell <id>',
+    DELIVERY_IN_PROGRESS: '投递进行中（写入前的中间标记，正常会在数秒内推进为 delivered 或带原因的重试）',
+    TERMINAL_WRITE_FAILED: '写入对方终端失败，会按重试间隔继续尝试',
+    TMUX_PANE_CHANGED: '目标面板已变化，投递已跳过，等待重新绑定',
+    TMUX_PANE_IN_MODE: '目标面板处于 tmux 模式（如滚动查看），按键已跳过',
+};
+export function deliveryDiagnosticText(lastError) {
+    if (typeof lastError !== 'string' || !lastError)
+        return '';
+    const code = lastError.split(':', 1)[0].trim();
+    const known = DELIVERY_DIAGNOSTICS[code];
+    return known ? `${code}：${known}` : lastError;
+}
 export async function executeCollaborationCommand(command, context, io) {
     const o = command.options;
     const now = io.now ?? Date.now;
@@ -329,6 +353,7 @@ export async function executeCollaborationCommand(command, context, io) {
     };
     const output = (value) => {
         if (o.text) {
+            let diagnosed = false;
             if (Array.isArray(value.messages))
                 for (const message of value.messages) {
                     const fanIds = Array.isArray(message.fanOutIds) ? message.fanOutIds : [];
@@ -346,6 +371,14 @@ export async function executeCollaborationCommand(command, context, io) {
                 if (!o['no-rules'] && value.message.instructions?.text)
                     io.write(`消息附群规版本 ${value.message.instructions.version}；td collab rules get <组id> --text 查看全文`);
                 io.write(`[${value.status}] ${canonicalShortId(String(value.message_id ?? ''))}\n${value.message.content}`);
+                // A pending message keeps retrying by design (the alternative is
+                // dropping it); surface why and when the next attempt is so the sender
+                // can decide to wait or resend instead of guessing.
+                if (value.status === 'pending' && (value.attempt_count || value.last_error)) {
+                    const retryIn = value.next_retry_at ? Math.max(0, Math.ceil((Number(value.next_retry_at) - now()) / 1000)) : null;
+                    io.write(`投递中：第 ${value.attempt_count ?? 0} 次尝试${retryIn !== null ? `，下次重试约 ${retryIn} 秒后` : ''}${value.last_error ? `，最近原因 ${deliveryDiagnosticText(value.last_error)}` : ''}`);
+                    diagnosed = true;
+                }
             }
             else if (value.message_id) {
                 io.write(`${value.status} ${canonicalShortId(String(value.message_id))}${value.thread_id ? ` thread=${canonicalShortId(String(value.thread_id))}` : ''}${value.code ? ` ${value.code}` : ''}${value.failure_reason ? ` ${value.failure_reason}` : ''}`);
@@ -363,8 +396,8 @@ export async function executeCollaborationCommand(command, context, io) {
             }
             else
                 io.write(JSON.stringify(value, null, 2));
-            if (value.last_error)
-                io.write(String(value.last_error));
+            if (value.last_error && !diagnosed)
+                io.write(`诊断：${deliveryDiagnosticText(value.last_error)}`);
             if (value.next_cursor)
                 io.write(`next_cursor=${value.next_cursor} has_more=${value.has_more}`);
         }

package/dist/server/agent/collaborationDeliveryWorker.js

@@ -176,7 +176,12 @@ export class CollaborationDeliveryWorker {
             // Capture the recipient terminal before marking delivered, so a sender
             // waiting on delivered always finds the snapshot present. The capture is
             // strictly best-effort: a failure must never block delivery completion.
+            // Delayed briefly so the pane shows the rendered paste rather than the
+            // input box mid-write.
             if (route.capture) {
+                const snapshotDelay = this.options.snapshotDelayMs ?? 200;
+                if (snapshotDelay > 0)
+                    await new Promise((resolve) => setTimeout(resolve, snapshotDelay));
                 try {
                     const snapshot = await route.capture();
                     if (snapshot)

package/dist/server/agent/collaborationPeerTransport.js

@@ -302,8 +302,13 @@ export class CollaborationPeerTransport {
                 || typeof message.toSessionId !== 'string' || !message.toSessionId.startsWith(`remote:${encodeURIComponent(b.localOrigin)}:`)
                 || Buffer.byteLength(JSON.stringify(message)) > COLLAB_LIMITS.wire_bytes)
                 throw new Error('INVALID_PEER_MESSAGE');
+            const localTarget = localSession(b.localOrigin, message.toSessionId);
+            // A session-scoped peer may only ever reach the sessions its inviter granted.
+            const scope = this.options.scopeFor?.(subjectId);
+            if (scope !== undefined && !scope.includes(localTarget))
+                throw new Error('SESSION_SCOPE_DENIED');
             const incoming = { ...message, fromSessionId: remoteSession(b.peer.origin, message.fromSessionId),
-                toSessionId: localSession(b.localOrigin, message.toSessionId), status: 'pending', deliveredAt: null, readAt: null,
+                toSessionId: localTarget, status: 'pending', deliveredAt: null, readAt: null,
                 snapshot: null, deliverySource: undefined, readSource: undefined, shellConfirmed: message.shellConfirmed === true };
             const existing = store.getMessage(message.id);
             if (existing && (existing.groupId !== incoming.groupId || existing.fromSessionId !== incoming.fromSessionId
@@ -402,7 +407,9 @@ export class CollaborationPeerTransport {
     }
     async sync(b) {
         const store = this.options.store, key = `${b.groupId}:${b.peer.serviceId}`;
+        const scope = this.options.scopeFor?.(b.peer.serviceId);
         const messages = store.federationSnapshot().messages.filter(m => m.groupId === b.groupId).filter(m => !m.fromSessionId?.startsWith('remote:') && m.fromSessionId !== null
+            && (scope === undefined || scope.includes(m.fromSessionId))
             && m.toSessionId.startsWith(`remote:${encodeURIComponent(b.peer.origin)}:`) && !['failed', 'expired'].includes(m.status)
             && (m.status === 'pending' || !m.snapshot)).sort((a, b) => Number(b.status === 'pending') - Number(a.status === 'pending'));
         const pending = messages.filter(m => m.status === 'pending');

package/dist/server/agent/collaborationService.js

@@ -33,6 +33,15 @@ export class CollaborationService {
                 throw new Error('INVALID_DIRECTORY');
             for (const peer of data.peers)
                 validateCollaborationNode(peer);
+            if (data.scoped !== undefined) {
+                if (!data.scoped || typeof data.scoped !== 'object' || Array.isArray(data.scoped))
+                    throw new Error('INVALID_DIRECTORY');
+                for (const [serviceId, scope] of Object.entries(data.scoped)) {
+                    if (!data.peers.some(peer => peer.serviceId === serviceId) || !scope || typeof scope !== 'object'
+                        || typeof scope.device !== 'string' || !/^12D3KooW[a-zA-Z0-9]{30,60}$/.test(scope.device))
+                        throw new Error('INVALID_DIRECTORY');
+                }
+            }
             if (data.origin)
                 validateCollaborationNode({ ...options.node(), origin: data.origin });
             this.document = data;
@@ -95,6 +104,43 @@ export class CollaborationService {
         void this.refresh();
         return { ok: true, registered: this.document.peers.map(peer => peer.serviceId) };
     }
+    /** Effective local sessions a peer may touch. `undefined` means a fully
+     * authorized directory peer; an array (possibly empty) means a peer that
+     * exists only because a device shared a write invitation for those sessions. */
+    effectiveScope(serviceId) {
+        const scoped = this.document.scoped?.[serviceId];
+        if (!scoped)
+            return undefined;
+        try {
+            return [...new Set(this.options.deviceScope?.(scoped.device) ?? [])];
+        }
+        catch {
+            return [];
+        }
+    }
+    /** Register a peer that a device's session-scoped write grant vouches for.
+     * The peer never gains directory or group authority beyond those sessions,
+     * and the surface follows the grant: revoking or expiring it empties the scope. */
+    registerScopedPeer(origin, deviceSubject, node, sessions) {
+        if (!/^12D3KooW[a-zA-Z0-9]{30,60}$/.test(deviceSubject) || !Array.isArray(sessions) || !sessions.length || sessions.length > 64
+            || sessions.some(session => typeof session !== 'string' || !session) || new Set(sessions).size !== sessions.length)
+            throw new Error('INVALID_SCOPE');
+        this.setOrigin(origin);
+        validateCollaborationNode(node);
+        const existing = this.document.peers.find(peer => peer.serviceId === node.serviceId || peer.origin === node.origin);
+        if (existing) {
+            if (existing.serviceId !== node.serviceId || existing.origin !== node.origin || existing.caFingerprint256 !== node.caFingerprint256)
+                throw new Error('PEER_IDENTITY_CHANGED');
+            // An already fully authorized directory peer must not be downgraded by a device.
+            if (!this.document.scoped?.[existing.serviceId])
+                return { ok: true, peer: existing.serviceId, sessions: [] };
+        }
+        this.remember(node);
+        this.document.scoped = { ...this.document.scoped, [node.serviceId]: { device: deviceSubject } };
+        this.persist();
+        void this.refresh();
+        return { ok: true, peer: node.serviceId, sessions: this.effectiveScope(node.serviceId) ?? [] };
+    }
     invite(origin) {
         this.setOrigin(origin);
         const code = randomBytes(32).toString('base64url'), expiresAt = Date.now() + 10 * 60_000;
@@ -142,24 +188,31 @@ export class CollaborationService {
         if (packet.action === 'duplex')
             return { ok: true };
         if (packet.action === 'directory')
-            return this.snapshot(peer.origin);
+            return this.snapshot(peer);
         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))
                 throw new Error('GROUP_SENDER_NOT_MEMBER');
-            this.merge(canonical, packet.nodes);
+            this.merge(canonical, packet.nodes, peer);
             return { ok: true };
         }
         throw new Error('COLLABORATION_OPERATION_UNSUPPORTED');
     }
     nodes() { return [...new Map([...this.options.transport.registeredNodes(), ...this.document.peers, this.node()].map(node => [node.origin, node])).values()]; }
-    snapshot(peerOrigin) {
+    /** A scoped peer sees exactly its authorized sessions and the groups those
+     * sessions belong to. Other peers' identities are not exposed to it. */
+    snapshot(peer) {
         const origin = this.node().origin;
-        return { sessions: this.options.sessions(), groups: this.options.store.federationSnapshot().groups
-                .filter(group => group.federated && (group.sessionIds.some(id => address(id)?.origin === peerOrigin) || this.document.replicas?.[group.id]?.includes(peerOrigin)))
-                .map(group => mapGroup(group, id => address(id) ? id : remoteSession(origin, id))), nodes: this.nodes() };
+        const scope = this.effectiveScope(peer.serviceId);
+        const sessions = this.options.sessions();
+        const groups = this.options.store.federationSnapshot().groups
+            .filter(group => group.federated && (group.sessionIds.some(id => address(id)?.origin === peer.origin) || this.document.replicas?.[group.id]?.includes(peer.origin)))
+            .filter(group => scope === undefined || group.sessionIds.every(id => address(id) ? true : scope.includes(id)))
+            .map(group => mapGroup(group, id => address(id) ? id : remoteSession(origin, id)));
+        return { sessions: scope === undefined ? sessions : sessions.filter(session => scope.includes(session.sessionId)),
+            groups, nodes: scope === undefined ? this.nodes() : [this.node(), peer] };
     }
-    merge(canonical, nodes) {
+    merge(canonical, nodes, source) {
         if (!canonical || typeof canonical.id !== 'string' || !canonical.id.startsWith('cross-') || !Array.isArray(canonical.sessionIds)
             || 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)
@@ -188,10 +241,19 @@ export class CollaborationService {
             this.persist();
         }
         const localIds = new Set(this.options.sessions().map(s => s.sessionId));
+        const scope = source ? this.effectiveScope(source.serviceId) : undefined;
         const incoming = { ...mapGroup(canonical, id => local(self.origin, id)), federated: true };
         for (const id of incoming.sessionIds) {
             const remote = address(id);
-            if (remote ? !nodes.some(node => node.origin === remote.origin) : !localIds.has(id) && !existing?.sessionIds.includes(id))
+            if (remote) {
+                if (!nodes.some(node => node.origin === remote.origin))
+                    throw new Error('GROUP_MEMBER_UNAVAILABLE');
+                continue;
+            }
+            // A scoped peer can never pull another local session into a group.
+            if (scope !== undefined && !scope.includes(id))
+                throw new Error('SESSION_SCOPE_DENIED');
+            if (!localIds.has(id) && !existing?.sessionIds.includes(id))
                 throw new Error('GROUP_MEMBER_UNAVAILABLE');
         }
         incoming.remoteSessions = incoming.sessionIds.filter(id => address(id)).map(id => {
@@ -241,10 +303,14 @@ export class CollaborationService {
                 const sessions = data.sessions.filter((s) => s && typeof s.sessionId === 'string' && !s.sessionId.startsWith('remote:'));
                 this.observations.set(peer.serviceId, { sessions, checkedAt: Date.now() });
                 for (const group of data.groups)
-                    this.merge(group, data.nodes);
+                    this.merge(group, data.nodes, peer);
                 for (const group of this.options.store.federationSnapshot().groups.filter(g => g.federated && (g.sessionIds.some(id => address(id)?.origin === peer.origin) || this.document.replicas?.[g.id]?.includes(peer.origin)))) {
+                    const scope = this.effectiveScope(peer.serviceId);
+                    // Never push a group to a scoped peer if it involves other local sessions.
+                    if (scope !== undefined && !group.sessionIds.every(id => address(id) ? true : scope.includes(id)))
+                        continue;
                     const canonical = mapGroup(group, id => address(id) ? id : remoteSession(this.node().origin, id));
-                    const nodes = this.nodes();
+                    const nodes = scope === undefined ? this.nodes() : [this.node(), peer];
                     if (canonical.sessionIds.some(id => !nodes.some(node => node.origin === address(id)?.origin)))
                         continue;
                     this.merge(canonical, nodes);
@@ -264,7 +330,7 @@ export class CollaborationService {
             return { origin: peer.origin, serviceId: peer.serviceId, label: peer.origin,
                 connected: !!observed && !observed.error && Date.now() - observed.checkedAt < 15_000, error: observed?.error ?? (!observed ? 'CONNECTING' : undefined) };
         });
-        return { protocolVersion: 2, sessions: this.document.peers.flatMap(peer => (this.observations.get(peer.serviceId)?.sessions ?? []).map(session => ({ ...session,
+        return { protocolVersion: 2, sessions: this.document.peers.flatMap(peer => this.document.scoped?.[peer.serviceId] ? [] : (this.observations.get(peer.serviceId)?.sessions ?? []).map(session => ({ ...session,
                 sessionId: remoteSession(peer.origin, session.sessionId), backendSessionId: null, agentNativeSessionId: null, serviceOrigin: peer.origin, serviceLabel: peer.origin,
                 serviceConnected: services.find(s => s.origin === peer.origin).connected, serviceCheckedAt: this.observations.get(peer.serviceId)?.checkedAt }))),
             services: [...services, ...missing.map(origin => ({ origin, label: origin, connected: false, error: '服务连接授权尚未同步；在已授权服务页面连接后会自动完成' }))] };

package/dist/server/entry.js

@@ -29,7 +29,7 @@ import { homedir } from 'os';
 import cookieParser from 'cookie-parser';
 import { fileURLToPath } from 'url';
 import { WebSocketServer } from 'ws';
-import terminalRoutes, { handleTerminalWebSocket, handleControlWebSocket } from './routes/terminal.js';
+import terminalRoutes, { handleTerminalWebSocket, handleControlWebSocket, resolveStableFederationSessionId } from './routes/terminal.js';
 import filesystemRoutes from './routes/filesystem.js';
 import authRoutes from './routes/auth.js';
 import notificationRoutes from './routes/notifications.js';
@@ -452,6 +452,7 @@ export function startServer(options = {}) {
     const federation = createFederationRuntime(app, path.join(homedir(), '.termdock', 'federation'), {
         terminal: handleTerminalWebSocket, control: handleControlWebSocket,
     }, {
+        resolveSessionId: resolveStableFederationSessionId,
         collaborationConnected: (subjectId, rpc) => {
             const channels = collaborationChannels.get(subjectId) ?? new Set();
             channels.add(rpc);
@@ -471,6 +472,11 @@ export function startServer(options = {}) {
                 throw new Error('COLLABORATION_UNAVAILABLE');
             return collaborationService.receive(subjectId, packet);
         },
+        registerScopedCollaborationPeer: (deviceSubject, origin, node, sessions) => {
+            if (!collaborationService)
+                throw new Error('COLLABORATION_UNAVAILABLE');
+            return collaborationService.registerScopedPeer(origin, deviceSubject, node, sessions);
+        },
         collaborationExchange: (subjectId, packet) => {
             if (!collaborationTransport)
                 throw new Error('COLLABORATION_UNAVAILABLE');
@@ -530,6 +536,7 @@ export function startServer(options = {}) {
             reverse: reverseCollaboration,
             file: path.join(homedir(), '.termdock', 'federation', 'collaboration-peers.json'), serviceId: runtime.serviceId,
             store: collaborationStore, deliver: deliverPeerCollaboration, activity: collaborationLocalActivity,
+            scopeFor: serviceId => collaborationService?.effectiveScope(serviceId),
             connect: async (peer, via) => {
                 if (!via)
                     return connectPeer(peer);
@@ -559,6 +566,9 @@ export function startServer(options = {}) {
         collaborationService = new CollaborationService({ file: path.join(homedir(), '.termdock', 'federation', 'collaboration-services.json'),
             store: collaborationStore, transport: collaborationTransport, node: () => app.locals.collaborationNode,
             sessions: collaborationDirectorySessions, reverse: reverseCollaboration, connect: connectPeer,
+            deviceScope: device => runtime.store.listEffective({ subjectId: device, serviceId: runtime.serviceId })
+                .filter(grant => grant.scope.kind === 'sessions' && grant.actions.includes('session.input'))
+                .flatMap(grant => grant.scope.kind === 'sessions' ? grant.scope.sessionIds : []),
             pairConnect: peer => connectCollaborationRpc(runtime.identity, peer) });
         app.locals.collaborationService = collaborationService;
         collaborationService.start();

package/dist/server/federation/runtime.js

@@ -126,7 +126,25 @@ export async function createFederationRuntime(app, directory, handlers, options
         let collaborationRpc;
         let unregisterCollaboration;
         const open = (action) => openAccessAllowed(context.allowOpenAccess === true, isAuthEnabled(), action);
-        const allowed = (subjectId, action, sessionId) => open(action) || store.authorize({ subjectId, serviceId, action, sessionId }).allowed;
+        const stableSessionId = (id) => {
+            try {
+                const resolved = options.resolveSessionId?.(id);
+                return typeof resolved === 'string' && resolved && resolved !== id ? resolved : undefined;
+            }
+            catch {
+                return undefined;
+            }
+        };
+        const allowed = (subjectId, action, sessionId) => {
+            if (open(action) || store.authorize({ subjectId, serviceId, action, sessionId }).allowed)
+                return true;
+            // The wire may still carry the transient backend PTY id while the grant
+            // is bound to the stable client session id (or an older backend id).
+            if (sessionId === undefined)
+                return false;
+            const stable = stableSessionId(sessionId);
+            return stable !== undefined && store.authorize({ subjectId, serviceId, action, sessionId: stable }).allowed;
+        };
         const full = (subjectId) => open() || store.hasFullServiceAccess({ subjectId, serviceId });
         let channel;
         const operations = new Map();
@@ -276,6 +294,20 @@ export async function createFederationRuntime(app, directory, handlers, options
                             throw new Error('COLLABORATION_UPGRADE_REQUIRED');
                         send({ type: 'result', id: packet.id, ...options.collaborationService(subjectId, packet) });
                     }
+                    else if (packet.type === 'collaboration-scoped-peer') {
+                        if (!options.registerScopedCollaborationPeer)
+                            throw new Error('COLLABORATION_UPGRADE_REQUIRED');
+                        const origin = typeof packet.origin === 'string' ? packet.origin : '';
+                        if (!origin || !packet.node || typeof packet.node !== 'object')
+                            throw new Error('INVALID_COLLABORATION_PEER');
+                        // The peer may only touch sessions this device can write to right now.
+                        const sessions = [...new Set(store.listEffective({ subjectId, serviceId })
+                                .filter(grant => grant.scope.kind === 'sessions' && grant.actions.includes('session.input'))
+                                .flatMap(grant => grant.scope.kind === 'sessions' ? grant.scope.sessionIds : []))];
+                        if (!sessions.length)
+                            throw new Error('AUTHORIZATION_DENIED');
+                        send({ type: 'result', id: packet.id, ...options.registerScopedCollaborationPeer(subjectId, origin, packet.node, sessions) });
+                    }
                     else if (packet.type === 'collaboration-exchange') {
                         if (!options.collaborationExchange)
                             throw new Error('COLLABORATION_UNAVAILABLE');
@@ -411,9 +443,24 @@ export async function createFederationRuntime(app, directory, handlers, options
                             ...(packet.expiresAt === undefined ? {} : { expiresAt: packet.expiresAt }) };
                         validateInvitation(invitation);
                         if (invitation.scope.kind === 'sessions') {
-                            const known = new Set((await sessionInventory()).filter(session => session.live === true).map(session => session.backendSessionId));
-                            if (!invitation.scope.sessionIds.every(id => known.has(id)))
+                            // Bind to the stable client session id, never the transient backend
+                            // PTY id: backends are replaced on restart, tmux recovery or
+                            // re-attach, which would otherwise invalidate the whole grant.
+                            const stable = new Map();
+                            for (const session of await sessionInventory()) {
+                                if (session.live !== true)
+                                    continue;
+                                const frontendSessionId = typeof session.sessionId === 'string' ? session.sessionId : '';
+                                if (!frontendSessionId)
+                                    continue;
+                                stable.set(frontendSessionId, frontendSessionId);
+                                if (typeof session.backendSessionId === 'string' && session.backendSessionId)
+                                    stable.set(session.backendSessionId, frontendSessionId);
+                            }
+                            const sessionIds = invitation.scope.sessionIds.map(id => stable.get(id)).filter((id) => typeof id === 'string');
+                            if (sessionIds.length !== invitation.scope.sessionIds.length || new Set(sessionIds).size !== sessionIds.length)
                                 throw new Error('UNKNOWN_SESSION');
+                            invitation.scope = { kind: 'sessions', sessionIds };
                         }
                         check('authorization.manage');
                         send({ type: 'result', id: packet.id, serviceId, ...invitations.create(subjectId, invitation) });

package/dist/server/routes/terminal.js

@@ -1436,6 +1436,19 @@ async function runAgentAutomation(automation, req) {
 function resolveFrontendSessionId(input) {
     return resolveCollaborationSessionId(input, globalSessionState.sessions, collaborationRouting);
 }
+/** Stable-id resolver for encrypted client authorization: accepts either the
+ * stable client session id or a transient backend PTY id and returns the stable
+ * one, so session-scoped grants survive backend replacement. */
+export function resolveStableFederationSessionId(id) {
+    if (!id)
+        return null;
+    try {
+        return resolveFrontendSessionId({ sessionId: id, backendSessionId: id });
+    }
+    catch {
+        return null;
+    }
+}
 function collaborationRemoteSessions() {
     return Array.from(new Map(collaborationStore.list().flatMap((group) => group.remoteSessions ?? [])
         .map((session) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.245",
+  "version": "1.4.247",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/runtime-manifest.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.245",
+  "version": "1.4.247",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-K4KyYJuVoQDpZsBM8ZX1Rw3MddOxAzVdp/cPm0iGZz0=",
-  "serverBundleHash": "sha256-5EHTPHBzYbhXiki7HYAUodtWvNgxb7mxs+XD1yM1sXo=",
-  "clientBundleHash": "sha256-+bCKIDDFWs3O4xXhcKsruZaYoCDM0PJDAJI6F7I5A3I=",
+  "serverBundleHash": "sha256-jt8V06gEQdEOQuK7k49oLE0RIfpkIZP7rDDt7Vh6E80=",
+  "clientBundleHash": "sha256-b+6COls3nNjiyFKb3RQRKLWhe9MI1wPlehaAY2rwHX8=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }