@taskforcehq/taskforce 0.3.305 → 0.3.307

package/dist/sync/workspaceSyncModel.test.js

@@ -1,5 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { buildWorkspaceSyncPayloadModel, buildWorkspaceSyncSignatureModel } from './workspaceSyncModel';
+import { aiProfileSyncResourceAdapter, taskSyncResourceAdapter } from './syncResourceAdapters';
 describe('workspaceSyncModel', () => {
     describe('buildWorkspaceSyncPayloadModel', () => {
         it('emits document-delete when a previously pushed document path is now missing', () => {
@@ -20,6 +21,28 @@ describe('workspaceSyncModel', () => {
                 expect.objectContaining({ op: 'document-delete', path: 'docs/remove.md' })
             ]));
         });
+        it('does not emit document-delete when a canonical path is still known but missing from the readable snapshot', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                documents: [
+                    { path: 'docs/keep.md', updatedAt: '2026-02-01T00:00:00.000Z', content: 'keep' }
+                ],
+                currentDocumentPaths: new Set(['docs/keep.md', 'docs/missing-content.md']),
+                lastPushedDocumentPaths: new Set(['docs/keep.md', 'docs/missing-content.md', 'docs/remove.md'])
+            });
+            expect(Array.from(payload.currentDocumentPaths).sort()).toEqual(['docs/keep.md', 'docs/missing-content.md']);
+            expect(Array.from(payload.deleteDocumentPaths).sort()).toEqual(['docs/remove.md']);
+            expect(payload.changes).toEqual(expect.arrayContaining([
+                expect.objectContaining({ op: 'document-upsert', path: 'docs/keep.md' }),
+                expect.objectContaining({ op: 'document-delete', path: 'docs/remove.md' })
+            ]));
+            expect(payload.changes).not.toEqual(expect.arrayContaining([
+                expect.objectContaining({ op: 'document-delete', path: 'docs/missing-content.md' })
+            ]));
+        });
         it('emits task-event-upsert changes for new activity events and tracks event watermarks', () => {
             const payload = buildWorkspaceSyncPayloadModel({
                 tasks: [],
@@ -27,6 +50,8 @@ describe('workspaceSyncModel', () => {
                 taskEvents: [
                     {
                         id: 'task-event-1',
+                        entityType: 'task',
+                        entityId: 'task-1',
                         taskId: 'task-1',
                         workspaceId: 'workspace-a',
                         action: 'task-status-changed',
@@ -68,6 +93,8 @@ describe('workspaceSyncModel', () => {
                 taskEvents: [
                     {
                         id: 'task-event-keep',
+                        entityType: 'task',
+                        entityId: 'task-1',
                         taskId: 'task-1',
                         workspaceId: 'workspace-a',
                         action: 'task-status-changed',
@@ -77,6 +104,8 @@ describe('workspaceSyncModel', () => {
                     },
                     {
                         id: 'task-event-new',
+                        entityType: 'task',
+                        entityId: 'task-2',
                         taskId: 'task-2',
                         workspaceId: 'workspace-a',
                         action: 'task-archived',
@@ -124,6 +153,67 @@ describe('workspaceSyncModel', () => {
                 ['docs/new.md', '2026-02-03T00:00:00.000Z']
             ]);
         });
+        it('emits a document upsert when a synced document receives a newer task link', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                documents: [
+                    {
+                        path: 'workspaces/default/assets/documents/asset-doc-1-notes.md',
+                        updatedAt: '2026-03-18T14:45:00.000Z',
+                        content: '# Notes',
+                        assetId: 'asset-doc-1',
+                        documentId: 'doc-1',
+                        referenceNumber: 8,
+                        version: 1,
+                        taskId: 'task-attach-1',
+                        originalFilename: 'notes.md',
+                        linkRole: 'attachment'
+                    }
+                ],
+                lastPushedDocumentPaths: new Set(['workspaces/default/assets/documents/asset-doc-1-notes.md']),
+                lastPushedDocumentWatermarks: new Map([
+                    ['workspaces/default/assets/documents/asset-doc-1-notes.md', '2026-03-18T13:30:00.000Z']
+                ])
+            });
+            expect(payload.changes).toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    op: 'document-upsert',
+                    path: 'workspaces/default/assets/documents/asset-doc-1-notes.md',
+                    updatedAt: '2026-03-18T14:45:00.000Z',
+                    taskId: 'task-attach-1',
+                    linkRole: 'attachment'
+                })
+            ]));
+        });
+        it('reports send-all diagnostics when a domain has no baseline', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                documents: [
+                    { path: 'docs/a.md', updatedAt: '2026-02-01T00:00:00.000Z', content: 'a' },
+                    { path: 'docs/b.md', updatedAt: '2026-02-02T00:00:00.000Z', content: 'b' }
+                ],
+                baselineResetReason: 'repair-reset'
+            });
+            expect(payload.deltaDiagnostics).toEqual(expect.objectContaining({
+                totalChanges: 2,
+                domains: expect.objectContaining({
+                    documents: expect.objectContaining({
+                        mode: 'send-all',
+                        reason: 'repair-reset',
+                        currentCount: 2,
+                        baselineCount: 0,
+                        changeCount: 2
+                    })
+                })
+            }));
+            expect(payload.deltaDiagnostics?.byOp['document-upsert']).toBe(2);
+        });
         it('preserves canonical document metadata on document-upsert changes', () => {
             const payload = buildWorkspaceSyncPayloadModel({
                 tasks: [],
@@ -196,6 +286,47 @@ describe('workspaceSyncModel', () => {
                 })
             ]));
         });
