@taskforcehq/taskforce 0.3.305 → 0.3.307

package/dist/sync/workspaceSyncModel.js

@@ -1,8 +1,17 @@
 import { parseAiProfileSurfaceType } from '../shared/aiProfileSurfaceType.js';
+import { parseAiProfileSeatScope } from '../shared/aiProfileSeatScope.js';
 import { serializeTaskForSync } from './taskSyncPayload.js';
+import { aiProfileSyncResourceAdapter, taskSyncResourceAdapter, shouldSyncResource, } from './syncResourceAdapters.js';
+import { normalizeSyncSameOriginAssetUrl } from './syncFieldSemantics.js';
 export function toWorkspaceSyncTaskSnapshot(task) {
     return serializeTaskForSync(task);
 }
+function normalizeWorkspaceSyncPathSet(value, fallback) {
+    const source = value ?? fallback;
+    return new Set(Array.from(source)
+        .map((entry) => String(entry || '').trim())
+        .filter((entry) => entry.length > 0));
+}
 function sortTaskEventsForSync(taskEvents) {
     return [...taskEvents].sort((left, right) => {
         const leftCreatedAt = String(left?.createdAt || '').trim();
@@ -20,6 +29,9 @@ function sortTasksForSync(tasks) {
         return leftId.localeCompare(rightId);
     });
 }
+function clonePlanningAttachmentsForSync(value) {
+    return Array.isArray(value) ? value : undefined;
+}
 export function buildWorkspaceSyncPayloadModel(input) {
     const payloadBuiltAt = new Date().toISOString();
     const pendingDeleteIds = new Set(Array.from(input.pendingDeletedTaskIds)
@@ -29,49 +41,62 @@ export function buildWorkspaceSyncPayloadModel(input) {
         .map(([taskId, deletedAt]) => [String(taskId || '').trim(), String(deletedAt || '').trim()])
         .filter(([taskId, deletedAt]) => taskId.length > 0 && Number.isFinite(Date.parse(deletedAt))));
     const lastWatermarks = input.lastPushedWatermarks;
-    const isDirty = (task) => {
+    const lastTaskChangeKeys = input.lastPushedTaskChangeKeys;
+    const isDirty = (task, archived) => {
         if ((task?.referenceNumber === undefined || task?.referenceNumber === null) && Number.isFinite(Number(task?.localReferenceNumber))) {
             return true;
         }
-        if (!lastWatermarks || lastWatermarks.size === 0)
-            return true;
-        const taskId = String(task?.id || '').trim();
-        if (!taskId)
-            return false;
-        const currentWatermark = String(task?.updatedAt || task?.createdAt || '').trim();
-        return lastWatermarks.get(taskId) !== currentWatermark;
+        return shouldSyncResource(taskSyncResourceAdapter, { ...task, isArchived: archived }, {
+            watermarks: lastWatermarks,
+            changeKeys: lastTaskChangeKeys,
+        });
     };
     const activeTasksOrdered = sortTasksForSync(input.tasks || []);
     const archivedTasksOrdered = sortTasksForSync(input.archivedTasks || []);
+    const currentTaskWatermarks = new Map();
+    const currentTaskChangeKeys = new Map();
     const pushedWatermarks = new Map();
+    const pushedTaskChangeKeys = new Map();
     const activeChanges = activeTasksOrdered
-        .filter((task) => !pendingDeleteIds.has(String(task?.id || '').trim()) && isDirty(task))
+        .filter((task) => !pendingDeleteIds.has(String(task?.id || '').trim()) && isDirty(task, false))
         .map((task) => {
         const taskId = String(task?.id || '').trim();
-        const wm = String(task?.updatedAt || task?.createdAt || '').trim();
-        if (taskId)
+        const wm = taskSyncResourceAdapter.getWatermark(task);
+        const changeKey = taskSyncResourceAdapter.getChangeKey({ ...task, isArchived: false });
+        if (taskId) {
             pushedWatermarks.set(taskId, wm);
+            pushedTaskChangeKeys.set(taskId, changeKey);
+        }
         return { op: 'upsert', archived: false, task: toWorkspaceSyncTaskSnapshot(task) };
     });
     const archivedChanges = archivedTasksOrdered
-        .filter((task) => !pendingDeleteIds.has(String(task?.id || '').trim()) && isDirty(task))
+        .filter((task) => !pendingDeleteIds.has(String(task?.id || '').trim()) && isDirty(task, true))
         .map((task) => {
         const taskId = String(task?.id || '').trim();
-        const wm = String(task?.updatedAt || task?.createdAt || '').trim();
-        if (taskId)
+        const wm = taskSyncResourceAdapter.getWatermark(task);
+        const changeKey = taskSyncResourceAdapter.getChangeKey({ ...task, isArchived: true });
+        if (taskId) {
             pushedWatermarks.set(taskId, wm);
+            pushedTaskChangeKeys.set(taskId, changeKey);
+        }
         return { op: 'upsert', archived: true, task: toWorkspaceSyncTaskSnapshot(task) };
     });
     const currentTaskIds = new Set();
     for (const task of input.tasks || []) {
         const taskId = String(task?.id || '').trim();
-        if (taskId)
-            currentTaskIds.add(taskId);
+        if (!taskId)
+            continue;
+        currentTaskIds.add(taskId);
+        currentTaskWatermarks.set(taskId, taskSyncResourceAdapter.getWatermark(task));
+        currentTaskChangeKeys.set(taskId, taskSyncResourceAdapter.getChangeKey({ ...task, isArchived: false }));
     }
     for (const task of input.archivedTasks || []) {
         const taskId = String(task?.id || '').trim();
-        if (taskId)
-            currentTaskIds.add(taskId);
+        if (!taskId)
+            continue;
+        currentTaskIds.add(taskId);
+        currentTaskWatermarks.set(taskId, taskSyncResourceAdapter.getWatermark(task));
+        currentTaskChangeKeys.set(taskId, taskSyncResourceAdapter.getChangeKey({ ...task, isArchived: true }));
     }
     const deleteChanges = Array.from(input.lastPushedTaskIds)
         .filter((taskId) => !currentTaskIds.has(taskId))
@@ -120,6 +145,7 @@ export function buildWorkspaceSyncPayloadModel(input) {
             createdAt: String(initiative?.createdAt || '').trim(),
             updatedAt: String(initiative?.updatedAt || initiative?.createdAt || '').trim(),
             order: Number.isFinite(Number(initiative?.order)) ? Math.floor(Number(initiative.order)) : null,
+            attachments: clonePlanningAttachmentsForSync(initiative?.attachments),
             isArchived: Boolean(initiative?.isArchived)
         }
     }))
@@ -162,6 +188,7 @@ export function buildWorkspaceSyncPayloadModel(input) {
             createdAt: String(workstream?.createdAt || '').trim(),
             updatedAt: String(workstream?.updatedAt || workstream?.createdAt || '').trim(),
             order: Number.isFinite(Number(workstream?.order)) ? Math.floor(Number(workstream.order)) : null,
+            attachments: clonePlanningAttachmentsForSync(workstream?.attachments),
             isArchived: Boolean(workstream?.isArchived)
         }
     }))
