From cb701bf0e188d30763397d93367dd8902fc265ff Mon Sep 17 00:00:00 2001
From: Madison <madison.w.kennedy@gmail.com>
Date: Thu, 28 May 2026 12:23:15 -0500
Subject: [PATCH] getPreviewPoolProjectForUser filtered on state === leased but
 ignored leaseExpiresAtMillis. Expired leases stay leased until
 cleanupExpiredPreviewPollLeases runs, so users could still be routed to old
 project

---
 apps/backend/src/lib/preview-pool.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/backend/src/lib/preview-pool.ts b/apps/backend/src/lib/preview-pool.ts
index 3a12252f4..9ecb0eeca 100644
--- a/apps/backend/src/lib/preview-pool.ts
+++ b/apps/backend/src/lib/preview-pool.ts
@@ -631,5 +631,12 @@ export async function getPreviewPoolProjectForUser(userId: string): Promise<stri
   });
 
   const metadata = parsePreviewPoolMetadata(membership?.team.serverMetadata);
-  return metadata?.projectId ?? null;
+  if (metadata == null) {
+    return null;
+  }
+  const now = new Date().getTime();
+  if (metadata.leaseExpiresAtMillis == null || metadata.leaseExpiresAtMillis <= now) {
+    return null;
+  }
+  return metadata.projectId;
 }