Latest lock file

chore: Update version for release (#779 )
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-12-06 15:45:43 +00:00 · 2023-12-06 15:42:36 +00:00 · 2023-12-06 15:37:50 +00:00 · 2023-12-06 11:29:58 +00:00 · 2023-12-06 11:28:06 +00:00 · 2023-12-06 10:23:37 +00:00
846 changed files with 50951 additions and 11140 deletions
@@ -1,5 +0,0 @@
---
-"@trigger.dev/cli": patch
---
-
-Detects JSRuntime (Node/Deno at the moment). Adds basic Deno support
@@ -1,5 +0,0 @@
---
-"@trigger.dev/cli": patch
---
-
-Improve create-integration output. Use templates and shared configs.
@@ -1,5 +0,0 @@
---
-"@trigger.dev/airtable": patch
---
-
-Export Base and Table
@@ -12,7 +12,14 @@ APP_ENV=development
 APP_ORIGIN=http://localhost:3030
 NODE_ENV=development

+# Redis is used for concurrency control
+# REDIS_HOST="localhost"
+# REDIS_PORT="6379"
+# REDIS_TLS_DISABLED="true"
+
 # OPTIONAL VARIABLES
+# This is used for validating emails that are allowed to log in. Every email that do not match this regex will be rejected.
+# WHITELISTED_EMAILS="authorized@yahoo\.com|authorized@gmail\.com"
 # This is used for logging in via GitHub. You can leave these commented out if you don't want to use GitHub for authentication.
 # AUTH_GITHUB_CLIENT_ID=
 # AUTH_GITHUB_CLIENT_SECRET=
@@ -7,6 +7,7 @@ jobs:
    runs-on: buildjet-4vcpu-ubuntu-2204
    steps:
      - name: 🐳 Login to Docker Hub
+        if: github.event_name == 'push'
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -1,11 +1,12 @@
 name: 🤖 PR Checks

 on:
-  pull_request_target:
+  pull_request:
    branches:
      - main
    paths-ignore:
      - "**.md"
+      - "**.mdx"
      - ".github/CODEOWNERS"
      - ".github/ISSUE_TEMPLATE/**"

@@ -0,0 +1,72 @@
+name: "🐳 Publish Docker"
+on:
+  workflow_call:
+jobs:
+  publish:
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
+      short_sha: ${{ steps.get_commit.outputs.sha_short }}
+    steps:
+      - name: 🐳 Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+
+      - name: 🆚 Get the version
+        id: get_version
+        run: |
+          IMAGE_TAG="${GITHUB_REF#refs/tags/}"
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            if [[ $IMAGE_TAG == v.docker.* ]]; then
+              ORIGINAL_VERSION="${IMAGE_TAG#v.docker.}"
+              IMAGE_TAG="v${ORIGINAL_VERSION}"
+            elif [[ $IMAGE_TAG == build-* ]]; then
+              IMAGE_TAG="${IMAGE_TAG#build-}"
+            fi
+            echo "IMAGE_TAG=${IMAGE_TAG}"
+          elif [[ $GITHUB_REF == refs/heads/main ]]; then
+            # Handle main branch specifically
+            IMAGE_TAG="main"
+            echo "IMAGE_TAG=${IMAGE_TAG}"
+          else
+            echo "Invalid reference: ${GITHUB_REF}"
+            exit 1
+          fi
+          echo "::set-output name=version::${IMAGE_TAG}"
+      - name: 🔢 Get the commit hash
+        id: get_commit
+        run: |
+          echo ::set-output name=sha_short::$(echo ${{ github.sha }} | cut -c1-7)
+
+      - name: 🐳 Build Docker Image
+        run: |
+          docker build -t release_build_image -f ./docker/Dockerfile .
+
+      - name: 🐙 Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 🐙 Push to GitHub Container Registry
+        run: |
+          docker tag release_build_image $REGISTRY/$REPOSITORY:$IMAGE_TAG
+          docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
+        env:
+          REGISTRY: ghcr.io/triggerdotdev
+          REPOSITORY: trigger.dev
+          IMAGE_TAG: ${{ steps.get_version.outputs.version }}
+
+      - name: 🐙 Push 'latest' to GitHub Container Registry
+        if: startsWith(github.ref, 'refs/tags/v.docker')
+        run: |
+          docker tag release_build_image $REGISTRY/$REPOSITORY:latest
+          docker push $REGISTRY/$REPOSITORY:latest
+        env:
+          REGISTRY: ghcr.io/triggerdotdev
+          REPOSITORY: trigger.dev
@@ -4,9 +4,9 @@ on:
  push:
    branches:
      - main
-      - improvements/*
    tags:
      - "v.docker.*"
+      - "build-*"
    paths:
      - ".github/workflows/publish.yml"
      - "packages/**"
@@ -51,71 +51,5 @@ jobs:

  publish:
    needs: [typecheck, units, e2e]
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    outputs:
-      version: ${{ steps.get_version.outputs.version }}
-      short_sha: ${{ steps.get_commit.outputs.sha_short }}
-    steps:
-      - name: 🐳 Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
-
-      - name: 🆚 Get the version
-        id: get_version
-        run: |
-          IMAGE_TAG="${GITHUB_REF#refs/tags/}"
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            if [[ $IMAGE_TAG == v.docker.* ]]; then
-              ORIGINAL_VERSION="${IMAGE_TAG#v.docker.}"
-              IMAGE_TAG="v${ORIGINAL_VERSION}"
-            fi
-            echo "IMAGE_TAG=${IMAGE_TAG}"
-          elif [[ $GITHUB_REF == refs/heads/improvements/* ]]; then
-            ORIGINAL_VERSION="${GITHUB_REF#refs/heads/improvements/}"
-            IMAGE_TAG="${ORIGINAL_VERSION}.rc"
-            echo "IMAGE_TAG=${IMAGE_TAG}"
-          elif [[ $GITHUB_REF == refs/heads/* ]]; then
-            IMAGE_TAG="${GITHUB_REF#refs/heads/}"
-            echo "IMAGE_TAG=${IMAGE_TAG}"
-          else
-            echo "Invalid reference: ${GITHUB_REF}"
-            exit 1
-          fi
-          echo "::set-output name=version::${IMAGE_TAG}"
-      - name: 🔢 Get the commit hash
-        id: get_commit
-        run: |
-          echo ::set-output name=sha_short::$(echo ${{ github.sha }} | cut -c1-7)
-
-      - name: 🐳 Build Docker Image
-        run: |
-          docker build -t release_build_image -f ./docker/Dockerfile .
-
-      - name: 🐙 Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: 🐙 Push to GitHub Container Registry
-        run: |
-          docker tag release_build_image $REGISTRY/$REPOSITORY:$IMAGE_TAG
-          docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
-        env:
-          REGISTRY: ghcr.io/triggerdotdev
-          REPOSITORY: trigger.dev
-          IMAGE_TAG: ${{ steps.get_version.outputs.version }}
-
-      - name: 🐙 Push 'latest' to GitHub Container Registry
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          docker tag release_build_image $REGISTRY/$REPOSITORY:latest
-          docker push $REGISTRY/$REPOSITORY:latest
-        env:
-          REGISTRY: ghcr.io/triggerdotdev
-          REPOSITORY: trigger.dev
+    uses: ./.github/workflows/publish-docker.yml
+    secrets: inherit
@@ -22,6 +22,16 @@ jobs:
          node-version: 18
          cache: "pnpm"

+      - name: ⎔ Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
+      - name: ⎔ Setup bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: "1.0.15"
+
      - name: 📥 Download deps
        run: pnpm install --frozen-lockfile

@@ -52,3 +52,5 @@ apps/**/public/build
 /test-results/
 /playwright-report/
 /playwright/.cache/
+
+.cosine
@@ -1,3 +1,4 @@
 {
-  "deno.enablePaths": ["references/deno-reference"]
+  "deno.enablePaths": ["references/deno-reference", "runtime_tests/tests/deno"],
+  "debug.toolBarLocation": "commandCenter"
 }
@@ -0,0 +1,43 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct that could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project email address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team  All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 2.0, available at [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html).
@@ -14,18 +14,6 @@

 </div>

-# ✨🎃 Get involved with Hacktoberfest 2023! 🎃✨
-
-All of October we're participating in Hacktoberfest and invite you to join us! We have a bunch of issues labeled `🎃 Hacktoberfest` that are ready for you to work on which will count towards Hacktoberfest. We are also running our own game, earn 💎 points to win swag!
-
- Check out our [Hacktoberfest landing page](https://trigger.dev/hacktoberfest) for how to participate and win swag.
- Contribute to either our [/trigger.dev](https://github.com/triggerdotdev/trigger.dev/labels/%F0%9F%8E%83%20hacktoberfest) or [/jobs-showcase](https://github.com/triggerdotdev/jobs-showcase/labels/%F0%9F%8E%83%20hacktoberfest) repositories and complete issues marked `🎃 Hacktoberfest` to be eligible for swag.
- Join our [Discord](https://discord.gg/JtBAxBr2m3) and get involved in with the community.
-
-_New to Hacktober? Check out the [Hacktoberfest website](https://hacktoberfest.digitalocean.com/) for more information._
-
-🎃 **Happy Hacking!** 🎃
-
 # About Trigger.dev

 Create long-running jobs directly in your codebase with features like API integrations, webhooks, scheduling and delays.
@@ -96,7 +84,7 @@ We provide an official trigger.dev docker image you can use to easily self-host

 To setup and develop locally or contribute to the open source project, follow our [development guide](./CONTRIBUTING.md).

-## 🙏 to our contributors
+## Meet the Amazing People Behind This Project 🚀

 <a href="https://github.com/triggerdotdev/trigger.dev/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=triggerdotdev/trigger.dev" />
@@ -0,0 +1,7 @@
+REWRITE_HOSTNAME=
+AWS_SQS_ACCESS_KEY_ID=
+AWS_SQS_SECRET_ACCESS_KEY=
+AWS_SQS_QUEUE_URL=
+AWS_SQS_REGION=
+#optional
+#REWRITE_PORT=
@@ -0,0 +1,13 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+tab_width = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
@@ -0,0 +1,172 @@
+# Logs
+
+logs
+_.log
+npm-debug.log_
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# Runtime data
+
+pids
+_.pid
+_.seed
+\*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+
+lib-cov
+
+# Coverage directory used by tools like istanbul
+
+coverage
+\*.lcov
+
+# nyc test coverage
+
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+
+bower_components
+
+# node-waf configuration
+
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+
+build/Release
+
+# Dependency directories
+
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+
+web_modules/
+
+# TypeScript cache
+
+\*.tsbuildinfo
+
+# Optional npm cache directory
+
+.npm
+
+# Optional eslint cache
+
+.eslintcache
+
+# Optional stylelint cache
+
+.stylelintcache
+
+# Microbundle cache
+
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+
+.node_repl_history
+
+# Output of 'npm pack'
+
+\*.tgz
+
+# Yarn Integrity file
+
+.yarn-integrity
+
+# dotenv environment variable files
+
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+
+.cache
+.parcel-cache
+
+# Next.js build output
+
+.next
+out
+
+# Nuxt.js build / generate output
+
+.nuxt
+dist
+
+# Gatsby files
+
+.cache/
+
+# Comment in the public line in if your project uses Gatsby and not Next.js
+
+# https://nextjs.org/blog/next-9-1#public-directory-support
+
+# public
+
+# vuepress build output
+
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+
+.temp
+.cache
+
+# Docusaurus cache and generated files
+
+.docusaurus
+
+# Serverless directories
+
+.serverless/
+
+# FuseBox cache
+
+.fusebox/
+
+# DynamoDB Local files
+
+.dynamodb/
+
+# TernJS port file
+
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+
+.vscode-test
+
+# yarn v2
+
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.\*
+
+# wrangler project
+
+.dev.vars
+.wrangler/
@@ -0,0 +1,11 @@
+{
+	"semi": true,
+	"singleQuote": false,
+	"jsxSingleQuote": false,
+	"trailingComma": "es5",
+	"bracketSpacing": true,
+	"bracketSameLine": false,
+	"printWidth": 100,
+	"tabWidth": 2,
+	"useTabs": false
+}
@@ -0,0 +1,48 @@
+# proxy
+
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies [f3efcc0c]
+  - @trigger.dev/core@2.3.1
+
+## 0.0.6
+
+### Patch Changes
+
+- Updated dependencies [17f6f29d]
+  - @trigger.dev/core@2.3.0
+
+## 0.0.5
+
+### Patch Changes
+
+- @trigger.dev/core@2.2.11
+
+## 0.0.4
+
+### Patch Changes
+
+- @trigger.dev/core@2.2.10
+
+## 0.0.3
+
+### Patch Changes
+
+- Updated dependencies [6ebd435e]
+  - @trigger.dev/core@2.2.9
+
+## 0.0.2
+
+### Patch Changes
+
+- Updated dependencies [067e19fe]
+  - @trigger.dev/core@2.2.8
+
+## 0.0.1
+
+### Patch Changes
+
+- Updated dependencies [756024da]
+  - @trigger.dev/core@2.2.7
@@ -0,0 +1,68 @@
+# Trigger.dev proxy
+
+This is an optional module that can be used to proxy and queue requests to the Trigger.dev API.
+
+## Why?
+
+The Trigger.dev API is designed to be fast and reliable. However, if you have a lot of traffic, you may want to use this proxy to queue requests to the API. It intercepts some requests to the API and adds them to an AWS SQS queue, then the webapp can be setup to process the queue.
+
+## Current features
+
+- Intercepts `sendEvent` requests and adds them to an AWS SQS queue. The webapp then reads from the queue and creates the events.
+
+## Setup
+
+### Create an AWS SQS queue
+
+In AWS you should create a new AWS SQS queue with appropriate security settings. You will need the queue URL for the next step.
+
+### Environment variables
+
+#### Cloudflare secrets
+
+Locally you should copy the `.dev.var.example` file to `.dev.var` and fill in the values.
+
+When deploying you should use `wrangler` (the Cloudflare CLI tool) to set secrets. Make sure you set the correct --env ("staging" or "prod")
+
+```bash
+wrangler secret put REWRITE_HOSTNAME --env staging
+wrangler secret put AWS_SQS_ACCESS_KEY_ID --env staging
+wrangler secret put AWS_SQS_SECRET_ACCESS_KEY --env staging
+wrangler secret put AWS_SQS_QUEUE_URL --env staging
+wrangler secret put AWS_SQS_REGION --env staging
+```
+
+You need to set your API CNAME entry to be proxied by Cloudflare. You can do this in the Cloudflare dashboard.
+
+#### Webapp
+
+These env vars also need setting in the webapp.
+
+```bash
+AWS_SQS_REGION
+AWS_SQS_ACCESS_KEY_ID
+AWS_SQS_SECRET_ACCESS_KEY
+AWS_SQS_QUEUE_URL
+AWS_SQS_BATCH_SIZE
+```
+
+## Deployment
+
+Staging:
+
+```bash
+npx wrangler@latest deploy --route "<your-api-subdomain>/*" --env staging
+```
+
+Prod:
+
+```bash
+npx wrangler@latest deploy --route "<your-api-subdomain>/*" --env prod
+```
+
+## Development
+
+Set the environment variables as described above.
+
+1. `pnpm install`
+2. `pnpm run dev --filter proxy`
@@ -0,0 +1,21 @@
+{
+  "name": "proxy",
+  "version": "0.0.7",
+  "private": true,
+  "scripts": {
+    "deploy": "wrangler deploy",
+    "dev": "wrangler dev"
+  },
+  "devDependencies": {
+    "@cloudflare/workers-types": "^4.20230419.0",
+    "typescript": "^5.0.4",
+    "wrangler": "^3.0.0"
+  },
+  "dependencies": {
+    "@aws-sdk/client-sqs": "^3.445.0",
+    "@trigger.dev/core": "workspace:*",
+    "ulidx": "^2.2.1",
+    "zod": "3.22.3",
+    "zod-error": "1.5.0"
+  }
+}
@@ -0,0 +1,20 @@
+import { z } from "zod";
+
+const AuthorizationHeaderSchema = z.string().regex(/^Bearer .+$/);
+
+export function getApiKeyFromRequest(request: Request) {
+  const rawAuthorization = request.headers.get("Authorization");
+
+  const authorization = AuthorizationHeaderSchema.safeParse(rawAuthorization);
+  if (!authorization.success) {
+    return;
+  }
+
+  const apiKey = authorization.data.replace(/^Bearer /, "");
+  const type = isPrivateApiKey(apiKey) ? ("PRIVATE" as const) : ("PUBLIC" as const);
+  return { apiKey, type };
+}
+
+function isPrivateApiKey(key: string) {
+  return key.startsWith("tr_");
+}
@@ -0,0 +1,87 @@
+import { SQSClient, SendMessageCommand } from "@aws-sdk/client-sqs";
+import { ApiEventLog, SendEventBodySchema } from "@trigger.dev/core";
+import { generateErrorMessage } from "zod-error";
+import { Env } from "..";
+import { getApiKeyFromRequest } from "../apikey";
+import { json } from "../json";
+import { calculateDeliverAt } from "./utils";
+
+/** Adds the event to an AWS SQS queue, so it can be consumed from the main Trigger.dev API */
+export async function queueEvent(request: Request, env: Env): Promise<Response> {
+  //check there's a private API key
+  const apiKeyResult = getApiKeyFromRequest(request);
+  if (!apiKeyResult || apiKeyResult.type !== "PRIVATE") {
+    return json(
+      { error: "Invalid or Missing API key" },
+      {
+        status: 401,
+      }
+    );
+  }
+
+  //parse the request body
+  try {
+    const anyBody = await request.json();
+    const body = SendEventBodySchema.safeParse(anyBody);
+    if (!body.success) {
+      return json(
+        { error: generateErrorMessage(body.error.issues) },
+        {
+          status: 422,
+        }
+      );
+    }
+
+    // The AWS SDK tries to use crypto from off of the window,
+    // so we need to trick it into finding it where it expects it
+    globalThis.global = globalThis;
+
+    const client = new SQSClient({
+      region: env.AWS_SQS_REGION,
+      credentials: {
+        accessKeyId: env.AWS_SQS_ACCESS_KEY_ID,
+        secretAccessKey: env.AWS_SQS_SECRET_ACCESS_KEY,
+      },
+    });
+
+    const timestamp = body.data.event.timestamp ?? new Date();
+
+    //add the event to the queue
+    const send = new SendMessageCommand({
+      // use wrangler secrets to provide this global variable
+      QueueUrl: env.AWS_SQS_QUEUE_URL,
+      MessageBody: JSON.stringify({
+        event: { ...body.data.event, timestamp },
+        options: body.data.options,
+        apiKey: apiKeyResult.apiKey,
+      }),
+    });
+
+    const queuedEvent = await client.send(send);
+    console.log("Queued event", queuedEvent);
+
+    //respond with the event
+    const event: ApiEventLog = {
+      id: body.data.event.id,
+      name: body.data.event.name,
+      payload: body.data.event.payload,
+      context: body.data.event.context,
+      timestamp,
+      deliverAt: calculateDeliverAt(body.data.options),
+    };
+
+    return json(event, {
+      status: 200,
+    });
+  } catch (e) {
+    console.error("queueEvent error", e);
+    return json(
+      {
+        error: `Failed to send event: ${e instanceof Error ? e.message : JSON.stringify(e)}`,
+      },
+      {
+        status: 422,
+      }
+    );
+  }
+}
@@ -0,0 +1,112 @@
+import { SQSClient, SendMessageBatchCommand } from "@aws-sdk/client-sqs";
+import { ApiEventLog, SendBulkEventsBodySchema } from "@trigger.dev/core";
+import { generateErrorMessage } from "zod-error";
+import { Env } from "..";
+import { getApiKeyFromRequest } from "../apikey";
+import { json } from "../json";
+import { calculateDeliverAt } from "./utils";
+
+/** Adds the event to an AWS SQS queue, so it can be consumed from the main Trigger.dev API */
+export async function queueEvents(request: Request, env: Env): Promise<Response> {
+  //check there's a private API key
+  const apiKeyResult = getApiKeyFromRequest(request);
+  if (!apiKeyResult || apiKeyResult.type !== "PRIVATE") {
+    return json(
+      { error: "Invalid or Missing API key" },
+      {
+        status: 401,
+      }
+    );
+  }
+
+  //parse the request body
+  try {
+    const anyBody = await request.json();
+    const body = SendBulkEventsBodySchema.safeParse(anyBody);
+    if (!body.success) {
+      return json(
+        { error: generateErrorMessage(body.error.issues) },
+        {
+          status: 422,
+        }
+      );
+    }
+
+    // The AWS SDK tries to use crypto from off of the window,
+    // so we need to trick it into finding it where it expects it
+    globalThis.global = globalThis;
+
+    const client = new SQSClient({
+      region: env.AWS_SQS_REGION,
+      credentials: {
+        accessKeyId: env.AWS_SQS_ACCESS_KEY_ID,
+        secretAccessKey: env.AWS_SQS_SECRET_ACCESS_KEY,
+      },
+    });
+
+    const updatedEvents: ApiEventLog[] = body.data.events.map((event) => {
+      const timestamp = event.timestamp ?? new Date();
+      return {
+        ...event,
+        payload: event.payload,
+        timestamp,
+      };
+    });
+
+    //divide updatedEvents into multiple batches of 10 (max size SQS accepts)
+    const batches: ApiEventLog[][] = [];
+    let currentBatch: ApiEventLog[] = [];
+    for (let i = 0; i < updatedEvents.length; i++) {
+      currentBatch.push(updatedEvents[i]);
+      if (currentBatch.length === 10) {
+        batches.push(currentBatch);
+        currentBatch = [];
+      }
+    }
+    if (currentBatch.length > 0) {
+      batches.push(currentBatch);
+    }
+
+    //loop through the batches and send them
+    for (let i = 0; i < batches.length; i++) {
+      const batch = batches[i];
+      //add the event to the queue
+      const send = new SendMessageBatchCommand({
+        // use wrangler secrets to provide this global variable
+        QueueUrl: env.AWS_SQS_QUEUE_URL,
+        Entries: batch.map((event, index) => ({
+          Id: `event-${index}`,
+          MessageBody: JSON.stringify({
+            event,
+            options: body.data.options,
+            apiKey: apiKeyResult.apiKey,
+          }),
+        })),
+      });
+
+      const queuedEvent = await client.send(send);
+      console.log("Queued events", queuedEvent);
+    }
+
+    //respond with the events
+    const events: ApiEventLog[] = updatedEvents.map((event) => ({
+      ...event,
+      payload: event.payload,
+      deliverAt: calculateDeliverAt(body.data.options),
+    }));
+
+    return json(events, {
+      status: 200,
+    });
+  } catch (e) {
+    console.error("queueEvents error", e);
+    return json(
+      {
+        error: `Failed to send events: ${e instanceof Error ? e.message : JSON.stringify(e)}`,
+      },
+      {
+        status: 422,
+      }
+    );
+  }
+}
@@ -0,0 +1,15 @@
+import { SendEventOptions } from "@trigger.dev/core";
+
+export function calculateDeliverAt(options?: SendEventOptions) {
+  // If deliverAt is a string and a valid date, convert it to a Date object
+  if (options?.deliverAt) {
+    return options?.deliverAt;
+  }
+
+  // deliverAfter is the number of seconds to wait before delivering the event
+  if (options?.deliverAfter) {
+    return new Date(Date.now() + options.deliverAfter * 1000);
+  }
+
+  return undefined;
+}
@@ -0,0 +1,67 @@
+import { queueEvent } from "./events/queueEvent";
+import { queueEvents } from "./events/queueEvents";
+
+export interface Env {
+  /** The hostname needs to be changed to allow requests to pass to the Trigger.dev platform */
+  REWRITE_HOSTNAME: string;
+  REWRITE_PORT?: string;
+  AWS_SQS_ACCESS_KEY_ID: string;
+  AWS_SQS_SECRET_ACCESS_KEY: string;
+  AWS_SQS_QUEUE_URL: string;
+  AWS_SQS_REGION: string;
+}
+
+export default {
+  async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
+    if (!env.REWRITE_HOSTNAME) throw new Error("Missing REWRITE_HOSTNAME");
+    console.log("url", request.url);
+
+    if (!queueingIsEnabled(env)) {
+      console.log("Missing AWS credentials. Passing through to the origin.");
+      return redirectToOrigin(request, env);
+    }
+
+    const url = new URL(request.url);
+    switch (url.pathname) {
+      case "/api/v1/events": {
+        if (request.method === "POST") {
+          return queueEvent(request, env);
+        }
+        break;
+      }
+      case "/api/v1/events/bulk": {
+        if (request.method === "POST") {
+          return queueEvents(request, env);
+        }
+        break;
+      }
+    }
+
+    //the same request but with the hostname (and port) changed
+    return redirectToOrigin(request, env);
+  },
+};
+
+function redirectToOrigin(request: Request, env: Env) {
+  const newUrl = new URL(request.url);
+  newUrl.hostname = env.REWRITE_HOSTNAME;
+  newUrl.port = env.REWRITE_PORT || newUrl.port;
+
+  const requestInit: RequestInit = {
+    method: request.method,
+    headers: request.headers,
+    body: request.body,
+  };
+
+  console.log("rewritten url", newUrl.toString());
+  return fetch(newUrl.toString(), requestInit);
+}
+
+function queueingIsEnabled(env: Env) {
+  return (
+    env.AWS_SQS_ACCESS_KEY_ID &&
+    env.AWS_SQS_SECRET_ACCESS_KEY &&
+    env.AWS_SQS_QUEUE_URL &&
+    env.AWS_SQS_REGION
+  );
+}
@@ -0,0 +1,13 @@
+export function json(body: any, init?: ResponseInit) {
+  const headers = {
+    "content-type": "application/json",
+    ...(init?.headers ?? {}),
+  };
+
+  const responseInit: ResponseInit = {
+    ...(init ?? {}),
+    headers,
+  };
+
+  return new Response(JSON.stringify(body), responseInit);
+}
@@ -0,0 +1,35 @@
+{
+  "compilerOptions": {
+    "target": "es2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+    "lib": [
+      "es2021"
+    ] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
+    "jsx": "react" /* Specify what JSX code is generated. */,
+
+    "module": "es2022" /* Specify what module code is generated. */,
+    "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+
+    "types": [
+      "@cloudflare/workers-types"
+    ] /* Specify type package names to be included without being referenced in a source file. */,
+    "resolveJsonModule": true /* Enable importing .json files */,
+
+    "allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
+    "checkJs": false /* Enable error reporting in type-checked JavaScript files. */,
+
+    "noEmit": true /* Disable emitting files from a compilation. */,
+
+    "isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
+    "allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
+    "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+
+    "strict": true /* Enable all strict type-checking options. */,
+
+    "skipLibCheck": true /* Skip type checking all .d.ts files. */,
+    "baseUrl": ".",
+    "paths": {
+      "@trigger.dev/core": ["../../packages/core/src/index"],
+      "@trigger.dev/core/*": ["../../packages/core/src/*"]
+    }
+  }
+}
@@ -0,0 +1,7 @@
+name = "proxy"
+main = "src/index.ts"
+compatibility_date = "2023-10-30"
+compatibility_flags = [ "nodejs_compat" ]
+
+[env.staging]
+[env.prod]
@@ -1,6 +1,6 @@
 import type { Preview } from "@storybook/react";
 import "../app/tailwind.css";
-import { unstable_createRemixStub } from "@remix-run/testing";
+import { createRemixStub } from "@remix-run/testing";
 import React from "react";
 import { LocaleContextProvider } from "../app/components/primitives/LocaleProvider";
 import { OperatingSystemContextProvider } from "../app/components/primitives/OperatingSystemProvider";
@@ -23,13 +23,16 @@ const preview: Preview = {
        },
      ],
    },
+    layout: "fullscreen",
  },
  decorators: [
    (Story) => {
-      const RemixStub = unstable_createRemixStub([
+      const RemixStub = createRemixStub([
        {
          path: "/*",
-          element: <Story />,
+          action: () => ({ redirect: "/" }),
+          loader: () => ({ redirect: "/" }),
+          Component: Story,
        },
      ]);

@@ -0,0 +1,36 @@
+export function EndpointIcon({ className }: { className?: string }) {
+  return (
+    <svg
+      className={className}
+      viewBox="0 0 24 24"
+      fill="currentColor"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M8.24336 5.11182C8.75159 4.60359 9.57559 4.60359 10.0838 5.11182L18.8882 13.9162C19.3964 14.4244 19.3964 15.2484 18.8882 15.7566L17.1469 17.4979C16.453 18.2196 15.6222 18.7956 14.7031 19.1922C13.7839 19.5889 12.7949 19.7982 11.7939 19.8081C10.7929 19.8179 9.79992 19.628 8.87318 19.2494C7.94643 18.8708 7.10449 18.3113 6.39662 17.6034C5.68875 16.8955 5.12916 16.0536 4.7506 15.1268C4.37205 14.2001 4.18212 13.2071 4.19194 12.2061C4.20176 11.2051 4.41112 10.2161 4.80779 9.29691C5.20445 8.37777 5.78044 7.54697 6.50206 6.85312L8.24336 5.11182Z"
+        fill="currentColor"
+      />
+      <path
+        d="M3.32398 20.676L7.11974 16.8803"
+        stroke="currentColor"
+        strokeWidth="2.16549"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M15.2535 3.32398L11.4578 7.11974"
+        stroke="currentColor"
+        strokeWidth="2.16549"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M20.676 8.74649L16.8803 12.5423"
+        stroke="currentColor"
+        strokeWidth="2.16549"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
@@ -0,0 +1,5 @@
+import { LogoIcon } from "~/components/LogoIcon";
+
+export function IntegrationIcon() {
+  return <LogoIcon className="h-3.5 w-3.5 flex-none pb-0.5" />;
+}
@@ -0,0 +1,18 @@
+export function RunsIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M12.2964 3.66962C11.97 3.83662 11.6961 4.09048 11.5047 4.40323C11.3134 4.71598 11.2121 5.07547 11.212 5.44211L11.211 8.0162L9.22047 8.0172C8.95637 8.0172 8.70309 8.12211 8.51635 8.30886C8.3296 8.4956 8.22469 8.74888 8.22469 9.01298V14.9877L8.23166 15.1042C8.26019 15.3464 8.37664 15.5697 8.5589 15.7318C8.74116 15.8939 8.97657 15.9834 9.22047 15.9834L11.211 15.9825L11.212 18.5585C11.2121 18.9524 11.329 19.3373 11.5478 19.6648C11.7666 19.9922 12.0777 20.2474 12.4415 20.3981C12.8054 20.5488 13.2057 20.5882 13.592 20.5114C13.9783 20.4346 14.3331 20.245 14.6116 19.9666L21.1698 13.4084C21.5432 13.0349 21.7529 12.5284 21.7529 12.0003C21.7529 11.4722 21.5432 10.9658 21.1698 10.5923L14.6116 4.03408C14.3331 3.75539 13.9782 3.56558 13.5918 3.48865C13.2054 3.41172 12.8048 3.45114 12.4408 3.60191L12.2964 3.66962Z"
+        fill="currentColor"
+      />
+      <path
+        d="M3.24578 8.0172C3.48968 8.01723 3.72509 8.10677 3.90735 8.26885C4.08961 8.43092 4.20606 8.65425 4.23459 8.89647L4.24156 9.01298V14.9877C4.24128 15.2415 4.1441 15.4856 3.96986 15.6701C3.79563 15.8547 3.55751 15.9658 3.30414 15.9806C3.05077 15.9955 2.80128 15.9131 2.60666 15.7502C2.41203 15.5873 2.28695 15.3562 2.25697 15.1042L2.25 14.9877V9.01298C2.25 8.74888 2.35491 8.4956 2.54166 8.30885C2.7284 8.12211 2.98168 8.0172 3.24578 8.0172Z"
+        fill="currentColor"
+      />
+      <path
+        d="M6.23312 8.0172C6.47702 8.01723 6.71243 8.10677 6.89469 8.26885C7.07696 8.43092 7.1934 8.65425 7.22193 8.89647L7.2289 9.01298V14.9877C7.22862 15.2415 7.13144 15.4856 6.95721 15.6701C6.78298 15.8547 6.54485 15.9658 6.29148 15.9806C6.03811 15.9955 5.78863 15.9131 5.594 15.7502C5.39937 15.5873 5.27429 15.3562 5.24431 15.1042L5.23734 14.9877V9.01298C5.23734 8.74888 5.34226 8.4956 5.529 8.30885C5.71575 8.12211 5.96903 8.0172 6.23312 8.0172Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
@@ -36,7 +36,8 @@ export function Feedback({ button, defaultValue = "bug" }: FeedbackProps) {

  const [form, { path, feedbackType, message }] = useForm({
    id: "accept-invite",
-    lastSubmission,
+    // TODO: type this
+    lastSubmission: lastSubmission as any,
    onValidate({ formData }) {
      return parse(formData, { schema });
    },
@@ -1,24 +1,18 @@
 import { Form } from "@remix-run/react";
 import { Paragraph } from "./primitives/Paragraph";
 import { Button } from "./primitives/Buttons";
+import { UserMinusIcon } from "@heroicons/react/20/solid";

-export function ImpersonationBanner({ impersonationId }: { impersonationId: string }) {
+export function ImpersonationBanner() {
  return (
-    <div className="grid h-8 grid-cols-3 items-center bg-gradient-to-r from-amber-500 via-amber-400 to-amber-500 px-4 text-center">
-      <span></span>
-      <Paragraph variant="small">
-        You are impersonating <span className="font-semibold">{impersonationId}</span>
-      </Paragraph>
-      <Form
-        action="/resources/impersonation"
-        method="delete"
-        reloadDocument
-        className="justify-self-end"
-      >
+    <div className="w-full">
+      <Form action="/resources/impersonation" method="delete" reloadDocument className="w-full">
        <Button
          type="submit"
-          className="!text-slate-700 transition hover:!text-slate-900"
-          variant="secondary/small"
+          variant="small-menu-item"
+          LeadingIcon={UserMinusIcon}
+          fullWidth
+          textAlignLeft
        >
          Stop impersonating
        </Button>
@@ -16,19 +16,23 @@ export type JobEnvironment = {
  lastRun?: Date;
  version: string;
  enabled: boolean;
+  concurrencyLimit?: number | null;
+  concurrencyLimitGroup?: { name: string; concurrencyLimit: number } | null;
 };

 type JobStatusTableProps = {
  environments: JobEnvironment[];
+  displayStyle?: "short" | "long";
 };

-export function JobStatusTable({ environments }: JobStatusTableProps) {
+export function JobStatusTable({ environments, displayStyle = "short" }: JobStatusTableProps) {
  return (
    <Table fullWidth>
      <TableHeader>
        <TableRow>
          <TableHeaderCell>Env</TableHeaderCell>
          <TableHeaderCell>Last Run</TableHeaderCell>
+          {displayStyle === "long" && <TableHeaderCell>Concurrency</TableHeaderCell>}
          <TableHeaderCell alignment="right">Version</TableHeaderCell>
          <TableHeaderCell alignment="right">Status</TableHeaderCell>
        </TableRow>
@@ -42,6 +46,23 @@ export function JobStatusTable({ environments }: JobStatusTableProps) {
            <TableCell>
              {environment.lastRun ? <DateTime date={environment.lastRun} /> : "Never Run"}
            </TableCell>
+            {displayStyle === "long" && (
+              <TableCell>
+                {environment.concurrencyLimitGroup ? (
+                  <span className="flex items-center gap-1">
+                    <span>{environment.concurrencyLimitGroup.name}</span>
+                    <span className="text-gray-400">
+                      ({environment.concurrencyLimitGroup.concurrencyLimit})
+                    </span>
+                  </span>
+                ) : typeof environment.concurrencyLimit === "number" ? (
+                  <span className="text-gray-400">{environment.concurrencyLimit}</span>
+                ) : (
+                  <span className="text-gray-400">Not specified</span>
+                )}
+              </TableCell>
+            )}
+
            <TableCell alignment="right">{environment.version}</TableCell>
            <TableCell alignment="right">
              <ActiveBadge active={environment.enabled} />
@@ -0,0 +1,341 @@
+import {
+  BoltIcon,
+  CloudIcon,
+  CodeBracketIcon,
+  CodeBracketSquareIcon,
+  HeartIcon,
+  ServerStackIcon,
+} from "@heroicons/react/24/solid";
+import { useEffect, useState } from "react";
+import { cn } from "~/utils/cn";
+import { LogoType } from "./LogoType";
+import { LinkButton } from "./primitives/Buttons";
+import { Header3 } from "./primitives/Headers";
+import { Icon } from "./primitives/Icon";
+import { Paragraph } from "./primitives/Paragraph";
+import { TextLink } from "./primitives/TextLink";
+import { LoginTooltip } from "./primitives/Tooltip";
+
+interface QuoteType {
+  quote: string;
+  person: string;
+}
+
+const quotes: QuoteType[] = [
+  {
+    quote: "Trigger.dev is redefining background jobs for modern developers.",
+    person: "Paul Copplestone, Supabase",
+  },
+  {
+    quote:
+      "Trigger.dev is a great way to automate email campaigns with Resend, and we've heard nothing but good things from our mutual customers.",
+    person: "Zeno Rocha, Resend",
+  },
+  {
+    quote: "We love Trigger.dev and it’s had a big impact in dev iteration velocity already.",
+    person: "André Neves, ZBD",
+  },
+  {
+    quote:
+      "We’ve been looking for a product like Trigger.dev for a really long time - automation that's simple and developer-focused.",
+    person: "Han Wang, Mintlify",
+  },
+];
+
+const layout = "group grid place-items-center text-center overflow-hidden";
+const gridCell = "hover:bg-midnight-850 rounded-lg transition bg-midnight-850/40";
+const opacity = "opacity-10 group-hover:opacity-100 transition group-hover:scale-105";
+const logos = "h-[60%] w-[60%] transition grayscale group-hover:grayscale-0";
+const features = "h-[60%] w-[60%] text-gray-500 grayscale transition group-hover:grayscale-0";
+const wide = "col-span-2";
+const wider = "col-span-3 row-span-2";
+const mediumSquare = "col-span-2 row-span-2";
+const hidden = "hidden xl:grid";
+
+export function LoginPageLayout({ children }: { children: React.ReactNode }) {
+  const [randomQuote, setRandomQuote] = useState<QuoteType | null>(null);
+  useEffect(() => {
+    const randomIndex = Math.floor(Math.random() * quotes.length);
+    setRandomQuote(quotes[randomIndex]);
+  }, []);
+
+  return (
+    <main className="grid h-full grid-cols-12">
+      <div className="border-midnight-750 z-10 col-span-12 border-r bg-midnight-850 md:col-span-6">
+        <div className="flex h-full flex-col items-center justify-between p-6">
+          <div className="flex w-full items-center justify-between">
+            <a href="https://trigger.dev">
+              <LogoType className="w-36" />
+            </a>
+            <LinkButton
+              to="https://trigger.dev/docs"
+              variant={"secondary/small"}
+              LeadingIcon="docs"
+            >
+              Documentation
+            </LinkButton>
+          </div>
+          <div className="flex h-full max-w-sm items-center justify-center">{children}</div>
+          <Paragraph variant="extra-small" className="text-center">
+            Having login issues? <TextLink href="mailto:help@trigger.dev">Email us</TextLink> or{" "}
+            <TextLink href="https://trigger.dev/discord">ask us in Discord</TextLink>
+          </Paragraph>
+        </div>
+      </div>
+      <div className="hidden grid-cols-3 grid-rows-6 gap-4 p-4 md:col-span-6 md:grid xl:grid-cols-5">
+        <LoginTooltip side="bottom" content={<ServerlessTooltipContent />}>
+          <div className={cn(layout, gridCell, mediumSquare)}>
+            <ServerStackIcon className={cn(opacity, features, "group-hover:text-green-500")} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="bottom" content={<SlackTooltipContent />}>
+          <div className={cn(layout, gridCell)}>
+            <Icon icon="slack" className={cn(logos, opacity)} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="left" content={<TriggerTooltipContent />}>
+          <div className={cn(layout, gridCell, mediumSquare, hidden)}>
+            <BoltIcon className={cn(opacity, features, "group-hover:text-yellow-500")} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="bottom" content={<StripeTooltipContent />} className="max-w-[15rem]">
+          <div className={cn("", layout, gridCell)}>
+            <Icon icon="stripe" className={cn(logos, opacity)} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="top" content={<QuoteTooltipContent />}>
+          <div className={cn(layout, gridCell, wider)}>
+            <div className="px-4">
+              <Header3 className="relative text-2xl font-normal leading-8 text-gray-600 transition before:relative before:right-1 before:top-0 before:text-4xl before:text-slate-600 before:opacity-20 before:content-['❝'] group-hover:text-slate-500 group-hover:before:opacity-30 lg-height:text-xl md-height:text-lg">
+                {randomQuote?.quote}
+              </Header3>
+              <Paragraph
+                variant="small"
+                className="mt-4 text-gray-700 transition group-hover:text-slate-600"
+              >
+                {randomQuote?.person}
+              </Paragraph>
+            </div>
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="left" content={<OpenaiTooltipContent />}>
+          <div className={cn("", layout, gridCell, hidden)}>
+            <Icon icon="openai" className={cn(logos, opacity)} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="left" content={<SendgridTooltipContent />}>
+          <div className={cn(layout, gridCell, hidden)}>
+            <Icon icon="sendgrid" className={cn(logos, opacity)} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="left" content={<ReactHooksTooltipContent />}>
+          <div className={cn(layout, gridCell, mediumSquare, hidden)}>
+            <Icon icon="react" className={cn(opacity, features, "group-hover:text-green-500")} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="right" content={<AirtableTooltipContent />}>
+          <div className={cn("", layout, gridCell)}>
+            <Icon icon="airtable" className={cn(logos, opacity)} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="top" content={<InYourCodebaseTooltipContent />}>
+          <div className={cn(layout, gridCell, mediumSquare)}>
+            <CodeBracketSquareIcon className={cn(opacity, features, "group-hover:text-rose-500")} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="right" content={<SupabaseTooltipContent />}>
+          <div className={cn(layout, gridCell)}>
+            <Icon icon="supabase" className={cn(logos, opacity)} />
+          </div>
+        </LoginTooltip>
+        <LoginTooltip side="left" content={<CloudTooltipContent />}>
+          <div className={cn(layout, gridCell, wide, hidden)}>
+            <CloudIcon className={cn(opacity, features, "h-20 w-20 group-hover:text-blue-600")} />
+          </div>
+        </LoginTooltip>
+      </div>
+    </main>
+  );
+}
+
+function SlackTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="slack" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Slack Integration
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">Post messages to your team when your Job is triggered.</Paragraph>
+    </>
+  );
+}
+
+function StripeTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="stripe" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Stripe Integration
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">Trigger payments, emails, subscription upgrades…</Paragraph>
+    </>
+  );
+}
+
+function SupabaseTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="supabase" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Supabase Integration
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">React to changes in your database.</Paragraph>
+    </>
+  );
+}
+
+function SendgridTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="sendgrid" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          SendGrid Integration
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Create a drip campaign, trigger an onboarding sequence and more…
+      </Paragraph>
+    </>
+  );
+}
+
+function AirtableTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="airtable" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Airtable Integration
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Update your Airtable records when you make a Stripe sale, receive a new Typeform response
+        and more…
+      </Paragraph>
+    </>
+  );
+}
+
+function OpenaiTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="openai" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          OpenAI Integration
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">Generate text, images, code and more with OpenAI's API.</Paragraph>
+    </>
+  );
+}
+
+function TriggerTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <BoltIcon className="h-5 w-5 text-yellow-500" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Triggering your Job
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Trigger your Jobs with a webhook, on a recurring schedule, or from your own custom events.
+      </Paragraph>
+    </>
+  );
+}
+
+function QuoteTooltipContent() {
+  return (
+    <>
+      <div className="flex items-center gap-x-1.5">
+        <HeartIcon className="h-5 w-5 text-rose-500" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Loved by developers
+        </Paragraph>
+      </div>
+    </>
+  );
+}
+
+function InYourCodebaseTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <CodeBracketSquareIcon className="h-5 w-5 text-rose-500" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          In your codebase
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Create background jobs where they belong: in your codebase.
+      </Paragraph>
+    </>
+  );
+}
+
+function CloudTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <CloudIcon className="h-5 w-5 text-blue-600" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Zero infrastructure
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Use our SDK to write Jobs in your codebase and deploy as you normally do.
+      </Paragraph>
+    </>
+  );
+}
+
+function ServerlessTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <ServerStackIcon className="h-5 w-5 text-green-500" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Full serverless support
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Run long-running background jobs without worrying about timeouts.
+      </Paragraph>
+    </>
+  );
+}
+
+function ReactHooksTooltipContent() {
+  return (
+    <>
+      <div className="mb-2 flex items-center gap-x-1.5">
+        <Icon icon="react" className="h-5 w-5" />
+        <Paragraph variant="base/bright" className="font-semibold">
+          Show Job progress in your UI
+        </Paragraph>
+      </div>
+      <Paragraph variant="base">
+        Use our React hooks to display a real-time status to your users.
+      </Paragraph>
+    </>
+  );
+}
@@ -0,0 +1,190 @@
+export function LogoType({ className }: { className?: string }) {
+  return (
+    <svg viewBox="0 0 751 130" xmlns="http://www.w3.org/2000/svg" className={className}>
+      <path
+        d="M195.022 16.2676H135.445H137.799V32.5096H157.858V102.4H174.84V32.5096H195.022V16.2676Z"
+        fill="url(#paint0_linear_228_1439)"
+      />
+      <path
+        d="M211.265 51.4587V40.8767H195.391V102.4H211.265V72.9917C211.265 60.0719 221.725 56.3805 229.97 57.3648V39.6463C222.218 39.6463 214.465 43.0916 211.265 51.4587Z"
+        fill="url(#paint1_linear_228_1439)"
+      />
+      <path
+        d="M246.954 33.494C252.368 33.494 256.799 29.0644 256.799 23.7734C256.799 18.4824 252.368 13.9297 246.954 13.9297C241.662 13.9297 237.232 18.4824 237.232 23.7734C237.232 29.0644 241.662 33.494 246.954 33.494ZM239.078 102.4H254.953V40.8767H239.078V102.4Z"
+        fill="url(#paint2_linear_228_1439)"
+      />
+      <path
+        d="M315.253 40.8768V48.5056C310.946 42.7224 304.301 39.1542 295.563 39.1542C278.089 39.1542 264.921 53.4275 264.921 70.6539C264.921 88.0033 278.089 102.154 295.563 102.154C304.301 102.154 310.946 98.5853 315.253 92.8021V99.4466C315.253 109.167 309.1 114.581 299.132 114.581C289.656 114.581 285.596 110.767 283.011 105.968L269.475 113.72C274.889 123.687 285.472 128.731 298.64 128.731C314.884 128.731 330.758 119.626 330.758 99.4466V40.8768H315.253ZM298.025 87.5112C288.057 87.5112 280.796 80.4975 280.796 70.6539C280.796 60.9332 288.057 53.9196 298.025 53.9196C307.992 53.9196 315.253 60.9332 315.253 70.6539C315.253 80.4975 307.992 87.5112 298.025 87.5112Z"
+        fill="url(#paint3_linear_228_1439)"
+      />
+      <path
+        d="M390.936 40.8768V48.5056C386.629 42.7224 379.983 39.1542 371.246 39.1542C353.772 39.1542 340.604 53.4275 340.604 70.6539C340.604 88.0033 353.772 102.154 371.246 102.154C379.983 102.154 386.629 98.5853 390.936 92.8021V99.4466C390.936 109.167 384.783 114.581 374.815 114.581C365.339 114.581 361.278 110.767 358.694 105.968L345.157 113.72C350.572 123.687 361.155 128.731 374.322 128.731C390.566 128.731 406.441 119.626 406.441 99.4466V40.8768H390.936ZM373.707 87.5112C363.739 87.5112 356.479 80.4975 356.479 70.6539C356.479 60.9332 363.739 53.9196 373.707 53.9196C383.675 53.9196 390.936 60.9332 390.936 70.6539C390.936 80.4975 383.675 87.5112 373.707 87.5112Z"
+        fill="url(#paint4_linear_228_1439)"
+      />
+      <path
+        d="M432.9 78.1597H479.293C479.663 76.0679 479.909 73.9761 479.909 71.6383C479.909 53.5505 466.987 39.1542 448.775 39.1542C429.454 39.1542 416.287 53.3044 416.287 71.6383C416.287 89.9721 429.331 104.122 450.005 104.122C461.819 104.122 471.048 99.3236 476.832 90.9564L464.034 83.5737C461.327 87.142 456.404 89.726 450.251 89.726C441.883 89.726 435.115 86.2807 432.9 78.1597ZM432.654 65.8551C434.5 57.9802 440.284 53.4274 448.775 53.4274C455.42 53.4274 462.065 56.9958 464.034 65.8551H432.654Z"
+        fill="url(#paint5_linear_228_1439)"
+      />
+      <path
+        d="M505.199 51.4587V40.8767H489.324V102.4H505.199V72.9917C505.199 60.0719 515.659 56.3805 523.904 57.3648V39.6463C516.151 39.6463 508.398 43.0916 505.199 51.4587Z"
+        fill="url(#paint6_linear_228_1439)"
+      />
+      <path
+        d="M529.934 103.999C535.717 103.999 540.394 99.3235 540.394 93.5404C540.394 87.7572 535.717 83.0815 529.934 83.0815C524.15 83.0815 519.473 87.7572 519.473 93.5404C519.473 99.3235 524.15 103.999 529.934 103.999Z"
+        fill="url(#paint7_linear_228_1439)"
+      />
+      <path
+        d="M596.632 16.2676V48.1364C592.202 42.4763 585.679 39.1541 576.696 39.1541C560.206 39.1541 546.67 53.3044 546.67 71.6382C546.67 89.972 560.206 104.122 576.696 104.122C585.679 104.122 592.202 100.8 596.632 95.1399V102.4H612.506V16.2676L596.632 16.2676ZM579.65 88.9876C569.805 88.9876 562.544 81.9741 562.544 71.6382C562.544 61.3024 569.805 54.2887 579.65 54.2887C589.371 54.2887 596.632 61.3024 596.632 71.6382C596.632 81.9741 589.371 88.9876 579.65 88.9876Z"
+        fill="url(#paint8_linear_228_1439)"
+      />
+      <path
+        d="M637.98 78.1597H684.373C684.742 76.0679 684.989 73.9761 684.989 71.6383C684.989 53.5505 672.067 39.1542 653.855 39.1542C634.534 39.1542 621.367 53.3044 621.367 71.6383C621.367 89.9721 634.411 104.122 655.085 104.122C666.899 104.122 676.128 99.3236 681.912 90.9564L669.114 83.5737C666.407 87.142 661.484 89.726 655.331 89.726C646.963 89.726 640.195 86.2807 637.98 78.1597ZM637.734 65.8551C639.58 57.9802 645.363 53.4274 653.855 53.4274C660.5 53.4274 667.145 56.9958 669.114 65.8551H637.734Z"
+        fill="url(#paint9_linear_228_1439)"
+      />
+      <path
+        d="M732.859 40.8768L717.846 83.9428L702.955 40.8768H685.481L708.862 102.4H726.952L750.333 40.8768H732.859Z"
+        fill="url(#paint10_linear_228_1439)"
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M35.664 42.3949L59.4114 1.26865L118.264 103.194H0.558823L24.3062 62.0665L41.1046 71.7643L34.157 83.7971H84.6657L59.4114 40.0612L52.4637 52.094L35.664 42.3949Z"
+        fill="url(#paint11_linear_228_1439)"
+      />
+      <defs>
+        <linearGradient
+          id="paint0_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint1_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint2_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint3_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint4_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint5_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint6_linear_228_1439"
+          x1="329.674"
+          y1="150.079"
+          x2="329.674"
+          y2="13.9297"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+        <linearGradient
+          id="paint7_linear_228_1439"
+          x1="634.903"
+          y1="139.717"
+          x2="651.436"
+          y2="25.9719"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#2563EB" />
+          <stop offset="1" stopColor="#A855F7" />
+        </linearGradient>
+        <linearGradient
+          id="paint8_linear_228_1439"
+          x1="634.903"
+          y1="139.717"
+          x2="651.436"
+          y2="25.9719"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#2563EB" />
+          <stop offset="1" stopColor="#A855F7" />
+        </linearGradient>
+        <linearGradient
+          id="paint9_linear_228_1439"
+          x1="634.903"
+          y1="139.717"
+          x2="651.436"
+          y2="25.9719"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#2563EB" />
+          <stop offset="1" stopColor="#A855F7" />
+        </linearGradient>
+        <linearGradient
+          id="paint10_linear_228_1439"
+          x1="634.903"
+          y1="139.717"
+          x2="651.436"
+          y2="25.9719"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#2563EB" />
+          <stop offset="1" stopColor="#A855F7" />
+        </linearGradient>
+        <linearGradient
+          id="paint11_linear_228_1439"
+          x1="95.8593"
+          y1="103.194"
+          x2="94.7607"
+          y2="31.2381"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#41FF54" />
+          <stop offset="1" stopColor="#E7FF52" />
+        </linearGradient>
+      </defs>
+    </svg>
+  );
+}
@@ -0,0 +1,105 @@
+import { ArrowPathIcon } from "@heroicons/react/20/solid";
+import { ExclamationTriangleIcon } from "@heroicons/react/24/solid";
+import { useFetcher } from "@remix-run/react";
+import { useState } from "react";
+import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
+import { generateTwoRandomWords } from "~/utils/randomWords";
+import { Button } from "../primitives/Buttons";
+import { Header1 } from "../primitives/Headers";
+import { Input } from "../primitives/Input";
+import { Paragraph } from "../primitives/Paragraph";
+import { Spinner } from "../primitives/Spinner";
+
+type ModalProps = {
+  id: string;
+  title: string;
+};
+
+type ModalContentProps = ModalProps & {
+  randomWord: string;
+  closeModal: () => void;
+};
+
+export function RegenerateApiKeyModal({ id, title }: ModalProps) {
+  const randomWord = generateTwoRandomWords();
+  const [open, setOpen] = useState(false);
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <Button
+          variant="tertiary/small"
+          leadingIconClassName="text-dimmed"
+          LeadingIcon={ArrowPathIcon}
+        >
+          Regenerate
+        </Button>
+      </DialogTrigger>
+      <DialogContent>
+        <DialogHeader>{`Regenerate ${title} Environment Key`}</DialogHeader>
+        <RegenerateApiKeyModalContent
+          id={id}
+          title={title}
+          randomWord={randomWord}
+          closeModal={() => setOpen(false)}
+        />
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+const RegenerateApiKeyModalContent = ({ id, randomWord, title, closeModal }: ModalContentProps) => {
+  const [confirmationText, setConfirmationText] = useState("");
+  const fetcher = useFetcher();
+  const isSubmitting = fetcher.state === "submitting";
+
+  // form submission completed
+  if (fetcher.state === "loading") {
+    closeModal();
+  }
+
+  return (
+    <div className="flex w-full flex-col items-center gap-y-5 pb-4">
+      <div className="mt-3 flex gap-x-3 rounded-md border border-ui-border py-4 pl-3 pr-5">
+        <ExclamationTriangleIcon className="relative top-1 h-6 w-6 min-w-[2rem] text-amber-500" />
+        <Paragraph>
+          Regenerating the keys for this environment will temporarily break any live Jobs in the
+          <span className="text-bright"> {title} Environment</span> until the new API keys are set
+          in the relevant environment variables.
+        </Paragraph>
+      </div>
+      <fetcher.Form
+        method="post"
+        action={`/resources/environments/${id}/regenerate-api-key`}
+        className="mt-2 flex w-full flex-col items-center gap-2"
+      >
+        <div className="mb-4 flex items-center gap-x-2">
+          <Paragraph variant="small/bright">Enter this text below to confirm:</Paragraph>
+          <Paragraph
+            variant="small"
+            className="select-all rounded-md border border-ui-border bg-slate-900 px-2 py-1 font-mono text-bright"
+          >
+            {randomWord}
+          </Paragraph>
+        </div>
+        <div className="flex items-center">
+          <Input
+            type="text"
+            placeholder="Confirmation text"
+            fullWidth
+            value={confirmationText}
+            onChange={(e) => setConfirmationText(e.target.value)}
+            className="rounded-r-none"
+            variant="large"
+          />
+          <Button
+            variant="primary/large"
+            disabled={confirmationText !== randomWord}
+            className="rounded-l-none"
+          >
+            {isSubmitting ? <Spinner color="white" /> : <>Regenerate</>}
+          </Button>
+        </div>
+      </fetcher.Form>
+    </div>
+  );
+};
@@ -3,11 +3,10 @@ import { GitHubDarkIcon } from "@trigger.dev/companyicons";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { projectSetupPath } from "~/utils/pathBuilder";
-import { PageGradient } from "../PageGradient";
 import { LinkButton } from "../primitives/Buttons";
 import { Header1 } from "../primitives/Headers";
-import { Paragraph } from "../primitives/Paragraph";
 import { NamedIcon } from "../primitives/NamedIcon";
+import { Paragraph } from "../primitives/Paragraph";
 export type FrameworkComingSoonProps = {
  frameworkName: string;
  githubIssueUrl: string;
@@ -25,43 +24,41 @@ export function FrameworkComingSoon({
  const project = useProject();

  return (
-    <PageGradient>
-      <div className="mx-auto max-w-3xl">
-        <div className="mb-6 grid place-items-center pb-6">{children}</div>
-        <div className="flex items-center justify-between">
-          <Header1 spacing>{frameworkName} is coming soon!</Header1>
-          <LinkButton
-            to={projectSetupPath(organization, project)}
-            variant="tertiary/small"
-            LeadingIcon={Squares2X2Icon}
-          >
-            Choose a different framework
-          </LinkButton>
-        </div>
-        <Paragraph spacing className="border-b border-slate-800 pb-4">
-          We're working hard to bring support for {frameworkName} in Trigger.dev. Follow along with
-          the GitHub issue or contribute and help us bring it to Trigger.dev faster.
-        </Paragraph>
-        <a
-          href={githubIssueUrl}
-          target="_blank"
-          className="group mt-4 block max-w-sm rounded-md bg-bright px-10 py-8 transition hover:bg-slate-100"
+    <div className="mx-auto max-w-3xl pt-16">
+      <div className="mb-6 grid place-items-center pb-6">{children}</div>
+      <div className="flex items-center justify-between">
+        <Header1 spacing>{frameworkName} is coming soon!</Header1>
+        <LinkButton
+          to={projectSetupPath(organization, project)}
+          variant="tertiary/small"
+          LeadingIcon={Squares2X2Icon}
        >
-          <Paragraph spacing>triggerdotdev/trigger.dev</Paragraph>
-          <h2 className="text-2xl font-semibold text-black">
-            <span className="mr-1 font-normal text-dimmed">#{githubIssueNumber}</span>Framework:
-            support for {frameworkName}
-          </h2>
-          <div className="mt-4 flex items-center gap-1.5">
-            <GitHubDarkIcon className="h-4 w-4" />
-            <Paragraph variant="small">View on GitHub</Paragraph>
-            <NamedIcon
-              name="arrow-right"
-              className="h-4 w-4 text-dimmed transition group-hover:translate-x-1"
-            />
-          </div>
-        </a>
+          Choose a different framework
+        </LinkButton>
      </div>
-    </PageGradient>
+      <Paragraph spacing className="border-b border-slate-800 pb-4">
+        We're working hard to bring support for {frameworkName} in Trigger.dev. Follow along with
+        the GitHub issue or contribute and help us bring it to Trigger.dev faster.
+      </Paragraph>
+      <a
+        href={githubIssueUrl}
+        target="_blank"
+        className="group mt-4 block max-w-sm rounded-md bg-bright px-10 py-8 transition hover:bg-slate-100"
+      >
+        <Paragraph spacing>triggerdotdev/trigger.dev</Paragraph>
+        <h2 className="text-2xl font-semibold text-black">
+          <span className="mr-1 font-normal text-dimmed">#{githubIssueNumber}</span>Framework:
+          support for {frameworkName}
+        </h2>
+        <div className="mt-4 flex items-center gap-1.5">
+          <GitHubDarkIcon className="h-4 w-4" />
+          <Paragraph variant="small">View on GitHub</Paragraph>
+          <NamedIcon
+            name="arrow-right"
+            className="h-4 w-4 text-dimmed transition group-hover:translate-x-1"
+          />
+        </div>
+      </a>
+    </div>
  );
 }
@@ -24,7 +24,6 @@ import {
  projectSetupSvelteKitPath,
 } from "~/utils/pathBuilder";
 import { Feedback } from "../Feedback";
-import { PageGradient } from "../PageGradient";
 import { Button } from "../primitives/Buttons";
 import { Header1 } from "../primitives/Headers";

@@ -33,51 +32,49 @@ export function FrameworkSelector() {
  const project = useProject();

  return (
-    <PageGradient>
-      <div className="mx-auto max-w-3xl">
-        <div className="flex items-center justify-between">
-          <Header1 spacing>Choose a framework to get started…</Header1>
-          <Feedback
-            button={
-              <Button variant="tertiary/small" LeadingIcon={ChatBubbleLeftRightIcon}>
-                Request a framework
-              </Button>
-            }
-            defaultValue="feature"
-          />
-        </div>
-
-        <div className="grid grid-cols-3 place-items-center gap-2">
-          <FrameworkLink to={projectSetupNextjsPath(organization, project)} supported>
-            <NextjsLogo className="w-32" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupExpressPath(organization, project)} supported>
-            <ExpressLogo className="w-36" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupRemixPath(organization, project)} supported>
-            <RemixLogo className="w-32" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupAstroPath(organization, project)} supported>
-            <AstroLogo className="w-32" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupRedwoodPath(organization, project)}>
-            <RedwoodLogo className="w-44" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupNuxtPath(organization, project)}>
-            <NuxtLogo className="w-32" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupSvelteKitPath(organization, project)} supported>
-            <SvelteKitLogo className="w-44" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupFastifyPath(organization, project)}>
-            <FastifyLogo className="w-36" />
-          </FrameworkLink>
-          <FrameworkLink to={projectSetupNestjsPath(organization, project)} supported>
-            <NestjsLogo className="w-36" />
-          </FrameworkLink>
-        </div>
+    <div className="mx-auto max-w-3xl pt-28">
+      <div className="flex items-center justify-between">
+        <Header1 spacing>Choose a framework to get started…</Header1>
+        <Feedback
+          button={
+            <Button variant="tertiary/small" LeadingIcon={ChatBubbleLeftRightIcon}>
+              Request a framework
+            </Button>
+          }
+          defaultValue="feature"
+        />
      </div>
