• Updated RunQueue.removeEnvironmentQueuesFromMasterQueue() method signature to take runtimeEnvironmentId instead of masterQueue parameter

• Added automatic master queue shard calculation using this.keys.masterQueueKeyForEnvironment(runtimeEnvironmentId, this.shardCount) 
• Updated RunEngine wrapper method to use new runtimeEnvironmentId parameter
• Updated DeleteProjectService to call the method once per environment instead of once per master queue
• Simplified API by encapsulating master queue sharding logic within RunQueue class

Author: ericallam

apps/webapp/app/services/deleteProject.server.ts

@@ -41,15 +41,9 @@ export class DeleteProjectService {
     }
 
     // Delete all queues from the RunEngine 2 prod master queues
-    const workerGroups = await this.#prismaClient.workerInstanceGroup.findMany({
-      select: {
-        masterQueue: true,
-      },
-    });
-    const engineMasterQueues = workerGroups.map((group) => group.masterQueue);
-    for (const masterQueue of engineMasterQueues) {
+    for (const environment of project.environments) {
       await engine.removeEnvironmentQueuesFromMasterQueue({
-        masterQueue,
+        runtimeEnvironmentId: environment.id,
         organizationId: project.organization.id,
         projectId: project.id,
       });

internal-packages/run-engine/src/engine/index.ts

@@ -745,16 +745,16 @@ export class RunEngine {
   }
 
   async removeEnvironmentQueuesFromMasterQueue({
-    masterQueue,
+    runtimeEnvironmentId,
     organizationId,
     projectId,
   }: {
-    masterQueue: string;
+    runtimeEnvironmentId: string;
     organizationId: string;
     projectId: string;
   }) {
     return this.runQueue.removeEnvironmentQueuesFromMasterQueue(
-      masterQueue,
+      runtimeEnvironmentId,
       organizationId,
       projectId
     );

internal-packages/run-engine/src/run-queue/index.ts

@@ -786,10 +786,13 @@ export class RunQueue {
   }
 
   public async removeEnvironmentQueuesFromMasterQueue(
-    masterQueue: string,
+    runtimeEnvironmentId: string,
     organizationId: string,
     projectId: string
   ) {
+    // Calculate the master queue shard for this environment
+    const masterQueue = this.keys.masterQueueKeyForEnvironment(runtimeEnvironmentId, this.shardCount);
+    
     // Use scanStream to find all matching members
     const stream = this.redis.zscanStream(masterQueue, {
       match: this.keys.queueKey(organizationId, projectId, "*", "*"),