From 82573c34c85a1a6cb924ba455382918262cb37b8 Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Thu, 20 Nov 2025 11:36:59 +0000
Subject: [PATCH] Don't show (or count) archived branches/projects against
 allocated concurrency

Archived preview branches were being counted. Also archived projects.
---
 .../presenters/v3/ManageConcurrencyPresenter.server.ts   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts b/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts
index d6464fef62..2b9af8dce5 100644
--- a/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts
@@ -63,9 +63,15 @@ export class ManageConcurrencyPresenter extends BasePresenter {
             userId: true,
           },
         },
+        project: {
+          select: {
+            deletedAt: true,
+          },
+        },
       },
       where: {
         organizationId,
+        archivedAt: null,
       },
     });
 
@@ -78,6 +84,9 @@ export class ManageConcurrencyPresenter extends BasePresenter {
       // Don't count parent environments
       if (environment.isBranchableEnvironment) continue;
 
+      // Don't count deleted projects
+      if (environment.project.deletedAt) continue;
+
       const limit = currentPlan
         ? getDefaultEnvironmentLimitFromPlan(environment.type, currentPlan)
         : 0;