Merge pull request #2532 from trycompai/fix/gcp-reconnect-flow

fix(cloud): identify legacy connections as old for reconnect

Author: tofikwest

apps/api/src/integration-platform/repositories/connection.repository.ts

@@ -39,7 +39,11 @@ export class ConnectionRepository {
     organizationId: string,
   ): Promise<IntegrationConnection | null> {
     return db.integrationConnection.findFirst({
-      where: { providerId, organizationId },
+      where: {
+        providerId,
+        organizationId,
+        status: { not: 'disconnected' },
+      },
       orderBy: { createdAt: 'desc' },
       include: {
         provider: true,

apps/app/src/lib/cloud-reconnect-policy.test.ts

@@ -25,6 +25,16 @@ describe('requiresCloudReconnect', () => {
     ).toBe(false);
   });
 
+  it('returns true for cloud connections created earlier on the rollout day', () => {
+    expect(
+      requiresCloudReconnect({
+        providerId: 'gcp',
+        createdAt: '2026-04-13T15:00:00.000Z',
+        status: 'active',
+      }),
+    ).toBe(true);
+  });
+
   it('returns false for cloud connections created after the cutoff date', () => {
     expect(
       requiresCloudReconnect({
@@ -54,4 +64,14 @@ describe('requiresCloudReconnect', () => {
       }),
     ).toBe(false);
   });
+
+  it('returns true for legacy cloud connections', () => {
+    expect(
+      requiresCloudReconnect({
+        providerId: 'aws',
+        isLegacy: true,
+        status: 'active',
+      }),
+    ).toBe(true);
+  });
 });

apps/app/src/lib/cloud-reconnect-policy.ts

@@ -4,8 +4,8 @@ const CLOUD_RECONNECT_PROVIDER_IDS = new Set(['aws', 'gcp', 'azure']);
  * Connections created before this UTC timestamp require re-connection.
  * This rollout date is fixed intentionally so the behavior is stable over time.
  */
-export const CLOUD_RECONNECT_CUTOFF_ISO_UTC = '2026-04-13T00:00:00.000Z';
-export const CLOUD_RECONNECT_CUTOFF_LABEL = 'April 13, 2026';
+export const CLOUD_RECONNECT_CUTOFF_ISO_UTC = '2026-04-13T18:16:52.000Z';
+export const CLOUD_RECONNECT_CUTOFF_LABEL = 'April 13, 2026 at 18:16 UTC';
 
 const CLOUD_RECONNECT_CUTOFF_MS = new Date(CLOUD_RECONNECT_CUTOFF_ISO_UTC).getTime();
 
@@ -18,12 +18,14 @@ type ReconnectCandidate = {
 
 export function requiresCloudReconnect(candidate: ReconnectCandidate): boolean {
   if (!CLOUD_RECONNECT_PROVIDER_IDS.has(candidate.providerId)) return false;
-  if (candidate.isLegacy) return false;
 
   if (candidate.status && candidate.status !== 'active' && candidate.status !== 'pending') {
     return false;
   }
 
+  // Legacy cloud connections come from the old integration table and should be re-added.
+  if (candidate.isLegacy) return true;
+
   if (!candidate.createdAt) return false;
 
   const createdAt = new Date(candidate.createdAt);