-    </PageGradient>
+
+      <div className="grid grid-cols-3 place-items-center gap-2">
+        <FrameworkLink to={projectSetupNextjsPath(organization, project)} supported>
+          <NextjsLogo className="w-32" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupExpressPath(organization, project)} supported>
+          <ExpressLogo className="w-36" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupRemixPath(organization, project)} supported>
+          <RemixLogo className="w-32" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupAstroPath(organization, project)} supported>
+          <AstroLogo className="w-32" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupSvelteKitPath(organization, project)} supported>
+          <SvelteKitLogo className="w-44" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupNestjsPath(organization, project)} supported>
+          <NestjsLogo className="w-36" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupFastifyPath(organization, project)}>
+          <FastifyLogo className="w-36" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupNuxtPath(organization, project)}>
+          <NuxtLogo className="w-32" />
+        </FrameworkLink>
+        <FrameworkLink to={projectSetupRedwoodPath(organization, project)}>
+          <RedwoodLogo className="w-44" />
+        </FrameworkLink>
+      </div>
+    </div>
  );
 }

@@ -93,8 +90,7 @@ function FrameworkLink({ children, to, supported = false }: FrameworkLinkProps)
      to={to}
      className={cn(
        "flex h-28 w-full items-center justify-center rounded-md border border-slate-750 px-8 py-4 transition hover:bg-slate-850",
-        !supported &&
-          "border-dashed opacity-50 grayscale transition hover:opacity-100 hover:grayscale-0"
+        !supported && "border opacity-30 grayscale transition hover:opacity-100 hover:grayscale-0"
      )}
    >
      {children}