+        it('does not emit asset-delete when a canonical asset path is still known but missing from the readable snapshot', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                assets: [
+                    {
+                        path: 'workspaces/default/assets/images/asset-image-1-diagram.png',
+                        updatedAt: '2026-03-17T12:00:00.000Z',
+                        contentBase64: 'aW1hZ2UtYnl0ZXM=',
+                        assetId: 'asset-image-1',
+                        kind: 'image',
+                        mimeType: 'image/png',
+                        taskId: 'task-1',
+                        originalFilename: 'diagram.png',
+                        linkRole: 'image'
+                    }
+                ],
+                currentAssetPaths: new Set([
+                    'workspaces/default/assets/images/asset-image-1-diagram.png',
+                    'workspaces/default/assets/files/asset-file-missing.pdf'
+                ]),
+                lastPushedAssetPaths: new Set([
+                    'workspaces/default/assets/images/asset-image-1-diagram.png',
+                    'workspaces/default/assets/files/asset-file-missing.pdf',
+                    'workspaces/default/assets/files/asset-file-old-document.pdf'
+                ])
+            });
+            expect(Array.from(payload.currentAssetPaths).sort()).toEqual([
+                'workspaces/default/assets/files/asset-file-missing.pdf',
+                'workspaces/default/assets/images/asset-image-1-diagram.png'
+            ]);
+            expect(Array.from(payload.deleteAssetPaths)).toEqual(['workspaces/default/assets/files/asset-file-old-document.pdf']);
+            expect(payload.changes).not.toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    op: 'asset-delete',
+                    path: 'workspaces/default/assets/files/asset-file-missing.pdf'
+                })
+            ]));
+        });
         it('emits timestamped task deletes for previously pushed tasks that are now missing', () => {
             const payload = buildWorkspaceSyncPayloadModel({
                 tasks: [],
@@ -277,6 +408,7 @@ describe('workspaceSyncModel', () => {
                         provider: 'OpenAI',
                         model: 'gpt-5.4',
                         surfaceType: 'coding_tool',
+                        rosterStateUpdatedAt: '2026-03-22T10:00:00.000Z',
                         createdAt: '2026-03-22T10:00:00.000Z',
                         updatedAt: '2026-03-22T10:05:00.000Z',
                         lastActiveAt: '2026-03-22T10:05:00.000Z'
@@ -293,14 +425,51 @@ describe('workspaceSyncModel', () => {
                         role: 'Implementer',
                         provider: 'OpenAI',
                         model: 'gpt-5.4',
-                        surfaceType: 'coding_tool'
+                        surfaceType: 'coding_tool',
+                        avatarRevision: 0,
+                        avatarUpdatedAt: null,
+                        rosterStateUpdatedAt: '2026-03-22T10:00:00.000Z'
                     })
                 })
             ]));
             expect(Array.from(payload.currentAiProfileIds)).toEqual(['ai-profile-1']);
             expect(payload.currentAiProfileWatermarks.get('ai-profile-1')).toBe('2026-03-22T10:05:00.000Z');
         });
