fix(knowledge): claim a member only under a proved lease and read email conversation dates

Author: waleedlatif1

apps/sim/lib/knowledge/connectors/member-sync-engine.ts

@@ -52,6 +52,7 @@ import {
   MEMBER_SYNC_SOFT_BUDGET_SECONDS,
 } from '@/lib/knowledge/connectors/sync-limits'
 import {
+  assertSyncLeaseHeldInTx,
   createMemberSyncLease,
   holdsMemberSyncLockToken,
   MEMBER_LOCKABLE_CONNECTOR_STATUSES,
@@ -660,15 +661,22 @@ async function reconcileMembership(
  * member be aborted at the deadline without touching the others.
  */
 async function claimNextMember(run: MemberSyncRun): Promise<MemberRow | null> {
-  const [claimed] = await db
-    .update(knowledgeConnectorMember)
-    .set({ lastStartedAt: new Date(), updatedAt: new Date() })
-    .where(
-      and(
-        eq(knowledgeConnectorMember.connectorId, run.connectorId),
-        eq(
-          knowledgeConnectorMember.id,
-          sql`(
+  /**
+   * Proved under the lease: a run reclaimed while it slept must not stamp
+   * `lastStartedAt`, which would hide the member from its replacement's
+   * selection and defer that member's access updates to a later run.
+   */
+  const [claimed] = await db.transaction(async (tx) => {
+    await assertSyncLeaseHeldInTx(tx, run.connectorId, run.lease)
+    return tx
+      .update(knowledgeConnectorMember)
+      .set({ lastStartedAt: new Date(), updatedAt: new Date() })
+      .where(
+        and(
+          eq(knowledgeConnectorMember.connectorId, run.connectorId),
+          eq(
+            knowledgeConnectorMember.id,
+            sql`(
             SELECT ${knowledgeConnectorMember.id} FROM ${knowledgeConnectorMember}
             WHERE ${knowledgeConnectorMember.connectorId} = ${run.connectorId}
               AND ${knowledgeConnectorMember.status} = 'active'
@@ -678,10 +686,11 @@ async function claimNextMember(run: MemberSyncRun): Promise<MemberRow | null> {
             LIMIT 1
             FOR UPDATE SKIP LOCKED
           )`
+          )
         )
       )
-    )
-    .returning()
+      .returning()
+  })
   return claimed ?? null
 }
 

apps/sim/lib/knowledge/connectors/source-modified-at.test.ts

@@ -51,6 +51,12 @@ describe('resolveSourceModifiedAt', () => {
     expect(resolveSourceModifiedAt({ modifiedTime: 1e20 })).toBeNull()
   })
 
+  it('reads the newest message time an email conversation reports', () => {
+    expect(
+      resolveSourceModifiedAt({ lastMessageDate: '2026-08-29T09:30:00Z' })?.toISOString()
+    ).toBe('2026-08-29T09:30:00.000Z')
+  })
+
   it('reads the last activity a chat space or channel reports', () => {
     expect(resolveSourceModifiedAt({ lastActivity: '2026-08-30T10:00:00Z' })?.toISOString()).toBe(
       '2026-08-30T10:00:00.000Z'

apps/sim/lib/knowledge/connectors/source-modified-at.ts

@@ -18,6 +18,8 @@ const SOURCE_MODIFIED_AT_KEYS = [
   'statusDate',
   /** Google Chat spaces and Teams channels: the latest message time, the listing's only change signal. */
   'lastActivity',
+  /** Gmail and Outlook conversations: the newest message's time. */
+  'lastMessageDate',
 ] as const
 
 /** Earlier than any plausible document; guards against epoch-zero placeholders. */