@@ -4,8 +4,7 @@ import { StepNumber } from "~/components/primitives/StepNumber";
 import { useJob } from "~/hooks/useJob";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
-import { IntegrationIcon } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.integrations/route";
-import { jobTestPath } from "~/utils/pathBuilder";
+import { docsPath, jobTestPath } from "~/utils/pathBuilder";
 import { CodeBlock } from "../code/CodeBlock";
 import { InlineCode } from "../code/InlineCode";
 import { EnvironmentLabel } from "../environments/EnvironmentLabel";
@@ -21,6 +20,7 @@ import selectEnvironment from "./select-environment.png";
 import selectExample from "./select-example.png";
 import { StepContentContainer } from "../StepContentContainer";
 import { TriggerDevCommand } from "../SetupCommands";
+import { IntegrationIcon } from "~/assets/icons/IntegrationIcon";

 export function HowToRunYourJob() {
  const organization = useOrganization();
@@ -294,3 +294,140 @@ export function HowToUseApiKeysAndEndpoints() {
    </>
  );
 }
+
+export function WhatAreHttpEndpoints() {
+  return (
+    <>
+      <Paragraph spacing>
+        HTTP endpoints allow you to trigger your Jobs from any webhooks. They require a bit more
+        work than using <TextLink to={docsPath("integrations/introduction")}>Integrations</TextLink>{" "}
+        but allow you to connect to any API.
+      </Paragraph>
+      <Header2 spacing>Getting started</Header2>
+      <Paragraph spacing>
+        You need to define the HTTP endpoint in your code. To do this you use{" "}
+        <InlineCode>client.defineHttpEndpoint()</InlineCode>. This will create an HTTP endpoint.
+      </Paragraph>
+      <Paragraph spacing>
+        Then you can create a Trigger from this by calling <InlineCode>.onRequest()</InlineCode> on
+        the created HTTP endpoint.
+      </Paragraph>
+      <Callout variant="docs" to={docsPath("documentation/concepts/http-endpoints")}>
+        Read the HTTP endpoints guide to learn more.
+      </Callout>
+      <Header2 spacing className="mt-4">
+        An example: cal.com
+      </Header2>
+      <CodeBlock
+        code={`//create an HTTP endpoint
+const caldotcom = client.defineHttpEndpoint({
+  id: "cal.com",
+  source: "cal.com",
+  icon: "caldotcom",
+  verify: async (request) => {
+    //this helper function makes verifying most webhooks easy
+    return await verifyRequestSignature({
+      request,
+      headerName: "X-Cal-Signature-256",
+      secret: process.env.CALDOTCOM_SECRET!,
+      algorithm: "sha256",
+    });
+  },
+});
+
+client.defineJob({
+  id: "http-caldotcom",
+  name: "HTTP Cal.com",
+  version: "1.0.0",
+  enabled: true,
+  //create a Trigger from the HTTP endpoint above. The filter is optional.
+  trigger: caldotcom.onRequest({ filter: { body: { triggerEvent: ["BOOKING_CANCELLED"] } } }),
+  run: async (request, io, ctx) => {
+    //note that when using HTTP endpoints, the first parameter is the request
+    //you need to get the body, usually it will be json so you do:
+    const body = await request.json();
+    await io.logger.info("Body", body);
+  },
+});`}
+      />
+    </>
+  );
+}
+
+export function HowToConnectHttpEndpoint() {
+  return (
+    <>
+      <Header2 spacing>Setting up your webhook</Header2>
+      <Paragraph spacing>
+        To start receiving data you need to enter the Endpoint URL and secret into the API service
+        you want to receive webhooks from.
+      </Paragraph>
+
+      <StepNumber stepNumber="1" title={<>Go to the relevant API dashboard</>} />
+      <StepContentContainer>
+        <Paragraph spacing>
+          For example, if you want to receive webhooks from Cal.com then you should login to your
+          Cal.com account and go to their Settings/Developer/Webhooks page.
+        </Paragraph>
+      </StepContentContainer>
+
+      <StepNumber stepNumber="2" title={<>Copy the Webhook URL and Secret</>} />
+      <StepContentContainer>
+        <Paragraph spacing>
+          A unique Webhook URL is created for each environment (Dev, Staging, and Prod). Jobs will
+          only be triggered from the relevant environment.
+        </Paragraph>
+        <Paragraph spacing>
+          Copy the relevant Endpoint URL and secret from the table opposite and paste it into the
+          correct place in the API dashboard you located in the previous step.
+        </Paragraph>
+      </StepContentContainer>
+
+      <StepNumber stepNumber="3" title={<>Add the Secret to your Environment variables</>} />
+      <StepContentContainer>
+        <Paragraph spacing>
+          You should also add the Secret to the Environment variables in your code and where you're
+          deploying. Usually in Node this means adding it to the .env file.
+        </Paragraph>
+        <Paragraph spacing>
+          Use the secret in the <InlineCode>verify()</InlineCode> function of HTTP Endpoint. This
+          ensures that someone can't just send a request to your Endpoint and trigger a Job.
+          Different APIs do this verification in different ways – a common way is to have a header
+          that has a hash of the payload and secret. Refer to the API's documentation for more
+          information.
+        </Paragraph>
+      </StepContentContainer>
+
+      <Header2 spacing>Triggering runs</Header2>
+      <StepNumber stepNumber="1" title="Ensure you're using the HTTP Endpoint in your code" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          In your code, you should use the <InlineCode>.onRequest()</InlineCode> function in a Job
+          Trigger. You can filter so only data that matches your criteria triggers the Job.
+        </Paragraph>
+      </StepContentContainer>
+      <StepNumber stepNumber="2" title="Make sure your code is deployed (for Staging and Prod)" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          If you're using the Staging or Prod environment, you need to make sure your code is
+          deployed. Deploy like you normally would –{" "}
+          <TextLink to={docsPath("documentation/guides/deployment")}>
+            read our deployment guide
+          </TextLink>
+          .
+        </Paragraph>
+      </StepContentContainer>
+      <StepNumber stepNumber="3" title="Perform an action that sends a webhook" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          Now you need to actually perform an action on that third-party service that triggers the
+          webhook you've subscribed to. For example, add a new meeting using Cal.com.
+        </Paragraph>
+      </StepContentContainer>
+
+      <Callout variant="docs" to={docsPath("documentation/concepts/http-endpoints")}>
+        Read the HTTP endpoints guide to learn more.
+      </Callout>
+    </>
+  );
+}
@@ -1,6 +1,6 @@
 import React, { useState } from "react";
-import { ApiAuthenticationMethodApiKey, Integration } from "~/services/externalApis/types";
-import { docsIntegrationPath } from "~/utils/pathBuilder";
+import { Integration } from "~/services/externalApis/types";
+import { apiReferencePath, docsIntegrationPath } from "~/utils/pathBuilder";
 import { LinkButton } from "../primitives/Buttons";
 import { Header1, Header2 } from "../primitives/Headers";
 import { NamedIconInBox } from "../primitives/NamedIcon";
@@ -48,6 +48,15 @@ export function ConnectToIntegrationSheet({
              <Paragraph variant="small">{integration.description}</Paragraph>
            )}
          </div>
+          <LinkButton
+            to={apiReferencePath(integration.identifier)}
+            variant="secondary/small"
+            TrailingIcon="arrow-up-right"
+            trailingIconClassName="h-4 w-4 text-slate-400"
+            target="_blank"
+          >
+            View examples
+          </LinkButton>
          <LinkButton
            to={docsIntegrationPath(integration.identifier)}
            variant="secondary/small"
@@ -83,13 +92,6 @@ export function ConnectToIntegrationSheet({
                variant="description"
              />
            )}