-        it('filters unchanged ai profiles when ai watermark state already matches', () => {
+        it('filters unchanged ai profiles when ai change-key state already matches', () => {
+            const profile = {
+                id: 'ai-profile-1',
+                workspaceId: 'ws-1',
+                profileToken: 'tfp_test',
+                name: 'Codex',
+                username: 'codex',
+                icon: 'Bot',
+                color: '#0ea5e9',
+                description: 'Terminal-first coding agent',
+                role: 'Implementer',
+                provider: 'OpenAI',
+                model: 'gpt-5.4',
+                surfaceType: 'coding_tool',
+                rosterStateUpdatedAt: '2026-03-22T10:00:00.000Z',
+                createdAt: '2026-03-22T10:00:00.000Z',
+                updatedAt: '2026-03-22T10:05:00.000Z',
+                lastActiveAt: '2026-03-22T10:05:00.000Z'
+            };
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                aiProfiles: [profile],
+                lastPushedAiProfileIds: new Set(['ai-profile-1']),
+                lastPushedAiProfileWatermarks: new Map([['ai-profile-1', '2026-03-22T10:05:00.000Z']]),
+                lastPushedAiProfileChangeKeys: new Map([
+                    ['ai-profile-1', aiProfileSyncResourceAdapter.getChangeKey(profile)]
+                ])
+            });
+            expect(payload.changes.some((change) => change.op === 'ai-profile-upsert')).toBe(false);
+            expect(Array.from(payload.currentAiProfileIds)).toEqual(['ai-profile-1']);
+        });
+        it('resends ai profiles when a legacy watermark did not include avatar fields', () => {
             const payload = buildWorkspaceSyncPayloadModel({
                 tasks: [],
                 archivedTasks: [],
@@ -315,11 +484,16 @@ describe('workspaceSyncModel', () => {
                         username: 'codex',
                         icon: 'Bot',
                         color: '#0ea5e9',
+                        avatarUrl: '/api/taskforce/context/workspaces%2Fws-1%2Fassets%2Fimages%2Fai-profiles%2Fai-profile-1%2Favatar%2Favatar.webp',
+                        avatarSourceUrl: '/api/taskforce/context/workspaces%2Fws-1%2Fassets%2Fimages%2Fai-profiles%2Fai-profile-1%2Favatar%2Fsource.webp',
+                        avatarRevision: 1,
+                        avatarUpdatedAt: '2026-03-22T10:04:00.000Z',
                         description: 'Terminal-first coding agent',
                         role: 'Implementer',
                         provider: 'OpenAI',
                         model: 'gpt-5.4',
                         surfaceType: 'coding_tool',
+                        rosterStateUpdatedAt: '2026-03-22T10:00:00.000Z',
                         createdAt: '2026-03-22T10:00:00.000Z',
                         updatedAt: '2026-03-22T10:05:00.000Z',
                         lastActiveAt: '2026-03-22T10:05:00.000Z'
@@ -328,8 +502,86 @@ describe('workspaceSyncModel', () => {
                 lastPushedAiProfileIds: new Set(['ai-profile-1']),
                 lastPushedAiProfileWatermarks: new Map([['ai-profile-1', '2026-03-22T10:05:00.000Z']])
             });
-            expect(payload.changes.some((change) => change.op === 'ai-profile-upsert')).toBe(false);
-            expect(Array.from(payload.currentAiProfileIds)).toEqual(['ai-profile-1']);
+            expect(payload.changes).toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    op: 'ai-profile-upsert',
+                    profile: expect.objectContaining({
+                        id: 'ai-profile-1',
+                        avatarUrl: expect.stringContaining('/api/taskforce/context/'),
+                        avatarSourceUrl: expect.stringContaining('/api/taskforce/context/'),
+                        avatarRevision: 1,
+                        avatarUpdatedAt: '2026-03-22T10:04:00.000Z'
+                    })
+                })
+            ]));
+            expect(payload.currentAiProfileWatermarks.get('ai-profile-1')).toBe('2026-03-22T10:05:00.000Z');
+            expect(payload.currentAiProfileChangeKeys?.get('ai-profile-1')).toBe(aiProfileSyncResourceAdapter.getChangeKey({
+                id: 'ai-profile-1',
+                workspaceId: 'ws-1',
+                profileToken: 'tfp_test',
+                name: 'Codex',
+                username: 'codex',
+                icon: 'Bot',
+                color: '#0ea5e9',
+                avatarUrl: '/api/taskforce/context/workspaces%2Fws-1%2Fassets%2Fimages%2Fai-profiles%2Fai-profile-1%2Favatar%2Favatar.webp',
+                avatarSourceUrl: '/api/taskforce/context/workspaces%2Fws-1%2Fassets%2Fimages%2Fai-profiles%2Fai-profile-1%2Favatar%2Fsource.webp',
+                avatarRevision: 1,
+                avatarUpdatedAt: '2026-03-22T10:04:00.000Z',
+                description: 'Terminal-first coding agent',
+                role: 'Implementer',
+                provider: 'OpenAI',
+                model: 'gpt-5.4',
+                surfaceType: 'coding_tool',
+                rosterStateUpdatedAt: '2026-03-22T10:00:00.000Z',
+                createdAt: '2026-03-22T10:00:00.000Z',
+                updatedAt: '2026-03-22T10:05:00.000Z',
+                lastActiveAt: '2026-03-22T10:05:00.000Z'
+            }));
+        });
+        it('resends ai profiles when lifecycle state advances beyond metadata updatedAt', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                aiProfiles: [
+                    {
+                        id: 'ai-profile-1',
+                        workspaceId: 'ws-1',
+                        profileToken: 'tfp_test',
+                        name: 'Codex',
+                        username: 'codex',
+                        icon: 'Bot',
+                        color: '#0ea5e9',
+                        description: 'Terminal-first coding agent',
+                        role: 'Implementer',
+                        provider: 'OpenAI',
+                        model: 'gpt-5.4',
+                        surfaceType: 'coding_tool',
+                        archivedAt: '2026-03-22T10:10:00.000Z',
+                        archivedBy: 'owner-1',
+                        archivedReason: 'manual_archive',
+                        rosterStateUpdatedAt: '2026-03-22T10:10:00.000Z',
+                        createdAt: '2026-03-22T10:00:00.000Z',
+                        updatedAt: '2026-03-22T10:05:00.000Z',
+                        lastActiveAt: '2026-03-22T10:05:00.000Z'
+                    }
+                ],
+                lastPushedAiProfileIds: new Set(['ai-profile-1']),
+                lastPushedAiProfileWatermarks: new Map([['ai-profile-1', '2026-03-22T10:05:00.000Z']])
+            });
+            expect(payload.changes).toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    op: 'ai-profile-upsert',
+                    profile: expect.objectContaining({
+                        id: 'ai-profile-1',
+                        archivedAt: '2026-03-22T10:10:00.000Z',
+                        rosterStateUpdatedAt: '2026-03-22T10:10:00.000Z',
+                        updatedAt: '2026-03-22T10:05:00.000Z'
+                    })
+                })
+            ]));
+            expect(payload.currentAiProfileWatermarks.get('ai-profile-1')).toBe('2026-03-22T10:10:00.000Z');
         });
         it('emits initiative and workstream upserts and tracks their watermarks', () => {
             const payload = buildWorkspaceSyncPayloadModel({
@@ -347,6 +599,12 @@ describe('workspaceSyncModel', () => {
                         createdAt: '2026-03-29T10:00:00.000Z',
                         updatedAt: '2026-03-29T11:00:00.000Z',
                         order: 1,
+                        attachments: [{
+                                path: 'workspaces/ws-1/assets/documents/asset-in.md',
+                                assetId: 'asset-in',
+                                referenceLabel: 'D-31',
+                                caption: 'Revenue context'
+                            }],
                         isArchived: false
                     }],
                 workstreams: [{
@@ -360,6 +618,12 @@ describe('workspaceSyncModel', () => {
                         createdAt: '2026-03-29T10:30:00.000Z',
                         updatedAt: '2026-03-29T11:30:00.000Z',
                         order: 2,
+                        attachments: [{
+                                path: 'workspaces/ws-1/assets/documents/asset-ws.md',
+                                assetId: 'asset-ws',
+                                referenceLabel: 'D-32',
+                                caption: 'Checkout context'
+                            }],
                         isArchived: false
                     }]
             });
@@ -368,7 +632,13 @@ describe('workspaceSyncModel', () => {
                     op: 'initiative-upsert',
                     initiative: expect.objectContaining({
                         id: 'initiative-1',
-                        title: 'Revenue Expansion'
+                        title: 'Revenue Expansion',
+                        attachments: expect.arrayContaining([
+                            expect.objectContaining({
+                                path: 'workspaces/ws-1/assets/documents/asset-in.md',
+                                referenceLabel: 'D-31'
+                            })
+                        ])
                     })
                 }),
                 expect.objectContaining({
@@ -376,7 +646,13 @@ describe('workspaceSyncModel', () => {
                     workstream: expect.objectContaining({
                         id: 'workstream-1',
                         initiativeId: 'initiative-1',
-                        title: 'Checkout UX'
+                        title: 'Checkout UX',
+                        attachments: expect.arrayContaining([
+                            expect.objectContaining({
+                                path: 'workspaces/ws-1/assets/documents/asset-ws.md',
+                                referenceLabel: 'D-32'
+                            })
+                        ])
                     })
                 })
             ]));
@@ -561,6 +837,138 @@ describe('workspaceSyncModel', () => {
                 })
             ]));
         });
