Merge remote-tracking branch 'origin/main' into feat/redis-worker-package

Author: nicktrn

.cursor/mcp.json

@@ -4,4 +4,4 @@
       "url": "http://localhost:3333/sse"
     }
   }
-}
+}

.cursor/rules/writing-tasks.mdc

@@ -1,6 +1,6 @@
 ---
 description: Guidelines for writing Trigger.dev tasks
-globs: **/trigger/**/*.ts, **/trigger/**/*.tsx
+globs: **/trigger/**/*.ts, **/trigger/**/*.tsx,**/trigger/**/*.js,**/trigger/**/*.jsx
 alwaysApply: false
 ---
 # How to write Trigger.dev tasks
@@ -832,7 +832,7 @@ npm add @trigger.dev/react-hooks
 
 All hooks require a Public Access Token. You can provide it directly to each hook:
 
-```typescriptx
+```typescript
 import { useRealtimeRun } from "@trigger.dev/react-hooks";
 
 function MyComponent({ runId, publicAccessToken }) {
@@ -845,7 +845,7 @@ function MyComponent({ runId, publicAccessToken }) {
 
 Or use the `TriggerAuthContext` provider:
 
-```typescriptx
+```typescript
 import { TriggerAuthContext } from "@trigger.dev/react-hooks";
 
 function SetupTrigger({ publicAccessToken }) {
@@ -859,7 +859,7 @@ function SetupTrigger({ publicAccessToken }) {
 
 For Next.js App Router, wrap the provider in a client component:
 
-```typescriptx
+```typescript
 // components/TriggerProvider.tsx
 "use client";
 
@@ -879,7 +879,7 @@ export function TriggerProvider({ accessToken, children }) {
 Several approaches for Next.js App Router:
 
 1. **Using cookies**:
-```typescriptx
+```typescript
 // Server action
 export async function startRun() {
   const handle = await tasks.trigger<typeof exampleTask>("example", { foo: "bar" });
@@ -899,7 +899,7 @@ export default function RunPage({ params }) {
 ```
 
 2. **Using query parameters**:
-```typescriptx
+```typescript
 // Server action
 export async function startRun() {
   const handle = await tasks.trigger<typeof exampleTask>("example", { foo: "bar" });
@@ -908,7 +908,7 @@ export async function startRun() {
 ```
 
 3. **Server-side token generation**:
-```typescriptx
+```typescript
 // Page component
 export default async function RunPage({ params }) {
   const publicAccessToken = await generatePublicAccessToken(params.id);
@@ -938,7 +938,7 @@ export async function generatePublicAccessToken(runId: string) {
 
 Data fetching hooks that use SWR for caching:
 
-```typescriptx
+```typescript
 "use client";
 import { useRun } from "@trigger.dev/react-hooks";
 import type { myTask } from "@/trigger/myTask";

.gitignore

@@ -58,3 +58,5 @@ apps/**/public/build
 .yarn
 *.tsbuildinfo
 /packages/cli-v3/src/package.json
+.husky
+/packages/react-hooks/src/package.json

.vscode/launch.json

@@ -138,15 +138,15 @@
       "type": "node-terminal",
       "request": "launch",
       "name": "Debug RunEngine tests",
-      "command": "pnpm run test --filter @internal/run-engine",
-      "cwd": "${workspaceFolder}",
+      "command": "pnpm run test ./src/engine/tests/releaseConcurrencyQueue.test.ts -t 'Should manage token bucket and queue correctly'",
+      "cwd": "${workspaceFolder}/internal-packages/run-engine",
       "sourceMaps": true
     },
     {
       "type": "node-terminal",
       "request": "launch",
       "name": "Debug RunQueue tests",
-      "command": "pnpm run test ./src/engine/tests/waitpoints.test.ts",
+      "command": "pnpm run test ./src/run-queue/index.test.ts",
       "cwd": "${workspaceFolder}/internal-packages/run-engine",
       "sourceMaps": true
     }

.vscode/settings.json

@@ -5,5 +5,6 @@
   "search.exclude": {
     "**/node_modules/**": true,
     "packages/cli-v3/e2e": true
-  }
+  },
+  "vitest.disableWorkspaceWarning": true
 }

apps/webapp/app/assets/images/queues-dashboard.png

@@ -6,6 +6,7 @@ import {
   ClockIcon,
   PlusIcon,
   RectangleGroupIcon,
+  RectangleStackIcon,
   ServerStackIcon,
   Squares2X2Icon,
 } from "@heroicons/react/20/solid";
@@ -368,35 +369,28 @@ export function AlertsNoneDeployed() {
   );
 }
 
-function AlertsNoneProd() {
+export function QueuesHasNoTasks() {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
   return (
-    <div className="space-y-8">
-      <InfoPanel
-        icon={BellAlertIcon}
-        iconClassName="text-red-500"
-        title="Adding alerts"
-        panelClassName="max-w-full"
+    <InfoPanel
+      title="You have no queues"
+      icon={RectangleStackIcon}
+      iconClassName="text-purple-500"
+      panelClassName="max-w-full"
+    >
+      <Paragraph spacing variant="small">
+        This means you haven't got any tasks yet in this environment.
+      </Paragraph>
+      <LinkButton
+        to={v3EnvironmentPath(organization, project, environment)}
+        variant="tertiary/medium"
       >
-        <Paragraph spacing variant="small">
-          You can get alerted when deployed runs fail.
-        </Paragraph>
-        <Paragraph spacing variant="small">
-          We don't support alerts in the Development environment. Switch to a deployed environment
-          to setup alerts.
-        </Paragraph>
-        <div className="flex gap-3">
-          <LinkButton
-            to={docsPath("troubleshooting-alerts")}
-            variant="docs/medium"
-            LeadingIcon={BookOpenIcon}
-            className="inline-flex"
-          >
-            How to setup alerts
-          </LinkButton>
-        </div>
-      </InfoPanel>
-      <SwitcherPanel />
-    </div>
+        Add tasks
+      </LinkButton>
+    </InfoPanel>
   );
 }
 

apps/webapp/app/components/BlankStatePanels.tsx

@@ -1,15 +1,13 @@
 import { createContext, useContext, useState } from "react";
 import { useAppOrigin } from "~/hooks/useAppOrigin";
 import { useProject } from "~/hooks/useProject";
-import { InlineCode } from "./code/InlineCode";
 import {
   ClientTabs,
   ClientTabsContent,
   ClientTabsList,
   ClientTabsTrigger,
 } from "./primitives/ClientTabs";
 import { ClipboardField } from "./primitives/ClipboardField";
-import { Paragraph } from "./primitives/Paragraph";
 import { Header3 } from "./primitives/Headers";
 
 type PackageManagerContextType = {

apps/webapp/app/components/SetupCommands.tsx

@@ -6,6 +6,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from "~/components/primitives/Tooltip";
+import { useOptionalEnvironment } from "~/hooks/useEnvironment";
 import { useIsImpersonating, useOptionalOrganization } from "~/hooks/useOrganizations";
 import { useOptionalProject } from "~/hooks/useProject";
 import { useHasAdminAccess, useUser } from "~/hooks/useUser";
@@ -35,6 +36,7 @@ export function AdminDebugTooltip({ children }: { children?: React.ReactNode })
 function Content({ children }: { children: React.ReactNode }) {
   const organization = useOptionalOrganization();
   const project = useOptionalProject();
+  const environment = useOptionalEnvironment();
   const user = useUser();
 
   return (
@@ -62,6 +64,22 @@ function Content({ children }: { children: React.ReactNode }) {
             </Property.Item>
           </>
         )}
+        {environment && (
+          <>
+            <Property.Item>
+              <Property.Label>Environment ID</Property.Label>
+              <Property.Value>{environment.id}</Property.Value>
+            </Property.Item>
+            <Property.Item>
+              <Property.Label>Environment type</Property.Label>
+              <Property.Value>{environment.type}</Property.Value>
+            </Property.Item>
+            <Property.Item>
+              <Property.Label>Environment paused</Property.Label>
+              <Property.Value>{environment.paused ? "Yes" : "No"}</Property.Value>
+            </Property.Item>
+          </>
+        )}
       </Property.Table>
       <div className="pt-2">{children}</div>
     </div>

apps/webapp/app/components/admin/debugTooltip.tsx

@@ -1,6 +1,4 @@
-import { useOptionalOrganization } from "~/hooks/useOrganizations";
 import { cn } from "~/utils/cn";
-import { useShowUpgradePrompt } from "../billing/UpgradePrompt";
 
 /** This container is used to surround the entire app, it correctly places the nav bar */
 export function AppContainer({ children }: { children: React.ReactNode }) {
@@ -13,19 +11,7 @@ export function MainBody({ children }: { children: React.ReactNode }) {
 
 /** This container should be placed around the content on a page */
 export function PageContainer({ children }: { children: React.ReactNode }) {
-  const organization = useOptionalOrganization();
-  const showUpgradePrompt = useShowUpgradePrompt(organization);
-
-  return (
-    <div
-      className={cn(
-        "grid overflow-hidden",
-        showUpgradePrompt.shouldShow ? "grid-rows-[5rem_1fr]" : "grid-rows-[2.5rem_1fr]"
-      )}
-    >
-      {children}
-    </div>
-  );
+  return <div className="grid grid-rows-[auto_1fr] overflow-hidden">{children}</div>;
 }
 
 export function PageBody({