fix(knowledge): preserve pending connector syncs

Author: TheodoreSpeaks

apps/sim/lib/knowledge/orchestration/connectors.test.ts

@@ -375,6 +375,67 @@ describe('performUpdateKnowledgeConnector', () => {
     expect(mockDispatchSync).not.toHaveBeenCalled()
   })
 
+  it('preserves an already-due source sync when scheduled sync is disabled', async () => {
+    const pendingSourceSyncAt = new Date(0)
+    dbChainMockFns.limit.mockResolvedValueOnce([
+      {
+        id: 'conn-1',
+        connectorType: 'notion',
+        nextSyncAt: pendingSourceSyncAt,
+        status: 'active',
+      },
+    ])
+    dbChainMockFns.returning.mockResolvedValueOnce([
+      {
+        id: 'conn-1',
+        connectorType: 'notion',
+        nextSyncAt: pendingSourceSyncAt,
+        status: 'active',
+      },
+    ])
+
+    const outcome = await performUpdateKnowledgeConnector({
+      ...ACTOR,
+      knowledgeBase: KB,
+      connectorId: 'conn-1',
+      updates: { syncIntervalMinutes: 0 },
+      resolveBillingAttribution,
+    })
+
+    expect(outcome).toMatchObject({ success: true })
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({ nextSyncAt: pendingSourceSyncAt, syncIntervalMinutes: 0 })
+    )
+    expect(mockDispatchSync).not.toHaveBeenCalled()
+  })
+
+  it('rejects an interval update that races with a source-sync due marker', async () => {
+    dbChainMockFns.limit
+      .mockResolvedValueOnce([
+        { id: 'conn-1', connectorType: 'notion', nextSyncAt: null, status: 'active' },
+      ])
+      .mockResolvedValueOnce([
+        {
+          id: 'conn-1',
+          connectorType: 'notion',
+          nextSyncAt: new Date(),
+          status: 'active',
+        },
+      ])
+    dbChainMockFns.returning.mockResolvedValueOnce([])
+
+    const outcome = await performUpdateKnowledgeConnector({
+      ...ACTOR,
+      knowledgeBase: KB,
+      connectorId: 'conn-1',
+      updates: { syncIntervalMinutes: 0 },
+      resolveBillingAttribution,
+    })
+
+    expect(outcome).toMatchObject({ success: false, errorCode: 'conflict' })
+    expect(mockDispatchSync).not.toHaveBeenCalled()
+  })
+
   it('rejects a source replacement while synchronization is in progress', async () => {
     dbChainMockFns.limit.mockResolvedValueOnce([
       { id: 'conn-1', connectorType: 'notion', status: 'syncing' },

apps/sim/lib/knowledge/orchestration/connectors.ts

@@ -493,9 +493,11 @@ export async function performUpdateKnowledgeConnector(
   if (updates.syncIntervalMinutes !== undefined) {
     values.syncIntervalMinutes = updates.syncIntervalMinutes
     values.nextSyncAt =
-      updates.syncIntervalMinutes > 0
-        ? new Date(Date.now() + updates.syncIntervalMinutes * 60 * 1000)
-        : null
+      existing.nextSyncAt && existing.nextSyncAt <= updateTimestamp
+        ? existing.nextSyncAt
+        : updates.syncIntervalMinutes > 0
+          ? new Date(updateTimestamp.getTime() + updates.syncIntervalMinutes * 60 * 1000)
+          : null
   }
   if (updates.status !== undefined) {
     values.status = updates.status
@@ -524,6 +526,13 @@ export async function performUpdateKnowledgeConnector(
     if (updates.sourceConfig !== undefined || updates.status !== undefined) {
       updateConditions.push(eq(knowledgeConnector.status, existing.status))
     }
+    if (values.nextSyncAt !== undefined) {
+      updateConditions.push(
+        existing.nextSyncAt
+          ? eq(knowledgeConnector.nextSyncAt, existing.nextSyncAt)
+          : isNull(knowledgeConnector.nextSyncAt)
+      )
+    }
 
     const [row] = await db
       .update(knowledgeConnector)
@@ -532,19 +541,21 @@ export async function performUpdateKnowledgeConnector(
       .returning()
 
     if (!row) {
-      if (updates.sourceConfig !== undefined || updates.status !== undefined) {
-        const current = await getKnowledgeConnector(kb.id, connectorId)
-        if (current?.status === 'syncing') {
-          return fail(
-            updates.sourceConfig !== undefined
-              ? 'Cannot update source configuration while connector synchronization is in progress'
-              : 'Cannot change connector status while synchronization is in progress',
-            'conflict'
-          )
-        }
-        if (current) {
-          return fail('Connector status changed during the update; retry the request', 'conflict')
-        }
+      const current = await getKnowledgeConnector(kb.id, connectorId)
+      if (current?.status === 'syncing' && updates.sourceConfig !== undefined) {
+        return fail(
+          'Cannot update source configuration while connector synchronization is in progress',
+          'conflict'
+        )
+      }
+      if (current?.status === 'syncing' && updates.status !== undefined) {
+        return fail(
+          'Cannot change connector status while synchronization is in progress',
+          'conflict'
+        )
+      }
+      if (current) {
+        return fail('Connector changed during the update; retry the request', 'conflict')
       }
       return fail('Connector not found', 'not_found')
     }