termdock 1.4.181 → 1.4.183

package/dist/server/agent/collaborationStore.js

@@ -70,6 +70,34 @@ export class CollaborationStore {
         this.persist();
         return true;
     }
+    /** A drag between two groups commits both memberships (or neither). */
+    moveMember(input) {
+        const source = this.getGroup(input.sourceGroupId);
+        const target = this.getGroup(input.targetGroupId);
+        if (!source || source.deleted || !target || target.deleted)
+            throw new CollaborationError('GROUP_NOT_FOUND', '协作组已删除，请刷新列表', 404);
+        if (source.id === target.id || !source.sessionIds.includes(input.sessionId)
+            || source.updatedAt !== input.expectedSourceUpdatedAt || target.updatedAt !== input.expectedTargetUpdatedAt) {
+            throw new CollaborationError('GROUP_CHANGED', '协作组已变化，请刷新后重新移动成员', 409);
+        }
+        const sourceIds = source.sessionIds.filter((id) => id !== input.sessionId);
+        const dissolved = sourceIds.length < 2;
+        const now = Date.now();
+        this.document = { ...this.document,
+            groups: this.document.groups.flatMap((group) => {
+                if (group.id === source.id) {
+                    if (dissolved)
+                        return group.federated ? [{ ...group, deleted: true, updatedAt: Math.max(now, group.updatedAt + 1) }] : [];
+                    return [{ ...group, sessionIds: sourceIds,
+                            ...(group.remoteSessions ? { remoteSessions: group.remoteSessions.filter((session) => sourceIds.includes(session.sessionId)) } : {}),
+                            updatedAt: Math.max(now, group.updatedAt + 1) }];
+                }
+                return group.id === target.id ? [{ ...group, sessionIds: [...new Set([...group.sessionIds, input.sessionId])], updatedAt: Math.max(now, group.updatedAt + 1) }] : [group];
+            }),
+            messages: dissolved ? this.document.messages.filter((message) => message.groupId !== source.id) : this.document.messages,
+        };
+        this.persist();
+    }
     removeSession(sessionId) {
         const affected = this.document.groups.filter((group) => group.sessionIds.includes(sessionId));
         if (affected.length === 0)
@@ -196,15 +224,7 @@ export class CollaborationStore {
         return { groups, messages, transportDiagnostics: Object.fromEntries(messages.flatMap((message) => this.document.transport?.[message.id] ? [[message.id, this.document.transport[message.id]]] : [])) };
     }
     mergeFederatedGroup(group) {
-        if (!group.federated || typeof group.id !== 'string' || !group.id.startsWith('cross-') || typeof group.name !== 'string' || !group.name.trim()
-            || !Number.isFinite(group.updatedAt) || !Number.isFinite(group.createdAt)
-            || !Array.isArray(group.sessionIds) || group.sessionIds.some((id) => typeof id !== 'string')
-            || !Array.isArray(group.remoteSessions) || group.remoteSessions.some((session) => !session
-            || typeof session.sessionId !== 'string' || !session.sessionId.startsWith('remote:')
-            || typeof session.serviceOrigin !== 'string' || typeof session.serviceLabel !== 'string'
-            || typeof session.name !== 'string' || !group.sessionIds.includes(session.sessionId))
-            || (!group.deleted && new Set(group.sessionIds).size < 2))
-            throw new Error('跨服务工作组无效');
+        validateFederatedGroup(group);
         const existing = this.getGroup(group.id);
         if (existing && (!existing.federated || existing.updatedAt > group.updatedAt))
             return;
@@ -213,6 +233,37 @@ export class CollaborationStore {
             this.document.messages = this.document.messages.filter((item) => item.groupId !== group.id);
         this.persist();
     }
+    /** Promote the source group and its complete history in one atomic file replacement. */
+    promoteGroup(id, group, expectedUpdatedAt) {
+        validateFederatedGroup(group);
+        const existing = this.getGroup(id);
+        if (!existing || existing.deleted)
+            throw new CollaborationError('GROUP_NOT_FOUND', '协作组已删除，请刷新列表', 404);
+        if (existing.federated || existing.updatedAt !== expectedUpdatedAt || this.getGroup(group.id)) {
+            throw new CollaborationError('GROUP_CHANGED', '协作组已被修改，请重新打开成员管理后再保存', 409);
+        }
+        const promoted = { ...group, createdAt: existing.createdAt, updatedAt: Math.max(Date.now(), existing.updatedAt + 1, group.updatedAt) };
+        const idempotency = { ...this.document.idempotency };
+        for (const [key, value] of Object.entries(idempotency)) {
+            let parts;
+            try {
+                parts = JSON.parse(key);
+            }
+            catch {
+                continue;
+            }
+            if (Array.isArray(parts) && parts[0] === id) {
+                delete idempotency[key];
+                idempotency[JSON.stringify([promoted.id, ...parts.slice(1)])] = value;
+            }
+        }
+        this.document = { ...this.document, idempotency,
+            groups: this.document.groups.map((item) => item.id === id ? promoted : item),
+            messages: this.document.messages.map((message) => message.groupId === id ? { ...message, groupId: promoted.id } : message),
+        };
+        this.persist();
+        return promoted;
+    }
     mergeFederatedMessages(messages) {
         let changed = false;
         const rank = STATUS_RANK;
@@ -439,3 +490,14 @@ function stableJson(value) {
     return JSON.stringify(value, (_key, entry) => entry && typeof entry === 'object' && !Array.isArray(entry)
         ? Object.fromEntries(Object.entries(entry).sort(([a], [b]) => a.localeCompare(b))) : entry);
 }
+function validateFederatedGroup(group) {
+    if (!group.federated || typeof group.id !== 'string' || !group.id.startsWith('cross-') || typeof group.name !== 'string' || !group.name.trim()
+        || !Number.isFinite(group.updatedAt) || !Number.isFinite(group.createdAt)
+        || !Array.isArray(group.sessionIds) || group.sessionIds.some((id) => typeof id !== 'string')
+        || !Array.isArray(group.remoteSessions) || group.remoteSessions.some((session) => !session
+        || typeof session.sessionId !== 'string' || !session.sessionId.startsWith('remote:')
+        || typeof session.serviceOrigin !== 'string' || typeof session.serviceLabel !== 'string'
+        || typeof session.name !== 'string' || !group.sessionIds.includes(session.sessionId))
+        || (!group.deleted && new Set(group.sessionIds).size < 2))
+        throw new Error('跨服务工作组无效');
+}

package/dist/server/routes/terminal.js

@@ -1,3 +1,4 @@
+import { collaborationGroupRoutes } from '../agent/collaborationGroupRoutes.js';
 import { TerminalClientAttachment } from '../utils/terminalClientAttachment.js';
 import { redrawTmuxClient } from '../utils/tmuxClientRedraw.js';
 import { TmuxInitialScreen } from '../utils/tmuxInitialScreen.js';
@@ -5386,7 +5387,12 @@ router.post('/operations/collaboration-federation', (req, res) => {
             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))) {
+        const existing = collaborationStore.getGroup(group.id);
+        if (req.body.expectedUpdatedAt !== undefined && req.body.expectedUpdatedAt !== existing?.updatedAt) {
+            return res.status(409).json({ code: 'GROUP_CHANGED', error: '协作组已被修改，请重新打开成员管理后再保存' });
+        }
+        const retainedIds = new Set(existing?.sessionIds ?? []);
+        if (!group.deleted && group.sessionIds.some((id) => !localIds.has(id) && !remoteIds.has(id) && !retainedIds.has(id))) {
             throw new Error('工作组包含不存在的本服务会话，请刷新成员列表');
         }
         collaborationStore.mergeFederatedGroup(group);
@@ -5411,31 +5417,8 @@ router.post('/operations/collaboration-federation', (req, res) => {
         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),
-    });
-});
-router.post('/operations/collaboration-groups', (req, res) => {
-    const name = typeof req.body?.name === 'string' ? req.body.name.trim() : '';
-    const sessionIds = Array.isArray(req.body?.sessionIds)
-        ? req.body.sessionIds.filter((id) => typeof id === 'string')
-        : [];
-    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: '协作组至少需要两个有效会话' });
-    const group = collaborationStore.save({
-        id: typeof req.body?.id === 'string' ? req.body.id : undefined,
-        name,
-        sessionIds: normalizedIds,
-    });
-    res.json({ group });
-});
+router.use('/operations', collaborationGroupRoutes({ store: collaborationStore,
+    sessions: () => globalSessionState.sessions.map(orchestrationSessionSnapshot) }));
 router.post('/operations/collaboration-groups/:groupId/spawn', async (req, res) => {
     const group = collaborationStore.getGroup(req.params.groupId);
     if (!group)
@@ -5449,11 +5432,6 @@ router.post('/operations/collaboration-groups/:groupId/spawn', async (req, res)
         res.status(400).json({ error: getErrorMessage(error) });
     }
 });
-router.delete('/operations/collaboration-groups/:groupId', (req, res) => {
-    if (!collaborationStore.remove(req.params.groupId))
-        return res.status(404).json({ error: '协作组不存在' });
-    res.status(204).send();
-});
 router.get('/operations/collaboration-groups/:groupId/messages', (req, res) => {
     const group = collaborationStore.getGroup(req.params.groupId);
     if (!group)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.181",
+  "version": "1.4.183",
   "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.181",
+  "version": "1.4.183",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-kSujny2SLOFnZ1ffxm1FYtli7g1vEN8d3vj1oQeLLdc=",
-  "serverBundleHash": "sha256-OJ83J67z97pdLmRW6AEkj8r5LkhdkmNIeAxu2L4niig=",
-  "clientBundleHash": "sha256-AHTJsL4pvoHmTozQ4JtoL/ea8KDoQp5Apw3HulQt6VE=",
+  "serverBundleHash": "sha256-//OpMMWFXRg8QzpFFBu/P7z4cA1+K9ZU3DV4Ns/JAwM=",
+  "clientBundleHash": "sha256-UGaJ61xoKrp6tvQ+Ux7cOVgZWkgcERW4ZT/h5DYHbxo=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }