termdock 1.4.172 → 1.4.174

package/dist/server/routes/terminal.js

@@ -1365,7 +1365,19 @@ function resolveFrontendSessionId(input) {
     const tmuxSessionName = typeof input.tmuxSessionName === 'string' ? input.tmuxSessionName.trim() : '';
     return globalSessionState.sessions.find((record) => record.tmuxSessionName === tmuxSessionName)?.sessionId ?? null;
 }
+function collaborationRemoteSessions() {
+    return Array.from(new Map(collaborationStore.list().flatMap((group) => group.remoteSessions ?? [])
+        .map((session) => [session.sessionId, { ...session, status: session.serviceConnected !== true || Date.now() - (session.serviceCheckedAt ?? 0) > 15_000 ? 'service-unreachable' : session.status, name: `${session.name} · ${session.serviceLabel}` }])).values());
+}
 function tryDeliverCollaborationInbox(frontendSessionId) {
+    const remote = collaborationRemoteSessions().find((session) => session.sessionId === frontendSessionId);
+    if (remote) {
+        const unavailable = remote.serviceConnected !== true || Date.now() - (remote.serviceCheckedAt ?? 0) > 15_000;
+        return { delivered: [], pending: collaborationStore.inbox(frontendSessionId, { pendingOnly: true }).length,
+            serviceUnavailable: unavailable, reason: unavailable
+                ? `服务 ${remote.serviceLabel} 不可达：消息尚未送达，仅保存在待发送队列；请勿等待对方已收到的回复，服务重连且 Mac 客户端运行后重试投递。`
+                : '跨服务消息尚未确认送达，正在等待 Mac 客户端转发。' };
+    }
     const record = globalSessionState.sessions.find((candidate) => candidate.sessionId === frontendSessionId);
     const session = record?.backendSessionId ? terminalSessions.get(record.backendSessionId) : null;
     const pending = collaborationStore.inbox(frontendSessionId, { pendingOnly: true, limit: 10 });
@@ -1378,15 +1390,15 @@ function tryDeliverCollaborationInbox(frontendSessionId) {
         targetSessionId: frontendSessionId,
         messages: pending,
         groups: collaborationStore.groupsForSession(frontendSessionId),
-        sessions: globalSessionState.sessions.map((candidate) => {
-            const snapshot = orchestrationSessionSnapshot(candidate);
-            return {
-                sessionId: snapshot.sessionId,
-                agentNativeSessionId: snapshot.agentNativeSessionId,
-                name: snapshot.name,
-                status: snapshot.status,
-            };
-        }),
+        sessions: [...collaborationRemoteSessions(), ...globalSessionState.sessions.map((candidate) => {
+                const snapshot = orchestrationSessionSnapshot(candidate);
+                return {
+                    sessionId: snapshot.sessionId,
+                    agentNativeSessionId: snapshot.agentNativeSessionId,
+                    name: snapshot.name,
+                    status: snapshot.status,
+                };
+            })],
     });
     session.ptyProcess.write(buildBracketedSubmitBytes(prompt));
     collaborationStore.markDelivered(pending.map((message) => message.id));
@@ -5188,8 +5200,36 @@ router.delete('/operations/automations/:automationId', (req, res) => {
         return res.status(404).json({ error: '自动任务不存在' });
     res.status(204).send();
 });
