fix(engine): key by the queue ID or the env/queue name instead of the run ID

Author: ericallam

internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts

@@ -237,7 +237,6 @@ export class RunAttemptSystem {
           filePath: "unknown",
         }),
       this.#resolveTaskRunExecutionQueue({
-        runId,
         lockedQueueId: run.lockedQueueId ?? undefined,
         queueName: run.queue,
         runtimeEnvironmentId: run.runtimeEnvironment.id,
@@ -538,7 +537,6 @@ export class RunAttemptSystem {
               }),
               this.#resolveTaskRunExecutionTask(taskRun.lockedById),
               this.#resolveTaskRunExecutionQueue({
-                runId,
                 lockedQueueId: updatedRun.lockedQueueId ?? undefined,
                 queueName: updatedRun.queue,
                 runtimeEnvironmentId: updatedRun.runtimeEnvironment.id,
@@ -1868,12 +1866,14 @@ export class RunAttemptSystem {
   }
 
   async #resolveTaskRunExecutionQueue(params: {
-    runId: string;
     lockedQueueId?: string;
     queueName: string;
     runtimeEnvironmentId: string;
   }): Promise<TaskRunExecutionQueue> {
-    const result = await this.cache.queues.swr(params.runId, async () => {
+    // Cache key should be based on queue identity, not run ID
+    // Using lockedQueueId if available, otherwise environment + queue name
+    const cacheKey = params.lockedQueueId ?? `${params.runtimeEnvironmentId}:${params.queueName}`;
+    const result = await this.cache.queues.swr(cacheKey, async () => {
       const queue = params.lockedQueueId
         ? await this.$.readOnlyPrisma.taskQueue.findFirst({
           where: {