Introduce the new "current dequeued concurrency set"

Author: ericallam

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx

@@ -10,10 +10,11 @@ import {
 import { DialogClose } from "@radix-ui/react-dialog";
 import {
   Form,
+  useNavigate,
   useNavigation,
   useRevalidator,
   useSearchParams,
-  type MetaFunction
+  type MetaFunction,
 } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { type RuntimeEnvironmentType } from "@trigger.dev/database";
@@ -33,8 +34,6 @@ import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
 import { FormButtons } from "~/components/primitives/FormButtons";
-import { Header3 } from "~/components/primitives/Headers";
-import { Input } from "~/components/primitives/Input";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
 import { PaginationControls } from "~/components/primitives/Pagination";
 import { Paragraph } from "~/components/primitives/Paragraph";
@@ -59,7 +58,6 @@ import { useEnvironment } from "~/hooks/useEnvironment";
 import { useEventSource } from "~/hooks/useEventSource";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
-import { useThrottle } from "~/hooks/useThrottle";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
@@ -71,6 +69,9 @@ import { docsPath, EnvironmentParamSchema, v3BillingPath } from "~/utils/pathBui
 import { PauseEnvironmentService } from "~/v3/services/pauseEnvironment.server";
 import { PauseQueueService } from "~/v3/services/pauseQueue.server";
 import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
+import { Header3 } from "~/components/primitives/Headers";
+import { Input } from "~/components/primitives/Input";
+import { useThrottle } from "~/hooks/useThrottle";
 
 const SearchParamsSchema = z.object({
   query: z.string().optional(),
@@ -423,16 +424,12 @@ export default function Page() {
                             alignment="right"
                             className={cn(
                               queue.paused ? "tabular-nums opacity-50" : undefined,
+                              queue.running > 0 && "text-text-bright",
                               isAtLimit && "text-warning"
                             )}
                           >
                             {queue.running}/
-                            <span
-                              className={cn(
-                                "tabular-nums text-text-dimmed",
-                                isAtLimit && "text-warning"
-                              )}
-                            >
+                            <span className={cn("tabular-nums", isAtLimit && "text-warning")}>
                               {limit}
                             </span>
                           </TableCell>

apps/webapp/app/routes/resources.taskruns.$runParam.debug.ts

@@ -102,7 +102,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
       run.runtimeEnvironment
     );
 
-    const queueCurrentConcurrencyKey = engine.runQueue.keys.currentConcurrencyKey(
+    const queueCurrentConcurrencyKey = engine.runQueue.keys.queueCurrentConcurrencyKey(
       run.runtimeEnvironment,
       run.queue,
       run.concurrencyKey ?? undefined

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

@@ -295,7 +295,6 @@ export class RunEngine {
       executionSnapshotSystem: this.executionSnapshotSystem,
       runAttemptSystem: this.runAttemptSystem,
       machines: this.options.machines,
-      waitpointSystem: this.waitpointSystem,
     });
   }
 

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

@@ -11,27 +11,23 @@ import { RunEngineOptions } from "../types.js";
 import { ExecutionSnapshotSystem, getLatestExecutionSnapshot } from "./executionSnapshotSystem.js";
 import { RunAttemptSystem } from "./runAttemptSystem.js";
 import { SystemResources } from "./systems.js";
-import { WaitpointSystem } from "./waitpointSystem.js";
 
 export type DequeueSystemOptions = {
   resources: SystemResources;
   machines: RunEngineOptions["machines"];
   executionSnapshotSystem: ExecutionSnapshotSystem;
   runAttemptSystem: RunAttemptSystem;
-  waitpointSystem: WaitpointSystem;
 };
 
 export class DequeueSystem {
   private readonly $: SystemResources;
   private readonly executionSnapshotSystem: ExecutionSnapshotSystem;
   private readonly runAttemptSystem: RunAttemptSystem;
-  private readonly waitpointSystem: WaitpointSystem;
 
   constructor(private readonly options: DequeueSystemOptions) {
     this.$ = options.resources;
     this.executionSnapshotSystem = options.executionSnapshotSystem;
     this.runAttemptSystem = options.runAttemptSystem;
-    this.waitpointSystem = options.waitpointSystem;
   }
 
   /**