-            <RadioGroupItem
-              id="custom"
-              value="custom"
-              label="Fetch/Existing SDK"
-              description={`Alternatively, use ${integration.name} without our integration.`}
-              variant="description"
-            />
          </RadioGroup>

          {integrationMethod && (
@@ -132,7 +134,5 @@ function SelectedIntegrationMethod({
          callbackUrl={callbackUrl}
        />
      );
-    case "custom":
-      return <CustomHelp name={integration.name} />;
  }
 }
@@ -46,7 +46,8 @@ export function ConnectToOAuthForm({

  const [form, { title, slug, scopes, hasCustomClient, customClientId, customClientSecret }] =
    useForm({
-      lastSubmission: fetcher.data,
+      // TODO: type this
+      lastSubmission: fetcher.data as any,
      shouldRevalidate: "onSubmit",
      onValidate({ formData }) {
        return parse(formData, {
@@ -1,79 +1,124 @@
-import { CodeBlock } from "../code/CodeBlock";
+import { useState } from "react";
+import { CodeExample } from "~/routes/resources.codeexample";
+import { Api } from "~/services/externalApis/apis.server";
+import { cn } from "~/utils/cn";
+import { Feedback } from "../Feedback";
 import { Header1, Header2 } from "../primitives/Headers";
 import { Paragraph } from "../primitives/Paragraph";
+import { TextLink } from "../primitives/TextLink";
+
+const fallbackExamples = [
+  {
+    title: "Post to Slack when meetings are booked or cancelled.",
+    slug: "cal-slack-meeting-alert",
+    version: "1.0.0",
+    codeUrl: "https://github.com/triggerdotdev/api-reference/raw/main/src/cal-http-endpoint.ts",
+  },
+  {
+    title: "Translate some text with DeepL.",
+    slug: "translate-text-with-deepl",
+    version: "1.0.0",
+    codeUrl: "https://github.com/triggerdotdev/api-reference/raw/main/src/deepl.ts",
+  },
+  {
+    title: "Create a Discord bot and send a message to a channel.",
+    slug: "discord-bot-send-message",
+    version: "1.0.0",
+    codeUrl: "https://github.com/triggerdotdev/api-reference/raw/main/src/discord.ts",
+  },
+  {
+    title: "Retrieve a Notion page by ID.",
+    slug: "retrieve-notion-page",
+    version: "1.0.0",
+    codeUrl: "https://github.com/triggerdotdev/api-reference/raw/main/src/notion.ts",
+  },
+];
+
+export function CustomHelp({ api }: { api: Api }) {
+  const [selectedExample, setSelectedExample] = useState(0);
+
+  const changeCodeExample = (index: number) => {
+    setSelectedExample(index);
+  };

-export function CustomHelp({ name }: { name: string }) {
  return (
    <div className="mt-4">
-      <Header1 className="mb-2">You can use any API with requests or an SDK</Header1>
-      <Header2 className="mb-2">How to use an SDK</Header2>
+      <Header1 className="mb-2">Using an API with an SDK or requests</Header1>
      <Paragraph spacing>
-        You can call SDK methods from inside the run function, but you should wrap them in a Task to
-        make sure they're resumable.
+        You can use Trigger.dev with any existing Node SDK or even just using fetch. You can
+        subscribe to any API with{" "}
+        <TextLink href="https://trigger.dev/docs/documentation/concepts/http-endpoints">
+          HTTP endpoints
+        </TextLink>{" "}
+        and perform actions by wrapping tasks using{" "}
+        <TextLink
+          href="https://trigger.dev/docs/documentation/guides/writing-jobs-step-by-step#create-your-own-tasks"
+          className="font-mono"
+        >
+          io.runTask
+        </TextLink>
+        . This makes your background job resumable and appear in our dashboard.
      </Paragraph>
-      <Paragraph spacing>Here's an example with the official GitHub SDK</Paragraph>
-      <CodeBlock
-        code={`
-client.defineJob({
-  id: "scheduled-job-1",
-  name: "Scheduled Job 1",
-  version: "0.1.1",
-  trigger: cronTrigger({
-    cron: "*/5 * * * *", // every 5 minutes
-  }),
-  run: async (payload, io, ctx) => {
-    //wrap an SDK call in io.runTask so it's resumable and displays in logs
-    const repo = await io.runTask(
-      "Get repo",
-      async () => {
-        //this is the regular GitHub SDK
-        const response = await octokit.rest.repos.get({
-          owner: "triggerdotdev",
-          repo: "trigger.dev",
-        });
-        return response.data;
-      },
-      //you can add metadata to the task to improve the display in the logs
-      { name: "Get repo", icon: "github" }
-    );
-  },
-});
-      `}
-        highlightedRanges={[[9, 22]]}
-        className="mb-4"
-      />
-      <Header2 className="mb-2">How to use fetch</Header2>
-      <Paragraph spacing>
-        You can use the fetch API to make requests to any API. Or a different request library like
-        axios if you'd prefer. Again wrapping the request in a Task will make sure it's resumable.
-      </Paragraph>
-      <CodeBlock
-        code={`
-client.defineJob({
-  id: "scheduled-job-1",
-  name: "Scheduled Job 1",
-  version: "0.1.1",
-  trigger: cronTrigger({
-    cron: "*/5 * * * *", // every 5 minutes
-  }),
-  run: async (payload, io, ctx) => {
-    //wrap anything in io.runTask so it's resumable and displays in logs
-    const repo = await io.runTask(
-      "Get org",
-      async () => {
-        //you can use fetch, axios, or any other library to make requests
-        const response = await fetch('https://api.github.com/orgs/nodejs');
-        return response.json();
-      },
-      //you can add metadata to the task to improve the display in the logs
-      { name: "Get org", icon: "github" }
-    );
-  },
-});
-      `}
-        highlightedRanges={[[9, 19]]}
-        className="mb-4"
-      />
+
+      {api.examples && api.examples.length > 0 ? (
+        <>
+          <Header2 className="mb-2">Example {api.name} code</Header2>
+          <Paragraph spacing className="mb-4">
+            This is how you can use {api.name} with Trigger.dev. This code can be copied and
+            modified to suit your use-case.
+          </Paragraph>
+          {api.examples.length > 1 && (
+            <div className=" flex w-full flex-row gap-4 overflow-x-scroll	scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700">
+              {api.examples?.map((example, index) => (
+                <button
+                  onClick={() => changeCodeExample(index)}
+                  key={example.codeUrl}
+                  className={cn(
+                    "w-64 min-w-[16rem] p-2 transition-colors duration-300 sm:w-full sm:rounded",
+                    "border-px focus:border-px cursor-pointer border border-slate-900 bg-slate-900 text-slate-300 transition duration-300  hover:bg-slate-800 focus:border focus:border-indigo-600"
+                  )}
+                >
+                  {example.title}
+                </button>
+              ))}
+            </div>
+          )}
+          <CodeExample example={api.examples[selectedExample]} />
+        </>
+      ) : (
+        <>
+          <Header2 className="mb-2">Example code using fetch / an existing SDK</Header2>
+          <Paragraph spacing className="mb-4">
+            You can use one of our examples below as a starting point / reference for your projects.
+            Please{" "}
+            <Feedback
+              button={
+                <span className="cursor-pointer text-indigo-500 transition duration-300 hover:text-indigo-400">
+                  reach out to us
+                </span>
+              }
+              defaultValue="help"
+            />{" "}
+            if you're having any issues.
+          </Paragraph>
+
+          <div className=" flex w-full flex-row gap-4 overflow-x-scroll	scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700 sm:h-full">
+            {fallbackExamples.map((example, index) => (
+              <button
+                onClick={() => changeCodeExample(index)}
+                key={example.codeUrl}
+                className={cn(
+                  "w-64 min-w-[16rem] p-2 transition-colors duration-300 sm:w-full sm:rounded",
+                  "border-px focus:border-px cursor-pointer border border-slate-900 bg-slate-900 text-slate-300 transition duration-300 hover:bg-slate-800 focus:border focus:border-indigo-600"
+                )}
+              >
+                {example.title}
+              </button>
+            ))}
+          </div>
+          <CodeExample example={fallbackExamples[selectedExample]} />
+        </>
+      )}
    </div>
  );
 }
@@ -1,14 +1,10 @@
+import { useFetcher } from "@remix-run/react";
 import React from "react";
-import { Api } from "~/services/externalApis/apis";
-import { Button } from "../primitives/Buttons";
-import { Callout } from "../primitives/Callout";
+import { Api } from "~/services/externalApis/apis.server";
 import { Header1 } from "../primitives/Headers";
 import { NamedIconInBox } from "../primitives/NamedIcon";
 import { Sheet, SheetBody, SheetContent, SheetHeader, SheetTrigger } from "../primitives/Sheet";
 import { CustomHelp } from "./CustomHelp";
-import { CheckIcon } from "@heroicons/react/24/solid";
-import { useFetcher } from "@remix-run/react";
-import { Paragraph } from "../primitives/Paragraph";

 export function NoIntegrationSheet({
  api,
@@ -31,27 +27,9 @@ export function NoIntegrationSheet({
            <NamedIconInBox name={api.identifier} className="h-9 w-9" />
            <Header1>{api.name}</Header1>
          </div>
-          {requested ? (
-            <div className="flex items-center gap-1">
-              <CheckIcon className="h-4 w-4 text-green-500" />
-              <Paragraph variant="small">
-                We'll let you know when the Integration is available.
-              </Paragraph>
-            </div>
-          ) : (
-            <fetcher.Form method="post" action={`/resources/apivote/${api.identifier}`}>
-              <Button
-                variant="primary/small"
-                disabled={isLoading}
-                LeadingIcon={isLoading ? "spinner-white" : undefined}
-              >
-                {isLoading ? "Saving…" : `I want an Integration for ${api.name}`}
-              </Button>
-            </fetcher.Form>
-          )}
        </SheetHeader>
        <SheetBody>
-          <CustomHelp name={api.name} />
+          <CustomHelp api={api} />
        </SheetBody>
      </SheetContent>
    </Sheet>
@@ -45,7 +45,8 @@ export function UpdateOAuthForm({
  const { isManagedCloud } = useFeatures();

  const [form, { title, scopes, hasCustomClient, customClientId, customClientSecret }] = useForm({
-    lastSubmission: fetcher.data,
+    // TODO: type this
+    lastSubmission: fetcher.data as any,
    onValidate({ formData }) {
      return parse(formData, {
        schema,
@@ -40,7 +40,7 @@ export function DeleteJobDialogContent({

  return (
    <div className="flex w-full flex-col items-center gap-y-6">
-      <div className="flex flex-col items-center justify-center gap-y-2">
+      <div className="mt-5 flex flex-col items-center justify-center gap-y-2">
        <Header1>{title}</Header1>
        <Paragraph variant="small">ID: {slug}</Paragraph>
      </div>
@@ -1,7 +1,7 @@
-import { ProjectJob } from "~/hooks/useJobs";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { JobRunStatus } from "~/models/job.server";
+import { ProjectJob } from "~/presenters/JobListPresenter.server";
 import { jobPath, jobTestPath } from "~/utils/pathBuilder";
 import { Button } from "../primitives/Buttons";
 import { DateTime } from "../primitives/DateTime";
@@ -27,10 +27,9 @@ import { JobStatusBadge } from "./JobStatusBadge";

 export function JobsTable({ jobs, noResultsText }: { jobs: ProjectJob[]; noResultsText: string }) {
  const organization = useOrganization();
-  const project = useProject();

  return (
-    <Table>
+    <Table containerClassName="mb-4">
      <TableHeader>
        <TableRow>
          <TableHeaderCell>Job</TableHeaderCell>
@@ -45,7 +44,7 @@ export function JobsTable({ jobs, noResultsText }: { jobs: ProjectJob[]; noResul
      <TableBody>
        {jobs.length > 0 ? (
          jobs.map((job) => {
-            const path = jobPath(organization, project, job);
+            const path = jobPath(organization, { slug: job.projectSlug }, job);
            return (
              <TableRow key={job.id} className="group">
                <TableCell to={path}>
@@ -153,26 +152,25 @@ export function JobsTable({ jobs, noResultsText }: { jobs: ProjectJob[]; noResul
                <TableCellMenu isSticky>
                  <PopoverMenuItem to={path} title="View Job" icon="eye" />
                  <PopoverMenuItem
-                    to={jobTestPath(organization, project, job)}
+                    to={jobTestPath(organization, { slug: job.projectSlug }, job)}
                    title="Test Job"
                    icon="beaker"
                  />

                  <Dialog>
                    <DialogTrigger asChild>
-                      <Button variant="menu-item" LeadingIcon="trash-can">
+                      <Button variant="small-menu-item" LeadingIcon="trash-can" className="text-xs">
                        Delete Job
                      </Button>
                    </DialogTrigger>
                    <DialogContent>
-                      <DialogHeader>
-                        <DeleteJobDialogContent
-                          id={job.id}
-                          title={job.title}
-                          slug={job.slug}
-                          environments={job.environments}
-                        />
-                      </DialogHeader>
+                      <DialogHeader>Delete Job</DialogHeader>
+                      <DeleteJobDialogContent
+                        id={job.id}
+                        title={job.title}
+                        slug={job.slug}
+                        environments={job.environments}
+                      />
                    </DialogContent>
                  </Dialog>
                </TableCellMenu>
@@ -11,7 +11,7 @@ export function AppContainer({
 }) {
  return (
    <BackgroundGradient showBackgroundGradient={showBackgroundGradient}>
-      <div className={cn("grid h-full w-full grid-rows-[2.75rem_auto]")}>{children}</div>
+      <div className={cn("grid h-full w-full grid-rows-1 overflow-hidden")}>{children}</div>
    </BackgroundGradient>
  );
 }
@@ -47,7 +47,11 @@ export function PageContainer({
  children: React.ReactNode;
  className?: string;
 }) {
-  return <div className={cn("grid h-full grid-rows-[auto_1fr]", className)}>{children}</div>;
+  return (
+    <div className={cn("grid h-full grid-rows-[auto_1fr] overflow-hidden", className)}>
+      {children}
+    </div>
+  );
 }

 export function PageBody({
@@ -58,7 +62,15 @@ export function PageBody({
  scrollable?: boolean;
 }) {
  return (
-    <div className={cn(scrollable ? "overflow-y-auto p-4 " : "overflow-hidden")}>{children}</div>
+    <div
+      className={cn(
+        scrollable
+          ? "overflow-y-auto p-4 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
+          : "overflow-hidden"
+      )}
+    >
+      {children}
+    </div>
  );
 }

@@ -66,10 +78,16 @@ export function PageBodyPadding({ children }: { children: React.ReactNode }) {
  return <div className="p-4">{children}</div>;
 }

-export function MainCenteredContainer({ children }: { children: React.ReactNode }) {
+export function MainCenteredContainer({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
  return (
-    <div className="h-full w-full">
-      <div className="mx-auto mt-[30vh] max-w-xs">{children}</div>
+    <div className="h-full w-full overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700">
+      <div className={cn("mx-auto mt-[25vh] max-w-xs overflow-y-auto", className)}>{children}</div>
    </div>
  );
 }
@@ -1,26 +1,35 @@
-import { RouteMatch, useMatches } from "@remix-run/react";
+import { UIMatch, useMatches } from "@remix-run/react";
 import { Fragment, ReactNode } from "react";
 import { BreadcrumbIcon } from "../primitives/BreadcrumbIcon";
+import { Handle } from "~/utils/handle";
+import { LinkButton } from "../primitives/Buttons";

-export type BreadcrumbItem = (match: RouteMatch, allMatches: RouteMatch[]) => ReactNode;
+export type BreadcrumbItem = (match: UIMatch, allMatches: UIMatch[]) => ReactNode;

 export function Breadcrumb() {
-  const matches = useMatches();
+  const matches = useMatches() as UIMatch<unknown, Handle>[];

  return (
-    <div className="hidden items-center md:flex">
-      {matches.map((match) => {
-        if (!match.handle || !match.handle.breadcrumb) return null;
+    <div className="flex items-center px-1">
+      {matches
+        .filter((b) => b.handle && b.handle.breadcrumb)
+        .map((match, index) => {
+          const breadcrumb = match.handle.breadcrumb as BreadcrumbItem;

-        const breadcrumb = match.handle.breadcrumb as BreadcrumbItem;
-
-        return (
-          <Fragment key={match.id}>
-            <BreadcrumbIcon />
-            {breadcrumb(match, matches)}
-          </Fragment>
-        );
-      })}
+          return (
+            <Fragment key={match.id}>
+              {index !== 0 && <BreadcrumbIcon />} {breadcrumb(match, matches)}
+            </Fragment>
+          );
+        })}
    </div>
  );
 }
+
+export function BreadcrumbLink({ title, to }: { title: string; to: string }) {
+  return (
+    <LinkButton to={to} variant="tertiary/small">
+      {title}
+    </LinkButton>
+  );
+}
@@ -1,65 +0,0 @@
-import { Link, RouteMatch } from "@remix-run/react";
-import { useState } from "react";
-import { useJob } from "~/hooks/useJob";
-import { useOrganization } from "~/hooks/useOrganizations";
-import { useProject } from "~/hooks/useProject";
-import { useJobs } from "~/hooks/useJobs";
-import { cn } from "~/utils/cn";
-import { jobPath } from "~/utils/pathBuilder";
-import { LabelValueStack } from "../primitives/LabelValueStack";
-import { NamedIcon } from "../primitives/NamedIcon";
-import {
-  Popover,
-  PopoverArrowTrigger,
-  PopoverContent,
-  PopoverSectionHeader,
-} from "../primitives/Popover";
-
-export function JobsMenu({ matches }: { matches: RouteMatch[] }) {
-  const [isOpen, setIsOpen] = useState(false);
-  const organization = useOrganization(matches);
-  const project = useProject(matches);
-  const projectJobs = useJobs(matches);
-  const currentJob = useJob(matches);
-
-  return (
-    <>
-      <Popover onOpenChange={(open) => setIsOpen(open)}>
-        <PopoverArrowTrigger isOpen={isOpen}>
-          {currentJob?.title ?? "Select a job"}
-        </PopoverArrowTrigger>
-        <PopoverContent
-          className="min-w-[20rem] overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
-          align="start"
-          collisionPadding={20}
-        >
-          <PopoverSectionHeader title="Jobs" />
-          <div className="flex flex-col gap-1 p-1">
-            {projectJobs.map((job) => {
-              const isSelected = job.id === currentJob?.id;
-              return (
-                <Link
-                  key={job.id}
-                  to={jobPath(organization, project, job)}
-                  className={cn(
-                    "flex w-full items-center gap-2 rounded-md p-2 transition hover:bg-slate-800",
-                    isSelected && "bg-slate-750 group-hover:bg-slate-750"
-                  )}
-                >
-                  <NamedIcon name={job.event.icon} className="h-8 w-8" />
-                  <LabelValueStack
-                    label={job.title}
-                    value={job.slug}
-                    variant="primary"
-                    className="w-full"
-                  />
-                  {isSelected && <NamedIcon name="check" className="mr-1 h-6 w-6" />}
-                </Link>
-              );
-            })}
-          </div>
-        </PopoverContent>
-      </Popover>
-    </>
-  );
-}
@@ -1,128 +0,0 @@
-import { Popover, Transition } from "@headlessui/react";
-import { BookOpenIcon, ChatBubbleLeftRightIcon } from "@heroicons/react/20/solid";
-import { Link } from "@remix-run/react";
-import { Fragment } from "react";
-import { cn } from "~/utils/cn";
-import { Feedback } from "../Feedback";
-import { LogoIcon } from "../LogoIcon";
-import { Button, LinkButton } from "../primitives/Buttons";
-import { Breadcrumb } from "./Breadcrumb";
-import { docsRoot } from "~/utils/pathBuilder";
-
-export function NavBar() {
-  return (
-    <div className="z-50 flex w-full items-center justify-between gap-2 border-b border-uiBorder py-1 pl-1 pr-2.5">
-      <div className="flex gap-0.5">
-        <Link to="/" className="p-2">
-          <LogoIcon className="h-5 w-5" />
-        </Link>
-        <Breadcrumb />
-        <MobileDropdownMenu />
-      </div>
-      <div className="hidden items-center gap-2 sm:flex">
-        <LinkButton to={docsRoot()} variant="secondary/small" LeadingIcon={BookOpenIcon}>
-          Documentation
-        </LinkButton>
-        <Feedback
-          button={
-            <Button
-              variant="secondary/small"
-              LeadingIcon={ChatBubbleLeftRightIcon}
-              shortcut={{ key: "f" }}
-            >
-              Help & feedback
-            </Button>
-          }
-        />
-      </div>
-    </div>
-  );
-}
-
-export function BreadcrumbLink({ title, to }: { title: string; to: string }) {
-  return (
-    <LinkButton to={to} variant="tertiary/small">
-      {title}
-    </LinkButton>
-  );
-}
-
-function MobileDropdownMenu() {
-  return (
-    <Popover className="block sm:hidden">
-      <Popover.Button
-        className="bg-slate-70 relative z-10 flex h-8 w-8 items-center justify-center rounded border-none bg-opacity-50 focus-visible:border-none focus-visible:outline-none"
-        aria-label="Toggle Navigation"
-      >
-        {({ open }) => <MobileNavIcon open={open} />}
-      </Popover.Button>
-      <Transition.Root>
-        <Transition.Child
-          as={Fragment}
-          enter="duration-150 ease-out"
-          enterFrom="opacity-0"
-          enterTo="opacity-100"
-          leave="duration-150 ease-in"
-          leaveFrom="opacity-100"
-          leaveTo="opacity-0"
-        >
-          <Popover.Overlay className="absolute left-0 top-0 h-full w-full origin-top bg-midnight-900/80" />
-        </Transition.Child>
-        <Transition.Child
-          as={Fragment}
-          enter="duration-150 ease-out"
-          enterFrom="opacity-0 scale-95"
-          enterTo="opacity-100 scale-100"
-          leave="duration-100 ease-in"
-          leaveFrom="opacity-100 scale-100"
-          leaveTo="opacity-0 scale-95"
-        >
-          <Popover.Panel
-            as="div"
-            className="absolute inset-x-6 top-0 mt-20 flex origin-top flex-col gap-4 rounded-md bg-slate-800 p-4 text-lg tracking-tight text-slate-900 shadow-xl ring-1 ring-slate-700"
-          >
-            {/* <PrimaryA
-              href={docsRoot()}
-              target="_blank"
-              className="max-w-full"
-            >
-              <ArrowTopRightOnSquareIcon className="-ml-1 h-4 w-4" />
-              Documentation
-            </PrimaryA>
-            <PrimaryButton
-              data-attr="posthog-feedback-button"
-              className="max-w-full"
-            >
-              <ChatBubbleLeftRightIcon className="-ml-1 h-4 w-4" />
-              Send us feedback
-            </PrimaryButton>
-            <SecondaryLink to="/logout" className="max-w-full">
-              Logout
-            </SecondaryLink> */}
-          </Popover.Panel>
-        </Transition.Child>
-      </Transition.Root>
-    </Popover>
-  );
-}
-
-function MobileNavIcon({ open }: { open: boolean }) {
-  return (
-    <svg
-      aria-hidden="true"
-      className="h-3.5 w-3.5 overflow-visible stroke-slate-300"
-      fill="none"
-      strokeWidth={2}
-      strokeLinecap="round"
-    >
-      <path
-        d="M0 1H14M0 7H14M0 13H14"
-        className={cn("origin-center transition", open && "scale-90 opacity-0")}
-      />
-      <path
-        d="M2 2L12 12M12 2L2 12"
-        className={cn("origin-center transition", !open && "scale-90 opacity-0")}
-      />
-    </svg>
-  );
-}
@@ -0,0 +1,9 @@
+import { useNavigation } from "@remix-run/react";
+import { Spinner } from "../primitives/Spinner";
+
+export function PageNavigationIndicator() {
+  const navigation = useNavigation();
+  if (navigation.state === "loading") {
+    return <Spinner color="muted" className="h-4 w-4" />;
+  }
+}
@@ -1,206 +0,0 @@
-import { useMatches } from "@remix-run/react";
-import { motion } from "framer-motion";
-import { useOptionalJob } from "~/hooks/useJob";
-import { useOrganization } from "~/hooks/useOrganizations";
-import { useProject } from "~/hooks/useProject";
-import { cn } from "~/utils/cn";
-import { Handle } from "~/utils/handle";
-import {
-  accountPath,
-  organizationBillingPath,
-  organizationTeamPath,
-  projectEnvironmentsPath,
-  projectIntegrationsPath,
-  projectPath,
-  projectSetupPath,
-  projectTriggersPath,
-} from "~/utils/pathBuilder";
-import { UserProfilePhoto } from "../UserProfilePhoto";
-import { NavLinkButton } from "../primitives/Buttons";
-import { NamedIcon, type IconNames } from "../primitives/NamedIcon";
-import { SimpleTooltip } from "../primitives/Tooltip";
-
-export function SideMenuContainer({ children }: { children: React.ReactNode }) {
-  return <div className="flex h-full w-full justify-stretch overflow-hidden">{children}</div>;
-}
-
-const expandedWith = "14rem";
-const collapsedWith = "2.81rem";
-
-const menuVariants = {
-  expanded: {
-    minWidth: expandedWith,
-    width: expandedWith,
-  },
-  collapsed: {
-    minWidth: collapsedWith,
-    width: collapsedWith,
-  },
-};
-
-export function ProjectSideMenu() {
-  const organization = useOrganization();
-  const project = useProject();
-  const matches = useMatches();
-
-  //the deepest route `handle` determines if the menu is expanded
-  const deepestMatch = matches.at(-1);
-  const handle = deepestMatch?.handle as Handle;
-  const isCollapsed = handle?.expandSidebar ? !handle.expandSidebar : true;
-
-  const job = useOptionalJob();
-  const jobsActive =
-    job !== undefined ||
-    deepestMatch?.id === "routes/_app.orgs.$organizationSlug.projects.$projectParam._index";
-
-  return (
-    <motion.div
-      animate={isCollapsed ? "collapsed" : "expanded"}
-      variants={menuVariants}
-      initial={isCollapsed ? "collapsed" : "expanded"}
-      transition={{ type: "spring", duration: 0.5 }}
-      className={cn(
-        "flex h-full flex-col justify-between overflow-hidden border-r border-uiBorder p-1 transition"
-      )}
-    >
-      <div className="flex flex-col gap-1">
-        <SideMenuItem
-          name="Jobs"
-          icon="job"
-          to={projectPath(organization, project)}
-          isCollapsed={isCollapsed}
-          forceActive={jobsActive}
-          data-action="jobs"
-        />
-        <SideMenuItem
-          name="Integrations"
-          icon="integration"
-          to={projectIntegrationsPath(organization, project)}
-          isCollapsed={isCollapsed}
-          hasWarning={project.hasUnconfiguredIntegrations}
-          data-action="integrations"
-        />
-        <SideMenuItem
-          name="Triggers"
-          icon="trigger"
-          to={projectTriggersPath(organization, project)}
-          isCollapsed={isCollapsed}
-          hasWarning={project.hasInactiveExternalTriggers}
-          data-action="triggers"
-        />
-        <SideMenuItem
-          name="Environments & API Keys"
-          icon="environment"
-          to={projectEnvironmentsPath(organization, project)}
-          isCollapsed={isCollapsed}
-          data-action="environments & api keys"
-        />
-      </div>
-      <div className="flex flex-col gap-1">
-        <SideMenuItem
-          name="Team"
-          icon="team"
-          to={organizationTeamPath(organization)}
-          isCollapsed={isCollapsed}
-          data-action="team"
-        />
-        <SideMenuItem
-          name="Usage & Billing"
-          icon="billing"
-          to={organizationBillingPath(organization)}
-          isCollapsed={isCollapsed}
-          data-action="usage & billing"
-        />
-        <SideMenuItem
-          name="Onboarding"
-          icon="clipboard-checked"
-          to={projectSetupPath(organization, project)}
-          isCollapsed={isCollapsed}
-          data-action="onboarding"
-        />
-        <SideMenuItem
-          name="Changelog"
-          icon="list"
-          to="https://trigger.dev/changelog"
-          isCollapsed={isCollapsed}
-          data-action="changelog"
-          target="_blank"
-        />
-        <SideMenuItem
-          name="Account"
-          icon={UserProfilePhoto}
-          to={accountPath()}
-          isCollapsed={isCollapsed}
-          data-action="account"
-        />
-      </div>
-    </motion.div>
-  );
-}
-
-const itemVariants = {
-  expanded: {
-    opacity: 1,
-  },
-  collapsed: {
-    opacity: 0,
-  },
-};
-
-function SideMenuItem({
-  icon,
-  name,
-  to,
-  isCollapsed,
-  forceActive,
-  hasWarning = false,
-  target,
-}: {
-  icon: IconNames | React.ComponentType<any>;
-  name: string;
-  to: string;
-  isCollapsed: boolean;
-  hasWarning?: boolean;
-  forceActive?: boolean;
-  target?: string;
-}) {
-  return (
-    <SimpleTooltip
-      button={
-        <NavLinkButton
-          variant="menu-item"
-          fullWidth
-          textAlignLeft
-          LeadingIcon={icon}
-          leadingIconClassName="text-dimmed"
-          to={to}
-          target={target}
-          className={({ isActive, isPending }) => {
-            if (forceActive !== undefined) {
-              isActive = forceActive;
-            }
-            return cn(
-              "relative",
-              isActive || isPending
-                ? "bg-slate-800 text-bright group-hover:bg-slate-800"
-                : "text-dimmed group-hover:bg-slate-850 group-hover:text-bright"
-            );
-          }}
-        >
-          <motion.span
-            className="shrink-0 pl-1"
-            animate={isCollapsed ? "collapsed" : "expanded"}
-            variants={itemVariants}
-            initial={isCollapsed ? "collapsed" : "expanded"}
-          >
-            {name}
-          </motion.span>
-          {hasWarning && <NamedIcon name="error" className="absolute left-1 top-1 h-4 w-4" />}
-        </NavLinkButton>
-      }
-      content={name}
-      side="right"
-      hidden={!isCollapsed}
-    />
-  );
-}
@@ -1,79 +0,0 @@
-import { RouteMatch } from "@remix-run/react";
-import { Fragment, useState } from "react";
-import simplur from "simplur";
-import { Badge } from "~/components/primitives/Badge";
-import { useIsNewOrganizationPage, useOrganizations } from "~/hooks/useOrganizations";
-import { useOptionalProject } from "~/hooks/useProject";
-import { newOrganizationPath, newProjectPath, projectPath } from "~/utils/pathBuilder";
-import {
-  Popover,
-  PopoverArrowTrigger,
-  PopoverContent,
-  PopoverMenuItem,
-  PopoverSectionHeader,
-} from "../primitives/Popover";
-
-export function ProjectsMenu({ matches }: { matches: RouteMatch[] }) {
-  const [isOpen, setIsOpen] = useState(false);
-  const organizations = useOrganizations(matches);
-  const isNewOrgPage = useIsNewOrganizationPage(matches);
-  const currentProject = useOptionalProject(matches);
-
-  if (isNewOrgPage) {
-    return null;
-  }
-
-  return (
-    <>
-      <Popover onOpenChange={(open) => setIsOpen(open)}>
-        <PopoverArrowTrigger isOpen={isOpen}>
-          {currentProject?.name ?? "Select a project"}
-        </PopoverArrowTrigger>
-        <PopoverContent
-          className="min-w-[20rem] overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
-          align="start"
-          collisionPadding={20}
-        >
-          {organizations.map((organization) => (
-            <Fragment key={organization.id}>
-              <PopoverSectionHeader title={organization.title} />
-              <div className="flex flex-col gap-1 p-1 ">
-                {organization.projects.map((project) => {
-                  const isSelected = project.id === currentProject?.id;
-                  return (
-                    <PopoverMenuItem
-                      key={project.id}
-                      to={projectPath(organization, project)}
-                      title={
-                        <div className="flex w-full items-center justify-between pl-1 text-bright">
-                          <span className="grow truncate text-left">{project.name}</span>
-                          <Badge className="mr-0.5">{simplur`${project._count.jobs} job[|s]`}</Badge>
-                        </div>
-                      }
-                      isSelected={isSelected}
-                      icon="folder"
-                    />
-                  );
-                })}
-                <PopoverMenuItem
-                  to={newProjectPath(organization)}
-                  title="New Project"
-                  isSelected={false}
-                  icon="plus"
-                />
-              </div>
-            </Fragment>
-          ))}
-          <div className="border-t border-slate-700 p-1">
-            <PopoverMenuItem
-              to={newOrganizationPath()}
-              title="New Organization"
-              isSelected={false}
-              icon="plus"
-            />
-          </div>
-        </PopoverContent>
-      </Popover>
-    </>
-  );
-}
@@ -0,0 +1,438 @@
+import {
+  AcademicCapIcon,
+  ArrowRightOnRectangleIcon,
+  ChartBarIcon,
+  EllipsisHorizontalIcon,
+} from "@heroicons/react/20/solid";
+import { UserGroupIcon, UserPlusIcon } from "@heroicons/react/24/solid";
+import { useNavigation } from "@remix-run/react";
+import { IconExclamationCircle } from "@tabler/icons-react";
+import { AnchorHTMLAttributes, Fragment, useEffect, useRef, useState } from "react";
+import { MatchedOrganization } from "~/hooks/useOrganizations";
+import { usePathName } from "~/hooks/usePathName";
+import { MatchedProject } from "~/hooks/useProject";
+import { User } from "~/models/user.server";
+import { cn } from "~/utils/cn";
+import {
+  accountPath,
+  inviteTeamMemberPath,
+  logoutPath,
+  newOrganizationPath,
+  newProjectPath,
+  organizationBillingPath,
+  organizationIntegrationsPath,
+  organizationPath,
+  organizationTeamPath,
+  projectEnvironmentsPath,
+  projectHttpEndpointsPath,
+  projectPath,
+  projectRunsPath,
+  projectSetupPath,
+  projectTriggersPath,
+} from "~/utils/pathBuilder";
+import { Feedback } from "../Feedback";
+import { ImpersonationBanner } from "../ImpersonationBanner";
+import { LogoIcon } from "../LogoIcon";
+import { UserAvatar, UserProfilePhoto } from "../UserProfilePhoto";
+import { Button, LinkButton } from "../primitives/Buttons";
+import { Icon } from "../primitives/Icon";
+import { type IconNames } from "../primitives/NamedIcon";
+import { Paragraph } from "../primitives/Paragraph";
+import {
+  Popover,
+  PopoverArrowTrigger,
+  PopoverContent,
+  PopoverCustomTrigger,
+  PopoverMenuItem,
+  PopoverSectionHeader,
+} from "../primitives/Popover";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
+import { useFeatures } from "~/hooks/useFeatures";
+
+type SideMenuUser = Pick<User, "email" | "admin"> & { isImpersonating: boolean };
+type SideMenuProject = Pick<
+  MatchedProject,
+  "id" | "name" | "slug" | "hasInactiveExternalTriggers" | "jobCount" | "httpEndpointCount"
+>;
+
+type SideMenuProps = {
+  user: SideMenuUser;
+  project: SideMenuProject;
+  organization: MatchedOrganization;
+  organizations: MatchedOrganization[];
+};
+
+export function SideMenu({ user, project, organization, organizations }: SideMenuProps) {
+  const borderRef = useRef<HTMLDivElement>(null);
+  const [showHeaderDivider, setShowHeaderDivider] = useState(false);
+  const { isManagedCloud } = useFeatures();
+
+  useEffect(() => {
+    const handleScroll = () => {
+      if (borderRef.current) {
+        const shouldShowHeaderDivider = borderRef.current.scrollTop > 1;
+        if (showHeaderDivider !== shouldShowHeaderDivider) {
+          setShowHeaderDivider(shouldShowHeaderDivider);
+        }
+      }
+    };
+
+    borderRef.current?.addEventListener("scroll", handleScroll);
+    return () => borderRef.current?.removeEventListener("scroll", handleScroll);
+  }, [showHeaderDivider]);
+
+  return (
+    <div
+      className={cn(
+        "flex h-full flex-col gap-y-8 overflow-hidden border-r border-ui-border transition"
+      )}
+    >
+      <div className="flex h-full flex-col">
+        <div
+          className={cn(
+            "flex items-center justify-between border-b bg-background px-1 py-1 transition",
+            showHeaderDivider ? " border-border" : "border-transparent"
+          )}
+        >
+          <ProjectSelector
+            organization={organization}
+            organizations={organizations}
+            project={project}
+          />
+          <UserMenu user={user} />
+        </div>
+        <div
+          className="h-full overflow-hidden overflow-y-auto pt-2 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
+          ref={borderRef}
+        >
+          <div className="mb-6 flex flex-col gap-1 px-1">
+            <SideMenuHeader title={project.name || "No project found"}>
+              <PopoverMenuItem
+                to={projectSetupPath(organization, project)}
+                title="Framework setup"
+                icon="plus"
+              />
+            </SideMenuHeader>
+            <SideMenuItem
+              name="Jobs"
+              icon="job"
+              iconColor="text-indigo-500"
+              count={project.jobCount}
+              to={projectPath(organization, project)}
+              data-action="jobs"
+            />
+            <SideMenuItem
+              name="Runs"
+              icon="runs"
+              iconColor="text-teal-500"
+              to={projectRunsPath(organization, project)}
+            />
+            <SideMenuItem
+              name="Triggers"
+              icon="trigger"
+              iconColor="text-amber-500"
+              to={projectTriggersPath(organization, project)}
+              data-action="triggers"
+              hasWarning={project.hasInactiveExternalTriggers}
+            />
+            <SideMenuItem
+              name="HTTP endpoints"
+              icon="http-endpoint"
+              iconColor="text-green-500"
+              count={project.httpEndpointCount}
+              to={projectHttpEndpointsPath(organization, project)}
+              data-action="httpendpoints"
+            />
+            <SideMenuItem
+              name="Environments & API Keys"
+              icon="environment"
+              iconColor="text-rose-500"
+              to={projectEnvironmentsPath(organization, project)}
+              data-action="environments & api keys"
+            />
+          </div>
+          <div className="mb-1 flex flex-col gap-1 px-1">
+            <SideMenuHeader title={organization.title}>
+              <PopoverMenuItem to={newProjectPath(organization)} title="New Project" icon="plus" />
+              <PopoverMenuItem
+                to={inviteTeamMemberPath(organization)}
+                title="Invite team member"
+                icon={UserPlusIcon}
+                leadingIconClassName="text-indigo-500"
+              />
+            </SideMenuHeader>
+            <SideMenuItem
+              name="Integrations"
+              icon="integration"
+              to={organizationIntegrationsPath(organization)}
+              data-action="integrations"
+              hasWarning={organization.hasUnconfiguredIntegrations}
+            />
+            <SideMenuItem
+              name="Projects"
+              icon="folder"
+              to={organizationPath(organization)}
+              data-action="projects"
+            />
+            <SideMenuItem
+              name="Team"
+              icon={UserGroupIcon}
+              to={organizationTeamPath(organization)}
+              iconColor="text-sky-500"
+              data-action="team"
+            />
+            <SideMenuItem
+              name={isManagedCloud ? "Usage & Billing" : "Usage"}
+              icon={ChartBarIcon}
+              to={organizationBillingPath(organization)}
+              iconColor="text-pink-500"
+              data-action="usage & billing"
+            />
+          </div>
+        </div>
+        <div className="flex flex-col gap-1 border-t border-border p-1">
+          <SideMenuItem
+            name="Documentation"
+            icon="docs"
+            to="https://trigger.dev/docs"
+            data-action="documentation"
+            target="_blank"
+          />
+          <SideMenuItem
+            name="Changelog"
+            icon="star"
+            to="https://trigger.dev/changelog"
+            data-action="changelog"
+            target="_blank"
+          />
+
+          <Feedback
+            button={
+              <Button
+                variant="small-menu-item"
+                LeadingIcon="log"
+                data-action="help & feedback"
+                fullWidth
+                textAlignLeft
+              >
+                Help & Feedback
+              </Button>
+            }
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function ProjectSelector({
+  project,
+  organization,
+  organizations,
+}: {
+  project: SideMenuProject;
+  organization: MatchedOrganization;
+  organizations: MatchedOrganization[];
+}) {
+  const [isOrgMenuOpen, setOrgMenuOpen] = useState(false);
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    setOrgMenuOpen(false);
+  }, [navigation.location?.pathname]);
+
+  return (
+    <Popover onOpenChange={(open) => setOrgMenuOpen(open)} open={isOrgMenuOpen}>
+      <PopoverArrowTrigger
+        isOpen={isOrgMenuOpen}
+        overflowHidden
+        className="h-7 w-full justify-between overflow-hidden py-1 pl-2"
+      >
+        <LogoIcon className="relative -top-px mr-2 h-4 w-4 min-w-[1rem]" />
+        <span className="truncate">{organization.title ?? "Select an organization"}</span>
+      </PopoverArrowTrigger>
+      <PopoverContent
+        className="min-w-[16rem] overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
+        align="start"
+        style={{ maxHeight: `calc(var(--radix-popover-content-available-height) - 10vh)` }}
+      >
+        {organizations.map((organization) => (
+          <Fragment key={organization.id}>
+            <PopoverSectionHeader title={organization.title} />
+            <div className="flex flex-col gap-1 p-1">
+              {organization.projects.map((p) => {
+                const isSelected = p.id === project.id;
+                return (
+                  <PopoverMenuItem
+                    key={p.id}
+                    to={projectPath(organization, p)}
+                    title={
+                      <div className="flex w-full items-center justify-between text-bright">
+                        <span className="grow truncate text-left">{p.name}</span>
+                        <MenuCount count={p.jobCount} />
+                      </div>
+                    }
+                    isSelected={isSelected}
+                    icon="folder"
+                  />
+                );
+              })}
+            </div>
+          </Fragment>
+        ))}
+        <div className="border-t border-slate-800 p-1">
+          <PopoverMenuItem to={newOrganizationPath()} title="New Organization" icon="plus" />
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function UserMenu({ user }: { user: SideMenuUser }) {
+  const [isProfileMenuOpen, setProfileMenuOpen] = useState(false);
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    setProfileMenuOpen(false);
+  }, [navigation.location?.pathname]);
+
+  return (
+    <Popover onOpenChange={(open) => setProfileMenuOpen(open)}>
+      <PopoverCustomTrigger isOpen={isProfileMenuOpen} className="p-1">
+        <UserProfilePhoto
+          className={cn(
+            "h-5 w-5 text-slate-600",
+            user.isImpersonating && "rounded-full border border-yellow-500"
+          )}
+        />
+      </PopoverCustomTrigger>
+      <PopoverContent
+        className="min-w-[12rem] overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
+        align="start"
+      >
+        <Fragment>
+          <PopoverSectionHeader title={user.email} variant="extra-small" />
+          <div className="flex flex-col gap-1 p-1">
+            {user.isImpersonating && <ImpersonationBanner />}
+            {user.admin && (
+              <PopoverMenuItem
+                to={"/admin"}
+                title="Admin"
+                icon={AcademicCapIcon}
+                leadingIconClassName="text-yellow-500"
+              />
+            )}
+            <PopoverMenuItem
+              to={accountPath()}
+              title="View profile"
+              icon={UserProfilePhoto}
+              leadingIconClassName="text-indigo-500"
+            />
+            <PopoverMenuItem
+              to={logoutPath()}
+              title="Log out"
+              icon={ArrowRightOnRectangleIcon}
+              leadingIconClassName="text-rose-500"
+            />
+          </div>
+        </Fragment>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function SideMenuHeader({ title, children }: { title: string; children: React.ReactNode }) {
+  const [isHeaderMenuOpen, setHeaderMenuOpen] = useState(false);
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    setHeaderMenuOpen(false);
+  }, [navigation.location?.pathname]);
+
+  return (
+    <div className="group flex items-center justify-between pl-1.5">
+      <Paragraph
+        variant="extra-extra-small/caps"
+        className="cursor-default truncate text-slate-500"
+      >
+        {title}
+      </Paragraph>
+      <Popover onOpenChange={(open) => setHeaderMenuOpen(open)} open={isHeaderMenuOpen}>
+        <PopoverCustomTrigger className="p-1">
+          <EllipsisHorizontalIcon className="h-4 w-4 text-slate-500 transition group-hover:text-bright" />
+        </PopoverCustomTrigger>
+        <PopoverContent
+          className="min-w-max overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700"
+          align="start"
+        >
+          <div className="flex flex-col gap-1 p-1">{children}</div>
+        </PopoverContent>
+      </Popover>
+    </div>
+  );
+}
+
+function SideMenuItem({
+  icon,
+  iconColor,
+  name,
+  to,
+  hasWarning,
+  count,
+  target,
+  subItem = false,
+}: {
+  icon?: IconNames | React.ComponentType<any>;
+  iconColor?: string;
+  name: string;
+  to: string;
+  hasWarning?: string | boolean;
+  count?: number;
+  target?: AnchorHTMLAttributes<HTMLAnchorElement>["target"];
+  subItem?: boolean;
+}) {
+  const pathName = usePathName();
+  const isActive = pathName === to;
+
+  return (
+    <LinkButton
+      variant={subItem ? "small-menu-sub-item" : "small-menu-item"}
+      fullWidth
+      textAlignLeft
+      LeadingIcon={icon}
+      leadingIconClassName={isActive ? iconColor : "text-dimmed"}
+      to={to}
+      target={target}
+      className={cn(
+        "text-bright group-hover:bg-slate-850",
+        subItem ? "text-dimmed" : "",
+        isActive ? "bg-slate-850 text-bright" : "group-hover:text-bright"
+      )}
+    >
+      <div className="flex w-full items-center justify-between overflow-hidden">
+        <span className="truncate">{name}</span>
+        <div className="flex items-center gap-1">
+          {count !== undefined && count > 0 && <MenuCount count={count} />}
+          {typeof hasWarning === "string" ? (
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger>
+                  <Icon icon={IconExclamationCircle} className="h-5 w-5 text-rose-500" />
+                </TooltipTrigger>
+                <TooltipContent className="flex items-center gap-1 border border-rose-500 bg-rose-500/20 backdrop-blur-xl">
+                  {hasWarning}
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          ) : (
+            hasWarning && <Icon icon={IconExclamationCircle} className="h-5 w-5 text-rose-500" />
+          )}
+        </div>
+      </div>
+    </LinkButton>
+  );
+}
+
+function MenuCount({ count }: { count: number | string }) {
+  return <div className="rounded-full bg-slate-900 px-2 py-1 text-xxs text-dimmed">{count}</div>;
+}
@@ -7,99 +7,156 @@ import { ShortcutKey } from "./ShortcutKey";

 const variant = {
  "primary/small": {
-    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80 px-1",
    button:
      "h-6 px-[5px] text-xs bg-indigo-600 group-hover:bg-indigo-500/90 group-disabled:opacity-50 group-disabled:pointer-events-none",
    icon: "h-3.5",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "small" as const,
    shortcut:
      "ml-1 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60 justify-self-center",
  },
  "secondary/small": {
-    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80",
+    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80 px-1",
    button:
      "h-6 px-[5px] text-xs bg-slate-800 group-hover:bg-slate-700/70 disabled:opacity-50 group-disabled:pointer-events-none",
    icon: "h-3.5",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "small" as const,
    shortcut:
      "ml-1 -mr-0.5 border-dimmed/40 text-dimmed group-hover:text-bright/80 group-hover:border-dimmed/60",
  },
  "tertiary/small": {
-    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80",
+    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80 px-1",
    button:
      "h-6 px-[5px] text-xs bg-transparent group-hover:bg-slate-850 disabled:opacity-50 group-disabled:pointer-events-none",
    icon: "h-3.5",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "small" as const,
    shortcut:
      "ml-1 -mr-0.5 border-dimmed/40 text-dimmed group-hover:text-bright/80 group-hover:border-dimmed/60",
  },
  "danger/small": {
-    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80 px-1",
    button:
      "h-6 px-[5px] text-xs bg-rose-600 group-hover:bg-rose-500 disabled:opacity-50 group-disabled:pointer-events-none",
    icon: "h-3.5",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "small" as const,
    shortcut: "ml-1 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
  },
  "primary/medium": {
-    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80 px-1",
    button: "h-8 px-2 text-sm bg-indigo-600 group-hover:bg-indigo-500/90 disabled:opacity-50",
    icon: "h-4",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "medium" as const,
    shortcut: "ml-1.5 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
  },
  "secondary/medium": {
-    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80",
+    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80 px-1",
    button: "h-8 px-2 text-sm bg-slate-800 group-hover:bg-slate-700/70 disabled:opacity-50",
    icon: "h-4",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "medium" as const,
    shortcut:
      "ml-1.5 -mr-0.5 border-dimmed/40 text-dimmed group-hover:border-dimmed group-hover:text-bright",
  },
  "tertiary/medium": {
-    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80",
+    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80 px-1",
    button: "h-8 px-2 text-sm bg-transparent group-hover:bg-slate-850 disabled:opacity-50",
    icon: "h-4",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "medium" as const,
    shortcut:
      "ml-1.5 -mr-0.5 border-bright/40 text-dimmed group-hover:border-bright/60 group-hover:text-bright",
  },
  "danger/medium": {
-    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80 px-1",
    button: "h-8 px-2 text-sm bg-rose-600 group-hover:bg-rose-500 disabled:opacity-50",
    icon: "h-4",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: "medium" as const,
    shortcut: "ml-1.5 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
  },
  "primary/large": {
-    textColor: "text-bright group-hover:text-white transition group-disabled:text-dimmed/80",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-dimmed/80 px-1",
    button:
-      "h-10 px-2 text-sm font-medium bg-indigo-600 group-hover:bg-indigo-500/90 disabled:opacity-50",
+      "h-10 px-2 text-sm font-medium bg-indigo-600 group-hover:bg-indigo-500/90 group-disabled:opacity-50",
    icon: "h-5",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: undefined,
    shortcut: undefined,
  },
  "secondary/large": {
-    textColor: "text-dimmed",
+    textColor: "text-dimmed px-1",
    button:
      "h-10 px-2 text-sm text-dimmed group-hover:text-bright transition font-medium bg-slate-800 group-hover:bg-slate-700/70 disabled:opacity-50",
    icon: "h-5",
+    iconSpacing: "gap-x-0.5",
    shortcutVariant: undefined,
    shortcut: undefined,
  },
  "danger/large": {
-    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/50",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/50 px-1",
    button:
      "h-10 px-2 text-md bg-rose-600 group-hover:bg-rose-500 group-disabled:opacity-50 group-disabled:group-hover:bg-rose-600",
    icon: "h-5",
+    iconSpacing: "gap-x-0.5",
+    shortcutVariant: "medium" as const,
+    shortcut: "ml-1.5 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
+  },
+  "primary/extra-large": {
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-dimmed/80",
+    button:
+      "h-12 px-2 text-md font-medium bg-indigo-600 group-hover:bg-indigo-500/90 disabled:opacity-50",
+    icon: "h-5",
+    iconSpacing: undefined,
+    shortcutVariant: undefined,
+    shortcut: undefined,
+  },
+  "secondary/extra-large": {
+    textColor: "text-dimmed",
+    button:
+      "h-12 px-2 text-md text-dimmed group-hover:text-bright transition font-medium bg-slate-800 group-hover:bg-slate-700/70 disabled:opacity-50",
+    icon: "h-5",
+    iconSpacing: undefined,
+    shortcutVariant: undefined,
+    shortcut: undefined,
+  },
+  "danger/extra-large": {
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/50",
+    button:
+      "h-12 px-2 text-md bg-rose-600 group-hover:bg-rose-500 group-disabled:opacity-50 group-disabled:group-hover:bg-rose-600",
+    icon: "h-5",
+    iconSpacing: undefined,
    shortcutVariant: "medium" as const,
    shortcut: "ml-1.5 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
  },
  "menu-item": {
-    textColor: "text-bright",
+    textColor: "text-bright px-1",
    button:
      "h-9 px-[0.475rem] text-sm rounded-sm bg-transparent group-hover:bg-slate-800 transition",
    icon: "h-5",
+    iconSpacing: "gap-x-0.5",
+    shortcutVariant: undefined,
+    shortcut: undefined,
+  },
+  "small-menu-item": {
+    textColor: "text-bright",
+    button:
+      "h-[1.8rem] px-[0.4rem] text-2sm rounded-sm text-dimmed bg-transparent group-hover:bg-slate-850 transition",
+    icon: "h-4",
+    iconSpacing: "gap-x-1.5",
+    shortcutVariant: undefined,
+    shortcut: undefined,
+  },
+  "small-menu-sub-item": {
+    textColor: "text-dimmed",
+    button:
+      "h-[1.8rem] px-[0.5rem] ml-5 text-2sm rounded-sm text-dimmed bg-transparent group-hover:bg-slate-850 transition",
+    icon: undefined,
+    iconSpacing: undefined,
    shortcutVariant: undefined,
    shortcut: undefined,
  },
@@ -110,7 +167,7 @@ const allVariants = {
  variant: variant,
 };

-type ButtonContentPropsType = {
+export type ButtonContentPropsType = {
  children?: React.ReactNode;
  LeadingIcon?: React.ComponentType<any> | IconNamesOrString;
  TrailingIcon?: React.ComponentType<any> | IconNamesOrString;
@@ -140,6 +197,7 @@ export function ButtonContent(props: ButtonContentPropsType) {
  // Based on the size prop, we'll use the corresponding variant classnames
  const btnClassName = cn(allVariants.$all, variation.button);
  const iconClassName = variation.icon;
+  const iconSpacingClassName = variation.iconSpacing;
  const shortcutClassName = variation.shortcut;
  const textColorClassName = variation.textColor;

@@ -148,7 +206,8 @@ export function ButtonContent(props: ButtonContentPropsType) {
      <div
        className={cn(
          textAlignLeft ? "text-left" : "justify-center",
-          "flex w-full items-center gap-x-0.5"
+          "flex w-full items-center",
+          iconSpacingClassName
        )}
      >
        {LeadingIcon &&
@@ -170,7 +229,7 @@ export function ButtonContent(props: ButtonContentPropsType) {

        {text &&
          (typeof text === "string" ? (
-            <span className={cn("mx-auto grow self-center truncate px-1", textColorClassName)}>
+            <span className={cn("mx-auto grow self-center truncate", textColorClassName)}>
              {text}
            </span>
          ) : (
@@ -245,8 +304,9 @@ export const Button = forwardRef<HTMLButtonElement, ButtonPropsType>(
  }
 );

-type LinkPropsType = Pick<LinkProps, "to" | "target"> & React.ComponentProps<typeof ButtonContent>;
-export const LinkButton = ({ to, ...props }: LinkPropsType) => {
+type LinkPropsType = Pick<LinkProps, "to" | "target" | "onClick"> &
+  React.ComponentProps<typeof ButtonContent>;
+export const LinkButton = ({ to, onClick, ...props }: LinkPropsType) => {
  const innerRef = useRef<HTMLAnchorElement>(null);
  if (props.shortcut) {
    useShortcutKeys({
@@ -265,6 +325,7 @@ export const LinkButton = ({ to, ...props }: LinkPropsType) => {
        href={to.toString()}
        ref={innerRef}
        className={cn("group outline-none", props.fullWidth ? "w-full" : "")}
+        onClick={onClick}
      >
        <ButtonContent {...props} />
      </ExtLink>
@@ -275,6 +336,7 @@ export const LinkButton = ({ to, ...props }: LinkPropsType) => {
        to={to}
        ref={innerRef}
        className={cn("group outline-none", props.fullWidth ? "w-full" : "")}
+        onClick={onClick}
      >
        <ButtonContent {...props} />
      </Link>
@@ -43,12 +43,12 @@ const DialogContent = React.forwardRef<
    <DialogPrimitive.Content
      ref={ref}
      className={cn(
-        "fixed z-50 grid w-full gap-4 rounded-b-lg border bg-midnight-800 p-6 pt-11 shadow-lg animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:max-w-lg sm:rounded-lg sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0",
+        "fixed z-50 grid w-full gap-4 rounded-b-lg border bg-midnight-800 px-4 pb-6 pt-3 shadow-lg animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:max-w-lg sm:rounded-lg sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0",
        className
      )}
      {...props}
    >
-      <hr className="-ml-6 w-[calc(100%_+_3rem)]" />
+      <hr className="absolute left-0 top-12 w-full" />
      {children}
      <DialogPrimitive.Close className="absolute right-3 top-3 rounded-sm opacity-70 ring-offset-background transition-opacity data-[state=open]:bg-accent data-[state=open]:text-muted-foreground hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none">
        <div className="flex gap-x-2">
@@ -73,7 +73,7 @@ const DialogContent = React.forwardRef<
 DialogContent.displayName = DialogPrimitive.Content.displayName;

 const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn("flex flex-col space-y-1.5 text-center sm:text-left", className)} {...props} />
+  <div className={cn("flex flex-col text-left font-medium text-dimmed", className)} {...props} />
 );
 DialogHeader.displayName = "DialogHeader";

@@ -21,7 +21,7 @@ export function FormTitle({
    <div
      className={cn(
        "mb-4 flex flex-col gap-3 pb-4",
-        divide ? "border-b border-uiBorder" : "",
+        divide ? "border-b border-ui-border" : "",
        className
      )}
    >
@@ -2,7 +2,7 @@ import { cn } from "~/utils/cn";

 const headerVariants = {
  header1: {
-    text: "font-sans text-base md:text-lg lg:text-xl leading-5 md:leading-6 lg:leading-7 font-semibold",
+    text: "font-sans text-2xl leading-5 md:leading-6 lg:leading-7 font-semibold",
    spacing: "mb-2",
  },
  header2: {
@@ -88,12 +88,7 @@ export function HelpContent({
            )}
          </div>

-          <div
-            className="grow rounded border border-slate-850 bg-midnight-850 bg-contain bg-left-top bg-no-repeat p-6"
-            style={{
-              backgroundImage: `url(${gradientPath})`,
-            }}
-          >
+          <div className="grow rounded border border-slate-850 bg-midnight-850/80 bg-contain bg-left-top bg-no-repeat p-6">
            {children}
          </div>
        </div>
@@ -6,7 +6,7 @@ import { NamedIcon } from "./NamedIcon";
 const variants = {
  large: {
    input:
-      "px-3 flex h-10 w-full text-bright rounded-md border border-slate-800 bg-slate-850 text-sm ring-offset-background transition file:border-0 file:bg-transparent file:text-base file:font-medium placeholder:text-muted-foreground hover:border-slate-750 hover:bg-slate-800 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0 focus:border-ring focus:outline-none focus:ring-2 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
+      "px-3 flex h-10 w-full text-bright rounded-[3px] border border-slate-800 bg-slate-850 text-sm ring-offset-background transition file:border-0 file:bg-transparent file:text-base file:font-medium placeholder:text-muted-foreground hover:border-slate-750 hover:bg-slate-800 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0 focus:border-ring focus:outline-none focus:ring-2 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50",

    iconSize: "h-4 w-4 ml-3",
    iconOffset: "pl-[34px]",
@@ -33,7 +33,7 @@ const variants = {
  },
  tertiary: {
    input:
-      "px-1 flex h-6 w-full text-bright rounded bg-transparent border border-transparent transition hover:border-slate-800 hover:bg-slate-850 focus:border-slate-800 focus:bg-slate-850 text-xs ring-offset-background transition file:border-0 file:bg-transparent file:text-xs file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
+      "px-1 flex h-6 w-full text-bright rounded bg-transparent border border-transparent hover:border-slate-800 hover:bg-slate-850 focus:border-slate-800 focus:bg-slate-850 text-xs ring-offset-background transition file:border-0 file:bg-transparent file:text-xs file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",

    iconSize: "h-3 w-3 ml-1.5",
    iconOffset: "pl-[21px]",
@@ -2,6 +2,7 @@ import { cn } from "~/utils/cn";
 import { Paragraph } from "./Paragraph";
 import { ArrowTopRightOnSquareIcon } from "@heroicons/react/20/solid";
 import { SimpleTooltip } from "./Tooltip";
+import { Link } from "@remix-run/react";

 const variations = {
  primary: {
@@ -45,18 +46,7 @@ export function LabelValueStack({
      <Paragraph variant={variation.label}>{label}</Paragraph>
      <>
        {href ? (
-          <SimpleTooltip
-            side="bottom"
-            button={
-              <Paragraph variant={variation.value}>
-                <a href={href} className="underline underline-offset-2" target="_blank">
-                  {value}
-                  <ArrowTopRightOnSquareIcon className="ml-1 inline-block h-4 w-4 text-dimmed" />
-                </a>
-              </Paragraph>
-            }
-            content={href}
-          />
+          <ValueButton value={value} href={href} variant={variant} />
        ) : (
          <Paragraph variant={variation.value}>{value}</Paragraph>
        )}
@@ -64,3 +54,40 @@ export function LabelValueStack({
    </div>
  );
 }
+
+type ValueButtonStackProps = {
+  value: React.ReactNode;
+  href: string;
+  variant?: keyof typeof variations;
+};
+
+function ValueButton({ value, href, variant = "secondary" }: ValueButtonStackProps) {
+  const variation = variations[variant];
+
+  const isExternalUrl = href.startsWith("http");
+
+  if (!isExternalUrl) {
+    return (
+      <Paragraph variant={variation.value}>
+        <Link to={href} reloadDocument className="underline underline-offset-2">
+          {value}
+        </Link>
+      </Paragraph>
+    );
+  }
+
+  return (
+    <SimpleTooltip
+      side="bottom"
+      button={
+        <Paragraph variant={variation.value}>
+          <a href={href} className="underline underline-offset-2" target="_blank">
+            {value}
+            <ArrowTopRightOnSquareIcon className="ml-1 inline-block h-4 w-4 text-dimmed" />
+          </a>
+        </Paragraph>
+      }
+      content={href}
+    />
+  );
+}
@@ -59,15 +59,19 @@ import {
 import { CompanyIcon, hasIcon } from "@trigger.dev/companyicons";
 import { ActivityIcon, HourglassIcon } from "lucide-react";
 import { DynamicTriggerIcon } from "~/assets/icons/DynamicTriggerIcon";
+import { EndpointIcon } from "~/assets/icons/EndpointIcon";
 import { ErrorIcon } from "~/assets/icons/ErrorIcon";
+import { OneTreeIcon } from "~/assets/icons/OneTreeIcon";
+import { RunsIcon } from "~/assets/icons/RunsIcon";
+import { SaplingIcon } from "~/assets/icons/SaplingIcon";
 import { ScheduleIcon } from "~/assets/icons/ScheduleIcon";
+import { TwoTreesIcon } from "~/assets/icons/TwoTreesIcon";
 import { WebhookIcon } from "~/assets/icons/WebhookIcon";
 import { cn } from "~/utils/cn";
+import { tablerIcons } from "~/utils/tablerIcons";
 import { LogoIcon } from "../LogoIcon";
 import { Spinner } from "./Spinner";
-import { SaplingIcon } from "~/assets/icons/SaplingIcon";
-import { TwoTreesIcon } from "~/assets/icons/TwoTreesIcon";
-import { OneTreeIcon } from "~/assets/icons/OneTreeIcon";
+import tablerSpritePath from "./tabler-sprite.svg";

 const icons = {
  account: (className: string) => <UserCircleIcon className={cn("text-slate-400", className)} />,
@@ -125,7 +129,9 @@ const icons = {
  "invite-member": (className: string) => (
    <UserPlusIcon className={cn("text-indigo-500", className)} />
  ),
-  job: (className: string) => <WrenchScrewdriverIcon className={cn("text-teal-500", className)} />,
+  job: (className: string) => (
+    <WrenchScrewdriverIcon className={cn("text-indigo-500", className)} />
+  ),
  key: (className: string) => <KeyIcon className={cn("text-amber-400", className)} />,
  lightbulb: (className: string) => <LightBulbIcon className={cn("text-amber-400", className)} />,
  "clipboard-checked": (className: string) => (
@@ -181,6 +187,11 @@ const icons = {
    <ScheduleIcon className={cn("text-sky-500", className)} />
  ),
  webhook: (className: string) => <WebhookIcon className={cn("text-pink-500", className)} />,
+  endpoint: (className: string) => <EndpointIcon className={cn("text-blue-500", className)} />,
+  "http-endpoint": (className: string) => (
+    <GlobeAltIcon className={cn("text-blue-500", className)} />
+  ),
+  runs: (className: string) => <RunsIcon className={cn("text-lime-500", className)} />,
 };

 export type IconNames = keyof typeof icons;
@@ -215,7 +226,15 @@ export function NamedIcon({
    );
  }

-  console.log(`Icon ${name} not found`);
+  if (tablerIcons.has("tabler-" + name)) {
+    return <TablerIcon name={"tabler-" + name} className={className} />;
+  } else if (name.startsWith("tabler-") && tablerIcons.has(name)) {
+    return <TablerIcon name={name} className={className} />;
+  }
+
+  if (name === "supabase-management") {
+    return <NamedIcon name="supabase" className={className} />;
+  }

  if (fallback) {
    return fallback;
@@ -247,3 +266,11 @@ export function NamedIconInBox({
    </div>
  );
 }
+
+export function TablerIcon({ name, className }: { name: string; className?: string }) {
+  return (
+    <svg className={cn("stroke-[1.5]", className)}>
+      <use xlinkHref={`${tablerSpritePath}#${name}`} />
+    </svg>
+  );
+}
@@ -6,6 +6,9 @@ import { Paragraph } from "./Paragraph";
 import { cn } from "~/utils/cn";
 import { NamedIcon } from "./NamedIcon";
 import { Tabs, TabsProps } from "./Tabs";
+import { Icon, RenderIcon } from "./Icon";
+import { Button, LinkButton } from "./Buttons";
+import { ArrowUpRightIcon } from "@heroicons/react/20/solid";

 type WithChildren = {
  children: React.ReactNode;
@@ -13,7 +16,7 @@ type WithChildren = {

 export function PageHeader({ children, hideBorder }: WithChildren & { hideBorder?: boolean }) {
  return (
-    <div className={cn("mx-4 pt-4", hideBorder ? "" : "border-b border-uiBorder pb-4")}>
+    <div className={cn("mx-4 pt-4", hideBorder ? "" : "border-b border-ui-border pb-4")}>
      {children}
    </div>
  );
@@ -24,6 +27,7 @@ export function PageTitleRow({ children }: WithChildren) {
 }

 type PageTitleProps = {
+  icon?: RenderIcon;
  title: string;
  backButton?: {
    to: string;
@@ -31,7 +35,7 @@ type PageTitleProps = {
  };
 };

-export function PageTitle({ title, backButton }: PageTitleProps) {
+export function PageTitle({ icon, title, backButton }: PageTitleProps) {
  return (
    <div className="flex items-center gap-2">
      {backButton && (
@@ -48,7 +52,10 @@ export function PageTitle({ title, backButton }: PageTitleProps) {
          <BreadcrumbIcon className="h-6" />
        </div>
      )}
-      <Header1>{title}</Header1>
+      <Header1 className="flex items-center gap-1">
+        {icon && <Icon icon={icon} className="h-5 w-5" />}
+        {title}
+      </Header1>
    </div>
  );
 }
@@ -89,20 +96,43 @@ export function PageInfoProperty({
  icon,
  label,
  value,
+  to,
 }: {
  icon?: string | React.ReactNode;
  label?: string;
-  value: React.ReactNode;
+  value?: React.ReactNode;
+  to?: string;
+}) {
+  if (to === undefined) {
+    return <PageInfoPropertyContent icon={icon} label={label} value={value} />;
+  }
+
+  return (
+    <LinkButton variant="tertiary/small" to={to} TrailingIcon={ArrowUpRightIcon}>
+      <PageInfoPropertyContent icon={icon} label={label} value={value} />
+    </LinkButton>
+  );
+}
+
+function PageInfoPropertyContent({
+  icon,
+  label,
+  value,
+}: {
+  icon?: string | React.ReactNode;
+  label?: string;
+  value?: React.ReactNode;
 }) {
  return (
    <div className="flex items-center gap-1">
      {icon && typeof icon === "string" ? <NamedIcon name={icon} className="h-4 w-4" /> : icon}
      {label && (
        <Paragraph variant="extra-small/caps" className="mt-0.5 whitespace-nowrap">
-          {label}:
+          {label}
+          {value && ":"}
        </Paragraph>
      )}
-      <Paragraph variant="small">{value}</Paragraph>
+      {value && <Paragraph variant="small">{value}</Paragraph>}
    </div>
  );
 }
@@ -51,6 +51,7 @@ const paragraphVariants = {
    text: "font-sans text-xxs font-normal text-bright",
    spacing: "mb-1",
  },
+
  "extra-extra-small/caps": {
    text: "font-sans text-xxs uppercase tracking-wider font-normal text-dimmed",
    spacing: "mb-1",
@@ -59,6 +60,10 @@ const paragraphVariants = {
    text: "font-sans text-xxs uppercase tracking-wider font-normal text-bright",
    spacing: "mb-1",
  },
+  "extra-extra-small/dimmed/caps": {
+    text: "font-sans text-xxs uppercase tracking-wider font-normal text-dimmed",
+    spacing: "mb-1",
+  },
 };

 export type ParagraphVariant = keyof typeof paragraphVariants;
@@ -3,12 +3,11 @@
 import * as React from "react";
 import * as PopoverPrimitive from "@radix-ui/react-popover";
 import { cn } from "~/utils/cn";
-import { Paragraph } from "./Paragraph";
+import { Paragraph, ParagraphVariant } from "./Paragraph";
 import { ChevronDownIcon, EllipsisVerticalIcon } from "@heroicons/react/24/solid";
-import { LinkButton } from "./Buttons";
+import { ButtonContentPropsType, LinkButton } from "./Buttons";

 const Popover = PopoverPrimitive.Root;
-
 const PopoverTrigger = PopoverPrimitive.Trigger;

 const PopoverContent = React.forwardRef<
@@ -22,19 +21,27 @@ const PopoverContent = React.forwardRef<
      sideOffset={sideOffset}
      avoidCollisions={true}
      className={cn(
-        "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        "z-50 min-w-max rounded-md border bg-midnight-850 p-4 text-popover-foreground shadow-md outline-none animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
        className
      )}
-      style={{ maxHeight: "var(--radix-popover-content-available-height)" }}
+      style={{
+        maxHeight: "var(--radix-popover-content-available-height)",
+      }}
      {...props}
    />
  </PopoverPrimitive.Portal>
 ));
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;

-function PopoverSectionHeader({ title }: { title: string }) {
+function PopoverSectionHeader({
+  title,
+  variant = "extra-extra-small/dimmed/caps",
+}: {
+  title: string;
+  variant?: ParagraphVariant;
+}) {
  return (
-    <Paragraph variant="extra-extra-small/bright/caps" className="bg-slate-900 px-2.5 py-2">
+    <Paragraph variant={variant} className="bg-slate-900 px-2.5 py-1.5">
      {title}
    </Paragraph>
  );
@@ -45,28 +52,33 @@ function PopoverMenuItem({
  icon,
  title,
  isSelected,
+  variant = { variant: "small-menu-item" },
+  leadingIconClassName,
 }: {
  to: string;
-  icon: string;
+  icon: string | React.ComponentType<any>;
  title: React.ReactNode;
  isSelected?: boolean;
+  variant?: ButtonContentPropsType;
+  leadingIconClassName?: string;
 }) {
  return (
    <LinkButton
      to={to}
-      variant="menu-item"
+      variant={variant.variant}
      LeadingIcon={icon}
+      leadingIconClassName={leadingIconClassName}
      fullWidth
      textAlignLeft
      TrailingIcon={isSelected ? "check" : undefined}
-      className={isSelected ? "bg-slate-750 group-hover:bg-slate-750" : undefined}
+      className={isSelected ? "bg-slate-750 group-hover:bg-slate-800" : undefined}
    >
      {title}
    </LinkButton>
  );
 }

-function PopoverArrowTrigger({
+function PopoverCustomTrigger({
  isOpen,
  children,
  className,
@@ -76,15 +88,50 @@ function PopoverArrowTrigger({
    <PopoverTrigger
      {...props}
      className={cn(
-        "group flex h-6 items-center gap-1 rounded px-2 text-dimmed transition hover:bg-slate-850 hover:text-bright",
+        "group flex items-center justify-end gap-1 rounded text-dimmed transition hover:bg-slate-850 hover:text-bright",
        className
      )}
    >
-      <Paragraph variant="extra-small" className="transition group-hover:text-bright">
+      {children}
+    </PopoverTrigger>
+  );
+}
+
+function PopoverArrowTrigger({
+  isOpen,
+  children,
+  fullWidth = false,
+  overflowHidden = false,
+  className,
+  ...props
+}: {
+  isOpen?: boolean;
+  fullWidth?: boolean;
+  overflowHidden?: boolean;
+} & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
+  return (
+    <PopoverTrigger
+      {...props}
+      className={cn(
+        "group flex h-6 items-center gap-1 rounded px-2 text-dimmed transition hover:bg-slate-850 hover:text-bright",
+        fullWidth && "w-full justify-between",
+        className
+      )}
+    >
+      <Paragraph
+        variant="extra-small"
+        className={cn(
+          "flex transition group-hover:text-bright",
+          overflowHidden && "overflow-hidden"
+        )}
+      >
        {children}
      </Paragraph>
      <ChevronDownIcon
-        className={cn("h-3 w-3 transition group-hover:text-bright", isOpen && "-rotate-180")}
+        className={cn(
+          "h-3 w-3 min-w-[0.75rem] text-slate-600 transition group-hover:text-bright",
+          isOpen && "-rotate-180"
+        )}
      />
    </PopoverTrigger>
  );
@@ -113,7 +160,8 @@ export {
  PopoverTrigger,
  PopoverContent,
  PopoverSectionHeader,
+  PopoverCustomTrigger,
  PopoverArrowTrigger,
-  PopoverMenuItem,
  PopoverVerticalEllipseTrigger,
+  PopoverMenuItem,
 };
@@ -51,7 +51,7 @@ const SheetOverlay = React.forwardRef<
 SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;

 const sheetVariants = cva(
-  "fixed z-50 scale-100 gap-4 bg-midnight-900 shadow-lg shadow-white/10 opacity-100 border-l border-uiBorder",
+  "fixed z-50 scale-100 gap-4 bg-midnight-900 shadow-lg shadow-white/10 opacity-100 border-l border-ui-border",
  {
    variants: {
      position: {
@@ -154,7 +154,7 @@ const SheetContent = React.forwardRef<
      {...props}
    >
      <div className="grid max-h-full grid-rows-[2.75rem_1fr] overflow-hidden">
-        <div className="flex items-center gap-2 border-b border-uiBorder p-2">
+        <div className="flex items-center gap-2 border-b border-ui-border p-2">
          <SheetPrimitive.Close className="rounded-sm p-1 transition hover:bg-slate-800 disabled:pointer-events-none">
            <NamedIcon name="close" className="h-4 w-4" />
            <span className="sr-only">Close</span>
@@ -181,7 +181,7 @@ export const SheetBody = ({ className, ...props }: React.HTMLAttributes<HTMLDivE
 export const SheetHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
  <div
    className={cn(
-      "mx-4 flex shrink-0 items-center gap-4 border-b border-uiBorder py-3.5",
+      "mx-4 flex shrink-0 items-center gap-4 border-b border-ui-border py-3.5",
      className
    )}
    {...props}
@@ -194,7 +194,7 @@ export const SheetFooter = ({
  ...props
 }: React.HTMLAttributes<HTMLDivElement>) => (
  <div className={cn("shrink-0", className)} {...props}>
-    <div className="mx-4 border-t border-uiBorder py-3">{children}</div>
+    <div className="mx-4 border-t border-ui-border py-3">{children}</div>
  </div>
 );

@@ -5,7 +5,7 @@ export function Spinner({
  color = "blue",
 }: {
  className?: string;
-  color?: "blue" | "white";
+  color?: "blue" | "white" | "muted";
 }) {
  const colors = {
    blue: {
@@ -16,6 +16,10 @@ export function Spinner({
      light: "rgba(255, 255, 255, 0.4)",
      dark: "rgba(255, 255, 255)",
    },
+    muted: {
+      light: "#1C2433",
+      dark: "#3C4B62",
+    },
  };

  const currentColor = colors[color];
@@ -16,7 +16,7 @@ export const Table = forwardRef<HTMLTableElement, TableProps>(
    return (
      <div
        className={cn(
-          "overflow-x-auto whitespace-nowrap rounded-md border border-uiBorder scrollbar-thin scrollbar-track-midnight-850 scrollbar-thumb-slate-700",
+          "overflow-x-auto whitespace-nowrap rounded-md border border-ui-border scrollbar-thin scrollbar-track-midnight-850 scrollbar-thumb-slate-700",
          containerClassName,
          fullWidth && "w-full"
        )}
@@ -39,7 +39,7 @@ export const TableHeader = forwardRef<HTMLTableSectionElement, TableHeaderProps>
    return (
      <thead
        ref={ref}
-        className={cn("rounded-t-md", "relative divide-y divide-uiBorder bg-slate-850", className)}
+        className={cn("rounded-t-md", "relative divide-y divide-ui-border bg-slate-850", className)}
      >
        {children}
      </thead>
@@ -55,7 +55,7 @@ type TableBodyProps = {
 export const TableBody = forwardRef<HTMLTableSectionElement, TableBodyProps>(
  ({ className, children }, ref) => {
    return (
-      <tbody ref={ref} className={cn("relative divide-y divide-uiBorder", className)}>
+      <tbody ref={ref} className={cn("relative divide-y divide-ui-border", className)}>
        {children}
      </tbody>
    );
@@ -106,7 +106,7 @@ export const TableHeaderCell = forwardRef<HTMLTableCellElement, TableHeaderCellP
        ref={ref}
        scope="col"
        className={cn(
-          "px-4 py-3 align-middle text-xs font-normal uppercase tracking-wider text-dimmed",
+          "px-4 py-2 align-middle text-xxs font-normal uppercase tracking-wider text-dimmed",
          alignmentClassName,
          className
        )}
@@ -8,11 +8,12 @@ export type TabsProps = {
    to: string;
  }[];
  className?: string;
+  layoutId: string
 };

-export function Tabs({ tabs, className }: TabsProps) {
+export function Tabs({ tabs, className, layoutId }: TabsProps) {
  return (
-    <div className={cn(`flex flex-row gap-x-6 border-b border-uiBorder`, className)}>
+    <div className={cn(`flex flex-row gap-x-6 border-b border-ui-border`, className)}>
      {tabs.map((tab, index) => (
        <NavLink key={index} to={tab.to} className="group flex flex-col items-center pt-1" end>
          {({ isActive, isPending }) => (
@@ -26,7 +27,7 @@ export function Tabs({ tabs, className }: TabsProps) {
                {tab.label}
              </span>
              {isActive || isPending ? (
-                <motion.div layoutId="underline" className="mt-1 h-0.5 w-full bg-indigo-500" />
+                <motion.div layoutId={layoutId} className="mt-1 h-0.5 w-full bg-indigo-500" />
              ) : (
                <div className="mt-1 h-0.5 w-full bg-slate-500 opacity-0 transition duration-200 group-hover:opacity-100" />
              )}
@@ -61,4 +61,34 @@ function SimpleTooltip({
  );
 }

+export function LoginTooltip({
+  children,
+  side,
+  content,
+  className,
+}: {
+  children: React.ReactNode;
+  side: "top" | "bottom" | "left" | "right";
+  content: React.ReactNode | string;
+  className?: string;
+}) {
+  return (
+    <TooltipProvider delayDuration={2500} disableHoverableContent>
+      <Tooltip>
+        <TooltipTrigger asChild>{children}</TooltipTrigger>
+        <TooltipContent
+          className={cn(
+            "max-w-xs border-slate-800 bg-slate-900 px-5 py-4 backdrop-blur-md",
+            className
+          )}
+          side={side}
+          sideOffset={14}
+        >
+          {content}
+        </TooltipContent>
+      </Tooltip>
+    </TooltipProvider>
+  );
+}
+
 export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider, TooltipArrow, SimpleTooltip };
@@ -36,7 +36,7 @@ export function RunPanel({
          ? "border-slate-850"
          : "border-slate-900",
        onClick && "cursor-pointer",
-        onClick && !selected && "hover:border-green-500/30",
+        onClick && !selected && "hover:border-slate-500/30",
        className
      )}
      onClick={() => onClick && onClick()}
@@ -1,6 +1,7 @@
 import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
-import { BoltIcon, ForwardIcon } from "@heroicons/react/24/solid";
+import { PlayIcon } from "@heroicons/react/20/solid";
+import { BoltIcon } from "@heroicons/react/24/solid";
 import {
  Form,
  Outlet,
@@ -9,13 +10,14 @@ import {
  useNavigate,
  useNavigation,
 } from "@remix-run/react";
-import { JobRunStatus, RuntimeEnvironmentType } from "@trigger.dev/database";
+import { RuntimeEnvironmentType } from "@trigger.dev/database";
 import { useMemo } from "react";
 import { usePathName } from "~/hooks/usePathName";
+import type { RunBasicStatus } from "~/models/jobRun.server";
 import { ViewRun } from "~/presenters/RunPresenter.server";
 import { cancelSchema } from "~/routes/resources.runs.$runId.cancel";
 import { schema } from "~/routes/resources.runs.$runId.rerun";
-import { formatDuration } from "~/utils";
+import { formatDuration, formatDurationMilliseconds } from "~/utils";
 import { cn } from "~/utils/cn";
 import { runCompletedPath, runTaskPath, runTriggerPath } from "~/utils/pathBuilder";
 import { CodeBlock } from "../code/CodeBlock";
@@ -37,14 +39,7 @@ import {
 } from "../primitives/PageHeader";
 import { Paragraph } from "../primitives/Paragraph";
 import { Popover, PopoverContent, PopoverTrigger } from "../primitives/Popover";
-import {
-  RunBasicStatus,
-  RunStatusIcon,
-  RunStatusLabel,
-  hasFinished,
-  runBasicStatus,
-  runStatusTitle,
-} from "../runs/RunStatuses";
+import { RunStatusIcon, RunStatusLabel, runStatusTitle } from "../runs/RunStatuses";
 import {
  RunPanel,
  RunPanelBody,
@@ -94,8 +89,6 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
    }
  }, [pathName]);

-  const basicStatus = runBasicStatus(run.status);
-
  return (
    <PageContainer>
      <PageHeader>
@@ -105,7 +98,9 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
              to: paths.back,
              text: "Runs",
            }}
-            title={`Run #${run.number}`}
+            title={
+              typeof run.number === "number" ? `Run #${run.number}` : `Run ${run.id.slice(0, 8)}`
+            }
          />
          <PageButtons>
            {run.isTest && (
@@ -114,15 +109,15 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
                Test run
              </span>
            )}
-            {showRerun && hasFinished(run.status) && (
+            {showRerun && run.isFinished && (
              <RerunPopover
                runId={run.id}
                runsPath={paths.runsPath}
                environmentType={run.environment.type}
-                status={basicStatus}
+                status={run.basicStatus}
              />
            )}
-            {!hasFinished(run.status) && <CancelRun runId={run.id} />}
+            {!run.isFinished && <CancelRun runId={run.id} />}
          </PageButtons>
        </PageTitleRow>
        <PageInfoRow>
@@ -145,7 +140,17 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
            <PageInfoProperty
              icon={"clock"}
              label={"Duration"}
-              value={formatDuration(run.startedAt, run.completedAt)}
+              value={formatDuration(run.startedAt, run.completedAt, { style: "short" })}
+            />
+            <PageInfoProperty
+              icon={"hourglass"}
+              label={"Execution Time"}
+              value={formatDurationMilliseconds(run.executionDuration, { style: "short" })}
+            />
+            <PageInfoProperty
+              icon={"list-numbers"}
+              label={"Execution Count"}
+              value={<>{run.executionCount}</>}
            />
          </PageInfoGroup>
          <PageInfoGroup alignment="right">
@@ -159,6 +164,17 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
        <div className="grid h-full grid-cols-2 gap-2">
          <div className="flex flex-col gap-6 overflow-y-auto py-4 pl-4 pr-2 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700">
            <div>
+              {run.status === "SUCCESS" &&
+                (run.tasks.length === 0 || run.tasks.every((t) => t.noop)) && (
+                  <Callout
+                    variant={"warning"}
+                    to="https://trigger.dev/docs/documentation/concepts/tasks"
+                    className="mb-4"
+                  >
+                    This Run completed but it did not use any Tasks – this can cause unpredictable
+                    results. Read the docs to view the solution.
+                  </Callout>
+                )}
              <Header2 className="mb-2">Trigger</Header2>
              <RunPanel
                selected={selectedId === "trigger"}
@@ -199,10 +215,10 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
                  );
                })
              ) : (
-                <BlankTasks status={run.status} basicStatus={basicStatus} />
+                <BlankTasks status={run.basicStatus} />
              )}
            </div>
-            {(basicStatus === "COMPLETED" || basicStatus === "FAILED") && (
+            {(run.basicStatus === "COMPLETED" || run.basicStatus === "FAILED") && (
              <div>
                <Header2 className={cn("mb-2")}>Run Summary</Header2>
                <RunPanel
@@ -251,7 +267,9 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
                      <CodeBlock language="json" code={run.output} maxLines={10} />
                    ) : (
                      run.output === null && (
-                        <Paragraph variant="small">This Run returned nothing.</Paragraph>
+                        <Paragraph variant="small" className="mt-4">
+                          This Run returned nothing.
+                        </Paragraph>
                      )
                    )}
                  </RunPanelBody>
@@ -262,7 +280,7 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps

          {/* Detail view */}
          <div className="overflow-y-auto py-4 pr-4 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700">
-            <Header2 className="mb-2">Detail</Header2>
+            <Header2 className="mb-2">Details</Header2>
            {selectedId ? <Outlet /> : <Callout variant="info">Select a task or trigger</Callout>}
          </div>
        </div>
@@ -271,14 +289,8 @@ export function RunOverview({ run, trigger, showRerun, paths }: RunOverviewProps
  );
 }

-function BlankTasks({
-  status,
-  basicStatus,
-}: {
-  status: JobRunStatus;
-  basicStatus: RunBasicStatus;
-}) {
-  switch (basicStatus) {
+function BlankTasks({ status }: { status: RunBasicStatus }) {
+  switch (status) {
    default:
    case "COMPLETED":
      return <Paragraph variant="small">There were no tasks for this run.</Paragraph>;
@@ -313,7 +325,8 @@ function RerunPopover({

  const [form, { successRedirect }] = useForm({
    id: "rerun",
-    lastSubmission,
+    // TODO: type this
+    lastSubmission: lastSubmission as any,
    onValidate({ formData }) {
      return parse(formData, { schema });
    },
@@ -326,50 +339,52 @@ function RerunPopover({
          Rerun Job
        </Button>
      </PopoverTrigger>
-      <PopoverContent className="flex w-80 flex-col gap-2 p-4" align="end">
+      <PopoverContent className="flex min-w-[20rem] max-w-[20rem] flex-col gap-2 p-0" align="end">
        <Form method="post" action={`/resources/runs/${runId}/rerun`} {...form.props}>
          <input {...conform.input(successRedirect, { type: "hidden" })} defaultValue={runsPath} />
          {environmentType === "PRODUCTION" && (
-            <Callout variant="warning" className="mb-2">
-              This will rerun this Job in your Production environment.
-            </Callout>
+            <div className="px-4 pt-4">
+              <Callout variant="warning">
+                This will rerun this Job in your Production environment.
+              </Callout>
+            </div>
          )}

-          <div className="flex flex-col items-start gap-4 divide-y divide-slate-600">
-            <div>
+          <div className="flex flex-col items-start divide-y divide-slate-800">
+            <div className="p-4">
+              <Paragraph variant="small" className="mb-3">
+                Start a brand new Job run with the same Trigger data as this one. This will re-do
+                every Task.
+              </Paragraph>
              <Button
-                variant="primary/small"
+                variant="secondary/medium"
                type="submit"
                name={conform.INTENT}
                value="start"
                fullWidth
-                LeadingIcon={BoltIcon}
+                className="text-bright"
              >
+                <BoltIcon className="mr-1 h-3.5 w-3.5 text-bright" />
                Run again
              </Button>
-
-              <Paragraph variant="extra-small" className="mt-2">
-                Start a brand new job run with the same Trigger data as this one. This will re-do
-                every task.
-              </Paragraph>
            </div>
            {status === "FAILED" && (
-              <div className="pt-4">
+              <div className="p-4">
+                <Paragraph variant="small" className="mb-3">
+                  Continue running this Job run from where it left off. This will skip any Task that
+                  has already been completed.
+                </Paragraph>
                <Button
-                  variant="primary/small"
+                  variant="secondary/medium"
                  type="submit"
                  name={conform.INTENT}
                  value="continue"
                  fullWidth
-                  LeadingIcon={ForwardIcon}
+                  className="text-bright"
                >
-                  Retry job run
+                  <PlayIcon className="mr-1 h-3.5 w-3.5 text-bright" />
+                  Retry Job run
                </Button>
-
-                <Paragraph variant="extra-small" className="mt-2">
-                  Continue running this job run from where it left off. This will skip any task that
-                  has already been completed.
-                </Paragraph>
              </div>
            )}
          </div>
@@ -386,7 +401,8 @@ export function CancelRun({ runId }: { runId: string }) {

  const [form, { redirectUrl }] = useForm({
    id: "cancel-run",
-    lastSubmission,
+    // TODO: type this
+    lastSubmission: lastSubmission as any,
    onValidate({ formData }) {
      return parse(formData, { schema: cancelSchema });
    },
@@ -28,12 +28,24 @@ import {
 } from "../primitives/Table";
 import { TaskAttemptStatusLabel } from "./TaskAttemptStatus";
 import { TaskStatusIcon } from "./TaskStatus";
-import { ClientOnly } from "remix-utils";
+import { ClientOnly } from "remix-utils/client-only";
 import { Spinner } from "../primitives/Spinner";
 import type { DetailedTask } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam.tasks.$taskParam/route";

 export function TaskDetail({ task }: { task: DetailedTask }) {
-  const { name, description, icon, status, params, properties, output, style, attempts } = task;
+  const {
+    name,
+    description,
+    icon,
+    status,
+    params,
+    properties,
+    output,
+    outputIsUndefined,
+    style,
+    attempts,
+    noop,
+  } = task;

  const startedAt = task.startedAt ? new Date(task.startedAt) : undefined;
  const completedAt = task.completedAt ? new Date(task.completedAt) : undefined;
@@ -140,16 +152,18 @@ export function TaskDetail({ task }: { task: DetailedTask }) {
            <Paragraph variant="small">No input</Paragraph>
          )}
        </div>
-        <div className="mt-4 flex flex-col gap-2">
-          <Header3>Output</Header3>
-          {output ? (
-            <ClientOnly fallback={<Spinner />}>
-              {() => <CodeBlock code={output} maxLines={35} />}
-            </ClientOnly>
-          ) : (
-            <Paragraph variant="small">No output</Paragraph>
-          )}
-        </div>
+        {!noop && (
+          <div className="mt-4 flex flex-col gap-2">
+            <Header3>Output</Header3>
+            {output && !outputIsUndefined ? (
+              <ClientOnly fallback={<Spinner />}>
+                {() => <CodeBlock code={output} maxLines={35} />}
+              </ClientOnly>
+            ) : (
+              <Paragraph variant="small">No output</Paragraph>
+            )}
+          </div>
+        )}
      </RunPanelBody>
    </RunPanel>
  );
@@ -3,6 +3,7 @@ import {
  CheckCircleIcon,
  ClockIcon,
  ExclamationTriangleIcon,
+  PauseCircleIcon,
  WrenchIcon,
  XCircleIcon,
 } from "@heroicons/react/24/solid";
@@ -10,18 +11,6 @@ import type { JobRunStatus } from "@trigger.dev/database";
 import { cn } from "~/utils/cn";
 import { Spinner } from "../primitives/Spinner";

-export function hasFinished(status: JobRunStatus): boolean {
-  return (
-    status === "SUCCESS" ||
-    status === "FAILURE" ||
-    status === "ABORTED" ||
-    status === "TIMED_OUT" ||
-    status === "CANCELED" ||
-    status === "UNRESOLVED_AUTH" ||
-    status === "INVALID_PAYLOAD"
-  );
-}
-
 export function RunStatus({ status }: { status: JobRunStatus }) {
  return (
    <span className="flex items-center gap-1">
@@ -40,49 +29,26 @@ export function RunStatusIcon({ status, className }: { status: JobRunStatus; cla
    case "SUCCESS":
      return <CheckCircleIcon className={cn(runStatusClassNameColor(status), className)} />;
    case "PENDING":
+    case "WAITING_TO_CONTINUE":
      return <ClockIcon className={cn(runStatusClassNameColor(status), className)} />;
    case "QUEUED":
-      return <ClockIcon className={cn(runStatusClassNameColor(status), className)} />;
+    case "WAITING_TO_EXECUTE":
+      return <PauseCircleIcon className={cn(runStatusClassNameColor(status), className)} />;
+    case "PREPROCESSING":
    case "STARTED":
+    case "EXECUTING":
      return <Spinner className={cn(runStatusClassNameColor(status), className)} />;
-    case "FAILURE":
-      return <XCircleIcon className={cn(runStatusClassNameColor(status), className)} />;
    case "TIMED_OUT":
      return <ExclamationTriangleIcon className={cn(runStatusClassNameColor(status), className)} />;
    case "UNRESOLVED_AUTH":
+    case "FAILURE":
+    case "ABORTED":
    case "INVALID_PAYLOAD":
      return <XCircleIcon className={cn(runStatusClassNameColor(status), className)} />;
    case "WAITING_ON_CONNECTIONS":
      return <WrenchIcon className={cn(runStatusClassNameColor(status), className)} />;
-    case "ABORTED":
-      return <XCircleIcon className={cn(runStatusClassNameColor(status), className)} />;
-    case "PREPROCESSING":
-      return <Spinner className={cn(runStatusClassNameColor(status), className)} />;
    case "CANCELED":
      return <NoSymbolIcon className={cn(runStatusClassNameColor(status), className)} />;
-  }
-}
-
-export type RunBasicStatus = "WAITING" | "PENDING" | "RUNNING" | "COMPLETED" | "FAILED";
-
-export function runBasicStatus(status: JobRunStatus): RunBasicStatus {
-  switch (status) {
-    case "WAITING_ON_CONNECTIONS":
-    case "QUEUED":
-    case "PREPROCESSING":
-    case "PENDING":
-      return "PENDING";
-    case "STARTED":
-      return "RUNNING";
-    case "FAILURE":
-    case "TIMED_OUT":
-    case "UNRESOLVED_AUTH":
-    case "CANCELED":
-    case "ABORTED":
-    case "INVALID_PAYLOAD":
-      return "FAILED";
-    case "SUCCESS":
-      return "COMPLETED";
    default: {
      const _exhaustiveCheck: never = status;
      throw new Error(`Non-exhaustive match for value: ${status}`);
@@ -99,7 +65,12 @@ export function runStatusTitle(status: JobRunStatus): string {
    case "STARTED":
      return "In progress";
    case "QUEUED":
+    case "WAITING_TO_EXECUTE":
      return "Queued";
+    case "EXECUTING":
+      return "Executing";
+    case "WAITING_TO_CONTINUE":
+      return "Waiting";
    case "FAILURE":
      return "Failed";
    case "TIMED_OUT":
@@ -130,9 +101,12 @@ export function runStatusClassNameColor(status: JobRunStatus): string {
    case "PENDING":
      return "text-slate-500";
    case "STARTED":
+    case "EXECUTING":
+    case "WAITING_TO_CONTINUE":
+    case "WAITING_TO_EXECUTE":
      return "text-blue-500";
    case "QUEUED":
-      return "text-amber-300";
+      return "text-slate-500";
    case "FAILURE":
    case "UNRESOLVED_AUTH":
    case "INVALID_PAYLOAD":
@@ -147,5 +121,9 @@ export function runStatusClassNameColor(status: JobRunStatus): string {
      return "text-blue-500";
    case "CANCELED":
      return "text-slate-500";
+    default: {
+      const _exhaustiveCheck: never = status;
+      throw new Error(`Non-exhaustive match for value: ${status}`);
+    }
  }
 }
@@ -1,14 +1,10 @@
 import { StopIcon } from "@heroicons/react/24/outline";
 import { CheckIcon } from "@heroicons/react/24/solid";
-import { useJob } from "~/hooks/useJob";
-import { useOrganization } from "~/hooks/useOrganizations";
-import { useProject } from "~/hooks/useProject";
-import { RunList } from "~/presenters/RunListPresenter.server";
-import { formatDuration } from "~/utils";
-import { JobForPath, OrgForPath, ProjectForPath, jobRunDashboardPath } from "~/utils/pathBuilder";
+import { JobRunStatus, RuntimeEnvironmentType } from "@trigger.dev/database";
+import { formatDuration, formatDurationMilliseconds } from "~/utils";
 import { EnvironmentLabel } from "../environments/EnvironmentLabel";
-import { Callout } from "../primitives/Callout";
 import { DateTime } from "../primitives/DateTime";
+import { Paragraph } from "../primitives/Paragraph";
 import { Spinner } from "../primitives/Spinner";
 import {
  Table,
@@ -21,18 +17,19 @@ import {
  TableRow,
 } from "../primitives/Table";
 import { RunStatus } from "./RunStatuses";
-import { JobRunStatus, RuntimeEnvironmentType } from "@trigger.dev/database";

 type RunTableItem = {
  id: string;
-  number: number;
+  number: number | null;
  environment: {
    type: RuntimeEnvironmentType;
  };
+  job: { title: string; slug: string };
  status: JobRunStatus;
  startedAt: Date | null;
  completedAt: Date | null;
  createdAt: Date | null;
+  executionDuration: number;
  version: string;
  isTest: boolean;
 };
@@ -40,6 +37,7 @@ type RunTableItem = {
 type RunsTableProps = {
  total: number;
  hasFilters: boolean;
+  showJob?: boolean;
  runs: RunTableItem[];
  isLoading?: boolean;
  runsParentPath: string;
@@ -50,6 +48,7 @@ export function RunsTable({
  hasFilters,
  runs,
  isLoading = false,
+  showJob = false,
  runsParentPath,
 }: RunsTableProps) {
  return (
@@ -57,10 +56,12 @@ export function RunsTable({
      <TableHeader>
        <TableRow>
          <TableHeaderCell>Run</TableHeaderCell>
+          {showJob && <TableHeaderCell>Job</TableHeaderCell>}
          <TableHeaderCell>Env</TableHeaderCell>
          <TableHeaderCell>Status</TableHeaderCell>
          <TableHeaderCell>Started</TableHeaderCell>
          <TableHeaderCell>Duration</TableHeaderCell>
+          <TableHeaderCell>Exec Time</TableHeaderCell>
          <TableHeaderCell>Test</TableHeaderCell>
          <TableHeaderCell>Version</TableHeaderCell>
          <TableHeaderCell>Created at</TableHeaderCell>
@@ -71,19 +72,24 @@ export function RunsTable({
      </TableHeader>
      <TableBody>
        {total === 0 && !hasFilters ? (
-          <TableBlankRow colSpan={8}>
-            <NoRuns title="No Runs found for this Job" />
+          <TableBlankRow colSpan={showJob ? 10 : 9}>
+            <NoRuns title="No Runs found" />
          </TableBlankRow>
        ) : runs.length === 0 ? (
-          <TableBlankRow colSpan={8}>
+          <TableBlankRow colSpan={showJob ? 10 : 9}>
            <NoRuns title="No Runs match your filters" />
          </TableBlankRow>
        ) : (
          runs.map((run) => {
-            const path = `${runsParentPath}/${run.id}/trigger`;
+            const path = showJob
+              ? `${runsParentPath}/jobs/${run.job.slug}/runs/${run.id}/trigger`
+              : `${runsParentPath}/${run.id}/trigger`;
            return (
              <TableRow key={run.id}>
-                <TableCell to={path}>#{run.number}</TableCell>
+                <TableCell to={path}>
+                  {typeof run.number === "number" ? `#${run.number}` : "-"}
+                </TableCell>
+                {showJob && <TableCell to={path}>{run.job.slug}</TableCell>}
                <TableCell to={path}>
                  <EnvironmentLabel environment={run.environment} />
                </TableCell>
@@ -98,6 +104,11 @@ export function RunsTable({
                    style: "short",
                  })}
                </TableCell>
+                <TableCell to={path}>
+                  {formatDurationMilliseconds(run.executionDuration, {
+                    style: "short",
+                  })}
+                </TableCell>
                <TableCell to={path}>
                  {run.isTest ? (
                    <CheckIcon className="h-4 w-4 text-slate-400" />
@@ -126,12 +137,11 @@ export function RunsTable({
    </Table>
  );
 }
+
 function NoRuns({ title }: { title: string }) {
  return (
    <div className="flex items-center justify-center">
-      <Callout variant="warning" className="w-auto">
-        {title}
-      </Callout>
+      <Paragraph className="w-auto">{title}</Paragraph>
    </div>
  );
 }
@@ -0,0 +1,126 @@
+import { StopIcon } from "@heroicons/react/24/outline";
+import { CheckIcon } from "@heroicons/react/24/solid";
+import { RuntimeEnvironmentType } from "@trigger.dev/database";
+import { formatDuration } from "~/utils";
+import { EnvironmentLabel } from "../environments/EnvironmentLabel";
+import { DateTime } from "../primitives/DateTime";
+import { Paragraph } from "../primitives/Paragraph";
+import { Spinner } from "../primitives/Spinner";
+import {
+  Table,
+  TableBlankRow,
+  TableBody,
+  TableCell,
+  TableHeader,
+  TableHeaderCell,
+  TableRow,
+} from "../primitives/Table";
+import { RunStatus } from "./RunStatuses";
+
+type RunTableItem = {
+  id: string;
+  number: number;
+  environment: {
+    type: RuntimeEnvironmentType;
+  };
+  error: string | null;
+  createdAt: Date | null;
+  deliveredAt: Date | null;
+  verified: boolean;
+};
+
+type RunsTableProps = {
+  total: number;
+  hasFilters: boolean;
+  runs: RunTableItem[];
+  isLoading?: boolean;
+  runsParentPath: string;
+};
+
+export function WebhookDeliveryRunsTable({
+  total,
+  hasFilters,
+  runs,
+  isLoading = false,
+  runsParentPath,
+}: RunsTableProps) {
+  return (
+    <Table>
+      <TableHeader>
+        <TableRow>
+          <TableHeaderCell>Run</TableHeaderCell>
+          <TableHeaderCell>Env</TableHeaderCell>
+          <TableHeaderCell>Status</TableHeaderCell>
+          <TableHeaderCell>Last Error</TableHeaderCell>
+          <TableHeaderCell>Started</TableHeaderCell>
+          <TableHeaderCell>Duration</TableHeaderCell>
+          <TableHeaderCell>Verified</TableHeaderCell>
+          <TableHeaderCell>Created at</TableHeaderCell>
+        </TableRow>
+      </TableHeader>
+      <TableBody>
+        {total === 0 && !hasFilters ? (
+          <TableBlankRow colSpan={8}>
+            <NoRuns title="No Runs found for this Job" />
+          </TableBlankRow>
+        ) : runs.length === 0 ? (
+          <TableBlankRow colSpan={8}>
+            <NoRuns title="No Runs match your filters" />
+          </TableBlankRow>
+        ) : (
+          runs.map((run) => {
+            return (
+              <TableRow key={run.id}>
+                <TableCell>#{run.number}</TableCell>
+                <TableCell>
+                  <EnvironmentLabel environment={run.environment} />
+                </TableCell>
+                <TableCell>
+                  <RunStatus
+                    status={
+                      !run.deliveredAt
+                        ? "STARTED"
+                        : run.error || !run.verified
+                        ? "FAILURE"
+                        : "SUCCESS"
+                    }
+                  />
+                </TableCell>
+                <TableCell>{run.error?.slice(0, 30) ?? "–"}</TableCell>
+                <TableCell>{run.createdAt ? <DateTime date={run.createdAt} /> : "–"}</TableCell>
+                <TableCell>
+                  {formatDuration(run.createdAt, run.deliveredAt, {
+                    style: "short",
+                  })}
+                </TableCell>
+                <TableCell>
+                  {run.verified ? (
+                    <CheckIcon className="h-4 w-4 text-slate-400" />
+                  ) : (
+                    <StopIcon className="h-4 w-4 text-slate-850" />
+                  )}
+                </TableCell>
+                <TableCell>{run.createdAt ? <DateTime date={run.createdAt} /> : "–"}</TableCell>
+              </TableRow>
+            );
+          })
+        )}
+        {isLoading && (
+          <TableBlankRow
+            colSpan={8}
+            className="absolute left-0 top-0 flex h-full w-full items-center justify-center gap-2 bg-slate-900/90"
+          >
+            <Spinner /> <span className="text-dimmed">Loading…</span>
+          </TableBlankRow>
+        )}
+      </TableBody>
+    </Table>
+  );
+}
+function NoRuns({ title }: { title: string }) {
+  return (
+    <div className="flex items-center justify-center">
+      <Paragraph className="w-auto">{title}</Paragraph>
+    </div>
+  );
+}
@@ -275,6 +275,31 @@ function ButtonList({ primary }: { primary: string }) {
          </div>
        </div>
      </div>
+      <Header1 className="mb-2 mt-8">Extra Large buttons</Header1>
+      <div className="grid grid-cols-1 gap-8 border-b border-slate-700 pb-8">
+        <div className="flex flex-col gap-2">
+          <div className="flex flex-col items-start gap-2">
+            <Button variant="primary/extra-large" fullWidth>
+              <NamedIcon name={"github"} className={"mr-1.5 h-5 w-5"} />
+              Continue with GitHub
+            </Button>
+            <Button variant="secondary/extra-large" fullWidth>
+              <NamedIcon
+                name={"envelope"}
+                className={"mr-1.5 h-5 w-5 transition group-hover:text-bright"}
+              />
+              Continue with Email
+            </Button>
+            <Button variant="danger/extra-large" fullWidth>
+              <NamedIcon
+                name={"trash-can"}
+                className={"mr-1.5 h-5 w-5 text-bright transition group-hover:text-bright"}
+              />
+              This is a delete button
+            </Button>
+          </div>
+        </div>
+      </div>
      <Header1 className="mb-2 mt-8">Menu items</Header1>
      <div className="grid grid-cols-1">
        <div className="flex flex-col items-start gap-1 rounded border border-slate-800 bg-slate-850 p-1">
@@ -1,6 +1,8 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { withDesign } from "storybook-addon-designs";
 import { NamedIcon, iconNames } from "../primitives/NamedIcon";
+import { tablerIcons } from "~/utils/tablerIcons";
+import { Header1 } from "../primitives/Headers";

 const meta: Meta<typeof NamedIcons> = {
  title: "Icons",
@@ -25,17 +27,35 @@ export const Basic: Story = {

 function NamedIcons() {
  return (
-    <div className="grid grid-cols-8 gap-4">
-      {iconNames
-        .sort((a, b) => a.localeCompare(b))
-        .map((iconName) => (
-          <div key={iconName} className="flex items-center gap-2">
-            <div>
-              <NamedIcon name={iconName} className={"h-6 w-6"} />
+    <div className="flex flex-col gap-4">
+      <div>
+        <Header1 spacing>Internal</Header1>
+        <div className="grid grid-cols-8 gap-4">
+          {iconNames
+            .sort((a, b) => a.localeCompare(b))
+            .map((iconName) => (
+              <div key={iconName} className="flex items-center gap-2">
+                <div>
+                  <NamedIcon name={iconName} className={"h-6 w-6"} />
+                </div>
+                <span className="text-xs text-dimmed">{iconName}</span>
+              </div>
+            ))}
+        </div>
+      </div>
+      <div>
+        <Header1 spacing>Tabler</Header1>
+        <div className="grid grid-cols-8 gap-4">
+          {Array.from(tablerIcons).map((iconName) => (
+            <div key={iconName} className="flex items-center gap-2">
+              <div>
+                <NamedIcon name={iconName} className={"h-6 w-6 text-indigo-500"} />
+              </div>
+              <span className="text-xs text-dimmed">{iconName}</span>
            </div>
-            <span className="text-xs text-dimmed">{iconName}</span>
-          </div>
-        ))}
+          ))}
+        </div>
+      </div>
    </div>
  );
 }
@@ -6,3 +6,6 @@ export const MAX_CONCURRENT_RUNS_LIMIT = 20;
 export const PREPROCESS_RETRY_LIMIT = 2;
 export const EXECUTE_JOB_RETRY_LIMIT = 10;
 export const MAX_RUN_YIELDED_EXECUTIONS = 100;
+export const RUN_CHUNK_EXECUTION_BUFFER = 350;
+export const MAX_RUN_CHUNK_EXECUTION_LIMIT = 120000; // 2 minutes
+export const VERCEL_RESPONSE_TIMEOUT_STATUS_CODES = [408, 504];
@@ -3,6 +3,7 @@ import invariant from "tiny-invariant";
 import { z } from "zod";
 import { logger } from "./services/logger.server";
 import { env } from "./env.server";
+import { singleton } from "./utils/singleton";

 export type PrismaTransactionClient = Omit<
  PrismaClient,
@@ -47,7 +48,7 @@ export async function $transaction<R>(
    return await (prisma as PrismaClient).$transaction(fn, options);
  } catch (error) {
    if (isPrismaKnownError(error)) {
-      logger.debug("prisma.$transaction error", {
+      logger.error("prisma.$transaction error", {
        code: error.code,
        meta: error.meta,
        stack: error.stack,
@@ -66,24 +67,7 @@ export async function $transaction<R>(

 export { Prisma };

-let prisma: PrismaClient;
-
-declare global {
-  var __db__: PrismaClient;
-}
-
-// this is needed because in development we don't want to restart
-// the server with every change, but we want to make sure we don't
-// create a new connection to the DB with every change either.
-// in production we'll have a single connection to the DB.
-if (process.env.NODE_ENV === "production") {
-  prisma = getClient();
-} else {
-  if (!global.__db__) {
-    global.__db__ = getClient();
-  }
-  prisma = global.__db__;
-}
+export const prisma = singleton("prisma", getClient);

 function getClient() {
  const { DATABASE_URL } = process.env;
@@ -143,7 +127,6 @@ function getClient() {
  return client;
 }

-export { prisma };
 export type { PrismaClient } from "@trigger.dev/database";

 export const PrismaErrorSchema = z.object({
@@ -1,6 +1,9 @@
 import { H } from "@highlight-run/node";
-import type { DataFunctionArgs, EntryContext, Headers } from "@remix-run/node"; // or cloudflare/deno
-import { Response } from "@remix-run/node"; // or cloudflare/deno
+import {
+  createReadableStreamFromReadable,
+  type DataFunctionArgs,
+  type EntryContext,
+} from "@remix-run/node"; // or cloudflare/deno
 import { RemixServer } from "@remix-run/react";
 import { parseAcceptLanguage } from "intl-parse-accept-language";
 import isbot from "isbot";
@@ -13,6 +16,8 @@ import {
  OperatingSystemPlatform,
 } from "./components/primitives/OperatingSystemProvider";
 import { env } from "./env.server";
+import { getSharedSqsEventConsumer } from "./services/events/sqsEventConsumer";
+import { singleton } from "./utils/singleton";

 const ABORT_DELAY = 30000;

@@ -36,7 +41,7 @@ export default function handleRequest(
  // response to render before sending it to the client. This
  // ensures that bots can see the full page content.
  if (isbot(request.headers.get("user-agent"))) {
-    return serveTheBots(
+    return handleBotRequest(
      request,
      responseStatusCode,
      responseHeaders,
@@ -46,7 +51,7 @@ export default function handleRequest(
    );
  }

-  return serveBrowsers(
+  return handleBrowserRequest(
    request,
    responseStatusCode,
    responseHeaders,
@@ -56,7 +61,7 @@ export default function handleRequest(
  );
 }

-function serveTheBots(
+function handleBotRequest(
  request: Request,
  responseStatusCode: number,
  responseHeaders: Headers,
@@ -65,76 +70,97 @@ function serveTheBots(
  platform: OperatingSystemPlatform
 ) {
  return new Promise((resolve, reject) => {
+    let shellRendered = false;
    const { pipe, abort } = renderToPipeableStream(
      <OperatingSystemContextProvider platform={platform}>
        <LocaleContextProvider locales={locales}>
-          <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />
+          <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
        </LocaleContextProvider>
      </OperatingSystemContextProvider>,
      {
-        // Use onAllReady to wait for the entire document to be ready
        onAllReady() {
-          responseHeaders.set("Content-Type", "text/html; charset=utf-8");
-          let body = new PassThrough();
-          pipe(body);
-          resolve(
-            new Response(body, {
-              status: responseStatusCode,
-              headers: responseHeaders,
-            })
-          );
-        },
-        onShellError(err: unknown) {
-          reject(err);
-        },
-      }
-    );
-    setTimeout(abort, ABORT_DELAY);
-  });
-}
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");

-function serveBrowsers(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  locales: string[],
-  platform: OperatingSystemPlatform
-) {
-  return new Promise((resolve, reject) => {
-    let didError = false;
-    let shellReady = false;
-    const { pipe, abort } = renderToPipeableStream(
-      <OperatingSystemContextProvider platform={platform}>
-        <LocaleContextProvider locales={locales}>
-          <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />
-        </LocaleContextProvider>
-      </OperatingSystemContextProvider>,
-      {
-        // use onShellReady to wait until a suspense boundary is triggered
-        onShellReady() {
-          shellReady = true;
-          responseHeaders.set("Content-Type", "text/html; charset=utf-8");
-          let body = new PassThrough();
-          pipe(body);
          resolve(
-            new Response(body, {
-              status: didError ? 500 : responseStatusCode,
+            new Response(stream, {
              headers: responseHeaders,
+              status: responseStatusCode,
            })
          );
+
+          pipe(body);
        },
-        onShellError(err: unknown) {
-          reject(err);
+        onShellError(error: unknown) {
+          reject(error);
        },
        onError(error: unknown) {
-          didError = true;
-          if (shellReady) {
-            logError(error, request);
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
          }
        },
      }
    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+
+function handleBrowserRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  locales: string[],
+  platform: OperatingSystemPlatform
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <OperatingSystemContextProvider platform={platform}>
+        <LocaleContextProvider locales={locales}>
+          <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />
+        </LocaleContextProvider>
+      </OperatingSystemContextProvider>,
+      {
+        onShellReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set("Content-Type", "text/html");
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            })
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      }
+    );
+
    setTimeout(abort, ABORT_DELAY);
  });
 }
@@ -166,3 +192,5 @@ function logError(error: unknown, request?: Request) {
  }
  console.error(error);
 }
+
+const sqsEventConsumer = singleton("sqsEventConsumer", getSharedSqsEventConsumer);
@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { SecretStoreOptionsSchema } from "./services/secrets/secretStore.server";
+import { isValidRegex } from "./utils/regex";

 const EnvironmentSchema = z.object({
  NODE_ENV: z.union([z.literal("development"), z.literal("production"), z.literal("test")]),
@@ -10,17 +11,14 @@ const EnvironmentSchema = z.object({
  SESSION_SECRET: z.string(),
  MAGIC_LINK_SECRET: z.string(),
  ENCRYPTION_KEY: z.string(),
+  WHITELISTED_EMAILS: z
+    .string()
+    .refine(isValidRegex, "WHITELISTED_EMAILS must be a valid regex.")
+    .optional(),
  REMIX_APP_PORT: z.string().optional(),
  LOGIN_ORIGIN: z.string().default("http://localhost:3030"),
  APP_ORIGIN: z.string().default("http://localhost:3030"),
-  APP_ENV: z
-    .union([
-      z.literal("development"),
-      z.literal("production"),
-      z.literal("test"),
-      z.literal("staging"),
-    ])
-    .default(process.env.NODE_ENV),
+  APP_ENV: z.string().default(process.env.NODE_ENV),
  SECRET_STORE: SecretStoreOptionsSchema.default("DATABASE"),
  POSTHOG_PROJECT_KEY: z.string().optional(),
  TELEMETRY_TRIGGER_API_KEY: z.string().optional(),
@@ -40,7 +38,32 @@ const EnvironmentSchema = z.object({
  EXECUTION_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
  WORKER_ENABLED: z.string().default("true"),
  EXECUTION_WORKER_ENABLED: z.string().default("true"),
+  TASK_OPERATION_WORKER_ENABLED: z.string().default("true"),
+  TASK_OPERATION_WORKER_CONCURRENCY: z.coerce.number().int().default(10),
+  TASK_OPERATION_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
  GRACEFUL_SHUTDOWN_TIMEOUT: z.coerce.number().int().default(60000),
+  /** Optional. Only used if you use the apps/proxy */
+  AWS_SQS_REGION: z.string().optional(),
+  /** Optional. Only used if you use the apps/proxy */
+  AWS_SQS_ACCESS_KEY_ID: z.string().optional(),
+  /** Optional. Only used if you use the apps/proxy */
+  AWS_SQS_SECRET_ACCESS_KEY: z.string().optional(),
+  /** Optional. Only used if you use the apps/proxy */
+  AWS_SQS_QUEUE_URL: z.string().optional(),
+  AWS_SQS_BATCH_SIZE: z.coerce.number().int().optional().default(10),
+  DISABLE_SSE: z.string().optional(),
+
+  // Redis options
+  REDIS_HOST: z.string().optional(),
+  REDIS_READER_HOST: z.string().optional(),
+  REDIS_READER_PORT: z.coerce.number().optional(),
+  REDIS_PORT: z.coerce.number().optional(),
+  REDIS_USERNAME: z.string().optional(),
+  REDIS_PASSWORD: z.string().optional(),
+  REDIS_TLS_DISABLED: z.string().optional(),
+
+  DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(10),
+  DEFAULT_DEV_ENV_EXECUTION_ATTEMPTS: z.coerce.number().int().positive().default(1),
 });

 export type Environment = z.infer<typeof EnvironmentSchema>;
@@ -1,17 +1,17 @@
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { MatchedProject, useOptionalProject } from "./useProject";
 import { useUser } from "./useUser";

 export type ProjectJobEnvironment = MatchedProject["environments"][number];

-export function useEnvironments(matches?: RouteMatch[]) {
+export function useEnvironments(matches?: UIMatch[]) {
  const project = useOptionalProject(matches);
  if (!project) return;

  return project.environments;
 }

-export function useDevEnvironment(matches?: RouteMatch[]) {
+export function useDevEnvironment(matches?: UIMatch[]) {
  const user = useUser();
  const environments = useEnvironments(matches);
  if (!environments) return;
@@ -21,7 +21,7 @@ export function useDevEnvironment(matches?: RouteMatch[]) {
  );
 }

-export function useProdEnvironment(matches?: RouteMatch[]) {
+export function useProdEnvironment(matches?: UIMatch[]) {
  const environments = useEnvironments(matches);
  if (!environments) return;

@@ -0,0 +1,43 @@
+import { useEffect, useState } from "react";
+
+type EventSourceOptions = {
+  init?: EventSourceInit;
+  event?: string;
+  disabled?: boolean;
+};
+
+/**
+ * Subscribe to an event source and return the latest event.
+ * @param url The URL of the event source to connect to
+ * @param options The options to pass to the EventSource constructor
+ * @returns The last event received from the server
+ */
+export function useEventSource(
+  url: string | URL,
+  { event = "message", init, disabled }: EventSourceOptions = {}
+) {
+  const [data, setData] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (disabled) {
+      return;
+    }
+
+    const eventSource = new EventSource(url, init);
+    eventSource.addEventListener(event ?? "message", handler);
+
+    // rest data if dependencies change
+    setData(null);
+
+    function handler(event: MessageEvent) {
+      setData(event.data || "UNKNOWN_EVENT_DATA");
+    }
+
+    return () => {
+      eventSource.removeEventListener(event ?? "message", handler);
+      eventSource.close();
+    };
+  }, [url, event, init, disabled]);
+
+  return data;
+}
@@ -1,4 +1,4 @@
-import { ProjectJob } from "./useJobs";
+import { ProjectJob } from "~/presenters/JobListPresenter.server";
 import { useTextFilter } from "./useTextFilter";
 import { useToggleFilter } from "./useToggleFilter";

@@ -1,21 +1,21 @@
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { UseDataFunctionReturn } from "remix-typedjson";
 import invariant from "tiny-invariant";
-import type { loader } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.integrations_.$clientParam/route";
+import type { loader } from "~/routes/_app.orgs.$organizationSlug.integrations_.$clientParam/route";
 import { useTypedMatchesData } from "./useTypedMatchData";

 export type MatchedClient = UseDataFunctionReturn<typeof loader>["client"];

-export function useOptionalIntegrationClient(matches?: RouteMatch[]) {
+export function useOptionalIntegrationClient(matches?: UIMatch[]) {
  const routeMatch = useTypedMatchesData<typeof loader>({
-    id: "routes/_app.orgs.$organizationSlug.projects.$projectParam.integrations_.$clientParam",
+    id: "routes/_app.orgs.$organizationSlug.integrations_.$clientParam",
    matches,
  });

  return routeMatch?.client;
 }

-export function useIntegrationClient(matches?: RouteMatch[]) {
+export function useIntegrationClient(matches?: UIMatch[]) {
  const integration = useOptionalIntegrationClient(matches);
  invariant(integration, "Integration must be defined");
  return integration;
@@ -1,11 +1,11 @@
-import { RouteMatch, useMatches } from "@remix-run/react";
+import { UIMatch, useMatches } from "@remix-run/react";

-export function useIsProjectChildPage(matches?: RouteMatch[]) {
+export function useIsOrgChildPage(matches?: UIMatch[]) {
  if (!matches) {
    matches = useMatches();
  }

  return matches.some((matchData) => {
-    return matchData.id.startsWith("routes/_app.orgs.$organizationSlug.projects.$projectParam");
+    return matchData.id.startsWith("routes/_app.orgs.$organizationSlug");
  });
 }
@@ -2,27 +2,28 @@ import { UseDataFunctionReturn } from "remix-typedjson";
 import invariant from "tiny-invariant";
 import type { loader } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam/route";
 import { useChanged } from "./useChanged";
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { useTypedMatchesData } from "./useTypedMatchData";

 export type MatchedJob = UseDataFunctionReturn<typeof loader>["job"];

 export const jobMatchId =
  "routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam";
-export function useOptionalJob(matches?: RouteMatch[]) {
+
+export function useOptionalJob(matches?: UIMatch[]) {
  const routeMatch = useTypedMatchesData<typeof loader>({
    id: jobMatchId,
    matches,
  });

-  if (!routeMatch || !routeMatch.job) {
+  if (!routeMatch) {
    return undefined;
  }

-  return routeMatch.projectJobs.find((j) => j.id === routeMatch.job.id);
+  return routeMatch.job;
 }

-export function useJob(matches?: RouteMatch[]) {
+export function useJob(matches?: UIMatch[]) {
  const job = useOptionalJob(matches);
  invariant(job, "Job must be defined");
  return job;
@@ -1,28 +0,0 @@
-import { UseDataFunctionReturn } from "remix-typedjson";
-import invariant from "tiny-invariant";
-import type { loader } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam/route";
-import { RouteMatch } from "@remix-run/react";
-import { useTypedMatchesData } from "./useTypedMatchData";
-
-export type ProjectJob = UseDataFunctionReturn<typeof loader>["projectJobs"][number];
-
-export const jobsMatchId =
-  "routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam";
-
-// This is only used in the JobsMenu component, which is the breadcrumb job list dropdown.
-// This dropdown is only shown once you have selected a job, so we can assume that
-// the route above has loaded and we can use the data from it.
-export function useOptionalJobs(matches?: RouteMatch[]) {
-  const routeMatch = useTypedMatchesData<typeof loader>({
-    id: jobsMatchId,
-    matches,
-  });
-
-  return routeMatch?.projectJobs;
-}
-
-export function useJobs(matches?: RouteMatch[]) {
-  const jobs = useOptionalJobs(matches);
-  invariant(jobs, "Jobs must be defined");
-  return jobs;
-}
@@ -1,29 +1,29 @@
 import { UseDataFunctionReturn, useTypedRouteLoaderData } from "remix-typedjson";
 import invariant from "tiny-invariant";
 import type { loader as orgLoader } from "~/routes/_app.orgs.$organizationSlug/route";
-import type { loader as appLoader } from "~/routes/_app/route";
 import { hydrateObject, useMatchesData } from "~/utils";
 import { useChanged } from "./useChanged";
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { useTypedMatchesData } from "./useTypedMatchData";

-export type MatchedOrganization = UseDataFunctionReturn<typeof appLoader>["organizations"][number];
+export type MatchedOrganization = UseDataFunctionReturn<typeof orgLoader>["organizations"][number];
+export const organizationMatchId = "routes/_app.orgs.$organizationSlug";

-export function useOptionalOrganizations(matches?: RouteMatch[]) {
-  const data = useTypedMatchesData<typeof appLoader>({
-    id: "routes/_app",
+export function useOptionalOrganizations(matches?: UIMatch[]) {
+  const data = useTypedMatchesData<typeof orgLoader>({
+    id: "routes/_app.orgs.$organizationSlug",
    matches,
  });
  return data?.organizations;
 }

-export function useOrganizations(matches?: RouteMatch[]) {
+export function useOrganizations(matches?: UIMatch[]) {
  const orgs = useOptionalOrganizations(matches);
  invariant(orgs, "No organizations found in loader.");
  return orgs;
 }

-export function useOptionalOrganization(matches?: RouteMatch[]) {
+export function useOptionalOrganization(matches?: UIMatch[]) {
  const orgs = useOptionalOrganizations(matches);
  const org = useTypedMatchesData<typeof orgLoader>({
    id: "routes/_app.orgs.$organizationSlug",
@@ -37,13 +37,13 @@ export function useOptionalOrganization(matches?: RouteMatch[]) {
  return orgs.find((o) => o.id === org.organization.id);
 }

-export function useOrganization(matches?: RouteMatch[]) {
+export function useOrganization(matches?: UIMatch[]) {
  const org = useOptionalOrganization(matches);
  invariant(org, "No organization found in loader.");
  return org;
 }

-export function useIsNewOrganizationPage(matches?: RouteMatch[]): boolean {
+export function useIsNewOrganizationPage(matches?: UIMatch[]): boolean {
  const data = useTypedMatchesData<any>({
    id: "routes/_app.orgs.new",
    matches,
@@ -1,4 +1,4 @@
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { UseDataFunctionReturn } from "remix-typedjson";
 import invariant from "tiny-invariant";
 import type { loader } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam/route";
@@ -9,7 +9,7 @@ export type MatchedProject = UseDataFunctionReturn<typeof loader>["project"];

 export const projectMatchId = "routes/_app.orgs.$organizationSlug.projects.$projectParam";

-export function useOptionalProject(matches?: RouteMatch[]) {
+export function useOptionalProject(matches?: UIMatch[]) {
  const routeMatch = useTypedMatchesData<typeof loader>({
    id: projectMatchId,
    matches,
@@ -18,7 +18,7 @@ export function useOptionalProject(matches?: RouteMatch[]) {
  return routeMatch?.project;
 }

-export function useProject(matches?: RouteMatch[]) {
+export function useProject(matches?: UIMatch[]) {
  const project = useOptionalProject(matches);
  invariant(project, "Project must be defined");
  return project;
@@ -1,9 +1,9 @@
 import { useEffect } from "react";
-import { useEventSource } from "remix-utils";
 import { projectPath, projectStreamingPath } from "~/utils/pathBuilder";
 import { useProject } from "./useProject";
 import { useOrganization } from "./useOrganizations";
 import { useNavigate } from "@remix-run/react";
+import { useEventSource } from "./useEventSource";

 export function useProjectSetupComplete() {
  const project = useProject();
@@ -1,4 +1,4 @@
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { UseDataFunctionReturn } from "remix-typedjson";
 import invariant from "tiny-invariant";
 import type { loader as runLoader } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam/route";
@@ -7,7 +7,7 @@ import { useTypedMatchesData } from "./useTypedMatchData";

 export type MatchedRun = UseDataFunctionReturn<typeof runLoader>["run"];

-export function useOptionalRun(matches?: RouteMatch[]) {
+export function useOptionalRun(matches?: UIMatch[]) {
  const project = useOptionalProject(matches);
  const routeMatch = useTypedMatchesData<typeof runLoader>({
    id: "routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam.runs.$runParam",
@@ -21,7 +21,7 @@ export function useOptionalRun(matches?: RouteMatch[]) {
  return routeMatch.run;
 }

-export function useRun(matches?: RouteMatch[]) {
+export function useRun(matches?: UIMatch[]) {
  const run = useOptionalRun(matches);
  invariant(run, "Run must be present");
  return run;
@@ -1,4 +1,4 @@
-import { RouteMatch, useMatches } from "@remix-run/react";
+import { UIMatch, useMatches } from "@remix-run/react";
 import { RemixSerializedType, UseDataFunctionReturn, deserializeRemix } from "remix-typedjson";

 type AppData = any;
@@ -8,7 +8,7 @@ function useTypedDataFromMatches<T = AppData>({
  matches,
 }: {
  id: string;
-  matches: RouteMatch[];
+  matches: UIMatch[];
 }): UseDataFunctionReturn<T> | undefined {
  const match = matches.find((m) => m.id === id);
  return useTypedMatchData<T>(match);
@@ -19,7 +19,7 @@ export function useTypedMatchesData<T = AppData>({
  matches,
 }: {
  id: string;
-  matches?: RouteMatch[];
+  matches?: UIMatch[];
 }): UseDataFunctionReturn<T> | undefined {
  if (!matches) {
    matches = useMatches();
@@ -29,7 +29,7 @@ export function useTypedMatchesData<T = AppData>({
 }

 export function useTypedMatchData<T = AppData>(
-  match: RouteMatch | undefined
+  match: UIMatch | undefined
 ): UseDataFunctionReturn<T> | undefined {
  if (!match) {
    return undefined;
@@ -1,11 +1,11 @@
 import type { User } from "~/models/user.server";
 import { useMatchesData } from "~/utils";
 import { useChanged } from "./useChanged";
-import { RouteMatch } from "@remix-run/react";
+import { UIMatch } from "@remix-run/react";
 import { useTypedMatchesData } from "./useTypedMatchData";
 import { loader } from "~/root";

-export function useOptionalUser(matches?: RouteMatch[]): User | undefined {
+export function useOptionalUser(matches?: UIMatch[]): User | undefined {
  const routeMatch = useTypedMatchesData<typeof loader>({
    id: "root",
    matches,
@@ -14,7 +14,7 @@ export function useOptionalUser(matches?: RouteMatch[]): User | undefined {
  return routeMatch?.user ?? undefined;
 }

-export function useUser(matches?: RouteMatch[]): User {
+export function useUser(matches?: UIMatch[]): User {
  const maybeUser = useOptionalUser(matches);
  if (!maybeUser) {
    throw new Error(
@@ -0,0 +1,101 @@
+import { RuntimeEnvironmentType, type RuntimeEnvironment } from "@trigger.dev/database";
+import { prisma } from "~/db.server";
+import { customAlphabet } from "nanoid";
+
+const apiKeyId = customAlphabet(
+  "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+  12
+);
+
+type RegenerateAPIKeyInput = {
+  userId: string;
+  environmentId: string;
+};
+
+export async function regenerateApiKey({ userId, environmentId }: RegenerateAPIKeyInput) {
+  const environment = await prisma.runtimeEnvironment.findUnique({
+    where: {
+      id: environmentId,
+    },
+    include: {
+      organization: true,
+      project: true,
+    },
+  });
+
+  if (!environment) {
+    throw new Error("Environment does not exist");
+  }
+
+  // check if the user is part of the org
+  const organization = await prisma.organization.findFirst({
+    where: {
+      id: environment.organization.id,
+      members: { some: { userId } },
+    },
+  });
+
+  if (!organization) {
+    throw new Error("User does not have permission to regenerate API key");
+  }
+
+  // check if it is the user's dev environment
+  if (environment.type === RuntimeEnvironmentType.DEVELOPMENT) {
+    if (!environment.orgMemberId) {
+      throw new Error("User does not have permission to regenerate API key");
+    }
+
+    const orgMember = await prisma.orgMember.findFirst({
+      where: {
+        organizationId: organization.id,
+        userId: userId,
+        id: environment.orgMemberId,
+      },
+    });
+
+    if (!orgMember) {
+      throw new Error("User does not have permission to regenerate API key");
+    }
+  }
+
+  // generate and store new keys
+  const newApiKey = createApiKeyForEnv(environment.type);
+  const newPkApiKey = createPkApiKeyForEnv(environment.type);
+
+  const updatedEnviroment = await prisma.runtimeEnvironment.update({
+    data: {
+      apiKey: newApiKey,
+      pkApiKey: newPkApiKey,
+    },
+    where: {
+      id: environmentId,
+    },
+  });
+
+  return updatedEnviroment;
+}
+
+export function createApiKeyForEnv(envType: RuntimeEnvironment["type"]) {
+  return `tr_${envSlug(envType)}_${apiKeyId(20)}`;
+}
+
+export function createPkApiKeyForEnv(envType: RuntimeEnvironment["type"]) {
+  return `pk_${envSlug(envType)}_${apiKeyId(20)}`;
+}
+
+export function envSlug(environmentType: RuntimeEnvironment["type"]) {
+  switch (environmentType) {
+    case "DEVELOPMENT": {
+      return "dev";
+    }
+    case "PRODUCTION": {
+      return "prod";
+    }
+    case "STAGING": {
+      return "stg";
+    }
+    case "PREVIEW": {
+      return "prev";
+    }
+  }
+}
@@ -1,3 +1,4 @@
+import { VERCEL_RESPONSE_TIMEOUT_STATUS_CODES } from "~/consts";
 import { prisma } from "~/db.server";
 import { Prettify } from "~/lib.es5";

@@ -18,3 +19,34 @@ export async function findEndpoint(id: string) {
    },
  });
 }
+
+export function detectResponseIsTimeout(rawBody: string, response?: Response) {
+  if (!response) {
+    return false;
+  }
+
+  return (
+    isResponseVercelTimeout(response) ||
+    isResponseDenoDeployTimeout(rawBody, response) ||
+    isResponseCloudflareTimeout(rawBody, response)
+  );
+}
+
+function isResponseCloudflareTimeout(rawBody: string, response: Response) {
+  return (
+    response.status === 503 &&
+    rawBody.includes("Worker exceeded resource limits") &&
+    typeof response.headers.get("cf-ray") === "string"
+  );
+}
+
+function isResponseVercelTimeout(response: Response) {
+  return (
+    VERCEL_RESPONSE_TIMEOUT_STATUS_CODES.includes(response.status) ||
+    response.headers.get("x-vercel-error") === "FUNCTION_INVOCATION_TIMEOUT"
+  );
+}
+
+function isResponseDenoDeployTimeout(rawBody: string, response: Response) {
+  return response.status === 502 && rawBody.includes("TIME_LIMIT");
+}
--- a/Show More
+++ b/Show More