@@ -175,9 +202,13 @@ export function buildWorkspaceSyncPayloadModel(input) {
         .map((profile) => String(profile?.id || '').trim())
         .filter((profileId) => profileId.length > 0));
     const currentAiProfileWatermarks = new Map((Array.isArray(input.aiProfiles) ? input.aiProfiles : [])
-        .map((profile) => [String(profile?.id || '').trim(), String(profile?.updatedAt || profile?.createdAt || '').trim()])
+        .map((profile) => [String(profile?.id || '').trim(), aiProfileSyncResourceAdapter.getWatermark(profile)])
+        .filter(([profileId]) => profileId.length > 0));
+    const currentAiProfileChangeKeys = new Map((Array.isArray(input.aiProfiles) ? input.aiProfiles : [])
+        .map((profile) => [String(profile?.id || '').trim(), aiProfileSyncResourceAdapter.getChangeKey(profile)])
         .filter(([profileId]) => profileId.length > 0));
     const previousAiProfileWatermarks = input.lastPushedAiProfileWatermarks;
+    const previousAiProfileChangeKeys = input.lastPushedAiProfileChangeKeys;
     const shouldSendAllAiProfiles = !previousAiProfileWatermarks || previousAiProfileWatermarks.size === 0;
     const aiProfileUpsertChanges = (Array.isArray(input.aiProfiles) ? input.aiProfiles : [])
         .map((profile) => ({
@@ -190,14 +221,34 @@ export function buildWorkspaceSyncPayloadModel(input) {
             username: String(profile.username || '').trim(),
             icon: String(profile.icon || 'Bot').trim() || 'Bot',
             color: String(profile.color || '#8b5cf6').trim() || '#8b5cf6',
+            avatarUrl: normalizeSyncSameOriginAssetUrl(profile.avatarUrl),
+            avatarSourceUrl: normalizeSyncSameOriginAssetUrl(profile.avatarSourceUrl),
+            avatarRevision: Number.isFinite(Number(profile.avatarRevision)) ? Math.max(0, Math.floor(Number(profile.avatarRevision))) : 0,
+            avatarUpdatedAt: typeof profile.avatarUpdatedAt === 'string' && profile.avatarUpdatedAt.trim().length > 0
+                ? profile.avatarUpdatedAt.trim()
+                : null,
             description: typeof profile.description === 'string' ? profile.description.trim() || null : null,
             role: typeof profile.role === 'string' ? profile.role.trim() || null : null,
             provider: typeof profile.provider === 'string' ? profile.provider.trim() || null : null,
             model: typeof profile.model === 'string' ? profile.model.trim() || null : null,
             surfaceType: parseAiProfileSurfaceType(profile.surfaceType),
+            seatScope: parseAiProfileSeatScope(profile.seatScope),
             providerMetadata: profile.providerMetadata && typeof profile.providerMetadata === 'object' && !Array.isArray(profile.providerMetadata)
                 ? profile.providerMetadata
                 : null,
+            archivedAt: typeof profile.archivedAt === 'string' && profile.archivedAt.trim().length > 0
+                ? profile.archivedAt.trim()
+                : null,
+            archivedBy: typeof profile.archivedBy === 'string' && profile.archivedBy.trim().length > 0
+                ? profile.archivedBy.trim()
+                : null,
+            archivedReason: typeof profile.archivedReason === 'string' ? profile.archivedReason.trim() || null : null,
+            mergedIntoProfileId: typeof profile.mergedIntoProfileId === 'string' && profile.mergedIntoProfileId.trim().length > 0
+                ? profile.mergedIntoProfileId.trim()
+                : null,
+            rosterStateUpdatedAt: typeof profile.rosterStateUpdatedAt === 'string' && profile.rosterStateUpdatedAt.trim().length > 0
+                ? profile.rosterStateUpdatedAt.trim()
+                : null,
             createdAt: String(profile.createdAt || '').trim(),
             updatedAt: String(profile.updatedAt || profile.createdAt || '').trim(),
             lastActiveAt: typeof profile.lastActiveAt === 'string' && profile.lastActiveAt.trim().length > 0
@@ -209,11 +260,13 @@ export function buildWorkspaceSyncPayloadModel(input) {
         .filter((change) => {
         if (shouldSendAllAiProfiles)
             return true;
-        return previousAiProfileWatermarks.get(change.profile.id) !== change.profile.updatedAt;
+        return shouldSyncResource(aiProfileSyncResourceAdapter, change.profile, {
+            watermarks: previousAiProfileWatermarks,
+            changeKeys: previousAiProfileChangeKeys,
+        });
     });
-    const currentDocumentPaths = new Set((Array.isArray(input.documents) ? input.documents : [])
-        .map((doc) => String(doc?.path || '').trim())
-        .filter((docPath) => docPath.length > 0));
+    const currentDocumentPaths = normalizeWorkspaceSyncPathSet(input.currentDocumentPaths, (Array.isArray(input.documents) ? input.documents : [])
+        .map((doc) => String(doc?.path || '').trim()));
     const deleteDocumentPaths = new Set(Array.from(input.lastPushedDocumentPaths || new Set())
         .map((docPath) => String(docPath || '').trim())
         .filter((docPath) => docPath.length > 0 && !currentDocumentPaths.has(docPath)));
@@ -233,6 +286,10 @@ export function buildWorkspaceSyncPayloadModel(input) {
         referenceNumber: Number.isFinite(Number(doc.referenceNumber)) ? Math.max(1, Math.floor(Number(doc.referenceNumber))) : null,
         version: Number.isFinite(Number(doc.version)) ? Math.max(1, Math.floor(Number(doc.version))) : null,
         taskId: typeof doc.taskId === 'string' && doc.taskId.trim().length > 0 ? doc.taskId.trim() : null,
+        linkTargetType: doc.linkTargetType === 'initiative' || doc.linkTargetType === 'workstream' || doc.linkTargetType === 'task'
+            ? doc.linkTargetType
+            : null,
+        linkTargetId: typeof doc.linkTargetId === 'string' && doc.linkTargetId.trim().length > 0 ? doc.linkTargetId.trim() : null,
         logicalName: typeof doc.logicalName === 'string' && doc.logicalName.trim().length > 0 ? doc.logicalName.trim() : null,
         caption: typeof doc.caption === 'string' && doc.caption.trim().length > 0 ? doc.caption.trim() : null,
         originalFilename: typeof doc.originalFilename === 'string' && doc.originalFilename.trim().length > 0 ? doc.originalFilename.trim() : null,
@@ -244,9 +301,8 @@ export function buildWorkspaceSyncPayloadModel(input) {
             return true;
         return previousDocumentWatermarks.get(doc.path) !== doc.updatedAt;
     });
-    const currentAssetPaths = new Set((Array.isArray(input.assets) ? input.assets : [])
-        .map((asset) => String(asset?.path || '').trim())
-        .filter((assetPath) => assetPath.length > 0));
+    const currentAssetPaths = normalizeWorkspaceSyncPathSet(input.currentAssetPaths, (Array.isArray(input.assets) ? input.assets : [])
+        .map((asset) => String(asset?.path || '').trim()));
     const deleteAssetPaths = new Set(Array.from(input.lastPushedAssetPaths || new Set())
         .map((assetPath) => String(assetPath || '').trim())
         .filter((assetPath) => assetPath.length > 0 && !currentAssetPaths.has(assetPath)));
@@ -266,6 +322,10 @@ export function buildWorkspaceSyncPayloadModel(input) {
         mimeType: typeof asset.mimeType === 'string' && asset.mimeType.trim().length > 0 ? asset.mimeType.trim() : 'application/octet-stream',
         referenceNumber: Number.isFinite(Number(asset.referenceNumber)) ? Math.max(1, Math.floor(Number(asset.referenceNumber))) : null,
         taskId: typeof asset.taskId === 'string' && asset.taskId.trim().length > 0 ? asset.taskId.trim() : null,
+        linkTargetType: asset.linkTargetType === 'initiative' || asset.linkTargetType === 'workstream' || asset.linkTargetType === 'task'
+            ? asset.linkTargetType
+            : null,
+        linkTargetId: typeof asset.linkTargetId === 'string' && asset.linkTargetId.trim().length > 0 ? asset.linkTargetId.trim() : null,
         logicalName: typeof asset.logicalName === 'string' && asset.logicalName.trim().length > 0 ? asset.logicalName.trim() : null,
         caption: typeof asset.caption === 'string' && asset.caption.trim().length > 0 ? asset.caption.trim() : null,
         originalFilename: typeof asset.originalFilename === 'string' && asset.originalFilename.trim().length > 0 ? asset.originalFilename.trim() : null,
@@ -282,21 +342,19 @@ export function buildWorkspaceSyncPayloadModel(input) {
         return previousAssetWatermarks.get(asset.path) !== asset.updatedAt;
     });
     const reviewSessions = Array.isArray(input.documentReviewSessions) ? input.documentReviewSessions : [];
+    const allDocumentReviewSessionIds = new Set(reviewSessions
+        .map((session) => String(session?.id || '').trim())
+        .filter((sessionId) => sessionId.length > 0));
     const currentDocumentReviewSessionIds = new Set(reviewSessions
         .filter((session) => String(session?.deletedAt || '').trim().length === 0)
         .map((session) => String(session?.id || '').trim())
         .filter((sessionId) => sessionId.length > 0));
-    const deleteDocumentReviewSessionIds = new Set([
-        ...Array.from(input.lastPushedDocumentReviewSessionIds || new Set())
-            .map((sessionId) => String(sessionId || '').trim())
-            .filter((sessionId) => sessionId.length > 0 && !currentDocumentReviewSessionIds.has(sessionId)),
-        ...reviewSessions
-            .filter((session) => String(session?.deletedAt || '').trim().length > 0)
-            .map((session) => String(session?.id || '').trim())
-            .filter((sessionId) => sessionId.length > 0)
-    ]);
+    const previousDocumentReviewSessionIds = input.lastPushedDocumentReviewSessionIds || new Set();
     const currentDocumentReviewSessionWatermarks = new Map(reviewSessions
-        .map((session) => [String(session?.id || '').trim(), String(session?.updatedAt || session?.createdAt || '').trim()])
+        .map((session) => [
+        String(session?.id || '').trim(),
+        String(session?.deletedAt || session?.updatedAt || session?.createdAt || '').trim()
+    ])
         .filter(([sessionId]) => sessionId.length > 0));
     const previousDocumentReviewSessionWatermarks = input.lastPushedDocumentReviewSessionWatermarks;
     const shouldSendAllDocumentReviewSessions = !previousDocumentReviewSessionWatermarks || previousDocumentReviewSessionWatermarks.size === 0;
@@ -324,22 +382,46 @@ export function buildWorkspaceSyncPayloadModel(input) {
             return true;
         return previousDocumentReviewSessionWatermarks.get(change.session.id) !== change.session.updatedAt;
     });
+    const deletedReviewSessionChanges = reviewSessions
+        .filter((session) => String(session?.deletedAt || '').trim().length > 0)
+        .map((session) => ({
+        sessionId: String(session?.id || '').trim(),
+        deletedAt: String(session?.deletedAt || session?.updatedAt || session?.createdAt || payloadBuiltAt).trim() || payloadBuiltAt
+    }))
+        .filter((change) => change.sessionId.length > 0)
+        .filter((change) => {
+        if (shouldSendAllDocumentReviewSessions)
+            return true;
+        return previousDocumentReviewSessionWatermarks.get(change.sessionId) !== change.deletedAt;
+    });
+    const missingDocumentReviewSessionDeleteIds = Array.from(previousDocumentReviewSessionIds)
+        .map((sessionId) => String(sessionId || '').trim())
+        .filter((sessionId) => sessionId.length > 0 && !allDocumentReviewSessionIds.has(sessionId));
+    const documentReviewSessionDeleteChanges = [
+        ...missingDocumentReviewSessionDeleteIds.map((sessionId) => ({
+            sessionId,
+            deletedAt: payloadBuiltAt
+        })),
+        ...deletedReviewSessionChanges
+    ];
+    const deleteDocumentReviewSessionIds = new Set([
+        ...missingDocumentReviewSessionDeleteIds,
+        ...deletedReviewSessionChanges.map((change) => change.sessionId)
+    ]);
     const reviewComments = Array.isArray(input.documentReviewComments) ? input.documentReviewComments : [];
+    const allDocumentReviewCommentIds = new Set(reviewComments
+        .map((comment) => String(comment?.id || '').trim())
+        .filter((commentId) => commentId.length > 0));
     const currentDocumentReviewCommentIds = new Set(reviewComments
         .filter((comment) => String(comment?.deletedAt || '').trim().length === 0)
         .map((comment) => String(comment?.id || '').trim())
         .filter((commentId) => commentId.length > 0));
-    const deleteDocumentReviewCommentIds = new Set([
-        ...Array.from(input.lastPushedDocumentReviewCommentIds || new Set())
-            .map((commentId) => String(commentId || '').trim())
-            .filter((commentId) => commentId.length > 0 && !currentDocumentReviewCommentIds.has(commentId)),
-        ...reviewComments
-            .filter((comment) => String(comment?.deletedAt || '').trim().length > 0)
-            .map((comment) => String(comment?.id || '').trim())
-            .filter((commentId) => commentId.length > 0)
-    ]);
+    const previousDocumentReviewCommentIds = input.lastPushedDocumentReviewCommentIds || new Set();
     const currentDocumentReviewCommentWatermarks = new Map(reviewComments
-        .map((comment) => [String(comment?.id || '').trim(), String(comment?.updatedAt || comment?.createdAt || '').trim()])
+        .map((comment) => [
+        String(comment?.id || '').trim(),
+        String(comment?.deletedAt || comment?.updatedAt || comment?.createdAt || '').trim()
+    ])
         .filter(([commentId]) => commentId.length > 0));
     const previousDocumentReviewCommentWatermarks = input.lastPushedDocumentReviewCommentWatermarks;
     const shouldSendAllDocumentReviewComments = !previousDocumentReviewCommentWatermarks || previousDocumentReviewCommentWatermarks.size === 0;
@@ -364,22 +446,46 @@ export function buildWorkspaceSyncPayloadModel(input) {
             return true;
         return previousDocumentReviewCommentWatermarks.get(change.comment.id) !== change.comment.updatedAt;
     });
+    const deletedReviewCommentChanges = reviewComments
+        .filter((comment) => String(comment?.deletedAt || '').trim().length > 0)
+        .map((comment) => ({
+        commentId: String(comment?.id || '').trim(),
+        deletedAt: String(comment?.deletedAt || comment?.updatedAt || comment?.createdAt || payloadBuiltAt).trim() || payloadBuiltAt
+    }))
+        .filter((change) => change.commentId.length > 0)
+        .filter((change) => {
+        if (shouldSendAllDocumentReviewComments)
+            return true;
+        return previousDocumentReviewCommentWatermarks.get(change.commentId) !== change.deletedAt;
+    });
+    const missingDocumentReviewCommentDeleteIds = Array.from(previousDocumentReviewCommentIds)
+        .map((commentId) => String(commentId || '').trim())
+        .filter((commentId) => commentId.length > 0 && !allDocumentReviewCommentIds.has(commentId));
+    const documentReviewCommentDeleteChanges = [
+        ...missingDocumentReviewCommentDeleteIds.map((commentId) => ({
+            commentId,
+            deletedAt: payloadBuiltAt
+        })),
+        ...deletedReviewCommentChanges
+    ];
+    const deleteDocumentReviewCommentIds = new Set([
+        ...missingDocumentReviewCommentDeleteIds,
+        ...deletedReviewCommentChanges.map((change) => change.commentId)
+    ]);
     const annotatedSessions = Array.isArray(input.annotatedAttachmentSessions) ? input.annotatedAttachmentSessions : [];
+    const allAnnotatedAttachmentSessionIds = new Set(annotatedSessions
+        .map((session) => String(session?.id || '').trim())
+        .filter((sessionId) => sessionId.length > 0));
     const currentAnnotatedAttachmentSessionIds = new Set(annotatedSessions
         .filter((session) => String(session?.deletedAt || '').trim().length === 0)
         .map((session) => String(session?.id || '').trim())
         .filter((sessionId) => sessionId.length > 0));
-    const deleteAnnotatedAttachmentSessionIds = new Set([
-        ...Array.from(input.lastPushedAnnotatedAttachmentSessionIds || new Set())
-            .map((sessionId) => String(sessionId || '').trim())
-            .filter((sessionId) => sessionId.length > 0 && !currentAnnotatedAttachmentSessionIds.has(sessionId)),
-        ...annotatedSessions
-            .filter((session) => String(session?.deletedAt || '').trim().length > 0)
-            .map((session) => String(session?.id || '').trim())
-            .filter((sessionId) => sessionId.length > 0)
-    ]);
+    const previousAnnotatedAttachmentSessionIds = input.lastPushedAnnotatedAttachmentSessionIds || new Set();
     const currentAnnotatedAttachmentSessionWatermarks = new Map(annotatedSessions
-        .map((session) => [String(session?.id || '').trim(), String(session?.updatedAt || session?.createdAt || '').trim()])
+        .map((session) => [
+        String(session?.id || '').trim(),
+        String(session?.deletedAt || session?.updatedAt || session?.createdAt || '').trim()
+    ])
         .filter(([sessionId]) => sessionId.length > 0));
     const previousAnnotatedAttachmentSessionWatermarks = input.lastPushedAnnotatedAttachmentSessionWatermarks;
     const shouldSendAllAnnotatedAttachmentSessions = !previousAnnotatedAttachmentSessionWatermarks || previousAnnotatedAttachmentSessionWatermarks.size === 0;
@@ -410,6 +516,32 @@ export function buildWorkspaceSyncPayloadModel(input) {
             return true;
         return previousAnnotatedAttachmentSessionWatermarks.get(change.session.id) !== change.session.updatedAt;
     });
+    const deletedAnnotatedAttachmentSessionChanges = annotatedSessions
+        .filter((session) => String(session?.deletedAt || '').trim().length > 0)
+        .map((session) => ({
+        sessionId: String(session?.id || '').trim(),
+        deletedAt: String(session?.deletedAt || session?.updatedAt || session?.createdAt || payloadBuiltAt).trim() || payloadBuiltAt
+    }))
+        .filter((change) => change.sessionId.length > 0)
+        .filter((change) => {
+        if (shouldSendAllAnnotatedAttachmentSessions)
+            return true;
+        return previousAnnotatedAttachmentSessionWatermarks.get(change.sessionId) !== change.deletedAt;
+    });
+    const missingAnnotatedAttachmentSessionDeleteIds = Array.from(previousAnnotatedAttachmentSessionIds)
+        .map((sessionId) => String(sessionId || '').trim())
+        .filter((sessionId) => sessionId.length > 0 && !allAnnotatedAttachmentSessionIds.has(sessionId));
+    const annotatedAttachmentSessionDeleteChanges = [
+        ...missingAnnotatedAttachmentSessionDeleteIds.map((sessionId) => ({
+            sessionId,
+            deletedAt: payloadBuiltAt
+        })),
+        ...deletedAnnotatedAttachmentSessionChanges
+    ];
+    const deleteAnnotatedAttachmentSessionIds = new Set([
+        ...missingAnnotatedAttachmentSessionDeleteIds,
+        ...deletedAnnotatedAttachmentSessionChanges.map((change) => change.sessionId)
+    ]);
     const taskEvents = sortTaskEventsForSync(Array.isArray(input.taskEvents) ? input.taskEvents : []);
     const currentTaskEventWatermarks = new Map(taskEvents
         .map((event) => [String(event?.id || '').trim(), String(event?.createdAt || '').trim()])
@@ -417,12 +549,17 @@ export function buildWorkspaceSyncPayloadModel(input) {
     const previousTaskEventWatermarks = input.lastPushedTaskEventWatermarks;
     const shouldSendAllTaskEvents = !previousTaskEventWatermarks || previousTaskEventWatermarks.size === 0;
     const taskEventUpsertChanges = taskEvents
-        .map((event) => ({
-        op: 'task-event-upsert',
-        event: {
+        .map((event) => {
+        const entityType = event.entityType === 'initiative' || event.entityType === 'workstream'
+            ? event.entityType
+            : 'task';
+        const entityId = String(event.entityId || event.taskId || '').trim();
+        const normalizedEvent = {
             id: String(event.id || '').trim(),
-            taskId: String(event.taskId || '').trim(),
             workspaceId: String(event.workspaceId || '').trim(),
+            entityType,
+            entityId,
+            taskId: entityType === 'task' ? String(event.taskId || entityId).trim() : undefined,
             action: String(event.action || '').trim(),
             actor: String(event.actor || 'system').trim() || 'system',
             actorType: event.actorType === 'ai' || event.actorType === 'human' || event.actorType === 'system'
@@ -432,10 +569,28 @@ export function buildWorkspaceSyncPayloadModel(input) {
                 ? event.details
                 : {},
             createdAt: String(event.createdAt || '').trim(),
+        };
+        if (entityType === 'task') {
+            return {
+                op: 'task-event-upsert',
+                event: {
+                    ...normalizedEvent,
+                    entityType: 'task',
+                    taskId: String(normalizedEvent.taskId || entityId).trim(),
+                }
+            };
         }
-    }))
+        return {
+            op: 'entity-event-upsert',
+            event: {
+                ...normalizedEvent,
+                entityType,
+                taskId: undefined,
+            }
+        };
+    })
         .filter((change) => (change.event.id.length > 0
-        && change.event.taskId.length > 0
+        && change.event.entityId.length > 0
         && change.event.workspaceId.length > 0
         && change.event.action.length > 0
         && Number.isFinite(Date.parse(change.event.createdAt))))
@@ -474,22 +629,22 @@ export function buildWorkspaceSyncPayloadModel(input) {
             deletedAt: payloadBuiltAt
         })),
         ...documentReviewSessionUpsertChanges,
-        ...Array.from(deleteDocumentReviewSessionIds).map((sessionId) => ({
+        ...documentReviewSessionDeleteChanges.map((change) => ({
             op: 'document-review-session-delete',
-            sessionId,
-            deletedAt: payloadBuiltAt
+            sessionId: change.sessionId,
+            deletedAt: change.deletedAt
         })),
         ...documentReviewCommentUpsertChanges,
-        ...Array.from(deleteDocumentReviewCommentIds).map((commentId) => ({
+        ...documentReviewCommentDeleteChanges.map((change) => ({
             op: 'document-review-comment-delete',
-            commentId,
-            deletedAt: payloadBuiltAt
+            commentId: change.commentId,
+            deletedAt: change.deletedAt
         })),
         ...annotatedAttachmentSessionUpsertChanges,
-        ...Array.from(deleteAnnotatedAttachmentSessionIds).map((sessionId) => ({
+        ...annotatedAttachmentSessionDeleteChanges.map((change) => ({
             op: 'annotated-attachment-session-delete',
-            sessionId,
-            deletedAt: payloadBuiltAt
+            sessionId: change.sessionId,
+            deletedAt: change.deletedAt
         })),
         ...taskEventUpsertChanges,
         ...activeChanges,
@@ -500,9 +655,46 @@ export function buildWorkspaceSyncPayloadModel(input) {
             deletedAt: pendingDeleteWatermarks.get(taskId) || payloadBuiltAt
         }))
     ];
+    const baselineResetReason = input.baselineResetReason ?? null;
+    const resolveDomainDeltaDiagnostics = (args) => {
+        const changeCount = args.upsertCount + (args.deleteCount || 0);
+        if (args.currentCount === 0 && changeCount === 0) {
+            return {
+                mode: 'none',
+                reason: null,
+                currentCount: 0,
+                baselineCount: args.baselineCount,
+                changeCount
+            };
+        }
+        if (args.alwaysFull) {
+            return {
+                mode: changeCount > 0 ? 'send-all' : 'none',
+                reason: changeCount > 0 ? 'full-state-domain' : null,
+                currentCount: args.currentCount,
+                baselineCount: args.baselineCount,
+                changeCount
+            };
+        }
+        const shouldSendAll = args.baselineCount === 0 && args.currentCount > 0 && args.upsertCount >= args.currentCount;
+        return {
+            mode: shouldSendAll ? 'send-all' : 'delta',
+            reason: shouldSendAll ? (baselineResetReason || 'missing-baseline') : null,
+            currentCount: args.currentCount,
+            baselineCount: args.baselineCount,
+            changeCount
+        };
+    };
+    const byOp = changes.reduce((acc, change) => {
+        const op = String(change.op || '').trim();
+        acc[op] = (acc[op] || 0) + 1;
+        return acc;
+    }, {});
     return {
         changes,
         currentTaskIds: new Set(Array.from(currentTaskIds).filter((taskId) => !pendingDeleteIds.has(taskId))),
+        currentTaskWatermarks: new Map(Array.from(currentTaskWatermarks.entries()).filter(([taskId]) => !pendingDeleteIds.has(taskId))),
+        currentTaskChangeKeys: new Map(Array.from(currentTaskChangeKeys.entries()).filter(([taskId]) => !pendingDeleteIds.has(taskId))),
         deleteTaskIds,
         currentInitiativeIds,
         currentInitiativeWatermarks,
@@ -510,6 +702,7 @@ export function buildWorkspaceSyncPayloadModel(input) {
         currentWorkstreamWatermarks,
         currentAiProfileIds,
         currentAiProfileWatermarks,
+        currentAiProfileChangeKeys,
         currentDocumentPaths,
         deleteDocumentPaths,
         currentDocumentWatermarks,
@@ -526,7 +719,77 @@ export function buildWorkspaceSyncPayloadModel(input) {
         deleteAnnotatedAttachmentSessionIds,
         currentAnnotatedAttachmentSessionWatermarks,
         currentTaskEventWatermarks,
-        pushedWatermarks
+        pushedWatermarks,
+        pushedTaskChangeKeys,
+        deltaDiagnostics: {
+            totalChanges: changes.length,
+            byOp,
+            baselineResetReason,
+            domains: {
+                tasks: resolveDomainDeltaDiagnostics({
+                    currentCount: currentTaskIds.size,
+                    baselineCount: lastWatermarks?.size || 0,
+                    upsertCount: activeChanges.length + archivedChanges.length,
+                    deleteCount: deleteTaskIds.size
+                }),
+                initiatives: resolveDomainDeltaDiagnostics({
+                    currentCount: currentInitiativeIds.size,
+                    baselineCount: previousInitiativeWatermarks?.size || 0,
+                    upsertCount: initiativeUpsertChanges.length
+                }),
+                workstreams: resolveDomainDeltaDiagnostics({
+                    currentCount: currentWorkstreamIds.size,
+                    baselineCount: previousWorkstreamWatermarks?.size || 0,
+                    upsertCount: workstreamUpsertChanges.length
+                }),
+                aiProfiles: resolveDomainDeltaDiagnostics({
+                    currentCount: currentAiProfileIds.size,
+                    baselineCount: previousAiProfileWatermarks?.size || 0,
+                    upsertCount: aiProfileUpsertChanges.length
+                }),
+                documents: resolveDomainDeltaDiagnostics({
+                    currentCount: currentDocumentPaths.size,
+                    baselineCount: previousDocumentWatermarks?.size || 0,
+                    upsertCount: documentUpsertChanges.length,
+                    deleteCount: deleteDocumentPaths.size
+                }),
+                assets: resolveDomainDeltaDiagnostics({
+                    currentCount: currentAssetPaths.size,
+                    baselineCount: previousAssetWatermarks?.size || 0,
+                    upsertCount: assetUpsertChanges.length,
+                    deleteCount: deleteAssetPaths.size
+                }),
+                documentReviewSessions: resolveDomainDeltaDiagnostics({
+                    currentCount: currentDocumentReviewSessionIds.size,
+                    baselineCount: previousDocumentReviewSessionWatermarks?.size || 0,
+                    upsertCount: documentReviewSessionUpsertChanges.length,
+                    deleteCount: deleteDocumentReviewSessionIds.size
+                }),
+                documentReviewComments: resolveDomainDeltaDiagnostics({
+                    currentCount: currentDocumentReviewCommentIds.size,
+                    baselineCount: previousDocumentReviewCommentWatermarks?.size || 0,
+                    upsertCount: documentReviewCommentUpsertChanges.length,
+                    deleteCount: deleteDocumentReviewCommentIds.size
+                }),
+                annotatedAttachmentSessions: resolveDomainDeltaDiagnostics({
+                    currentCount: currentAnnotatedAttachmentSessionIds.size,
+                    baselineCount: previousAnnotatedAttachmentSessionWatermarks?.size || 0,
+                    upsertCount: annotatedAttachmentSessionUpsertChanges.length,
+                    deleteCount: deleteAnnotatedAttachmentSessionIds.size
+                }),
+                taskEvents: resolveDomainDeltaDiagnostics({
+                    currentCount: currentTaskEventWatermarks.size,
+                    baselineCount: previousTaskEventWatermarks?.size || 0,
+                    upsertCount: taskEventUpsertChanges.length
+                }),
+                taxonomy: resolveDomainDeltaDiagnostics({
+                    currentCount: (input.taxonomyState && typeof input.taxonomyState === 'object') || Array.isArray(input.taxonomies) ? 1 : 0,
+                    baselineCount: 0,
+                    upsertCount: byOp['taxonomy-upsert'] || 0,
+                    alwaysFull: true
+                })
+            }
+        }
     };
 }
 export function buildWorkspaceSyncSignatureModel(input) {
@@ -543,6 +806,7 @@ export function buildWorkspaceSyncSignatureModel(input) {
         updatedAt: String(initiative.updatedAt || initiative.createdAt || '').trim(),
         title: String(initiative.title || '').trim(),
         ownerId: typeof initiative.ownerId === 'string' ? initiative.ownerId.trim() : '',
+        attachments: clonePlanningAttachmentsForSync(initiative.attachments) || [],
         isArchived: Boolean(initiative.isArchived)
     }))
         .filter((initiative) => initiative.id.length > 0)
@@ -554,6 +818,7 @@ export function buildWorkspaceSyncSignatureModel(input) {
         initiativeId: typeof workstream.initiativeId === 'string' ? workstream.initiativeId.trim() : '',
         title: String(workstream.title || '').trim(),
         ownerId: typeof workstream.ownerId === 'string' ? workstream.ownerId.trim() : '',
+        attachments: clonePlanningAttachmentsForSync(workstream.attachments) || [],
         isArchived: Boolean(workstream.isArchived)
     }))
         .filter((workstream) => workstream.id.length > 0)
@@ -570,7 +835,11 @@ export function buildWorkspaceSyncSignatureModel(input) {
                 id: String(profile.id || '').trim(),
                 updatedAt: String(profile.updatedAt || profile.createdAt || '').trim(),
                 name: String(profile.name || '').trim(),
-                username: String(profile.username || '').trim()
+                username: String(profile.username || '').trim(),
+                archivedAt: String(profile.archivedAt || '').trim(),
+                archivedReason: String(profile.archivedReason || '').trim(),
+                mergedIntoProfileId: String(profile.mergedIntoProfileId || '').trim(),
+                rosterStateUpdatedAt: String(profile.rosterStateUpdatedAt || '').trim()
             }))
                 .filter((profile) => profile.id.length > 0)
                 .sort((a, b) => a.id.localeCompare(b.id))