fix: Handle collaboration push old format (#26467)

Author: dariacodes

packages/cli/src/collaboration/__tests__/collaboration.state.test.ts

@@ -119,5 +119,32 @@ describe('CollaborationState', () => {
 				userId: 'user1',
 			});
 		});
+
+		it('should gracefully ignore old cache format and clean it up', async () => {
+			// Arrange
+			const now = new Date().toISOString();
+
+			mockCacheService.getHash.mockResolvedValueOnce({
+				'old-user-uuid': '2026-02-26T21:23:36.318Z',
+				newClientId: `new-user-uuid|${now}`,
+			});
+
+			// Act
+			const users = await collaborationState.getCollaborators(workflowId);
+
+			// Assert
+			expect(users).toEqual([
+				{
+					clientId: 'newClientId',
+					lastSeen: now,
+					userId: 'new-user-uuid',
+				},
+			]);
+
+			expect(mockCacheService.deleteFromHash).toHaveBeenCalledWith(
+				'collaboration:workflow',
+				'old-user-uuid',
+			);
+		});
 	});
 });

packages/cli/src/collaboration/collaboration.service.ts

@@ -1,6 +1,7 @@
 import type { PushPayload } from '@n8n/api-types';
 import type { User } from '@n8n/db';
 import { UserRepository } from '@n8n/db';
+import { Logger } from '@n8n/backend-common';
 import { Service } from '@n8n/di';
 import { ErrorReporter } from 'n8n-core';
 import type { Workflow } from 'n8n-workflow';
@@ -29,6 +30,7 @@ import { AccessService } from '@/services/access.service';
 @Service()
 export class CollaborationService {
 	constructor(
+		private readonly logger: Logger,
 		private readonly errorReporter: ErrorReporter,
 		private readonly push: Push,
 		private readonly state: CollaborationState,
@@ -41,6 +43,13 @@ export class CollaborationService {
 			try {
 				await this.handleUserMessage(event.userId, event.pushRef, event.msg);
 			} catch (error) {
+				if (this.isTransientError(error)) {
+					this.logger.debug('Transient infrastructure error in collaboration service', {
+						error,
+					});
+					return;
+				}
+
 				this.errorReporter.error(
 					new UnexpectedError('Error handling CollaborationService push message', {
 						extra: {
@@ -55,6 +64,15 @@ export class CollaborationService {
 		});
 	}
 
+	private isTransientError(error: unknown): error is NodeJS.ErrnoException {
+		return (
+			error instanceof Error &&
+			'code' in error &&
+			typeof error.code === 'string' &&
+			['ECONNREFUSED', 'ETIMEDOUT', 'ENOTFOUND', 'ECONNRESET'].includes(error.code)
+		);
+	}
+
 	async handleUserMessage(userId: User['id'], clientId: string, msg: unknown) {
 		const workflowMessage = await parseWorkflowMessage(msg);
 

packages/cli/src/collaboration/collaboration.state.ts

@@ -63,11 +63,12 @@ export class CollaborationState {
 			return [];
 		}
 
-		const activeCollaborators = this.cacheHashToCollaborators(cacheValue);
-		const [expired, stillActive] = this.splitToExpiredAndStillActive(activeCollaborators);
+		const { valid, invalid } = this.parseCacheHashToCollaborators(cacheValue);
+		const [expired, stillActive] = this.splitToExpiredAndStillActive(valid);
 
-		if (expired.length > 0) {
-			void this.removeExpiredCollaborators(workflowId, expired);
+		const toRemove = [...expired, ...invalid];
+		if (toRemove.length > 0) {
+			void this.removeExpiredCollaborators(workflowId, toRemove);
 		}
 
 		// Deduplicate by userId - keep the most recent entry for each user
@@ -113,15 +114,36 @@ export class CollaborationState {
 		);
 	}
 
-	private cacheHashToCollaborators(workflowCacheEntry: WorkflowCacheHash): CacheEntry[] {
-		return Object.entries(workflowCacheEntry).map(([clientId, value]) => {
-			const [userId, lastSeen] = value.split('|');
-			return {
-				userId,
-				lastSeen,
-				clientId,
-			};
-		});
+	private parseCacheHashToCollaborators(workflowCacheEntry: WorkflowCacheHash): {
+		valid: CacheEntry[];
+		invalid: CacheEntry[];
+	} {
+		const valid: CacheEntry[] = [];
+		const invalid: CacheEntry[] = [];
+
+		for (const [clientId, value] of Object.entries(workflowCacheEntry)) {
+			const parts = value.split('|');
+
+			// Handle old format (pre-tab-scoped collaboration) where value was just a timestamp
+			// Old: { "userId": "2026-02-26T21:23:36.318Z" }
+			// New: { "clientId": "userId|2026-02-26T21:23:36.318Z" }
+			if (parts.length === 1) {
+				invalid.push({
+					clientId,
+					userId: '', // Not needed for deletion
+					lastSeen: value,
+				});
+			} else {
+				const [userId, lastSeen] = parts;
+				valid.push({
+					userId,
+					lastSeen,
+					clientId,
+				});
+			}
+		}
+
+		return { valid, invalid };
 	}
 
 	private hasSessionExpired(lastSeenString: Iso8601DateTimeString) {