+        it('does not resend already-acknowledged deleted collaboration records', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                documentReviewSessions: [
+                    {
+                        id: 'review-deleted',
+                        assetId: 'asset-doc-1',
+                        documentId: 'doc-1',
+                        documentVersion: 2,
+                        title: 'Review',
+                        status: 'open',
+                        comments: [],
+                        createdByActorId: null,
+                        updatedByActorId: null,
+                        createdAt: '2026-03-24T10:00:00.000Z',
+                        updatedAt: '2026-03-24T10:05:00.000Z',
+                        deletedAt: '2026-03-24T10:06:00.000Z'
+                    }
+                ],
+                documentReviewComments: [
+                    {
+                        id: 'comment-deleted',
+                        sessionId: 'review-deleted',
+                        body: 'Delete me.',
+                        anchor: { kind: 'document' },
+                        order: 0,
+                        authorActorId: null,
+                        createdAt: '2026-03-24T10:00:00.000Z',
+                        updatedAt: '2026-03-24T10:05:00.000Z',
+                        deletedAt: '2026-03-24T10:06:30.000Z'
+                    }
+                ],
+                annotatedAttachmentSessions: [
+                    {
+                        id: 'annotation-deleted',
+                        workspaceId: 'ws-1',
+                        taskId: 'task-1',
+                        baseImageAssetId: 'asset-image-1',
+                        title: 'Annotations',
+                        globalInstruction: null,
+                        annotations: [],
+                        createdByActorId: null,
+                        updatedByActorId: null,
+                        createdAt: '2026-03-24T10:00:00.000Z',
+                        updatedAt: '2026-03-24T10:05:00.000Z',
+                        deletedAt: '2026-03-24T10:07:00.000Z'
+                    }
+                ],
+                lastPushedDocumentReviewSessionIds: new Set(),
+                lastPushedDocumentReviewSessionWatermarks: new Map([
+                    ['review-deleted', '2026-03-24T10:06:00.000Z']
+                ]),
+                lastPushedDocumentReviewCommentIds: new Set(),
+                lastPushedDocumentReviewCommentWatermarks: new Map([
+                    ['comment-deleted', '2026-03-24T10:06:30.000Z']
+                ]),
+                lastPushedAnnotatedAttachmentSessionIds: new Set(),
+                lastPushedAnnotatedAttachmentSessionWatermarks: new Map([
+                    ['annotation-deleted', '2026-03-24T10:07:00.000Z']
+                ])
+            });
+            expect(payload.currentDocumentReviewSessionWatermarks.get('review-deleted')).toBe('2026-03-24T10:06:00.000Z');
+            expect(payload.currentDocumentReviewCommentWatermarks.get('comment-deleted')).toBe('2026-03-24T10:06:30.000Z');
+            expect(payload.currentAnnotatedAttachmentSessionWatermarks.get('annotation-deleted')).toBe('2026-03-24T10:07:00.000Z');
+            expect(payload.changes).not.toEqual(expect.arrayContaining([
+                expect.objectContaining({ op: 'document-review-session-delete', sessionId: 'review-deleted' }),
+                expect.objectContaining({ op: 'document-review-comment-delete', commentId: 'comment-deleted' }),
+                expect.objectContaining({ op: 'annotated-attachment-session-delete', sessionId: 'annotation-deleted' })
+            ]));
+            expect(payload.deltaDiagnostics?.domains.documentReviewSessions.changeCount).toBe(0);
+            expect(payload.deltaDiagnostics?.domains.documentReviewComments.changeCount).toBe(0);
+            expect(payload.deltaDiagnostics?.domains.annotatedAttachmentSessions.changeCount).toBe(0);
+        });
+        it('emits a single delete op when a previously pushed collaboration record is now soft-deleted', () => {
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(),
+                pendingDeletedTaskIds: new Set(),
+                documentReviewSessions: [{
+                        id: 'review-deleted',
+                        assetId: 'asset-doc-1',
+                        documentId: 'doc-1',
+                        documentVersion: 2,
+                        title: 'Review',
+                        status: 'open',
+                        comments: [],
+                        createdByActorId: null,
+                        updatedByActorId: null,
+                        createdAt: '2026-03-24T10:00:00.000Z',
+                        updatedAt: '2026-03-24T10:05:00.000Z',
+                        deletedAt: '2026-03-24T10:06:00.000Z'
+                    }],
+                documentReviewComments: [{
+                        id: 'comment-deleted',
+                        sessionId: 'review-deleted',
+                        body: 'Delete me.',
+                        anchor: { kind: 'document' },
+                        order: 0,
+                        authorActorId: null,
+                        createdAt: '2026-03-24T10:00:00.000Z',
+                        updatedAt: '2026-03-24T10:05:00.000Z',
+                        deletedAt: '2026-03-24T10:06:30.000Z'
+                    }],
+                annotatedAttachmentSessions: [{
+                        id: 'annotation-deleted',
+                        workspaceId: 'ws-1',
+                        taskId: 'task-1',
+                        baseImageAssetId: 'asset-image-1',
+                        title: 'Annotations',
+                        globalInstruction: null,
+                        annotations: [],
+                        createdByActorId: null,
+                        updatedByActorId: null,
+                        createdAt: '2026-03-24T10:00:00.000Z',
+                        updatedAt: '2026-03-24T10:05:00.000Z',
+                        deletedAt: '2026-03-24T10:07:00.000Z'
+                    }],
+                lastPushedDocumentReviewSessionIds: new Set(['review-deleted']),
+                lastPushedDocumentReviewSessionWatermarks: new Map(),
+                lastPushedDocumentReviewCommentIds: new Set(['comment-deleted']),
+                lastPushedDocumentReviewCommentWatermarks: new Map(),
+                lastPushedAnnotatedAttachmentSessionIds: new Set(['annotation-deleted']),
+                lastPushedAnnotatedAttachmentSessionWatermarks: new Map()
+            });
+            expect(payload.changes.filter((change) => change.op === 'document-review-session-delete')).toHaveLength(1);
+            expect(payload.changes.filter((change) => change.op === 'document-review-comment-delete')).toHaveLength(1);
+            expect(payload.changes.filter((change) => change.op === 'annotated-attachment-session-delete')).toHaveLength(1);
+        });
     });
     describe('buildWorkspaceSyncSignatureModel', () => {
         it('includes pending delete operations in the signature hash', () => {
@@ -718,6 +1126,63 @@ describe('workspaceSyncModel', () => {
             });
             expect(changedSignature).not.toEqual(baseSignature);
         });
+        it('changes when initiative or workstream attachments change', () => {
+            const baseSignature = buildWorkspaceSyncSignatureModel({
+                workspaceId: 'ws-1',
+                tasks: [],
+                archivedTasks: [],
+                initiatives: [{
+                        id: 'initiative-1',
+                        title: 'Revenue Expansion',
+                        description: null,
+                        createdAt: '2026-03-29T10:00:00.000Z',
+                        updatedAt: '2026-03-29T11:00:00.000Z',
+                        attachments: []
+                    }],
+                workstreams: [{
+                        id: 'workstream-1',
+                        initiativeId: 'initiative-1',
+                        title: 'Checkout UX',
+                        description: null,
+                        createdAt: '2026-03-29T10:30:00.000Z',
+                        updatedAt: '2026-03-29T11:30:00.000Z',
+                        attachments: []
+                    }]
+            });
+            const changedSignature = buildWorkspaceSyncSignatureModel({
+                workspaceId: 'ws-1',
+                tasks: [],
+                archivedTasks: [],
+                initiatives: [{
+                        id: 'initiative-1',
+                        title: 'Revenue Expansion',
+                        description: null,
+                        createdAt: '2026-03-29T10:00:00.000Z',
+                        updatedAt: '2026-03-29T11:00:00.000Z',
+                        attachments: [{
+                                path: 'workspaces/ws-1/assets/documents/asset-in.md',
+                                assetId: 'asset-in',
+                                referenceLabel: 'D-31',
+                                caption: 'Revenue context'
+                            }]
+                    }],
+                workstreams: [{
+                        id: 'workstream-1',
+                        initiativeId: 'initiative-1',
+                        title: 'Checkout UX',
+                        description: null,
+                        createdAt: '2026-03-29T10:30:00.000Z',
+                        updatedAt: '2026-03-29T11:30:00.000Z',
+                        attachments: [{
+                                path: 'workspaces/ws-1/assets/documents/asset-ws.md',
+                                assetId: 'asset-ws',
+                                referenceLabel: 'D-32',
+                                caption: 'Checkout context'
+                            }]
+                    }]
+            });
+            expect(changedSignature).not.toEqual(baseSignature);
+        });
         it('changes when document review sessions change', () => {
             const baseSignature = buildWorkspaceSyncSignatureModel({
                 workspaceId: 'ws-1',
@@ -810,6 +1275,8 @@ describe('workspaceSyncModel', () => {
                 archivedTasks: [],
                 taskEvents: [{
                         id: 'task-event-1',
+                        entityType: 'task',
+                        entityId: 'task-1',
                         taskId: 'task-1',
                         workspaceId: 'ws-1',
                         action: 'task-status-changed',
@@ -824,6 +1291,8 @@ describe('workspaceSyncModel', () => {
                 archivedTasks: [],
                 taskEvents: [{
                         id: 'task-event-1',
+                        entityType: 'task',
+                        entityId: 'task-1',
                         taskId: 'task-1',
                         workspaceId: 'ws-1',
                         action: 'task-status-changed',
@@ -836,15 +1305,16 @@ describe('workspaceSyncModel', () => {
         });
     });
     describe('dirty task watermarks', () => {
-        it('emits an upsert when a status-only server-confirmed update changes updatedAt', () => {
+        it('resends once when a legacy watermark-only task baseline exists', () => {
+            const task = {
+                id: 'task-1',
+                title: 'Task 1',
+                status: 'in-progress',
+                createdAt: '2026-03-16T10:00:00.000Z',
+                updatedAt: '2026-03-16T10:05:00.000Z'
+            };
             const payload = buildWorkspaceSyncPayloadModel({
-                tasks: [{
-                        id: 'task-1',
-                        title: 'Task 1',
-                        status: 'in-progress',
-                        createdAt: '2026-03-16T10:00:00.000Z',
-                        updatedAt: '2026-03-16T10:05:00.000Z'
-                    }],
+                tasks: [task],
                 archivedTasks: [],
                 lastPushedTaskIds: new Set(['task-1']),
                 pendingDeletedTaskIds: new Set(),
@@ -863,6 +1333,81 @@ describe('workspaceSyncModel', () => {
                 })
             ]));
             expect(payload.pushedWatermarks.get('task-1')).toBe('2026-03-16T10:05:00.000Z');
+            expect(payload.pushedTaskChangeKeys.get('task-1')).toBe(taskSyncResourceAdapter.getChangeKey({ ...task, isArchived: false }));
+        });
+        it('does not resend a task when only updatedAt changes but the replicated change key matches', () => {
+            const task = {
+                id: 'task-1',
+                title: 'Task 1',
+                status: 'in-progress',
+                createdAt: '2026-03-16T10:00:00.000Z',
+                updatedAt: '2026-03-16T10:05:00.000Z'
+            };
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [task],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(['task-1']),
+                pendingDeletedTaskIds: new Set(),
+                lastPushedWatermarks: new Map([
+                    ['task-1', '2026-03-16T10:00:00.000Z']
+                ]),
+                lastPushedTaskChangeKeys: new Map([
+                    ['task-1', taskSyncResourceAdapter.getChangeKey({ ...task, isArchived: false })]
+                ])
+            });
+            expect(payload.changes.some((change) => change.op === 'upsert' && change.task.id === 'task-1')).toBe(false);
+            expect(payload.currentTaskWatermarks.get('task-1')).toBe('2026-03-16T10:05:00.000Z');
+        });
+        it('treats comment and attachment changes as replicated task-state changes', () => {
+            const task = {
+                id: 'task-1',
+                title: 'Task 1',
+                status: 'task',
+                createdAt: '2026-03-16T10:00:00.000Z',
+                updatedAt: '2026-03-16T10:05:00.000Z',
+                comments: [{
+                        id: 'comment-1',
+                        author: 'ai-profile-1',
+                        text: 'Shipped',
+                        timestamp: '2026-03-16T10:05:00.000Z'
+                    }],
+                attachments: [{
+                        path: 'workspaces/ws-1/assets/files/asset-1.txt',
+                        caption: 'Spec',
+                        timestamp: '2026-03-16T10:05:00.000Z'
+                    }]
+            };
+            const previousTask = {
+                ...task,
+                comments: [],
+                attachments: []
+            };
+            const payload = buildWorkspaceSyncPayloadModel({
+                tasks: [task],
+                archivedTasks: [],
+                lastPushedTaskIds: new Set(['task-1']),
+                pendingDeletedTaskIds: new Set(),
+                lastPushedWatermarks: new Map([
+                    ['task-1', '2026-03-16T10:05:00.000Z']
+                ]),
+                lastPushedTaskChangeKeys: new Map([
+                    ['task-1', taskSyncResourceAdapter.getChangeKey({ ...previousTask, isArchived: false })]
+                ])
+            });
+            expect(payload.changes).toEqual(expect.arrayContaining([
+                expect.objectContaining({
+                    op: 'upsert',
+                    task: expect.objectContaining({
+                        id: 'task-1',
+                        comments: expect.arrayContaining([
+                            expect.objectContaining({ id: 'comment-1' })
+                        ]),
+                        attachments: expect.arrayContaining([
+                            expect.objectContaining({ path: 'workspaces/ws-1/assets/files/asset-1.txt' })
+                        ])
+                    })
+                })
+            ]));
         });
         it('keeps provisional local-reference tasks dirty until a canonical reference is assigned', () => {
             const payload = buildWorkspaceSyncPayloadModel({