+// Authenticated desktop connections exchange only collaboration data; no peer credentials
+// or arbitrary remote URLs are accepted by the server.
+router.get('/operations/collaboration-federation', (_req, res) => {
+    res.json({ ...collaborationStore.federationSnapshot(),
+        sessions: globalSessionState.sessions.map(orchestrationSessionSnapshot) });
+});
+router.post('/operations/collaboration-federation', (req, res) => {
+    try {
+        const group = req.body?.group;
+        if (!group || !Array.isArray(group.remoteSessions))
+            throw new Error('跨服务工作组无效');
+        const remoteIds = new Set(group.remoteSessions.map((session) => session.sessionId));
+        const localIds = new Set(globalSessionState.sessions.map((session) => session.sessionId));
+        if (!group.deleted && group.sessionIds.some((id) => !localIds.has(id) && !remoteIds.has(id))) {
+            throw new Error('工作组包含不存在的本服务会话，请刷新成员列表');
+        }
+        collaborationStore.mergeFederatedGroup(group);
+        collaborationStore.mergeFederatedMessages(Array.isArray(req.body.messages) ? req.body.messages : []);
+        for (const id of group.sessionIds)
+            if (localIds.has(id))
+                tryDeliverCollaborationInbox(id);
+        res.json(collaborationStore.federationSnapshot());
+    }
+    catch (error) {
+        res.status(400).json({ error: getErrorMessage(error) });
+    }
+});
 router.get('/operations/collaboration-groups', (_req, res) => {
     res.json({
+        federationVersion: 1,
         groups: collaborationStore.list(),
         sessions: globalSessionState.sessions.map(orchestrationSessionSnapshot),
     });
@@ -5199,7 +5239,9 @@ router.post('/operations/collaboration-groups', (req, res) => {
     const sessionIds = Array.isArray(req.body?.sessionIds)
         ? req.body.sessionIds.filter((id) => typeof id === 'string')
         : [];
-    const knownIds = new Set(globalSessionState.sessions.map((session) => session.sessionId));
+    const existingGroup = typeof req.body?.id === 'string' ? collaborationStore.getGroup(req.body.id) : null;
+    const knownIds = new Set([...globalSessionState.sessions.map((session) => session.sessionId),
+        ...(existingGroup?.remoteSessions?.map((session) => session.sessionId) ?? [])]);
     const normalizedIds = Array.from(new Set(sessionIds.filter((id) => knownIds.has(id))));
     if (!name || normalizedIds.length < 2)
         return res.status(400).json({ error: '协作组至少需要两个有效会话' });
@@ -5277,7 +5319,7 @@ router.get('/operations/orchestration/peers', async (req, res) => {
     res.json({
         source: orchestrationSessionSnapshot(source),
         groups,
-        peers: globalSessionState.sessions.filter((record) => peerIds.has(record.sessionId)).map(orchestrationSessionSnapshot),
+        peers: [...globalSessionState.sessions.filter((record) => peerIds.has(record.sessionId)).map(orchestrationSessionSnapshot), ...collaborationRemoteSessions().filter((record) => peerIds.has(record.sessionId))],
         sessions: globalSessionState.sessions.map(orchestrationSessionSnapshot),
         agents: await listDetectedAgentLaunchers(),
     });
@@ -5355,7 +5397,7 @@ router.get('/operations/orchestration/inbox', (req, res) => {
     res.json({
         session: orchestrationSessionSnapshot(globalSessionState.sessions.find((record) => record.sessionId === sessionId)),
         groups,
-        peers: globalSessionState.sessions.filter((record) => peerIds.has(record.sessionId)).map(orchestrationSessionSnapshot),
+        peers: [...globalSessionState.sessions.filter((record) => peerIds.has(record.sessionId)).map(orchestrationSessionSnapshot), ...collaborationRemoteSessions().filter((record) => peerIds.has(record.sessionId))],
         messages,
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.172",
+  "version": "1.4.174",
   "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.172",
+  "version": "1.4.174",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-/c1QpL8I/K1/8wYVjqa7fYdeLyBTU/rKXAewGrOlv5A=",
-  "serverBundleHash": "sha256-3/vtMutjjKDsz/MO+TNOHmV5p9kwugiNM17A8KDwWm4=",
-  "clientBundleHash": "sha256-iz9NXTLOOSc6bvt7iPyICq/NC/vDog4/zLsogEE2gNI=",
+  "serverBundleHash": "sha256-o3Ox04RTctpLtrl/Ju26M1EbnuLNZEMLJygf6jXN2Mw=",
+  "clientBundleHash": "sha256-Ow17qaVsrs3zp8W6ZxYahdTzZQglcr0Mgj1MBry/oTE=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/dist/client/assets/channel-B6TjYAez.js

@@ -1 +0,0 @@
-import{c as a,C as n}from"./mermaid.core-j1keBL4G.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/client/assets/classDiagram-ZZMXUADV-i1BY3yGM.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-TICWLB2K-CQf5JDJ6.js";import{d as i}from"./mermaid.core-j1keBL4G.js";import"./chunk-5VM5RSS4-BTAoWfr3.js";import"./chunk-XXDRQBXY-DE4EwG0P.js";import"./chunk-POPQ4Y6H-gKY0GzzT.js";import"./chunk-F27PBJKO-BdXEY658.js";import"./purify.es-4eNOHKSq.js";import"./app-BSIGjhTf.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/classDiagram-v2-VYDZK3BY-i1BY3yGM.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-TICWLB2K-CQf5JDJ6.js";import{d as i}from"./mermaid.core-j1keBL4G.js";import"./chunk-5VM5RSS4-BTAoWfr3.js";import"./chunk-XXDRQBXY-DE4EwG0P.js";import"./chunk-POPQ4Y6H-gKY0GzzT.js";import"./chunk-F27PBJKO-BdXEY658.js";import"./purify.es-4eNOHKSq.js";import"./app-BSIGjhTf.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/stateDiagram-v2-MP3YSRHH-CGUrcSGo.js

@@ -1 +0,0 @@
-import{b as r,a as e,s as a,S as i}from"./chunk-IMKFNOWR-HRQGNR2J.js";import{d as s}from"./mermaid.core-j1keBL4G.js";import"./chunk-XXDRQBXY-DE4EwG0P.js";import"./chunk-POPQ4Y6H-gKY0GzzT.js";import"./chunk-F27PBJKO-BdXEY658.js";import"./purify.es-4eNOHKSq.js";import"./app-BSIGjhTf.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:a,get db(){return new i(2)},renderer:e,styles:r,init:s(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/swimlanesDiagram-VR7AAH4N-DZRxbRMF.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-HODETNUW-D4WBOJfi.js";import{d as o}from"./mermaid.core-j1keBL4G.js";import"./chunk-5VM5RSS4-BTAoWfr3.js";import"./chunk-XXDRQBXY-DE4EwG0P.js";import"./chunk-POPQ4Y6H-gKY0GzzT.js";import"./chunk-F27PBJKO-BdXEY658.js";import"./purify.es-4eNOHKSq.js";import"./channel-B6TjYAez.js";import"./app-BSIGjhTf.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var a=o(t=>`${e(t)}
-  .swimlane.cluster rect {
-    stroke: ${t.clusterBorder} !important;
-  }
-  [data-look="neo"].cluster rect {
-    filter: none;
-  }
-`,"getStyles"),m=a,v=r({defaultLayout:"swimlane",styles:m});export{v as diagram};