Fixing pnpm lock file

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/config.json

@@ -2,13 +2,10 @@
   "$schema": "https://unpkg.com/@changesets/config@2.2.0/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "fixed": [],
+  "fixed": [["@trigger.dev/*"]],
   "linked": [],
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": [
-    "webapp",
-    "emails"
-  ]
-}
+  "ignore": ["webapp", "emails", "@trigger.dev/database"]
+}

.changeset/curly-hornets-sort.md

@@ -1,11 +0,0 @@
----
-"@trigger.dev/integration-kit": patch
-"@trigger.dev/sdk": patch
-"@trigger.dev/github": patch
-"@trigger.dev/openai": patch
-"@trigger.dev/slack": patch
-"@trigger.dev/nextjs": patch
-"@trigger.dev/init": patch
----
-
-Creating the init CLI package

.changeset/dirty-needles-kneel.md

@@ -1,8 +0,0 @@
----
-"@trigger.dev/sdk": major
-"@trigger.dev/github": major
-"@trigger.dev/slack": major
-"@trigger.dev/nextjs": major
----
-
-Preparing packages for V2

.changeset/four-ligers-perform.md

@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Endpoint registration and indexing now is only initiated outside of clients

.changeset/great-meals-listen.md

@@ -1,7 +0,0 @@
----
-"@trigger.dev/sdk": patch
-"@trigger.dev/github": patch
-"@trigger.dev/nextjs": patch
----
-
-Add support for task errors and task retrying

.changeset/itchy-rockets-provide.md

@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Fixed the eventTrigger name

.changeset/modern-emus-suffer.md

@@ -1,8 +0,0 @@
----
-"@trigger.dev/sdk": patch
-"@trigger.dev/github": patch
-"@trigger.dev/openai": patch
-"@trigger.dev/slack": patch
----
-
-Added support for backgroundFetch

.changeset/pre.json

@@ -1,28 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "next",
-  "initialVersions": {
-    "webapp": "1.0.0",
-    "@trigger.dev/github": "0.2.0",
-    "@trigger.dev/slack": "0.2.0",
-    "create-trigger": "0.2.0",
-    "emails": "1.0.0",
-    "@trigger.dev/internal": "0.0.1",
-    "@trigger.dev/nextjs": "0.1.0",
-    "@trigger.dev/sdk": "1.0.0",
-    "@trigger.dev/openai": "1.0.0-next.0",
-    "@trigger.dev/database": "0.0.0",
-    "@trigger.dev/init": "0.2.0",
-    "@trigger.dev/integration-kit": "2.0.0-next.1"
-  },
-  "changesets": [
-    "curly-hornets-sort",
-    "dirty-needles-kneel",
-    "four-ligers-perform",
-    "great-meals-listen",
-    "itchy-rockets-provide",
-    "modern-emus-suffer",
-    "stupid-files-cough",
-    "tough-walls-share"
-  ]
-}

.changeset/stupid-files-cough.md

@@ -1,5 +0,0 @@
----
-"@trigger.dev/nextjs": patch
----
-
-Loosen the peer dep requirement on next

.changeset/tough-walls-share.md

@@ -1,5 +0,0 @@
----
-"@trigger.dev/nextjs": patch
----
-
-Make sure nextjs app routes have the correct types

.dockerignore

@@ -3,6 +3,7 @@
 .github
 # editor
 .idea
+.vscode
 # dependencies
 node_modules
 .pnp
@@ -34,4 +35,11 @@ cypress/screenshots
 cypress/videos
 
 apps/**/styles/tailwind.css
-packages/**/styles/tailwind.css
+packages/**/styles/tailwind.css
+
+.changeset
+examples
+CHANGESETS.md
+CONTRIBUTING.md
+README.md
+LICENSE

.env.example

@@ -0,0 +1,33 @@
+# YOU MIGHT LIKE TO MODIFY THESE VARIABLES
+SESSION_SECRET=abcdef1234
+MAGIC_LINK_SECRET=abcdef1234
+ENCRYPTION_KEY=ae13021afef0819c3a307ad487071c06 # Must be a random 16 byte hex string. You can generate an encryption key by running `openssl rand -hex 16` in your terminal
+LOGIN_ORIGIN=http://localhost:3030
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres?schema=public 
+REMIX_APP_PORT=3030
+APP_ENV=development
+APP_ORIGIN=http://localhost:3030
+NODE_ENV=development
+
+# OPTIONAL VARIABLES
+# 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=
+
+# Resend is an email service used for signing in to Trigger.dev via a Magic Link.
+# Emails will print to the console if you leave these commented out
+### Visit https://resend.com, create an account and get your API key. Then insert it below along with your From and Reply To email addresses. Visit https://resend.com/docs for more information.
+# RESEND_API_KEY=<api_key>
+# FROM_EMAIL=
+# REPLY_TO_EMAIL=
+
+# CLOUD VARIABLES
+POSTHOG_PROJECT_KEY=
+PLAIN_API_KEY= 
+CLOUD_AIRTABLE_CLIENT_ID=
+CLOUD_AIRTABLE_CLIENT_SECRET=
+CLOUD_GITHUB_CLIENT_ID=
+CLOUD_GITHUB_CLIENT_SECRET=
+CLOUD_SLACK_APP_HOST=
+CLOUD_SLACK_CLIENT_ID=
+CLOUD_SLACK_CLIENT_SECRET= 

.github/workflows/docker.yml

@@ -1,70 +0,0 @@
-name: 🚀 Publish Trigger.dev Docker
-
-on:
-  push:
-    branches:
-      - main
-      - dev-q22023
-
-permissions:
-  id-token: write
-  packages: write
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  typecheck:
-    name: ʦ TypeScript
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
-
-      - name: ⎔ Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 7.18
-
-      - name: ⎔ Setup node
-        uses: buildjet/setup-node@v3
-        with:
-          node-version: 18
-          cache: "pnpm"
-
-      - name: 📥 Download deps
-        run: pnpm install --frozen-lockfile
-
-      - name: 📀 Generate Prisma Client
-        run: pnpm run generate
-
-      - name: 🔎 Type check
-        run: pnpm run typecheck --filter webapp
-
-  publish:
-    needs: [typecheck]
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    steps:
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          tags: ghcr.io/${{ github.repository }}:latest
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:latest
-          cache-to: type=inline

.github/workflows/publish.yml

@@ -0,0 +1,127 @@
+name: 🚀 Publish Trigger.dev Docker
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v.docker.*"
+    paths:
+      - ".github/workflows/publish.yml"
+      - "packages/**"
+      - "!packages/**/*.md"
+      - "!packages/**/*.eslintrc"
+      - "apps/**"
+      - "!apps/**/*.md"
+      - "!apps/**/*.eslintrc"
+      - "integrations/**"
+      - "!integrations/**/*.md"
+      - "!integrations/**/*.eslintrc"
+      - "pnpm-lock.yaml"
+      - "pnpm-workspace.yaml"
+      - "turbo.json"
+      - "docker/Dockerfile"
+      - "docker/scripts/**"
+
+permissions:
+  id-token: write
+  packages: write
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+env:
+  AWS_REGION: us-east-1
+
+jobs:
+  typecheck:
+    name: ʦ TypeScript
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v2.2.4
+        with:
+          version: 7.18
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v3
+        with:
+          node-version: 18
+          cache: "pnpm"
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: 🔎 Type check
+        run: pnpm run typecheck --filter webapp
+
+  publish:
+    needs: [typecheck]
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
+      short_sha: ${{ steps.get_commit.outputs.sha_short }}
+    steps:
+      - 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/* ]]; 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

.github/workflows/release.yml

@@ -0,0 +1,77 @@
+name: 🦋 Changesets Release
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/release.yml"
+      - "packages/**"
+      - "!packages/**/*.md"
+      - "changesets/**"
+      - "integrations/**"
+      - "!integrations/**/*.md"
+      - "pnpm-lock.yaml"
+      - "pnpm-workspace.yaml"
+      - "turbo.json"
+
+jobs:
+  release:
+    name: 🦋 Changesets Release
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    if: |
+      github.repository == 'triggerdotdev/trigger.dev'
+    outputs:
+      published_packages: ${{ steps.changesets.outputs.publishedPackages }}
+      published: ${{ steps.changesets.outputs.published }}
+    steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.11.0
+
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v2.2.4
+        with:
+          version: 7.18
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v3
+        with:
+          node-version: 18
+          cache: "pnpm"
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: 🔎 Type check
+        run: pnpm run typecheck
+
+      - name: 🔐 Setup npm auth
+        run: |
+          echo "registry=https://registry.npmjs.org" >> ~/.npmrc
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
+
+        # This action has two responsibilities. The first time the workflow runs
+        # (initial push to the `main` branch) it will create a new branch and
+        # then open a PR with the related changes for the new version. After the
+        # PR is merged, the workflow will run again and this action will build +
+        # publish to npm.
+      - name: 🚀 PR / Publish
+        id: changesets
+        uses: changesets/action@v1
+        with:
+          version: pnpm run changeset:version
+          commit: "chore: Update version for release"
+          title: "chore: Update version for release"
+          publish: pnpm run changeset:release
+          createGithubReleases: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.infisical.json

@@ -1 +1 @@
-{"workspaceId":"63e5e42daf9a537ba8d9503c"}
+{ "workspaceId": "63e5e42daf9a537ba8d9503c" }

.prettierignore

@@ -0,0 +1,11 @@
+node_modules
+.env
+.env.local
+pnpm-lock.yaml
+tailwind.css
+.babelrc.json
+**/.react-email/
+**/storybook-static/
+**/.changeset/
+**/build/
+**/dist/

.vscode/launch.json

@@ -5,19 +5,12 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "command": "pnpm run idev --filter webapp",
+      "command": "pnpm run dev --filter webapp",
       "name": "Run webapp",
       "request": "launch",
       "type": "node-terminal",
       "cwd": "${workspaceFolder}"
     },
-    {
-      "command": "pnpm run dev --filter integrations",
-      "name": "Run integrations",
-      "request": "launch",
-      "type": "node-terminal",
-      "cwd": "${workspaceFolder}"
-    },
     {
       "type": "chrome",
       "request": "launch",

.vscode/trigger.code-workspace

@@ -1,19 +0,0 @@
-{
-  "folders": [
-    {
-      "name": "trigger.dev",
-      "path": "../"
-    },
-    {
-      "name": "Webapp",
-      "path": "../apps/webapp"
-    },
-    {
-      "name": "Integrations",
-      "path": "../apps/integrations"
-    }
-  ],
-  "settings": {
-    "vitest.commandLine": "pnpm exec vitest"
-  }
-}

.warp/triggerdotdev.yaml.example

@@ -1,73 +0,0 @@
-# Warp Launch Configuration
-#
-#
-# Use this to start a certain configuration of windows, tabs, and panes
-# Open the launch configuration palette to access and open any launch configuration
-#
-# This file defines your launch configuration
-# More on how to do so here:
-# https://docs.warp.dev/features/session-management/launch-configurations
-#
-# All launch configurations are stored under ~/.warp/launch_configurations/
-# Edit them anytime!
-#
-# You can also add commands that run on-start for your launch configurations like so:
-# ---
-# name: Example with Command
-# windows:
-#  - tabs:
-#      - layout:
-#          cwd: /Users/warp-user/project
-#          commands:
-#            - exec: code .
-
----
-name: Triggerdotdev
-windows:
-  - tabs:
-      - title: webapp
-        layout:
-          split_direction: vertical
-          panes:
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev
-              commands:
-                - exec: pnpm run build --filter webapp
-                - exec: pnpm run i-dev --filter webapp
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev/apps/webapp
-      - title: integrations
-        layout:
-          split_direction: vertical
-          panes:
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev
-              commands:
-                - exec: pnpm run dev --filter integrations
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev/apps/integrations
-      - title: ngrok
-        layout:
-          split_direction: horizontal
-          panes:
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev
-              commands:
-                - exec: ./scripts/proxy-webapp.sh <your-trigger-dev>
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev
-              commands:
-                - exec: ./scripts/proxy-pizzly.sh <your-pizzly-dev>
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev
-              commands:
-                - exec: ./scripts/proxy-wss.sh <your-wss-dev>
-      - title: wss and examples
-        layout:
-          split_direction: horizontal
-          panes:
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev/apps/wss
-              commands:
-                - exec: LOG_LEVEL=debug pnpm run dev
-            - cwd: /Users/eric/code/triggerdotdev/trigger.dev/examples
-      - title: emails
-        layout:
-          split_direction: horizontal
-          panes:
-            - cwd: /Users/eric/Work/Git/APIHero/trigger.dev/packages/emails
-              commands:
-                - exec: pnpm run dev
-            - cwd: /Users/eric/Work/Git/APIHero/trigger.dev/packages/emails

CHANGESETS.md

@@ -4,23 +4,22 @@ Trigger.dev uses [changesets](https://github.com/changesets/changesets) to manag
 
 ## Adding a changeset
 
-To add a changeset, use `pnpm run changeset:add` and follow the instructions [here](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md). Please only ever select one of our public packages when adding a changeset, which currently are:
+To add a changeset, use `pnpm run changeset:add` and follow the instructions [here](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md). Please only ever select one of our public packages when adding a changeset.
 
-- `@trigger.dev/sdk`
-- `@trigger.dev/integration-sdk`
-- `@trigger.dev/github`
-- `@trigger.dev/notion`
-- `@trigger.dev/slack`
-- `@trigger.dev/shopify`
-- `@trigger.dev/resend`
-
-## Release instructions
+## Release instructions (local only)
 
 Based on the instructions [here](https://github.com/changesets/changesets/blob/main/docs/intro-to-using-changesets.md)
 
 1. Run `pnpm run changeset:version`
 2. Run `pnpm run changeset:release`
 
+## Release instructions (CI)
+
+Please follow the best-practice of adding changesets in the same commit as the code making the change with `pnpm run changeset:add`, as it will allow our release.yml CI workflow to function properly:
+
+- Anytime new changesets are added in a commit in the `main` branch, the [release.yml](./.github/workflows/release.yml) workflow will run and will automatically create/update a PR with a fresh run of `pnpm run changeset:version`.
+- When the version PR is merged into `main`, the release.yml workflow will automatically run `pnpm run changeset:release` to build and release packages to npm.
+
 ## Pre-release instructions
 
 1. Add changesets as usual `pnpm run changeset:add`

CONTRIBUTING.md

@@ -0,0 +1,245 @@
+# Contributing to Trigger.dev
+
+Thank you for taking the time to contribute to Trigger.dev. Your involvement is not just welcomed, but we encourage it! 🚀
+
+Please take some time to read this guide to understand contributing best practices for Trigger.dev.
+
+Thank you for helping us make Trigger.dev even better! 🤩
+
+## Developing
+
+The development branch is `main`. This is the branch that all pull
+requests should be made against. The changes on the `main`
+branch are tagged into a release monthly.
+
+### Prerequisites
+
+- [Node.js](https://nodejs.org/en) version >=16.x
+- [pnpm package manager](https://pnpm.io/installation) version 7
+- [Docker](https://www.docker.com/get-started/)
+
+### Setup
+
+1. Clone the repo into a public GitHub repository or [fork the repo](https://github.com/triggerdotdev/trigger.dev/fork). If you plan to distribute the code, keep the source code public to comply with the [Apache Licence 2.0](https://github.com/triggerdotdev/trigger.dev/blob/main/LICENSE).
+
+   ```
+   git clone https://github.com/triggerdotdev/trigger.dev.git
+   ```
+
+   > If you are on windows, run the following command on gitbash with admin privileges:
+   > `git clone -c core.symlinks=true https://triggerdotdev/trigger.dev.git`
+
+2. Navigate to the project folder
+   ```
+   cd trigger.dev
+   ```
+3. Install the required packages using pnpm.
+   ```
+   pnpm i
+   ```
+4. Create your `.env` files
+   ```
+   cp .env.example .env && cp packages/database/.env.example packages/database/.env
+   ```
+5. Open the root `.env` file and generate a new value for `ENCRYPTION_KEY`:
+
+   `ENCRYPTION_KEY` is used to two-way encrypt OAuth access tokens and so you'll probably want to actually generate a unique value, and it must be a random 16 byte hex string. You can generate one with the following command:
+
+   ```sh
+   openssl rand -hex 16
+   ```
+
+   Feel free to update `SESSION_SECRET` and `MAGIC_LINK_SECRET` as well using the same method.
+
+6. Start Docker. This starts the required services like Postgres. If this is your first time using Docker, consider going through this [guide](DOCKER_INSTALLATION.md)
+   ```
+   pnpm run docker
+   ```
+7. Migrate the database
+   ```
+   pnpm run db:migrate
+   ```
+8. Build the app
+   ```
+   pnpm run build --filter webapp
+   ```
+9. Run the seed script
+   ```
+   pnpm run db:seed
+   ```
+10. Run the app. See the section below.
+
+## Running
+
+1. You can run the app with:
+
+   ```
+   pnpm run dev --filter webapp
+   ```
+
+   It should run on port `3030`: [http://localhost:3030](http://localhost:3030/)
+
+2. Once the app is running click the magic link button and enter your email.
+3. Check your terminal, the magic link email should have printed out as following:
+
+   ```sh
+   webapp:dev: Log in to Trigger.dev
+   webapp:dev:
+   webapp:dev: Click here to log in with this magic link
+   webapp:dev: [http://localhost:3030/magic?token=U2FsdGVkX18OvB0JxgaswTLCSbaRz%2FY82TN0EZWhSzFyZYwgG%2BIzKVTkeiaOtWfotPw7F8RwFzCHh53aBpMEu%2B%2B%2FItb%2FcJYh89MSjc3Pz92bevoEjqxSQ%2Ff%2BZbks09JOpqlBbYC3FzGWC8vuSVFBlxqLXxteSDLthZSUaC%2BS2LaA%2BJgp%2BLO7hgjAaC2lXbCHrM7MTgTdXOFt7i0Dvvuwz6%2BWY25RnfomZOPqDsyH0xz8Q2rzPTz0Xu53WSXrZ1hd]
+   webapp:dev:
+   webapp:dev: If you didn't try to log in, you can safely ignore this email.
+   ```
+
+   Paste the magic link shown in your terminal into your browser to login.
+
+## Adding and running migrations
+
+1. Modify packages/database/prisma/schema.prisma file
+2. Change directory to the packages/database folder
+   ```sh
+   cd packages/database
+   ```
+3. Generate the Prisma client
+
+   ```sh
+   pnpm run generate
+   ```
+
+   The above updates the prisma client generated into node_modules/.prisma/client folder. This helps with typing of relevant prisma models. It ensures typescript
+   recognizes fields added or removed from a model and type-checks appropriately.
+
+4. Create and apply the migrations
+
+   ```
+   pnpm run db:migrate:dev
+   ```
+
+   This creates a migration file and executes the migrations against your database and applies changes to the database schema(s)
+
+5. Commit generated migrations as well as changes to the schema.prisma file
+6. If you're using VSCode you may need to restart the Typescript server in the webapp to get updated type inference. Open a TypeScript file, then open the Command Palette (View > Command Palette) and run `TypeScript: Restart TS server`.
+
+## Testing CLI changes
+
+To test CLI changes, follow the steps below:
+
+1. Build the CLI and watch for changes
+
+```sh
+cd packages/cli
+pnpm run dev
+```
+
+2. Open a new Terminal window and run the webapp locally and then create a new project in the dashboard. Copy out the dev API key.
+
+3. Create a new temporary Next.js app in examples directory
+
+```sh
+pnpm create next-app@latest
+```
+
+Follow the prompts to create a TypeScript project using the App Directory.
+
+4. Then once that's finished, add the `@trigger.dev/cli` to the `devDependencies` of the newly created Next.js app's `package.json` file, like so:
+
+```json
+{
+  "devDependencies": { "@trigger.dev/cli": "workspace:*" }
+}
+```
+
+5. Open a new terminal window, navigate into the example, and initialize the CLI:
+
+```sh
+cd examples/your-newly-created-nextjs-project
+pnpm i
+pnpm exec trigger-cli init
+```
+
+6. When prompted, select `self-hosted` and enter `localhost:3030` for your local version of the webapp. When asked for an API key, use the key you copied earlier.
+
+7. Run the CLI
+
+```sh
+pnpm exec trigger-cli dev
+```
+
+8. After running the CLI, start your newly created Next.js project. You should now be able to see the changes.
+
+9. Please remember to delete the temporary project you created after you've tested the changes, and before you raise a PR.
+
+## Add sample jobs
+
+The [examples/jobs-starter](./examples/jobs-starter/) project defines simple jobs you can get started with.
+
+1. `cd` into `examples/jobs-starter`
+2. Create a `.env.local` file with the following content,
+   replacing `[TRIGGER_DEV_API_KEY]` with an actual key:
+
+```env
+TRIGGER_API_KEY=[TRIGGER_DEV_API_KEY]
+TRIGGER_API_URL=http://localhost:3030
+```
+
+`TRIGGER_API_URL` is used to configure the URL for your Trigger.dev instance,
+where the jobs will be registered.
+
+3. Run the `jobs-starter` app:
+
+```sh
+pnpm dev
+```
+
+4. Navigate to your trigger.dev instance ([http://localhost:3030](http://localhost:3030/)), to see the jobs.
+   You can use the test feature to trigger them.
+
+## Making a pull request
+
+**If you get errors, be sure to fix them before committing.**
+
+- Be sure to [check the "Allow edits from maintainers" option](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) while creating you PR.
+- If your PR refers to or fixes an issue, be sure to add `refs #XXX` or `fixes #XXX` to the PR description. Replacing `XXX` with the respective issue number. See more about [Linking a pull request to an issue
+  ](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+- Be sure to fill the PR Template accordingly.
+
+## Adding changesets
+
+We use [changesets](https://github.com/changesets/changesets) to manage our package versions and changelogs. If you've never used changesets before, first read [their guide here](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md).
+
+If you are contributing a change to any packages in this monorepo (anything in either the `/packages` or `/integrations` directories), then you will need to add a changeset to your Pull Requests before they can be merged.
+
+To add a changeset, run the following command in the root of the repo
+
+```sh
+pnpm run changeset:add
+```
+
+Here's an example of creating a `patch` changeset for the `@trigger.dev/github` and `@trigger.dev/slack` packages (click to view):
+
+[![asciicast](https://asciinema.org/a/599228.svg)](https://asciinema.org/a/599228)
+
+You will be prompted to select which packages to include in the changeset. Only select the packages that you have made changes for.
+
+Most of the time the changes you'll make are likely to be categorized as patch releases. If you feel like there is the need for a minor or major release of the package based on the changes being made, add the changeset as such and it will be discussed during PR review.
+
+## Troubleshooting
+
+### EADDRINUSE: address already in use :::3030
+
+When receiving the following error message:
+
+```sh
+webapp:dev: Error: listen EADDRINUSE: address already in use :::3030
+```
+
+The process running on port `3030` should be destroyed.
+
+1. Get the `PID` of the process running on PORT `3030`
+   ```sh
+   lsof -i :3030
+   ```
+2. Kill the process
+   ```sh
+   sudo kill -9 <PID>
+   ```

DEPLOYMENT.md

@@ -1,32 +0,0 @@
-# Trigger.dev Deployment Guide
-
-## StreamNative Cloud - Hosted Pulsar
-
-### Generic client credentials
-
-```sh
-snctl auth export-service-account webapp --key-file webapp-credentials.json
-snctl auth export-service-account websocketserver --key-file wss-credentials.json
-```
-
-### Topics
-
-#### Triggers (`persistent://triggerdotdev/workflows/triggers`)
-
-Events that trigger workflows to run. These are sent by the "platform" and read by the Web Socket Servers, which then coordinate with the hosts for running the workflows
-
-#### Run Commands (`persistent://triggerdotdev/workflows/run-commands`)
-
-These are events that come from hosts and are published by the Web Socket Servers, e.g. Sending Integration Requests, Sending Logs, Initializing a Delay
-
-#### Run Command Responses (`persistent://triggerdotdev/workflows/run-command-responses`)
-
-These are events that come from the platform and are read by the Web Socket Servers, to resolve or reject a previous Run Command
-
-#### Integration Requests (`persistent://triggerdotdev/queues/integration-requests`)
-
-This is an internal queue used by the platform to perform integration requests, and retry them.
-
-#### App Task Queue (`persistent://triggerdotdev/queues/background-tasks`)
-
-This is an internal queue used by the platform to do tasks in a queue. Basically a background job system.

DEVELOPMENT.md

@@ -1,231 +0,0 @@
-# Initial setup
-
-## Prerequisites
-
-### Pulsar requirements
-
-1. Ensure you have Homebrew installed by running `which brew` in terminal. If it's not found then you should install it: https://brew.sh/. Run `which brew` again to check it's found. If it's not you may need to [add it your path](https://stackoverflow.com/questions/36657321/after-installing-homebrew-i-get-zsh-command-not-found-brew)
-
-2. Run `brew install libpulsar` to install the C++ libraries that the pulsar-client depends on
-
-3. Make sure you have Python installed on your machine by running `which python3` in terminal.
-
-4. If python isn't found then you should install it: https://www.python.org/downloads/. In a new terminal window run `which python3` again.
-
-5. Run `npm config set python /the/path/from/the/which/python3/command` inserting the path from step 2 or 3
-
-6. Install node-gyp: `npm install -g node-gyp`
-
-7. Make sure you have the Xcode command line tools installed by running `xcode-select --install` from the terminal. If it says they're already installed then you're set.
-
-8. Run this in the terminal:
-
-```sh
-export CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:$(brew --prefix)/include"
-export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
-export PULSAR_CPP_DIR=/opt/homebrew/Cellar/libpulsar/3.1.0
-```
-
-9. Run `pnpm install` in the same terminal window.
-
-## Building and running the webapp
-
-> **Warning**
-> All the following commands should be launched from the **monorepo root directory**
-
-1. Install the dependencies.
-   ```bash
-   pnpm install
-   ```
-2. Optionally, if you are testing auth (pizzly) or webhooks (webapp) then you'll need to use ngrok to proxy internet traffic to your local machine
-
-   Get access to ngrok and then follow the instructions here to get it setup: https://ngrok.com/download (use homebrew) and make sure to authenticate.
-
-   Then run the following scripts to start proxying:
-
-   ```sh
-   ./scripts/proxy-pizzly.sh dan-pizzly-dev
-   ./scripts/proxy-webapp.sh dan-trigger-dev
-   ```
-
-3. Environment variables. You will need to create copies of the `.env.example` files in `app/webapp`
-
-   ```sh
-   cp ./apps/webapp/.env.example ./apps/webapp/.env
-   ```
-
-   Then you will need to fill in the fields with real values.
-
-   You also need to create the `pizzly-server.env` files under the `.docker` directory:
-
-   ```sh
-   cp ./.docker/pizzly-server.env.example ./.docker/pizzly-server.env
-   ```
-
-   Next, update the `AUTH_CALLBACK_URL` env var in the `pizzly-server.env` env file with the value provided to the `./scripts/proxy-pizzly.sh` command. Using the example above the `AUTH_CALLBACK_URL` would be `AUTH_CALLBACK_URL=https://dan-pizzly-dev.eu.ngrok.io/oauth/callback`.
-
-   If you aren't proxying pizzly according to step 2, then leave the `pizzly-server.env` file empty.
-
-   If you are proxying the webapp according to step 2 then in `webapp/.env`, set the `APP_ORIGIN` to the `NGROK_SUBDOMAIN` provided to the `./scripts/proxy-webapp.sh` command, e.g. `APP_ORIGIN=https://dan-trigger-dev.eu.ngrok.io`
-
-4. Start postgresql, redis, pizzly server, followed by pulsar standalone
-
-   ```bash
-   pnpm run docker:services
-   pnpm run docker:pulsar
-   ```
-
-   > **Note:** The npm script will complete while Docker sets up the container in the background. Ensure that Docker has finished and your container is running before proceeding.
-
-5. Generate prisma schema
-   ```bash
-   pnpm run generate
-   ```
-6. Run the Prisma migration to the database
-
-   ```bash
-   pnpm run db:migrate:deploy
-   ```
-
-7. Run the first build (with dependencies via the `...` option)
-
-   ```bash
-   pnpm run build --filter=webapp...
-   ```
-
-   **Running simply `pnpm run build` will build everything, including the Remix app.**
-
-8. Run the Remix dev server
-
-```bash
-pnpm run dev --filter=webapp
-```
-
-## Attaching an API integration using Pizzly
-
-```bash
-PIZZLY_HOSTPORT=http://localhost:3004 npx pizzly config:create github github <client-id> <client-secret> "repo,user"
-```
-
-## Tests, Typechecks, Lint, Install packages...
-
-Check the `turbo.json` file to see the available pipelines.
-
-- Run the Cypress tests and Dev
-  ```bash
-  pnpm run test:e2e:dev --filter=webapp
-  ```
-- Lint everything
-  ```bash
-  pnpm run lint
-  ```
-- Typecheck the whole monorepo
-  ```bash
-  pnpm run typecheck
-  ```
-- Test the whole monorepo
-  ```bash
-  pnpm run test
-  or
-  pnpm run test:dev
-  ```
-- How to install an npm package in the Remix app ?
-  ```bash
-  pnpm add dayjs --filter webapp
-  ```
-- Tweak the tsconfigs, eslint configs in the `config-package` folder. Any package or app will then extend from these configs.
-
-# Running a workflow locally
-
-## After pulling a change
-
-1. Ensure there are no database migrations to run
-
-```bash
-pnpm run db:migrate:dev
-```
-
-2. Generate the Prisma database client
-
-```bash
-pnpm run generate
-```
-
-3. Install packages
-
-```bash
-pnpm install
-```
-
-4. Build everything
-
-```bash
-pnpm run build
-```
-
-5. Install packages again, this makes sure the local packages are linked
-
-```bash
-pnpm install
-```
-
-## Running the servers
-
-1. Ensure the docker containers are running
-
-```bash
-pnpm run docker:services
-pnpm run docker:pulsar
-```
-
-2. Run the webapp
-
-```bash
-pnpm run dev --filter=webapp
-```
-
-3. Run the Web Socket Server
-
-```bash
-pnpm run dev --filter=wss
-```
-
-4. Build all the @trigger.dev/\* packages
-
-```bash
-pnpm run dev --filter="@trigger.dev/*"
-```
-
-## Running the smoke test
-
-1. Run the smoke test workflow
-
-```bash
-cd ./examples/smoke-test
-pnpm run dev
-```
-
-2. Running the workflow requires you to send data to the local API.
-
-You can use this cURL command to send a `user.created` event. This will run the workflow and generate the corresponding logs.
-
-```bash
-curl --request POST \
-  --url http://localhost:3000/api/v1/events \
-  --header 'Authorization: Bearer trigger_dev_zC25mKNn6c0q' \
-  --header 'Content-Type: application/json' \
-  --data '{
-	"name": "user.created",
-	"payload": {
-		"id": "123"
-	}
-}'
-```
-
-## Dependency & Package graph
-
-![Dependency Graph](assets/dependencyGraph.png)
-
-## Warp Launch Configuration
-
-Setup a custom launch configuration for the Warp terminal ([docs here](https://docs.warp.dev/features/sessions/launch-configurations)) by copying the `.warp/triggerdotdev.yaml.example` file to `~/.warp/launch_configurations/triggerdotdev.yaml`. Make sure you edit the file and replace `<your-trigger-dev>` and `<your-pizzly-dev>` with your custom ngrok subdomains.

DOCKER_INSTALLATION.md

@@ -0,0 +1,126 @@
+This guide covers installing Docker and Docker Compose. If you're looking for instructions for running Trigger.dev in docker, [see here](https://github.com/triggerdotdev/docker).
+
+## Setting up Docker for the first time.
+
+In the contributing guide of Trigger.dev, there's a section that requires you to start Docker.
+
+If you don't have Docker installed on your machine, you'll run into some complications (errors).
+
+Below are the steps on how you can avoid that.
+
+First you need to setup docker-compose as it is an underlying tool that this command: `pnpm run docker` fires behind the scene.
+
+## Linux
+
+To install Docker Compose on Linux Ubuntu via the terminal, you can follow these steps:
+
+1. Update the package index on your system by running the following command:
+
+   ```shell
+   sudo apt update
+   ```
+
+2. Install the required dependencies by running the following command:
+
+   ```shell
+   sudo apt install curl
+   ```
+
+3. Download the Docker Compose binary into the `/usr/local/bin` directory using the `curl` command:
+
+   ```shell
+   sudo curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+   ```
+
+4. Set the appropriate permissions to make the `docker-compose` binary executable:
+
+   ```shell
+   sudo chmod +x /usr/local/bin/docker-compose
+   ```
+
+5. Verify that Docker Compose has been successfully installed by running the following command:
+
+   ```shell
+   docker-compose --version
+   ```
+
+   This command should display the version information of Docker Compose without any errors.
+
+After following these steps, you should have Docker Compose installed on your Ubuntu system, and you can use it by running `docker-compose` commands in the terminal.
+
+When you've verified that the `docker-compose` package is installed and you proceed to start Docker with `pnpm run docker`.
+
+You'll probably get an error similar to the one below:
+
+```shell
+Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?
+ ELIFECYCLE  Command failed with exit code 1.
+```
+
+The error message suggests that the Docker daemon is not running on your system. The Docker daemon is responsible for managing and running Docker containers.
+
+To resolve this issue, you may need to install Docker properly on your Ubuntu system. Here are the steps to install Docker on Ubuntu:
+
+1. Update the package index on your system by running the following command:
+
+   ```shell
+   sudo apt update
+   ```
+
+2. Install the necessary packages to allow apt to use repositories over HTTPS:
+
+   ```shell
+   sudo apt install apt-transport-https ca-certificates curl software-properties-common
+   ```
+
+3. Add the official Docker GPG key to your system by running the following command:
+
+   ```shell
+   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+   ```
+
+4. Add the Docker repository to the APT sources list:
+
+   ```shell
+   echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+   ```
+
+5. Update the package index again:
+
+   ```shell
+   sudo apt update
+   ```
+
+6. Install Docker by running the following command:
+
+   ```shell
+   sudo apt install docker-ce docker-ce-cli containerd.io
+   ```
+
+7. After the installation is complete, verify that Docker is installed correctly by running the following command:
+
+   ```shell
+   docker --version
+   ```
+
+   This command should display the version information of Docker without any errors.
+
+Once Docker is installed and verified, you should be able to start the Docker daemon and run the `pnpm run docker` command without encountering any issues.
+
+## Windows
+
+1. Download the Docker Desktop installer from the Docker website: [Docker Desktop for Windows](https://www.docker.com/products/docker-desktop)
+
+2. Run the installer and follow the instructions to install Docker Desktop.
+
+3. After installation, Docker Desktop should be running automatically.
+
+## macOS
+
+1. Download the Docker Desktop installer from the Docker website: [Docker Desktop for Mac](https://www.docker.com/products/docker-desktop)
+
+2. Run the installer and follow the instructions to install Docker Desktop.
+
+3. After installation, Docker Desktop should be running automatically.
+
+Please note that the instructions provided above are for the most common scenarios. For specific versions or different distributions, it's always a good idea to consult the official Docker documentation for the respective operating systems.

LICENSE

@@ -1,25 +1,201 @@
-Copyright (c) 2022 API Hero Inc.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Portions of this software are licensed as follows:
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-- All content that resides under any "ee/" directory of this repository, if such directories exists, are licensed under the license defined in "ee/LICENSE".
-- All third party components incorporated into the Trigger.dev Software are licensed under the original license provided by the owner of the applicable component.
-- Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.
+   1. Definitions.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -4,18 +4,62 @@
   <source media="(prefers-color-scheme: light)" srcset="https://imagedelivery.net/3TbraffuDZ4aEf8KWOmI_w/3f5ad4c1-c4c8-4277-b622-290e7f37bd00/public">
   <img alt="Trigger.dev logo" src="https://imagedelivery.net/3TbraffuDZ4aEf8KWOmI_w/a45d1fa2-0ae8-4a39-4409-f4f934bfae00/public">
 </picture>
+  
+### The background jobs framework for Next.js
+
+[Discord](https://discord.gg/JtBAxBr2m3) | [Website](https://trigger.dev) | [Issues](https://github.com/triggerdotdev/trigger.dev/issues) | [Docs](https://trigger.dev/docs)
 
 [![Twitter](https://img.shields.io/twitter/url/https/twitter.com/triggerdotdev.svg?style=social&label=Follow%20%40trigger.dev)](https://twitter.com/triggerdotdev)
 [![GitHub Repo stars](https://img.shields.io/github/stars/triggerdotdev/trigger.dev?style=social)](https://github.com/triggerdotdev/trigger.dev)
 
 </div>
 
-# **The background jobs framework for Next.js**
+# About Trigger.dev
 
 Create long-running jobs directly in your codebase with features like API integrations, webhooks, scheduling and delays.
 
-&nbsp;
+### Long running Jobs on serverless
 
-### _**Trigger.dev v2 is launching soon...**_
+Reliably run jobs and don’t worry about function timeouts, we handle those for you.
 
-Visit the new landing page for [Trigger.dev v2](https://trigger.dev) and [sign up for early access.](https://bcymafitv0e.typeform.com/to/QQnotGJM#source=github)
+- Auto-resume after a function timeout
+- Auto-resume after a server outage
+- Add delays of up to a year
+
+### In your codebase
+
+Create Jobs where they belong: in your codebase. Version control, localhost, test, review, and deploy like you're already used to.
+
+### Secure by design
+
+We only receive Triggers and the data you choose to send to us. You can even completely self-host the entire platform.
+
+### Don't worry about deployment
+
+Just use our SDK to write Jobs in your Next.js codebase. There's nothing extra to deploy and no CI to configure, your Jobs just connect to our cloud. Or you can always self-host.
+
+### Full visibility of every job run
+
+View every Task in every Run so you can tell exactly what happened.
+
+![image](https://www.trigger.dev/build/_assets/web-app-2QFKXFLW.png)
+
+### Built-in integrations
+
+Easily integrate with hundreds of third-party APIs – including your own. Use API keys (which never leave your server) or let us handle OAuth for you. Install our integration packages and easily subscribe to webhooks and perform common tasks, or you can easily use your existing favorite Node.JS SDKs and get resumability and idempotency through our `runTask` function.
+
+### Trigger.dev Connect (coming soon)
+
+Easily add integrations for your users.
+
+# Getting started
+
+Visit our docs [here](https://trigger.dev/docs).
+
+## Self-host
+
+We provide an official trigger.dev docker image you can use to easily self-host the platform. We're working on more extensive guides but we currently provide a [Fly.io example repository](https://github.com/triggerdotdev/fly.io) with instructions in the README for deploying and using a self-hosted instance of Trigger.dev on Fly.io.
+
+## Development
+
+To setup and develop locally or contribute to the open source project, follow our [developement guide](./CONTRIBUTING.md).

apps/webapp/.env.example

@@ -1,70 +0,0 @@
-
-TRIGGER_API_KEY=
- 
-TRIGGER_LOG_LEVEL=debug 
-
-
-
-########################################################################################## 
-# ************************************* BASICS ******************************************* 
-##########################################################################################
- 
-APP_ENV=development
- 
-APP_ORIGIN=http://localhost:3000
- 
-NODE_ENV=development
- 
-SESSION_SECRET= 
-
-
-
-######################################################################################### 
-# ************************************* LOGIN ******************************************* 
-#########################################################################################
- 
-AUTH_GITHUB_CLIENT_ID=
- 
-AUTH_GITHUB_CLIENT_SECRET=
- 
-LOGIN_ORIGIN=http://localhost:3000
- 
-MAGIC_LINK_SECRET= 
-
-
-
-############################################################################################ 
-# ************************************ OPTIONAL ******************************************** 
-############################################################################################
- 
-POSTHOG_PROJECT_KEY= 
-
-
-
-############################################################################################ 
-# ************************************ DATABASE ******************************************** 
-############################################################################################
- 
-DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres 
-
-
-
-################################################################################################ 
-# ********************************** INTEGRATIONS ********************************************** 
-################################################################################################
- 
-PIZZLY_HOST=http://localhost:3004
- 
-PIZZLY_SECRET_KEY= 
-
-
-
-######################################################################################### 
-# ************************************* EMAIL ******************************************* 
-#########################################################################################
- 
-FROM_EMAIL=
- 
-REPLY_TO_EMAIL=
- 
-RESEND_API_KEY=<api_key> 

apps/webapp/.eslintrc

@@ -1,9 +1,5 @@
 {
-  "extends": [
-    "@remix-run/eslint-config",
-    "@remix-run/eslint-config/node",
-    "prettier"
-  ],
+  "extends": ["@remix-run/eslint-config", "@remix-run/eslint-config/node", "prettier"],
   "rules": {
     "@typescript-eslint/strict-boolean-expressions": [
       "error",

apps/webapp/.gitignore

@@ -15,4 +15,6 @@ node_modules
 build-storybook.log
 .out
 .storybook-out
-storybook-static
+storybook-static
+
+/prisma/seed.js

apps/webapp/.infisical.json

@@ -1 +0,0 @@
-{"workspaceId":"63e5e42daf9a537ba8d9503c"}

apps/webapp/.storybook/main.ts

@@ -20,10 +20,7 @@ const config: StorybookConfig = {
       },
     };
   },
-  stories: [
-    "../app/**/stories/*.mdx",
-    "../app/**/stories/*.stories.@(js|jsx|ts|tsx)",
-  ],
+  stories: ["../app/**/stories/*.mdx", "../app/**/stories/*.stories.@(js|jsx|ts|tsx)"],
   addons: [
     "@storybook/addon-links",
     "@storybook/addon-essentials",

apps/webapp/.storybook/preview.tsx

@@ -35,9 +35,7 @@ const preview: Preview = {
 
       return (
         <OperatingSystemContextProvider platform="mac">
-          <LocaleContextProvider
-            locales={window.navigator.languages as string[]}
-          >
+          <LocaleContextProvider locales={window.navigator.languages as string[]}>
             <RemixStub initialEntries={["/"]} />
           </LocaleContextProvider>
         </OperatingSystemContextProvider>

apps/webapp/app/assets/icons/DynamicTriggerIcon.tsx

@@ -1,11 +1,6 @@
 export function DynamicTriggerIcon({ className }: { className?: string }) {
   return (
-    <svg
-      viewBox="0 0 21 21"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      className={className}
-    >
+    <svg viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
       <path
         fillRule="evenodd"
         clipRule="evenodd"

apps/webapp/app/assets/icons/ErrorIcon.tsx

@@ -0,0 +1,13 @@
+export function ErrorIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="10" cy="10" r="7" fill="white" />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2C14.4183 2 18 5.58172 18 10ZM10 5C10.4142 5 10.75 5.33579 10.75 5.75V10.25C10.75 10.6642 10.4142 11 10 11C9.58579 11 9.25 10.6642 9.25 10.25V5.75C9.25 5.33579 9.58579 5 10 5ZM10 15C10.5523 15 11 14.5523 11 14C11 13.4477 10.5523 13 10 13C9.44771 13 9 13.4477 9 14C9 14.5523 9.44771 15 10 15Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}

apps/webapp/app/assets/icons/WebhookIcon.tsx

@@ -1,11 +1,6 @@
 export function WebhookIcon({ className }: { className?: string }) {
   return (
-    <svg
-      className={className}
-      viewBox="0 0 190 180"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
+    <svg className={className} viewBox="0 0 190 180" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
         fill="currentColor"
         fillRule="evenodd"

apps/webapp/app/components/ComingSoon.tsx

@@ -1,7 +1,7 @@
 import { ReactNode } from "react";
 import { MainCenteredContainer } from "./layout/AppLayout";
-import { Header1, Header2 } from "./primitives/Headers";
-import { NamedIcon, NamedIconInBox } from "./primitives/NamedIcon";
+import { Header2 } from "./primitives/Headers";
+import { NamedIconInBox } from "./primitives/NamedIcon";
 import { Paragraph } from "./primitives/Paragraph";
 
 type ComingSoonProps = {
@@ -16,16 +16,13 @@ export function ComingSoon({ title, description, icon }: ComingSoonProps) {
       <div className="flex flex-col justify-center rounded border border-slate-800 bg-slate-850">
         <div className="flex items-center gap-2 border-b border-slate-750 px-4 py-4">
           {typeof icon === "string" ? (
-            <NamedIconInBox
-              name={icon}
-              className={"h-10 w-10 bg-midnight-800"}
-            />
+            <NamedIconInBox name={icon} className={"h-10 w-10 bg-midnight-800"} />
           ) : (
             icon
           )}
-          <div className="mt-0.5 flex flex-col">
+          <div className="mt-0.5 flex flex-col gap-y-1">
             <Paragraph variant="extra-extra-small/caps">Coming soon</Paragraph>
-            <Header1 className="-mt-0.5">{title}</Header1>
+            <Header2 className="-mt-0.5">{title}</Header2>
           </div>
         </div>
         <Paragraph variant="small" className="p-4">

apps/webapp/app/components/ErrorDisplay.tsx

@@ -0,0 +1,50 @@
+import { isRouteErrorResponse, useRouteError } from "@remix-run/react";
+import { LinkButton } from "./primitives/Buttons";
+import { Header1, Header3 } from "./primitives/Headers";
+import { friendlyErrorDisplay } from "~/utils/httpErrors";
+
+type ErrorDisplayOptions = {
+  button?: {
+    title: string;
+    to: string;
+  };
+};
+
+export function RouteErrorDisplay(options?: ErrorDisplayOptions) {
+  const error = useRouteError();
+
+  return (
+    <>
+      {isRouteErrorResponse(error) ? (
+        <ErrorDisplay
+          title={friendlyErrorDisplay(error.status, error.statusText).title}
+          message={
+            error.data.message ?? friendlyErrorDisplay(error.status, error.statusText).message
+          }
+          {...options}
+        />
+      ) : error instanceof Error ? (
+        <ErrorDisplay title={error.name} message={error.message} {...options} />
+      ) : (
+        <ErrorDisplay title="Oops" message={JSON.stringify(error)} {...options} />
+      )}
+    </>
+  );
+}
+
+type DisplayOptionsProps = {
+  title: string;
+  message?: string;
+} & ErrorDisplayOptions;
+
+export function ErrorDisplay({ title, message, button }: DisplayOptionsProps) {
+  return (
+    <div className="p-4">
+      <Header1 className="mb-4 border-b border-slate-800 pb-4">{title}</Header1>
+      {message && <Header3>{message}</Header3>}
+      <LinkButton to={button ? button.to : "/"} variant="primary/medium" className="mt-8">
+        {button ? button.title : "Home"}
+      </LinkButton>
+    </div>
+  );
+}

apps/webapp/app/components/Feedback.tsx

@@ -1,14 +1,8 @@
 import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
-import { ChatBubbleLeftRightIcon } from "@heroicons/react/24/solid";
-import {
-  Form,
-  useActionData,
-  useLocation,
-  useNavigation,
-} from "@remix-run/react";
-import { useState } from "react";
-import { feedbackTypeLabel, schema } from "~/routes/resources.feedback";
+import { Form, useActionData, useLocation, useNavigation } from "@remix-run/react";
+import { ReactNode, useState } from "react";
+import { FeedbackType, feedbackTypeLabel, schema } from "~/routes/resources.feedback";
 import { Button } from "./primitives/Buttons";
 import { Fieldset } from "./primitives/Fieldset";
 import { FormButtons } from "./primitives/FormButtons";
@@ -24,16 +18,15 @@ import {
   SelectTrigger,
   SelectValue,
 } from "./primitives/Select";
-import {
-  Sheet,
-  SheetBody,
-  SheetContent,
-  SheetHeader,
-  SheetTrigger,
-} from "./primitives/Sheet";
+import { Sheet, SheetBody, SheetContent, SheetHeader, SheetTrigger } from "./primitives/Sheet";
 import { TextArea } from "./primitives/TextArea";
 
-export function Feedback() {
+type FeedbackProps = {
+  button: ReactNode;
+  defaultValue?: FeedbackType;
+};
+
+export function Feedback({ button, defaultValue = "bug" }: FeedbackProps) {
   const [open, setOpen] = useState(false);
   const location = useLocation();
   const lastSubmission = useActionData();
@@ -58,31 +51,21 @@ export function Feedback() {
 
   return (
     <Sheet open={open} onOpenChange={setOpen}>
-      <SheetTrigger asChild={true}>
-        <Button
-          variant="secondary/small"
-          LeadingIcon={ChatBubbleLeftRightIcon}
-          shortcut={{ key: "f" }}
-        >
-          Send us feedback
-        </Button>
-      </SheetTrigger>
+      <SheetTrigger asChild={true}>{button}</SheetTrigger>
       <SheetContent size="sm">
-        <SheetHeader className="justify-between">Give us feedback</SheetHeader>
+        <SheetHeader className="justify-between">Help & feedback</SheetHeader>
         <SheetBody>
           <Paragraph variant="small" className="mb-4">
-            We'd love to hear your feedback, good, bad or ugly.
+            Use this form to ask for help or give us feedback. We read every message and will get
+            back to you as soon as we can.
           </Paragraph>
           <Form method="post" action="/resources/feedback" {...form.props}>
             <Fieldset>
-              <input
-                value={location.pathname}
-                {...conform.input(path, { type: "hidden" })}
-              />
+              <input value={location.pathname} {...conform.input(path, { type: "hidden" })} />
               <InputGroup>
-                <Label>What kind of feedback do you have?</Label>
+                <Label>How can we help?</Label>
                 <SelectGroup>
-                  <Select {...conform.input(feedbackType)} defaultValue={"bug"}>
+                  <Select {...conform.input(feedbackType)} defaultValue={defaultValue}>
                     <SelectTrigger size="medium" width="full">
                       <SelectValue placeholder="Type" />
                     </SelectTrigger>
@@ -95,9 +78,7 @@ export function Feedback() {
                     </SelectContent>
                   </Select>
                 </SelectGroup>
-                <FormError id={feedbackType.errorId}>
-                  {feedbackType.error}
-                </FormError>
+                <FormError id={feedbackType.errorId}>{feedbackType.error}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label>Message</Label>

apps/webapp/app/components/HighlightInit.tsx

@@ -0,0 +1,14 @@
+import { H, HighlightOptions } from "highlight.run";
+import { useEffect } from "react";
+
+interface Props extends HighlightOptions {
+  projectId?: string;
+}
+
+export function HighlightInit({ projectId, ...highlightOptions }: Props) {
+  useEffect(() => {
+    projectId && H.init(projectId, highlightOptions);
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return null;
+}

apps/webapp/app/components/ImpersonationBanner.tsx

@@ -2,17 +2,12 @@ import { Form } from "@remix-run/react";
 import { Paragraph } from "./primitives/Paragraph";
 import { Button } from "./primitives/Buttons";
 
-export function ImpersonationBanner({
-  impersonationId,
-}: {
-  impersonationId: string;
-}) {
+export function ImpersonationBanner({ impersonationId }: { impersonationId: string }) {
   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>
+        You are impersonating <span className="font-semibold">{impersonationId}</span>
       </Paragraph>
       <Form
         action="/resources/impersonation"

apps/webapp/app/components/NoMobileOverlay.tsx

@@ -10,9 +10,7 @@ export function NoMobileOverlay() {
         <div className="absolute mx-8 flex flex-col items-center gap-6 rounded-lg bg-slate-850 px-8 py-10 text-center">
           <XMarkIcon className="absolute top-14 h-8 w-8 text-rose-600" />
           <DevicePhoneMobileIcon className="h-16 w-16 text-slate-500" />
-          <Paragraph>
-            Trigger.dev is currently only available on desktop.
-          </Paragraph>
+          <Paragraph>Trigger.dev is currently only available on desktop.</Paragraph>
           <LinkButton to="https://trigger.dev" variant="primary/medium">
             Back Home
           </LinkButton>

apps/webapp/app/components/UserProfilePhoto.tsx

@@ -4,13 +4,7 @@ import { cn } from "~/utils/cn";
 
 export function UserProfilePhoto({ className }: { className?: string }) {
   const user = useOptionalUser();
-  return (
-    <UserAvatar
-      avatarUrl={user?.avatarUrl}
-      name={user?.name}
-      className={className}
-    />
-  );
+  return <UserAvatar avatarUrl={user?.avatarUrl} name={user?.name} className={className} />;
 }
 
 export function UserAvatar({
@@ -23,9 +17,9 @@ export function UserAvatar({
   className?: string;
 }) {
   return avatarUrl ? (
-    <div>
+    <div className={cn("grid aspect-square place-items-center", className)}>
       <img
-        className={cn("aspect-square rounded-full p-[7%]", className)}
+        className={cn("aspect-square rounded-full p-[7%]")}
         src={avatarUrl}
         alt={name ?? "User"}
       />

apps/webapp/app/components/code/CodeBlock.tsx

@@ -2,16 +2,8 @@ import type { Language, PrismTheme } from "prism-react-renderer";
 import Highlight, { defaultProps } from "prism-react-renderer";
 import { forwardRef, useCallback, useState } from "react";
 import { cn } from "~/utils/cn";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "../primitives/Tooltip";
-import {
-  ClipboardDocumentCheckIcon,
-  ClipboardIcon,
-} from "@heroicons/react/24/solid";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
+import { ClipboardDocumentCheckIcon, ClipboardIcon } from "@heroicons/react/24/solid";
 import { Clipboard, ClipboardCheck, ClipboardCheckIcon } from "lucide-react";
 
 //This is a fork of https://github.com/mantinedev/mantine/blob/master/src/mantine-prism/src/Prism/Prism.tsx
@@ -193,9 +185,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
     const maxLineWidth = lineCount.toString().length;
     let maxHeight: string | undefined = undefined;
     if (maxLines && lineCount > maxLines) {
-      maxHeight = `calc(${
-        (maxLines + extraLinesWhenClipping) * 0.75 * 1.625
-      }rem + 1.5rem )`;
+      maxHeight = `calc(${(maxLines + extraLinesWhenClipping) * 0.75 * 1.625}rem + 1.5rem )`;
     }
 
     const highlightLines = highlightedRanges?.flatMap(([start, end]) =>
@@ -204,10 +194,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
 
     return (
       <div
-        className={cn(
-          "relative overflow-hidden rounded-md border border-slate-800",
-          className
-        )}
+        className={cn("relative overflow-hidden rounded-md border border-slate-800", className)}
         style={{
           backgroundColor: theme.plain.backgroundColor,
         }}
@@ -226,9 +213,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
                 className={cn(
                   "absolute  right-3 z-50 transition-colors duration-100 hover:cursor-pointer",
                   showChrome ? "top-10" : "top-3",
-                  copied
-                    ? "text-emerald-500"
-                    : "text-slate-500 hover:text-slate-300"
+                  copied ? "text-emerald-500" : "text-slate-500 hover:text-slate-300"
                 )}
               >
                 {copied ? (
@@ -244,12 +229,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
           </TooltipProvider>
         )}
 
-        <Highlight
-          {...defaultProps}
-          theme={theme}
-          code={code}
-          language={language}
-        >
+        <Highlight {...defaultProps} theme={theme} code={code} language={language}>
           {({
             className: inheritedClassName,
             style: inheritedStyle,
@@ -285,15 +265,10 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
                     const lineNumber = index + 1;
                     const lineProps = getLineProps({ line, key: index });
 
-                    let hasAnyHighlights = highlightLines
-                      ? highlightLines.length > 0
-                      : false;
+                    let hasAnyHighlights = highlightLines ? highlightLines.length > 0 : false;
 
                     let shouldDim = hasAnyHighlights;
-                    if (
-                      hasAnyHighlights &&
-                      highlightLines?.includes(lineNumber)
-                    ) {
+                    if (hasAnyHighlights && highlightLines?.includes(lineNumber)) {
                       shouldDim = false;
                     }
 

apps/webapp/app/components/code/JSONEditor.tsx

@@ -1,9 +1,6 @@
 import { json as jsonLang } from "@codemirror/lang-json";
 import type { ViewUpdate } from "@codemirror/view";
-import type {
-  ReactCodeMirrorProps,
-  UseCodeMirror,
-} from "@uiw/react-codemirror";
+import type { ReactCodeMirrorProps, UseCodeMirror } from "@uiw/react-codemirror";
 import { useCodeMirror } from "@uiw/react-codemirror";
 import { useRef, useEffect } from "react";
 import { getEditorSetup } from "./codeMirrorSetup";

apps/webapp/app/components/code/codeMirrorSetup.ts

@@ -30,10 +30,7 @@ export function getViewerSetup(): Array<Extension> {
   return [drawSelection(), dropCursor(), bracketMatching(), lineNumbers()];
 }
 
-export function getEditorSetup(
-  showLineNumbers = true,
-  showHighlights = true
-): Array<Extension> {
+export function getEditorSetup(showLineNumbers = true, showHighlights = true): Array<Extension> {
   const options = [
     drawSelection(),
     dropCursor(),

apps/webapp/app/components/code/codeMirrorTheme.ts

@@ -36,8 +36,9 @@ export function darkTheme(): Extension {
       },
 
       ".cm-cursor, .cm-dropCursor": { borderLeftColor: cursor },
-      "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
-        { backgroundColor: selection },
+      "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection": {
+        backgroundColor: selection,
+      },
 
       ".cm-panels": { backgroundColor: darkBackground, color: ivory },
       ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
@@ -101,13 +102,7 @@ export function darkTheme(): Extension {
   const jsonHeroHighlightStyle = HighlightStyle.define([
     { tag: tags.keyword, color: violet },
     {
-      tag: [
-        tags.name,
-        tags.deleted,
-        tags.character,
-        tags.propertyName,
-        tags.macroName,
-      ],
+      tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
       color: coral,
     },
     { tag: [tags.function(tags.variableName), tags.labelName], color: malibu },
@@ -194,8 +189,9 @@ export function lightTheme(): Extension[] {
       },
 
       ".cm-cursor, .cm-dropCursor": { borderLeftColor: cursor },
-      "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
-        { backgroundColor: selection },
+      "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection": {
+        backgroundColor: selection,
+      },
 
       ".cm-panels": { backgroundColor: darkBackground, color: ivory },
       ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
@@ -259,13 +255,7 @@ export function lightTheme(): Extension[] {
   const jsonHeroHighlightStyle = tagHighlighter([
     { tag: tags.keyword, class: violet },
     {
-      tag: [
-        tags.name,
-        tags.deleted,
-        tags.character,
-        tags.propertyName,
-        tags.macroName,
-      ],
+      tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
       class: variableColor,
     },
     {

apps/webapp/app/components/helpContent/HelpContentText.tsx

@@ -0,0 +1,393 @@
+import { Link } from "@remix-run/react";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { StepNumber } from "~/components/primitives/StepNumber";
+import { useAppOrigin } from "~/hooks/useAppOrigin";
+import { useDevEnvironment } from "~/hooks/useEnvironments";
+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 { CodeBlock } from "../code/CodeBlock";
+import { InlineCode } from "../code/InlineCode";
+import { EnvironmentLabel } from "../environments/EnvironmentLabel";
+import { HelpPanelProps } from "../integrations/ApiKeyHelp";
+import { HelpInstall } from "../integrations/HelpInstall";
+import { HelpSamples } from "../integrations/HelpSamples";
+import { Button, LinkButton } from "../primitives/Buttons";
+import { Callout, variantClasses } from "../primitives/Callout";
+import {
+  ClientTabs,
+  ClientTabsContent,
+  ClientTabsList,
+  ClientTabsTrigger,
+} from "../primitives/ClientTabs";
+import { ClipboardField } from "../primitives/ClipboardField";
+import { Header2 } from "../primitives/Headers";
+import { TextLink } from "../primitives/TextLink";
+import integrationButton from "./integration-button.png";
+import selectEnvironment from "./select-environment.png";
+import selectExample from "./select-example.png";
+
+export function HowToSetupYourProject() {
+  const devEnvironment = useDevEnvironment();
+  const appOrigin = useAppOrigin();
+  return (
+    <>
+      <StepNumber stepNumber="1" title="Run the CLI 'init' command in a Next.js project" />
+      <StepContentContainer>
+        <ClientTabs defaultValue="npm">
+          <ClientTabsList>
+            <ClientTabsTrigger value={"npm"}>npm</ClientTabsTrigger>
+            <ClientTabsTrigger value={"pnpm"}>pnpm</ClientTabsTrigger>
+            <ClientTabsTrigger value={"yarn"}>yarn</ClientTabsTrigger>
+          </ClientTabsList>
+          <ClientTabsContent value={"npm"}>
+            <ClipboardField
+              variant="primary/medium"
+              className="mb-4"
+              secure={`npx @trigger.dev/cli@latest init -k ••••••••• -t ${appOrigin}`}
+              value={`npx @trigger.dev/cli@latest init -k ${devEnvironment?.apiKey} -t ${appOrigin}`}
+            />
+          </ClientTabsContent>
+          <ClientTabsContent value={"pnpm"}>
+            <ClipboardField
+              variant="primary/medium"
+              className="mb-4"
+              secure={`pnpm dlx @trigger.dev/cli@latest init -k ••••••••• -t ${appOrigin}`}
+              value={`pnpm dlx @trigger.dev/cli@latest init -k ${devEnvironment?.apiKey} -t ${appOrigin}`}
+            />
+          </ClientTabsContent>
+          <ClientTabsContent value={"yarn"}>
+            <ClipboardField
+              variant="primary/medium"
+              className="mb-4"
+              secure={`yarn dlx @trigger.dev/cli@latest init -k ••••••••• -t ${appOrigin}`}
+              value={`yarn dlx @trigger.dev/cli@latest init -k ${devEnvironment?.apiKey} -t ${appOrigin}`}
+            />
+          </ClientTabsContent>
+        </ClientTabs>
+
+        <Paragraph spacing>
+          You’ll notice a new folder in your project called 'jobs'. We’ve added a very simple
+          example Job in <InlineCode>examples.ts</InlineCode> to help you get started.
+        </Paragraph>
+      </StepContentContainer>
+      <StepNumber stepNumber="2" title="Run your Next.js app" />
+      <StepContentContainer>
+        <Paragraph>Ensure your app is running locally.</Paragraph>
+        <ClientTabs defaultValue="npm">
+          <ClientTabsList>
+            <ClientTabsTrigger value={"npm"}>npm</ClientTabsTrigger>
+            <ClientTabsTrigger value={"pnpm"}>pnpm</ClientTabsTrigger>
+            <ClientTabsTrigger value={"yarn"}>yarn</ClientTabsTrigger>
+          </ClientTabsList>
+          <ClientTabsContent value={"npm"}>
+            <ClipboardField variant="primary/medium" className="mb-4" value={`npm run dev`} />
+          </ClientTabsContent>
+          <ClientTabsContent value={"pnpm"}>
+            <ClipboardField variant="primary/medium" className="mb-4" value={`pnpm run dev`} />
+          </ClientTabsContent>
+          <ClientTabsContent value={"yarn"}>
+            <ClipboardField variant="primary/medium" className="mb-4" value={`yarn run dev`} />
+          </ClientTabsContent>
+        </ClientTabs>
+      </StepContentContainer>
+      <StepNumber stepNumber="3" title="Run the CLI 'dev' command" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          In a <strong className="text-bright">separate terminal window or tab</strong> run:
+        </Paragraph>
+        <ClientTabs defaultValue="npm">
+          <ClientTabsList>
+            <ClientTabsTrigger value={"npm"}>npm</ClientTabsTrigger>
+            <ClientTabsTrigger value={"pnpm"}>pnpm</ClientTabsTrigger>
+            <ClientTabsTrigger value={"yarn"}>yarn</ClientTabsTrigger>
+          </ClientTabsList>
+          <ClientTabsContent value={"npm"}>
+            <ClipboardField
+              variant="primary/medium"
+              className="mb-4"
+              value={`npx @trigger.dev/cli@latest dev`}
+            />
+          </ClientTabsContent>
+          <ClientTabsContent value={"pnpm"}>
+            <ClipboardField
+              variant="primary/medium"
+              className="mb-4"
+              value={`pnpm dlx @trigger.dev/cli@latest dev`}
+            />
+          </ClientTabsContent>
+          <ClientTabsContent value={"yarn"}>
+            <ClipboardField
+              variant="primary/medium"
+              className="mb-4"
+              value={`yarn dlx @trigger.dev/cli@latest dev`}
+            />
+          </ClientTabsContent>
+        </ClientTabs>
+        <Paragraph spacing variant="small">
+          If you’re not running on port 3000 you can specify the port by adding{" "}
+          <InlineCode>--port 3001</InlineCode> to the end.
+        </Paragraph>
+        <Paragraph spacing variant="small">
+          You should leave the <InlineCode>dev</InlineCode> command running when you're developing.
+        </Paragraph>
+      </StepContentContainer>
+      <StepNumber stepNumber="4" title="Check for Jobs" />
+      <StepContentContainer>
+        <Paragraph>
+          Once you've run the CLI command, click Refresh to view your example Job in the list.
+        </Paragraph>
+        <Button
+          variant="primary/medium"
+          className="mt-4"
+          LeadingIcon="refresh"
+          onClick={() => window.location.reload()}
+        >
+          Refresh
+        </Button>
+      </StepContentContainer>
+    </>
+  );
+}
+
+export function HowToRunYourJob() {
+  const organization = useOrganization();
+  const project = useProject();
+  const job = useJob();
+
+  return (
+    <>
+      <Callout variant="info" className="mb-6">
+        <Paragraph variant={"small"} className={variantClasses.info.textColor}>
+          Scheduled Triggers <strong>do not</strong> trigger Jobs in the DEV Environment. When
+          developing locally you should use the{" "}
+          <Link
+            to={jobTestPath(organization, project, job)}
+            className="underline underline-offset-2 transition hover:text-blue-100"
+          >
+            Test feature
+          </Link>{" "}
+          to trigger any scheduled Jobs.
+        </Paragraph>
+      </Callout>
+
+      <Paragraph spacing>There are two ways to run your Job:</Paragraph>
+
+      <StepNumber stepNumber="1" title="Trigger a test Run" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          You can perform a Run with any payload you want, or use one of our examples, on the test
+          page.
+        </Paragraph>
+        <LinkButton
+          to={jobTestPath(organization, project, job)}
+          variant={"primary/small"}
+          LeadingIcon={"beaker"}
+          leadingIconClassName="text-bright"
+        >
+          Test
+        </LinkButton>
+      </StepContentContainer>
+
+      <StepNumber stepNumber="2" title="Trigger your Job for real" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          Performing a real run depends on the type of Trigger your Job is using.
+        </Paragraph>
+
+        <LinkButton
+          to="https://trigger.dev/docs/documentation/guides/running-jobs"
+          variant={"primary/small"}
+          LeadingIcon={"docs"}
+          leadingIconClassName="text-bright"
+        >
+          How to run a Job
+        </LinkButton>
+      </StepContentContainer>
+    </>
+  );
+}
+
+export function HowToRunATest() {
+  return (
+    <>
+      <StepNumber
+        stepNumber="1"
+        title="Select an environment
+"
+      />
+      <StepContentContainer>
+        <Paragraph spacing>Select the environment you’d like the test to run against.</Paragraph>
+        <img src={selectEnvironment} className="mt-2 w-52" />
+      </StepContentContainer>
+      <StepNumber stepNumber="2" title="Write your test payload" />
+      <StepContentContainer>
+        <Paragraph spacing>
+          Write your own payload specific to your Job. Some Triggers also provide example payloads
+          that you can select from. This will populate the code editor below.
+        </Paragraph>
+        <img src={selectExample} className="mt-2 h-40" />
+      </StepContentContainer>
+      <StepNumber stepNumber="3" title="Run your test" />
+      <StepContentContainer>
+        <Paragraph spacing>When you’re happy with the payload, click Run test.</Paragraph>
+      </StepContentContainer>
+      <Callout variant="docs" to="https://trigger.dev/docs/documentation/guides/testing-jobs">
+        Learn more about running tests.
+      </Callout>
+    </>
+  );
+}
+
+export function HowToConnectAnIntegration() {
+  return (
+    <>
+      <StepNumber stepNumber="1" title="Select an API from the list" />
+      <StepContentContainer>
+        <Paragraph>
+          APIs marked with a
+          <span className="mx-2 -mt-1 inline-flex" aria-label="Trigger.dev Integration icon">
+            <IntegrationIcon />
+          </span>
+          are Trigger.dev Integrations. These Integrations make connecting to the API easier by
+          offering OAuth or API key authentication. All APIs can also be used with fetch or an SDK.
+        </Paragraph>
+        <img src={integrationButton} className="mt-2 h-10" />
+      </StepContentContainer>
+      <StepNumber stepNumber="2" title="Choose how you want to connect" />
+      <StepContentContainer>
+        <Paragraph>
+          Follow the instructions for your chosen connection method in the popover form. If no
+          Integration exists yet, you can request one by clicking the "I want an Integration"
+          button.
+        </Paragraph>
+      </StepContentContainer>
+      <StepNumber stepNumber="3" title="Your connection will appear in the list" />
+      <StepContentContainer>
+        <Paragraph>
+          Once you've connected your API, it will appear in the list of Integrations below. You can
+          view details and manage your connection by selecting it from the table.
+        </Paragraph>
+      </StepContentContainer>
+      <Callout variant={"docs"} to="https://trigger.dev/docs/integrations/introduction">
+        View the Integration docs page for more information on connecting an API using an
+        Integration or other method.
+      </Callout>
+    </>
+  );
+}
+
+export function HowToUseThisIntegration({ integration, help, integrationClient }: HelpPanelProps) {
+  return (
+    <>
+      <StepNumber stepNumber="1" title="Install the package" />
+      <StepContentContainer>
+        <HelpInstall packageName={integration.packageName} />
+      </StepContentContainer>
+      {help && (
+        <>
+          <StepNumber stepNumber="2" title="Create a Job" />
+          <StepContentContainer>
+            <HelpSamples
+              help={help}
+              integration={integration}
+              integrationClient={integrationClient}
+            />
+          </StepContentContainer>
+        </>
+      )}
+    </>
+  );
+}
+
+export function HowToUseApiKeysAndEndpoints() {
+  return (
+    <>
+      <Paragraph spacing>
+        Environments and Endpoints are used to connect your server to the Trigger.dev platform.
+      </Paragraph>
+      <Header2 spacing>Environments</Header2>
+      <Paragraph spacing>
+        Each environment has API Keys associated with it. The Server API Key is used to authenticate
+        your Jobs with the Trigger.dev platform.
+      </Paragraph>
+      <Paragraph spacing>
+        The Server API Key you use for your{" "}
+        <TextLink to="https://trigger.dev/docs/documentation/concepts/client-adaptors">
+          Client
+        </TextLink>{" "}
+        is how we know which environment to run your code against:
+      </Paragraph>
+      <CodeBlock
+        showLineNumbers={false}
+        className="mb-4"
+        code={`export const client = new TriggerClient({
+  id: "nextjs-example",
+  //this environment variable should be set to your Server DEV API Key locally,
+  //and your Server PROD API Key in production
+  apiKey: process.env.TRIGGER_API_KEY!,
+});`}
+      />
+      <StepNumber
+        stepNumber="→"
+        title={
+          <span className="flex items-center gap-x-2">
+            <span>Development</span>
+            <EnvironmentLabel environment={{ type: "DEVELOPMENT" }} />
+          </span>
+        }
+      />
+      <StepContentContainer>
+        <Paragraph>
+          The <InlineCode>DEV</InlineCode> environment should only be used for local development.
+          It’s where you can test your Jobs before deploying them to servers.
+        </Paragraph>
+        <Callout variant="warning" className="my-2">
+          Scheduled Triggers do not trigger Jobs in the DEV Environment. When you’re working locally
+          you should use the Test feature to trigger any scheduled Jobs.
+        </Callout>
+      </StepContentContainer>
+      <StepNumber
+        stepNumber="→"
+        title={
+          <span className="flex items-center gap-x-2">
+            <span>Production</span>
+            <EnvironmentLabel environment={{ type: "PRODUCTION" }} />
+          </span>
+        }
+      />
+      <StepContentContainer>
+        <Paragraph spacing>
+          The <InlineCode>PROD</InlineCode> environment is where your Jobs will run in production.
+          It’s where you can run your Jobs against real data.
+        </Paragraph>
+      </StepContentContainer>
+      <Header2 spacing>Endpoints</Header2>
+      <Paragraph spacing>
+        An Endpoint is a URL on your server that Trigger.dev can connect to. This URL is used to
+        register Jobs, start them and orchestrate runs and retries.
+      </Paragraph>
+      <Paragraph spacing>
+        <InlineCode>DEV</InlineCode> has multiple endpoints associated with it – one for each team
+        member. This allows each team member to run their own Jobs, without interfering with each
+        other.
+      </Paragraph>
+      <Paragraph spacing>
+        All other environments have just a single endpoint (with a single URL) associated with them.
+      </Paragraph>
+      <Header2 spacing>Deployment</Header2>
+      <Paragraph spacing>
+        Deployment uses Environments and Endpoints to connect your Jobs to the Trigger.dev platform.
+      </Paragraph>
+      <Callout variant="docs" to="https://trigger.dev/docs/documentation/guides/deployment">
+        Read the deployment guide to learn more.
+      </Callout>
+    </>
+  );
+}
+
+function StepContentContainer({ children }: { children: React.ReactNode }) {
+  return <div className="mb-6 ml-9 mt-1">{children}</div>;
+}

apps/webapp/app/components/integrations/ApiKeyHelp.tsx

@@ -1,44 +1,34 @@
-import {
-  ApiAuthenticationMethodApiKey,
-  Integration,
-} from "~/services/externalApis/types";
-import { Paragraph } from "../primitives/Paragraph";
-import { CodeBlock } from "../code/CodeBlock";
+import { Help, Integration } from "~/services/externalApis/types";
 import { InlineCode } from "../code/InlineCode";
-import { Header1, Header2 } from "../primitives/Headers";
-import { ClipboardField } from "../primitives/ClipboardField";
+import { Header1 } from "../primitives/Headers";
+import { Paragraph } from "../primitives/Paragraph";
+import { HelpInstall } from "./HelpInstall";
+import { HelpSamples, ReplacementData } from "./HelpSamples";
 
-export function ApiKeyHelp({
-  integration,
-  apiAuth,
-}: {
-  integration: Integration;
-  apiAuth: ApiAuthenticationMethodApiKey;
-}) {
+export type HelpPanelIntegration = Pick<Integration, "name" | "packageName" | "identifier">;
+
+export type HelpPanelProps = {
+  integration: HelpPanelIntegration;
+  help?: Help;
+  integrationClient?: ReplacementData;
+};
+
+export function ApiKeyHelp({ integration, help, integrationClient }: HelpPanelProps) {
   return (
     <div className="mt-4">
-      <Header1 className="mb-2">
-        How to use {integration.name} with API keys
-      </Header1>
+      <Header1 className="mb-2">How to use {integration.name} with API keys</Header1>
       <Paragraph spacing>
-        You can use API keys to authenticate with {integration.name}. Your API
-        keys won't leave your server, we'll never see them.
+        You can use API keys to authenticate with {integration.name}. Your API keys won't leave your
+        server, we'll never see them.
       </Paragraph>
       <Paragraph spacing>
-        First install the <InlineCode>{integration.packageName}</InlineCode>{" "}
-        package using your preferred package manager. For example:
+        First install the <InlineCode>{integration.packageName}</InlineCode> package using your
+        preferred package manager. For example:
       </Paragraph>
-      <ClipboardField
-        variant="secondary/medium"
-        value={`npm install ${integration.packageName}`}
-        className="mb-4"
-      />
-      {apiAuth.help.samples.map((sample, i) => (
-        <div key={i}>
-          <Paragraph spacing>{sample.title}</Paragraph>
-          <CodeBlock code={sample.code} className="mb-4" />
-        </div>
-      ))}
+      <HelpInstall packageName={integration.packageName} />
+      {help && (
+        <HelpSamples help={help} integration={integration} integrationClient={integrationClient} />
+      )}
     </div>
   );
 }

apps/webapp/app/components/integrations/ConnectToIntegrationSheet.tsx

@@ -1,23 +1,15 @@
 import React, { useState } from "react";
-import {
-  ApiAuthenticationMethodApiKey,
-  Integration,
-} from "~/services/externalApis/types";
+import { ApiAuthenticationMethodApiKey, Integration } from "~/services/externalApis/types";
+import { docsIntegrationPath } from "~/utils/pathBuilder";
+import { LinkButton } from "../primitives/Buttons";
 import { Header1, Header2 } from "../primitives/Headers";
 import { NamedIconInBox } from "../primitives/NamedIcon";
-import {
-  Sheet,
-  SheetBody,
-  SheetContent,
-  SheetHeader,
-  SheetTrigger,
-} from "../primitives/Sheet";
+import { Paragraph } from "../primitives/Paragraph";
 import { RadioGroup, RadioGroupItem } from "../primitives/RadioButton";
+import { Sheet, SheetBody, SheetContent, SheetHeader, SheetTrigger } from "../primitives/Sheet";
 import { ApiKeyHelp } from "./ApiKeyHelp";
 import { CustomHelp } from "./CustomHelp";
 import { SelectOAuthMethod } from "./SelectOAuthMethod";
-import { Paragraph } from "../primitives/Paragraph";
-import { LinkButton } from "../primitives/Buttons";
 
 type IntegrationMethod = "apikey" | "oauth2" | "custom";
 
@@ -26,17 +18,19 @@ export function ConnectToIntegrationSheet({
   organizationId,
   button,
   className,
-  callbackUrl
+  callbackUrl,
+  icon,
 }: {
   integration: Integration;
   organizationId: string;
   button: React.ReactNode;
   callbackUrl: string;
   className?: string;
+  icon?: string;
 }) {
-  const [integrationMethod, setIntegrationMethod] = useState<
-    IntegrationMethod | undefined
-  >(undefined);
+  const [integrationMethod, setIntegrationMethod] = useState<IntegrationMethod | undefined>(
+    undefined
+  );
 
   const authMethods = Object.values(integration.authenticationMethods);
   const hasApiKeyOption = authMethods.some((s) => s.type === "apikey");
@@ -45,19 +39,20 @@ export function ConnectToIntegrationSheet({
   return (
     <Sheet>
       <SheetTrigger className={className}>{button}</SheetTrigger>
-      <SheetContent size="lg">
+      <SheetContent size="lg" className="relative">
         <SheetHeader>
-          <NamedIconInBox name={integration.identifier} className="h-9 w-9" />
+          <NamedIconInBox name={icon ?? integration.identifier} className="h-9 w-9" />
           <div className="grow">
-            <Header2>{integration.name}</Header2>
+            <Header1>{integration.name}</Header1>
             {integration.description && (
               <Paragraph variant="small">{integration.description}</Paragraph>
             )}
           </div>
           <LinkButton
-            to={`https://trigger.dev/docs/integrations/${integration.identifier}`}
+            to={docsIntegrationPath(integration.identifier)}
             variant="secondary/small"
             LeadingIcon="docs"
+            target="_blank"
           >
             View docs
           </LinkButton>
@@ -115,7 +110,7 @@ function SelectedIntegrationMethod({
   integration,
   organizationId,
   method,
-  callbackUrl
+  callbackUrl,
 }: {
   integration: Integration;
   organizationId: string;
@@ -128,12 +123,7 @@ function SelectedIntegrationMethod({
     case "apikey":
       const apiAuth = authMethods.find((a) => a.type === "apikey");
       if (!apiAuth) return null;
-      return (
-        <ApiKeyHelp
-          integration={integration}
-          apiAuth={apiAuth as ApiAuthenticationMethodApiKey}
-        />
-      );
+      return <ApiKeyHelp integration={integration} help={apiAuth.help} />;
     case "oauth2":
       return (
         <SelectOAuthMethod

apps/webapp/app/components/integrations/ConnectToOAuthForm.tsx

@@ -1,16 +1,14 @@
 import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
 import { useFetcher, useLocation, useNavigation } from "@remix-run/react";
+import type { ConnectionType } from "@trigger.dev/database";
 import cuid from "cuid";
 import { useState } from "react";
 import simplur from "simplur";
+import { useFeatures } from "~/hooks/useFeatures";
 import { useTextFilter } from "~/hooks/useTextFilter";
 import { createSchema } from "~/routes/resources.connection.$organizationId.oauth2";
-import {
-  ApiAuthenticationMethodOAuth2,
-  Integration,
-  Scope,
-} from "~/services/externalApis/types";
+import { ApiAuthenticationMethodOAuth2, Integration, Scope } from "~/services/externalApis/types";
 import { cn } from "~/utils/cn";
 import { CodeBlock } from "../code/CodeBlock";
 import { Button } from "../primitives/Buttons";
@@ -18,13 +16,11 @@ import { Checkbox } from "../primitives/Checkbox";
 import { Fieldset } from "../primitives/Fieldset";
 import { FormError } from "../primitives/FormError";
 import { Header2, Header3 } from "../primitives/Headers";
+import { Hint } from "../primitives/Hint";
 import { Input } from "../primitives/Input";
 import { InputGroup } from "../primitives/InputGroup";
 import { Label } from "../primitives/Label";
-import { NamedIcon } from "../primitives/NamedIcon";
 import { Paragraph } from "../primitives/Paragraph";
-import type { ConnectionType } from "@trigger.dev/database";
-import { useFeatures } from "~/hooks/useFeatures";
 
 export type Status = "loading" | "idle";
 
@@ -48,25 +44,22 @@ export function ConnectToOAuthForm({
   const fetcher = useFetcher();
   const { isManagedCloud } = useFeatures();
 
-  const [
-    form,
-    { title, scopes, hasCustomClient, customClientId, customClientSecret },
-  ] = useForm({
-    lastSubmission: fetcher.data,
-    onValidate({ formData }) {
-      return parse(formData, {
-        // Create the schema without any constraint defined
-        schema: createSchema(),
-      });
-    },
-  });
+  const [form, { title, slug, scopes, hasCustomClient, customClientId, customClientSecret }] =
+    useForm({
+      lastSubmission: fetcher.data,
+      shouldRevalidate: "onSubmit",
+      onValidate({ formData }) {
+        return parse(formData, {
+          // Create the schema without any constraint defined
+          schema: createSchema(),
+        });
+      },
+    });
 
   const location = useLocation();
 
   const [selectedScopes, setSelectedScopes] = useState<Set<string>>(
-    new Set(
-      authMethod.scopes.filter((s) => s.defaultChecked).map((s) => s.name)
-    )
+    new Set(authMethod.scopes.filter((s) => s.defaultChecked).map((s) => s.name))
   );
 
   const requiresCustomOAuthApp = clientType === "EXTERNAL" || !isManagedCloud;
@@ -77,10 +70,7 @@ export function ConnectToOAuthForm({
     items: authMethod.scopes,
     filter: (scope, text) => {
       if (scope.name.toLowerCase().includes(text.toLowerCase())) return true;
-      if (
-        scope.description &&
-        scope.description.toLowerCase().includes(text.toLowerCase())
-      )
+      if (scope.description && scope.description.toLowerCase().includes(text.toLowerCase()))
         return true;
 
       return false;
@@ -96,20 +86,26 @@ export function ConnectToOAuthForm({
     >
       <Fieldset>
         <input type="hidden" name="id" value={id} />
-        <input
-          type="hidden"
-          name="integrationIdentifier"
-          value={integration.identifier}
-        />
-        <input
-          type="hidden"
-          name="integrationAuthMethod"
-          value={authMethodKey}
-        />
+        <input type="hidden" name="integrationIdentifier" value={integration.identifier} />
+        <input type="hidden" name="integrationAuthMethod" value={authMethodKey} />
         <input type="hidden" name="redirectTo" value={location.pathname} />
         <InputGroup>
           <FormError>{form.error}</FormError>
         </InputGroup>
+        <InputGroup fullWidth>
+          <Label variant="large">ID</Label>
+          <Input
+            type="text"
+            fullWidth
+            {...conform.input(slug)}
+            placeholder={`e.g. ${integration.identifier}`}
+          />
+          <Hint>
+            This is used in your code to reference this connection. It must be unique for this
+            project.
+          </Hint>
+          <FormError>{slug.error}</FormError>
+        </InputGroup>
         <InputGroup fullWidth>
           <Label variant="large">Name</Label>
           <Input
@@ -124,8 +120,7 @@ export function ConnectToOAuthForm({
         <div>
           <Header2>Use my OAuth App</Header2>
           <Paragraph variant="small" className="mb-2">
-            To use your own OAuth app, check the option below and insert the
-            details.
+            To use your own OAuth app, check the option below and insert the details.
           </Paragraph>
           <Checkbox
             id="hasCustomClient"
@@ -139,17 +134,13 @@ export function ConnectToOAuthForm({
           {useMyOAuthApp && (
             <div className="ml-6 mt-2">
               <Paragraph variant="small" className="mb-2">
-                Set the callback url to{" "}
-                <CodeBlock code={callbackUrl} showLineNumbers={false} />
+                Set the callback url to <CodeBlock code={callbackUrl} showLineNumbers={false} />
               </Paragraph>
               <div className="flex flex-col gap-2">
                 <div className="flex gap-2">
                   <InputGroup fullWidth>
                     <Label variant="small">Client ID</Label>
-                    <Input
-                      fullWidth
-                      {...conform.input(customClientId, { type: "text" })}
-                    />
+                    <Input fullWidth {...conform.input(customClientId, { type: "text" })} />
                   </InputGroup>
                   <InputGroup fullWidth>
                     <Label variant="small">Client secret</Label>
@@ -166,15 +157,15 @@ export function ConnectToOAuthForm({
             </div>
           )}
         </div>
-        <div>
-          <Header2>Scopes</Header2>
-          <Paragraph variant="small" className="mb-4">
-            Select the scopes you want to grant to {integration.name} in order
-            for it to access your data. Note: If you try and perform an action
-            in a Job that requires a scope you haven’t granted, that task will
-            fail.
-          </Paragraph>
-          {/* <Header3 className="mb-2">
+        {authMethod.scopes.length > 0 && (
+          <div>
+            <Header2>Scopes</Header2>
+            <Paragraph variant="small" className="mb-4">
+              Select the scopes you want to grant to {integration.name} in order for it to access
+              your data. Note: If you try and perform an action in a Job that requires a scope you
+              haven’t granted, that task will fail.
+            </Paragraph>
+            {/* <Header3 className="mb-2">
                   Select from popular scope collections
                 </Header3>
                 <fieldset>
@@ -184,74 +175,71 @@ export function ConnectToOAuthForm({
                     variant="button/small"
                   />
                 </fieldset> */}
-          <div className="mb-2 mt-4 flex items-center justify-between">
-            <Header3>Select {integration.name} scopes</Header3>
-            <Paragraph variant="small" className="text-slate-500">
-              {simplur`${selectedScopes.size} scope[|s] selected`}
-            </Paragraph>
-          </div>
-          <Input
-            placeholder="Search scopes"
-            className="mb-2"
-            variant="medium"
-            icon="search"
-            fullWidth={true}
-            value={filterText}
-            onChange={(e) => setFilterText(e.target.value)}
-          />
-          <div className="flex flex-col gap-y-0.5 overflow-hidden rounded-md">
-            {filteredItems.length === 0 && (
-              <Paragraph variant="small" className="p-4">
-                No scopes match {filterText}. Try a different search query.
+            <div className="mb-2 mt-4 flex items-center justify-between">
+              <Header3>Select {integration.name} scopes</Header3>
+              <Paragraph variant="small" className="text-slate-500">
+                {simplur`${selectedScopes.size} scope[|s] selected`}
               </Paragraph>
-            )}
-            {authMethod.scopes.map((s) => {
-              return (
-                <Checkbox
-                  key={s.name}
-                  id={s.name}
-                  value={s.name}
-                  name="scopes"
-                  label={s.name}
-                  defaultChecked={s.defaultChecked ?? false}
-                  badges={s.annotations?.map((a) => a.label)}
-                  description={s.description}
-                  variant="description"
-                  className={cn(
-                    filteredItems.find((f) => f.name === s.name) ? "" : "hidden"
-                  )}
-                  onChange={(isChecked) => {
-                    if (isChecked) {
-                      setSelectedScopes((selected) => {
-                        selected.add(s.name);
-                        return new Set(selected);
-                      });
-                    } else {
-                      setSelectedScopes((selected) => {
-                        selected.delete(s.name);
-                        return new Set(selected);
-                      });
-                    }
-                  }}
-                />
-              );
-            })}
+            </div>
+            <Input
+              placeholder="Search scopes"
+              className="mb-2"
+              variant="medium"
+              icon="search"
+              fullWidth={true}
+              value={filterText}
+              onChange={(e) => setFilterText(e.target.value)}
+            />
+            <div className="mb-28 flex flex-col gap-y-0.5 overflow-hidden rounded-md">
+              {filteredItems.length === 0 && (
+                <Paragraph variant="small" className="p-4">
+                  No scopes match {filterText}. Try a different search query.
+                </Paragraph>
+              )}
+              {authMethod.scopes.map((s) => {
+                return (
+                  <Checkbox
+                    key={s.name}
+                    id={s.name}
+                    value={s.name}
+                    name="scopes"
+                    label={s.name}
+                    defaultChecked={s.defaultChecked ?? false}
+                    badges={s.annotations?.map((a) => a.label)}
+                    description={s.description}
+                    variant="description"
+                    className={cn(filteredItems.find((f) => f.name === s.name) ? "" : "hidden")}
+                    onChange={(isChecked) => {
+                      if (isChecked) {
+                        setSelectedScopes((selected) => {
+                          selected.add(s.name);
+                          return new Set(selected);
+                        });
+                      } else {
+                        setSelectedScopes((selected) => {
+                          selected.delete(s.name);
+                          return new Set(selected);
+                        });
+                      }
+                    }}
+                  />
+                );
+              })}
+            </div>
           </div>
-        </div>
+        )}
       </Fieldset>
 
-      <div className="flex items-center justify-end gap-x-4">
+      <div className="absolute bottom-0 left-0 flex w-full items-center justify-end gap-x-4 rounded-b-md border-t border-slate-800 bg-midnight-900 p-4">
         <FormError>{scopes.error}</FormError>
         <Button
           type="submit"
           className="flex gap-2"
           disabled={transition.state !== "idle"}
           variant="primary/medium"
+          LeadingIcon={integration.icon ?? integration.identifier}
         >
-          <>
-            <NamedIcon name={integration.identifier} className={"h-4 w-4"} />
-            Connect to {integration.name}
-          </>
+          Connect to {integration.name}
         </Button>
       </div>
     </fetcher.Form>

apps/webapp/app/components/integrations/CustomHelp.tsx

@@ -5,20 +5,16 @@ import { Paragraph } from "../primitives/Paragraph";
 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>
+      <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>
       <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.
-      </Paragraph>
-      <Paragraph spacing>
-        Here's an example with the official GitHub SDK
+        You can call SDK methods from inside the run function, but you should wrap them in a Task to
+        make sure they're resumable.
       </Paragraph>
+      <Paragraph spacing>Here's an example with the official GitHub SDK</Paragraph>
       <CodeBlock
         code={`
-new Job(client, {
+client.defineJob({
   id: "scheduled-job-1",
   name: "Scheduled Job 1",
   version: "0.1.1",
@@ -48,13 +44,12 @@ new Job(client, {
       />
       <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.
+        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={`
-new Job(client, {
+client.defineJob({
   id: "scheduled-job-1",
   name: "Scheduled Job 1",
   version: "0.1.1",

apps/webapp/app/components/integrations/HelpInstall.tsx

@@ -0,0 +1,45 @@
+import { Integration } from "~/services/externalApis/types";
+import { InlineCode } from "../code/InlineCode";
+import {
+  ClientTabs,
+  ClientTabsList,
+  ClientTabsTrigger,
+  ClientTabsContent,
+} from "../primitives/ClientTabs";
+import { ClipboardField } from "../primitives/ClipboardField";
+import { Paragraph } from "../primitives/Paragraph";
+
+export function HelpInstall({ packageName }: { packageName: string }) {
+  return (
+    <>
+      <ClientTabs defaultValue="npm">
+        <ClientTabsList>
+          <ClientTabsTrigger value={"npm"}>npm</ClientTabsTrigger>
+          <ClientTabsTrigger value={"pnpm"}>pnpm</ClientTabsTrigger>
+          <ClientTabsTrigger value={"yarn"}>yarn</ClientTabsTrigger>
+        </ClientTabsList>
+        <ClientTabsContent value={"npm"}>
+          <ClipboardField
+            variant="secondary/medium"
+            value={`npm install ${packageName}`}
+            className="mb-4"
+          />
+        </ClientTabsContent>
+        <ClientTabsContent value={"pnpm"}>
+          <ClipboardField
+            variant="secondary/medium"
+            value={`pnpm add ${packageName}`}
+            className="mb-4"
+          />
+        </ClientTabsContent>
+        <ClientTabsContent value={"yarn"}>
+          <ClipboardField
+            variant="secondary/medium"
+            value={`yarn add ${packageName}`}
+            className="mb-4"
+          />
+        </ClientTabsContent>
+      </ClientTabs>
+    </>
+  );
+}

apps/webapp/app/components/integrations/HelpSamples.tsx

@@ -0,0 +1,47 @@
+import { Integration } from "~/services/externalApis/types";
+import { HelpPanelIntegration, HelpPanelProps } from "./ApiKeyHelp";
+import { Paragraph } from "../primitives/Paragraph";
+import { CodeBlock } from "../code/CodeBlock";
+
+export type ReplacementData = {
+  slug: string;
+};
+
+export function HelpSamples({ help, integrationClient, integration }: HelpPanelProps) {
+  return (
+    <>
+      {help &&
+        help.samples.map((sample, i) => {
+          const code = runReplacers(sample.code, integrationClient, integration);
+          return (
+            <div key={i}>
+              <Paragraph spacing>{sample.title}</Paragraph>
+              <CodeBlock code={code} className="mb-4" highlightedRanges={sample.highlight} />
+            </div>
+          );
+        })}
+    </>
+  );
+}
+
+const replacements = [
+  {
+    match: /__SLUG__/g,
+    replacement: (data: ReplacementData | undefined, integration: HelpPanelIntegration) => {
+      if (data) return data.slug;
+      return integration.identifier;
+    },
+  },
+];
+
+function runReplacers(
+  code: string,
+  replacementData: ReplacementData | undefined,
+  integration: HelpPanelIntegration
+) {
+  replacements.forEach((r) => {
+    code = code.replace(r.match, r.replacement(replacementData, integration));
+  });
+
+  return code;
+}

apps/webapp/app/components/integrations/IntegrationWithMissingFieldSheet.tsx

@@ -0,0 +1,58 @@
+import { docsIntegrationPath } from "~/utils/pathBuilder";
+import { LinkButton } from "../primitives/Buttons";
+import { Header1 } from "../primitives/Headers";
+import { NamedIconInBox } from "../primitives/NamedIcon";
+import { Paragraph } from "../primitives/Paragraph";
+import { Sheet, SheetBody, SheetContent, SheetHeader, SheetTrigger } from "../primitives/Sheet";
+import { SelectOAuthMethod } from "./SelectOAuthMethod";
+import { Integration } from "~/services/externalApis/types";
+import { Client } from "~/presenters/IntegrationsPresenter.server";
+
+export function IntegrationWithMissingFieldSheet({
+  integration,
+  organizationId,
+  button,
+  callbackUrl,
+  existingIntegration,
+  className,
+}: {
+  integration: Integration;
+  organizationId: string;
+  button: React.ReactNode;
+  callbackUrl: string;
+  existingIntegration: Client;
+  className?: string;
+}) {
+  return (
+    <Sheet>
+      <SheetTrigger className={className}>{button}</SheetTrigger>
+      <SheetContent size="lg" className="relative">
+        <SheetHeader>
+          <NamedIconInBox name={integration.identifier} className="h-9 w-9" />
+          <div className="grow">
+            <Header1>{integration.name}</Header1>
+            {integration.description && (
+              <Paragraph variant="small">{integration.description}</Paragraph>
+            )}
+          </div>
+          <LinkButton
+            to={docsIntegrationPath(integration.identifier)}
+            variant="secondary/small"
+            LeadingIcon="docs"
+            target="_blank"
+          >
+            View docs
+          </LinkButton>
+        </SheetHeader>
+        <SheetBody>
+          <SelectOAuthMethod
+            integration={integration}
+            organizationId={organizationId}
+            callbackUrl={callbackUrl}
+            existingIntegration={existingIntegration}
+          />
+        </SheetBody>
+      </SheetContent>
+    </Sheet>
+  );
+}

apps/webapp/app/components/integrations/NoIntegrationSheet.tsx

@@ -4,13 +4,7 @@ import { Button } from "../primitives/Buttons";
 import { Callout } from "../primitives/Callout";
 import { Header1 } from "../primitives/Headers";
 import { NamedIconInBox } from "../primitives/NamedIcon";
-import {
-  Sheet,
-  SheetBody,
-  SheetContent,
-  SheetHeader,
-  SheetTrigger,
-} from "../primitives/Sheet";
+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";
@@ -41,32 +35,22 @@ export function NoIntegrationSheet({
             <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.
+                We'll let you know when the Integration is available.
               </Paragraph>
             </div>
           ) : (
-            <fetcher.Form
-              method="post"
-              action={`/resources/apivote/${api.identifier}`}
-            >
+            <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}`}
+                {isLoading ? "Saving…" : `I want an Integration for ${api.name}`}
               </Button>
             </fetcher.Form>
           )}
         </SheetHeader>
         <SheetBody>
-          <Callout variant="info">
-            We don’t have an integration for the {api.name} API yet but you can
-            request one by clicking the button above. In the meantime, connect
-            to {api.name} using the methods below.
-          </Callout>
           <CustomHelp name={api.name} />
         </SheetBody>
       </SheetContent>

apps/webapp/app/components/integrations/SelectOAuthMethod.tsx

@@ -1,19 +1,20 @@
 import { useState } from "react";
-import {
-  ApiAuthenticationMethodOAuth2,
-  Integration,
-} from "~/services/externalApis/types";
+import { ApiAuthenticationMethodOAuth2, Integration } from "~/services/externalApis/types";
 import { RadioGroup, RadioGroupItem } from "../primitives/RadioButton";
 import type { ConnectionType } from "@trigger.dev/database";
 import { Header2 } from "../primitives/Headers";
 import { ConnectToOAuthForm } from "./ConnectToOAuthForm";
 import { Paragraph } from "../primitives/Paragraph";
+import { Client } from "~/presenters/IntegrationsPresenter.server";
+import { UpdateOAuthForm } from "./UpdateOAuthForm";
 
 export function SelectOAuthMethod({
   integration,
   organizationId,
-  callbackUrl
+  callbackUrl,
+  existingIntegration,
 }: {
+  existingIntegration?: Client;
   integration: Integration;
   organizationId: string;
   callbackUrl: string;
@@ -25,14 +26,10 @@ export function SelectOAuthMethod({
   const [oAuthKey, setOAuthKey] = useState<string | undefined>(
     oAuthMethods.length === 1 ? oAuthMethods[0][0] : undefined
   );
-  const [connectionType, setConnectionType] = useState<
-    ConnectionType | undefined
-  >();
+  const [connectionType, setConnectionType] = useState<ConnectionType | undefined>();
 
   const selectedOAuthMethod = oAuthKey
-    ? (integration.authenticationMethods[
-        oAuthKey
-      ] as ApiAuthenticationMethodOAuth2)
+    ? (integration.authenticationMethods[oAuthKey] as ApiAuthenticationMethodOAuth2)
     : undefined;
 
   return (
@@ -61,9 +58,7 @@ export function SelectOAuthMethod({
       )}
       {selectedOAuthMethod && (
         <>
-          <Header2 className="mb-2 mt-4">
-            Who is connecting to {integration.name}
-          </Header2>
+          <Header2 className="mb-2 mt-4">Who is connecting to {integration.name}</Header2>
           <RadioGroup
             name="connection-type"
             className="flex gap-2"
@@ -91,24 +86,33 @@ export function SelectOAuthMethod({
         connectionType &&
         oAuthKey &&
         (connectionType === "DEVELOPER" ? (
-          <ConnectToOAuthForm
-            integration={integration}
-            authMethod={selectedOAuthMethod}
-            authMethodKey={oAuthKey}
-            organizationId={organizationId}
-            clientType={connectionType}
-            callbackUrl={callbackUrl}
-          />
+          existingIntegration ? (
+            <UpdateOAuthForm
+              existingIntegration={existingIntegration}
+              integration={integration}
+              authMethod={selectedOAuthMethod}
+              authMethodKey={oAuthKey}
+              organizationId={organizationId}
+              clientType={connectionType}
+              callbackUrl={callbackUrl}
+            />
+          ) : (
+            <ConnectToOAuthForm
+              integration={integration}
+              authMethod={selectedOAuthMethod}
+              authMethodKey={oAuthKey}
+              organizationId={organizationId}
+              clientType={connectionType}
+              callbackUrl={callbackUrl}
+            />
+          )
         ) : (
           <>
             <Header2 className="mb-1 mt-4">User OAuth coming soon</Header2>
             <Paragraph spacing>
-              End-user OAuth is going to be released soon. If you are interested
-              in being an early beta tester then please{" "}
-              <a
-                href="mailto:founders@trigger.dev"
-                className="text-indigo-500 underline"
-              >
+              End-user OAuth is going to be released soon. If you are interested in being an early
+              beta tester then please{" "}
+              <a href="mailto:founders@trigger.dev" className="text-indigo-500 underline">
                 message us
               </a>
               .

apps/webapp/app/components/integrations/UpdateOAuthForm.tsx

@@ -0,0 +1,237 @@
+import { conform, useForm } from "@conform-to/react";
+import { parse } from "@conform-to/zod";
+import { useFetcher, useLocation, useNavigation } from "@remix-run/react";
+import type { ConnectionType } from "@trigger.dev/database";
+import { useState } from "react";
+import simplur from "simplur";
+import { useFeatures } from "~/hooks/useFeatures";
+import { useTextFilter } from "~/hooks/useTextFilter";
+import { ApiAuthenticationMethodOAuth2, Integration, Scope } from "~/services/externalApis/types";
+import { cn } from "~/utils/cn";
+import { CodeBlock } from "../code/CodeBlock";
+import { Button } from "../primitives/Buttons";
+import { Checkbox } from "../primitives/Checkbox";
+import { Fieldset } from "../primitives/Fieldset";
+import { FormError } from "../primitives/FormError";
+import { Header2, Header3 } from "../primitives/Headers";
+import { Input } from "../primitives/Input";
+import { InputGroup } from "../primitives/InputGroup";
+import { Label } from "../primitives/Label";
+import { Paragraph } from "../primitives/Paragraph";
+import { Client } from "~/presenters/IntegrationsPresenter.server";
+import { schema } from "~/routes/resources.connection.$organizationId.oauth2.$integrationId";
+
+export type Status = "loading" | "idle";
+
+export function UpdateOAuthForm({
+  existingIntegration,
+  integration,
+  authMethod,
+  authMethodKey,
+  organizationId,
+  clientType,
+  callbackUrl,
+}: {
+  existingIntegration: Client;
+  integration: Integration;
+  authMethod: ApiAuthenticationMethodOAuth2;
+  authMethodKey: string;
+  organizationId: string;
+  clientType: ConnectionType;
+  callbackUrl: string;
+}) {
+  const transition = useNavigation();
+  const fetcher = useFetcher();
+  const { isManagedCloud } = useFeatures();
+
+  const [form, { title, scopes, hasCustomClient, customClientId, customClientSecret }] = useForm({
+    lastSubmission: fetcher.data,
+    onValidate({ formData }) {
+      return parse(formData, {
+        schema,
+      });
+    },
+  });
+
+  const location = useLocation();
+
+  const [selectedScopes, setSelectedScopes] = useState<Set<string>>(
+    new Set(authMethod.scopes.filter((s) => s.defaultChecked).map((s) => s.name))
+  );
+
+  const requiresCustomOAuthApp = clientType === "EXTERNAL" || !isManagedCloud;
+
+  const [useMyOAuthApp, setUseMyOAuthApp] = useState(requiresCustomOAuthApp);
+
+  const { filterText, setFilterText, filteredItems } = useTextFilter<Scope>({
+    items: authMethod.scopes,
+    filter: (scope, text) => {
+      if (scope.name.toLowerCase().includes(text.toLowerCase())) return true;
+      if (scope.description && scope.description.toLowerCase().includes(text.toLowerCase()))
+        return true;
+
+      return false;
+    },
+  });
+
+  return (
+    <fetcher.Form
+      method="put"
+      action={`/resources/connection/${organizationId}/oauth2/${existingIntegration.id}`}
+      {...form.props}
+      className="flex h-full max-h-full flex-grow flex-col"
+    >
+      <Fieldset>
+        <input type="hidden" name="id" value={existingIntegration.id} />
+        <input type="hidden" name="integrationIdentifier" value={integration.identifier} />
+        <input type="hidden" name="integrationAuthMethod" value={authMethodKey} />
+        <input type="hidden" name="redirectTo" value={location.pathname} />
+        <InputGroup>
+          <FormError>{form.error}</FormError>
+        </InputGroup>
+        <InputGroup fullWidth>
+          <Label variant="large">ID</Label>
+          <Paragraph variant="small" className="mb-2">
+            {existingIntegration.slug}
+          </Paragraph>
+        </InputGroup>
+        <InputGroup fullWidth>
+          <Label variant="large">Name</Label>
+          <Input
+            type="text"
+            fullWidth
+            {...conform.input(title)}
+            defaultValue={existingIntegration.title ?? undefined}
+            placeholder={`e.g. Personal ${integration.name}`}
+          />
+          <FormError>{title.error}</FormError>
+        </InputGroup>
+        <input type="hidden" name="clientType" value={clientType} />
+        <div>
+          <Header2>Use my OAuth App</Header2>
+          <Paragraph variant="small" className="mb-2">
+            To use your own OAuth app, check the option below and insert the details.
+          </Paragraph>
+          <Checkbox
+            id="hasCustomClient"
+            label="Use my OAuth App"
+            variant="simple/small"
+            disabled={requiresCustomOAuthApp}
+            onChange={(checked) => setUseMyOAuthApp(checked)}
+            {...conform.input(hasCustomClient, { type: "checkbox" })}
+            defaultChecked={requiresCustomOAuthApp}
+          />
+          {useMyOAuthApp && (
+            <div className="ml-6 mt-2">
+              <Paragraph variant="small" className="mb-2">
+                Set the callback url to <CodeBlock code={callbackUrl} showLineNumbers={false} />
+              </Paragraph>
+              <div className="flex flex-col gap-2">
+                <div className="flex gap-2">
+                  <InputGroup fullWidth>
+                    <Label variant="small">Client ID</Label>
+                    <Input fullWidth {...conform.input(customClientId, { type: "text" })} />
+                  </InputGroup>
+                  <InputGroup fullWidth>
+                    <Label variant="small">Client secret</Label>
+                    <Input
+                      fullWidth
+                      {...conform.input(customClientSecret, {
+                        type: "password",
+                      })}
+                    />
+                  </InputGroup>
+                </div>
+                <FormError>{customClientId.error}</FormError>
+              </div>
+            </div>
+          )}
+        </div>
+        {authMethod.scopes.length > 0 && (
+          <div>
+            <Header2>Scopes</Header2>
+            <Paragraph variant="small" className="mb-4">
+              Select the scopes you want to grant to {integration.name} in order for it to access
+              your data. Note: If you try and perform an action in a Job that requires a scope you
+              haven’t granted, that task will fail.
+            </Paragraph>
+            {/* <Header3 className="mb-2">
+                  Select from popular scope collections
+                </Header3>
+                <fieldset>
+                  <Checkbox
+                    id="allScopes"
+                    label="Select all"
+                    variant="button/small"
+                  />
+                </fieldset> */}
+            <div className="mb-2 mt-4 flex items-center justify-between">
+              <Header3>Select {integration.name} scopes</Header3>
+              <Paragraph variant="small" className="text-slate-500">
+                {simplur`${selectedScopes.size} scope[|s] selected`}
+              </Paragraph>
+            </div>
+            <Input
+              placeholder="Search scopes"
+              className="mb-2"
+              variant="medium"
+              icon="search"
+              fullWidth={true}
+              value={filterText}
+              onChange={(e) => setFilterText(e.target.value)}
+            />
+            <div className="mb-28 flex flex-col gap-y-0.5 overflow-hidden rounded-md">
+              {filteredItems.length === 0 && (
+                <Paragraph variant="small" className="p-4">
+                  No scopes match {filterText}. Try a different search query.
+                </Paragraph>
+              )}
+              {authMethod.scopes.map((s) => {
+                return (
+                  <Checkbox
+                    key={s.name}
+                    id={s.name}
+                    value={s.name}
+                    name="scopes"
+                    label={s.name}
+                    defaultChecked={s.defaultChecked ?? false}
+                    badges={s.annotations?.map((a) => a.label)}
+                    description={s.description}
+                    variant="description"
+                    className={cn(filteredItems.find((f) => f.name === s.name) ? "" : "hidden")}
+                    onChange={(isChecked) => {
+                      if (isChecked) {
+                        setSelectedScopes((selected) => {
+                          selected.add(s.name);
+                          return new Set(selected);
+                        });
+                      } else {
+                        setSelectedScopes((selected) => {
+                          selected.delete(s.name);
+                          return new Set(selected);
+                        });
+                      }
+                    }}
+                  />
+                );
+              })}
+            </div>
+          </div>
+        )}
+      </Fieldset>
+
+      <div className="absolute bottom-0 left-0 flex w-full items-center justify-end gap-x-4 rounded-b-md border-t border-slate-800 bg-midnight-900 p-4">
+        <FormError>{scopes.error}</FormError>
+        <Button
+          type="submit"
+          className="flex gap-2"
+          disabled={transition.state !== "idle"}
+          variant="primary/medium"
+          LeadingIcon={integration.identifier}
+        >
+          Connect to {integration.name}
+        </Button>
+      </div>
+    </fetcher.Form>
+  );
+}

apps/webapp/app/components/jobs/JobsTable.tsx

@@ -15,17 +15,13 @@ import {
 } from "../primitives/Table";
 import { SimpleTooltip } from "../primitives/Tooltip";
 import { runStatusTitle } from "../runs/RunStatuses";
-import { ProjectJob, useProject } from "~/hooks/useProject";
+import { ProjectJob } from "~/hooks/useJobs";
+import { useProject } from "~/hooks/useProject";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { JobRunStatus } from "~/models/job.server";
+import { cn } from "~/utils/cn";
 
-export function JobsTable({
-  jobs,
-  noResultsText,
-}: {
-  jobs: ProjectJob[];
-  noResultsText: string;
-}) {
+export function JobsTable({ jobs, noResultsText }: { jobs: ProjectJob[]; noResultsText: string }) {
   const organization = useOrganization();
   const project = useProject();
 
@@ -46,7 +42,10 @@ export function JobsTable({
           jobs.map((job) => {
             const path = jobPath(organization, project, job);
             return (
-              <TableRow key={job.id}>
+              <TableRow
+                key={job.id}
+                className={cn(job.hasIntegrationsRequiringAction && "bg-rose-500/30")}
+              >
                 <TableCell to={path}>
                   <span className="flex items-center gap-2">
                     <NamedIcon name={job.event.icon} className="h-8 w-8" />
@@ -56,8 +55,7 @@ export function JobsTable({
                         job.dynamic ? (
                           <span className="flex items-center gap-0.5">
                             <NamedIcon name="dynamic" className="h-4 w-4" />{" "}
-                            <span className="uppercase">Dynamic:</span>{" "}
-                            {job.event.title}
+                            <span className="uppercase">Dynamic:</span> {job.event.title}
                           </span>
                         ) : (
                           job.event.title
@@ -68,23 +66,31 @@ export function JobsTable({
                   </span>
                 </TableCell>
                 <TableCell to={path}>
-                  <LabelValueStack
-                    label={job.slug}
-                    value={`v${job.version}`}
-                    variant="primary"
-                  />
+                  <LabelValueStack label={job.slug} value={`v${job.version}`} variant="primary" />
                 </TableCell>
                 <TableCell to={path}>
                   {job.integrations.map((integration) => (
                     <SimpleTooltip
                       key={integration.key}
                       button={
-                        <NamedIcon
-                          name={integration.icon}
-                          className="h-6 w-6"
-                        />
+                        <div className="relative">
+                          <NamedIcon name={integration.icon} className="h-6 w-6" />
+                          {integration.setupStatus === "MISSING_FIELDS" && (
+                            <NamedIcon name="error" className="absolute -left-1 -top-1 h-4 w-4" />
+                          )}
+                        </div>
+                      }
+                      content={
+                        <div>
+                          <p className="mb-1 text-rose-400">
+                            {integration.setupStatus === "MISSING_FIELDS" &&
+                              "This integration requires configuration"}
+                          </p>
+                          <p>
+                            {integration.title}: {integration.key}
+                          </p>
+                        </div>
                       }
-                      content={`${integration.title}: ${integration.key}`}
                     />
                   ))}
                 </TableCell>
@@ -126,10 +132,9 @@ export function JobsTable({
                         </span>
                       }
                       value={
-                        <DateTime
-                          date={job.lastRun.createdAt}
-                          className={classForJobStatus(job.lastRun.status)}
-                        />
+                        <span className={classForJobStatus(job.lastRun.status)}>
+                          <DateTime date={job.lastRun.createdAt} />
+                        </span>
                       }
                     />
                   ) : (
@@ -142,10 +147,7 @@ export function JobsTable({
           })
         ) : (
           <TableBlankRow colSpan={6}>
-            <Paragraph
-              variant="small"
-              className="flex items-center justify-center"
-            >
+            <Paragraph variant="small" className="flex items-center justify-center">
               {noResultsText}
             </Paragraph>
           </TableBlankRow>

apps/webapp/app/components/layout/AppLayout.tsx

@@ -11,9 +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-[2.75rem_auto]")}>{children}</div>
     </BackgroundGradient>
   );
 }
@@ -43,9 +41,7 @@ export function BackgroundGradient({
 
 /** This container should be placed around the content on a page */
 export function PageContainer({ children }: { children: React.ReactNode }) {
-  return (
-    <div className={cn("grid h-full grid-rows-[auto_1fr]")}>{children}</div>
-  );
+  return <div className={cn("grid h-full grid-rows-[auto_1fr]")}>{children}</div>;
 }
 
 export function PageBody({
@@ -56,11 +52,7 @@ 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 " : "overflow-hidden")}>{children}</div>
   );
 }
 
@@ -68,11 +60,7 @@ 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 }: { children: React.ReactNode }) {
   return (
     <div className="h-full w-full">
       <div className="mx-auto mt-[30vh] max-w-xs">{children}</div>

apps/webapp/app/components/navigation/Breadcrumb.tsx

@@ -1,211 +1,26 @@
-import { useMatches } from "@remix-run/react";
-import { Fragment } from "react";
-import {
-  useIntegrationClient,
-  useOptionalIntegrationClient,
-} from "~/hooks/useIntegrationClient";
-import { useJob, useOptionalJob } from "~/hooks/useJob";
-import {
-  useOptionalOrganization,
-  useOrganization,
-} from "~/hooks/useOrganizations";
-import { useOptionalProject, useProject } from "~/hooks/useProject";
-import { useOptionalRun, useRun } from "~/hooks/useRun";
-import {
-  integrationClientConnectionsPath,
-  integrationClientPath,
-  integrationClientScopesPath,
-  jobPath,
-  jobTestPath,
-  projectEnvironmentsPath,
-  projectIntegrationsPath,
-  projectPath,
-  runDashboardPath,
-} from "~/utils/pathBuilder";
+import { RouteMatch, useMatches } from "@remix-run/react";
+import { Fragment, ReactNode } from "react";
 import { BreadcrumbIcon } from "../primitives/BreadcrumbIcon";
-import { JobsMenu } from "./JobsMenu";
-import { BreadcrumbLink } from "./NavBar";
-import { ProjectsMenu } from "./ProjectsMenu";
 
-export type Breadcrumb = {
-  slug:
-    | "projects"
-    | "jobs"
-    | "integrations"
-    | "integration"
-    | "integration-job"
-    | "integration-connections"
-    | "integration-scopes"
-    | "environments"
-    | "job"
-    | "test"
-    | "runs"
-    | "run";
-  link?: {
-    to: string;
-    title: string;
-  };
-};
-
-function useBreadcrumbs(): Breadcrumb[] {
-  const matches = useMatches();
-
-  return matches
-    .filter((match) => match.handle)
-    .filter((match) => match.handle!.breadcrumb)
-    .map((match) => match.handle!.breadcrumb as Breadcrumb);
-}
+export type BreadcrumbItem = (match: RouteMatch, allMatches: RouteMatch[]) => ReactNode;
 
 export function Breadcrumb() {
-  const breadcrumbs = useBreadcrumbs();
-  const organization = useOptionalOrganization();
-  const project = useOptionalProject();
-  const job = useOptionalJob();
-  const run = useOptionalRun();
-  const client = useOptionalIntegrationClient();
+  const matches = useMatches();
 
   return (
     <div className="hidden items-center md:flex">
-      {breadcrumbs.map((breadcrumb, index) => (
-        <Fragment key={breadcrumb.slug}>
-          <BreadcrumbIcon />
-          <BreadcrumbItem
-            breadcrumb={breadcrumb}
-            organization={organization}
-            project={project}
-            job={job}
-            run={run}
-            client={client}
-          />
-        </Fragment>
-      ))}
+      {matches.map((match) => {
+        if (!match.handle || !match.handle.breadcrumb) return null;
+
+        const breadcrumb = match.handle.breadcrumb as BreadcrumbItem;
+
+        return (
+          <Fragment key={match.id}>
+            <BreadcrumbIcon />
+            {breadcrumb(match, matches)}
+          </Fragment>
+        );
+      })}
     </div>
   );
 }
-
-function BreadcrumbItem({
-  breadcrumb,
-  organization,
-  project,
-  job,
-  run,
-  client,
-}: {
-  breadcrumb: Breadcrumb;
-  organization?: ReturnType<typeof useOrganization>;
-  project?: ReturnType<typeof useProject>;
-  job?: ReturnType<typeof useJob>;
-  run?: ReturnType<typeof useRun>;
-  client?: ReturnType<typeof useIntegrationClient>;
-}) {
-  switch (breadcrumb.slug) {
-    case "projects":
-      return <ProjectsMenu key={breadcrumb.slug} />;
-    case "jobs":
-      return (
-        <BreadcrumbLink
-          key={breadcrumb.slug}
-          to={projectPath(organization!, project!)}
-          title="Jobs"
-        />
-      );
-    case "environments":
-      return (
-        <BreadcrumbLink
-          key={breadcrumb.slug}
-          to={projectEnvironmentsPath(organization!, project!)}
-          title="Environments"
-        />
-      );
-    case "integrations":
-      return (
-        <BreadcrumbLink
-          key={breadcrumb.slug}
-          to={projectIntegrationsPath(organization!, project!)}
-          title="Integrations"
-        />
-      );
-    case "integration":
-      return (
-        <Fragment key={breadcrumb.slug}>
-          <BreadcrumbLink
-            to={projectIntegrationsPath(organization!, project!)}
-            title="Integrations"
-          />
-          <BreadcrumbIcon />
-          <BreadcrumbLink
-            to={integrationClientPath(organization!, project!, client!)}
-            title={client!.title}
-          />
-        </Fragment>
-      );
-    case "integration-job":
-      return (
-        <BreadcrumbLink
-          to={integrationClientPath(organization!, project!, client!)}
-          title={"Jobs"}
-        />
-      );
-    case "integration-connections":
-      return (
-        <BreadcrumbLink
-          to={integrationClientConnectionsPath(
-            organization!,
-            project!,
-            client!
-          )}
-          title={"Connections"}
-        />
-      );
-    case "integration-scopes":
-      return (
-        <BreadcrumbLink
-          to={integrationClientScopesPath(organization!, project!, client!)}
-          title={"Scopes"}
-        />
-      );
-    case "job":
-      return (
-        <Fragment key={breadcrumb.slug}>
-          <BreadcrumbLink
-            to={projectPath(organization!, project!)}
-            title="Jobs"
-          />
-          <BreadcrumbIcon />
-          <JobsMenu key={breadcrumb.slug} />
-        </Fragment>
-      );
-    case "test":
-      return (
-        <BreadcrumbLink
-          key={breadcrumb.slug}
-          to={jobTestPath(organization!, project!, job!)}
-          title="Test"
-        />
-      );
-    case "runs":
-      return (
-        <BreadcrumbLink
-          key={breadcrumb.slug}
-          to={jobPath(organization!, project!, job!)}
-          title="Runs"
-        />
-      );
-    case "run":
-      return (
-        <Fragment key={breadcrumb.slug}>
-          <BreadcrumbLink
-            to={jobPath(organization!, project!, job!)}
-            title="Runs"
-          />
-          <BreadcrumbIcon />
-          <BreadcrumbLink
-            to={runDashboardPath(organization!, project!, job!, run!)}
-            title={`Run #${run!.number}`}
-          />
-        </Fragment>
-      );
-  }
-
-  return <span className="text-red-500">{breadcrumb.slug}</span>;
-}

apps/webapp/app/components/navigation/JobsMenu.tsx

@@ -1,26 +1,26 @@
+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 { IconNames, NamedIcon } from "../primitives/NamedIcon";
+import { LabelValueStack } from "../primitives/LabelValueStack";
+import { NamedIcon } from "../primitives/NamedIcon";
 import {
   Popover,
   PopoverArrowTrigger,
   PopoverContent,
-  PopoverMenuItem,
   PopoverSectionHeader,
 } from "../primitives/Popover";
-import { LabelValueStack } from "../primitives/LabelValueStack";
-import { LinkButton } from "../primitives/Buttons";
-import { Link } from "@remix-run/react";
-import { cn } from "~/utils/cn";
 
-export function JobsMenu() {
+export function JobsMenu({ matches }: { matches: RouteMatch[] }) {
   const [isOpen, setIsOpen] = useState(false);
-  const organization = useOrganization();
-  const project = useProject();
-  const currentJob = useJob();
+  const organization = useOrganization(matches);
+  const project = useProject(matches);
+  const projectJobs = useJobs(matches);
+  const currentJob = useJob(matches);
 
   return (
     <>
@@ -29,33 +29,31 @@ export function JobsMenu() {
           {currentJob?.title ?? "Select a job"}
         </PopoverArrowTrigger>
         <PopoverContent
-          className="w-80 overflow-y-auto p-0"
+          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">
-            {project.jobs.map((job) => {
+            {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",
+                    "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-6 w-6" />
+                  <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" />
-                  )}
+                  {isSelected && <NamedIcon name="check" className="mr-1 h-6 w-6" />}
                 </Link>
               );
             })}

apps/webapp/app/components/navigation/NavBar.tsx

@@ -1,16 +1,17 @@
 import { Popover, Transition } from "@headlessui/react";
-import { BookOpenIcon } from "@heroicons/react/20/solid";
+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 { LinkButton } from "../primitives/Buttons";
+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-divide py-1 pl-2 pr-2.5">
+    <div className="z-50 flex w-full items-center justify-between gap-2 border-b border-divide py-1 pl-1 pr-2.5">
       <div className="flex gap-0.5">
         <Link to="/" className="p-2">
           <LogoIcon className="h-5 w-5" />
@@ -19,14 +20,20 @@ export function NavBar() {
         <MobileDropdownMenu />
       </div>
       <div className="hidden items-center gap-2 sm:flex">
-        <LinkButton
-          to="https://docs.trigger.dev"
-          variant="secondary/small"
-          LeadingIcon={BookOpenIcon}
-        >
+        <LinkButton to={docsRoot()} variant="secondary/small" LeadingIcon={BookOpenIcon}>
           Documentation
         </LinkButton>
-        <Feedback />
+        <Feedback
+          button={
+            <Button
+              variant="secondary/small"
+              LeadingIcon={ChatBubbleLeftRightIcon}
+              shortcut={{ key: "f" }}
+            >
+              Help & feedback
+            </Button>
+          }
+        />
       </div>
     </div>
   );
@@ -75,7 +82,7 @@ function MobileDropdownMenu() {
             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="https://docs.trigger.dev"
+              href={docsRoot()}
               target="_blank"
               className="max-w-full"
             >
@@ -114,10 +121,7 @@ function MobileNavIcon({ open }: { open: boolean }) {
       />
       <path
         d="M2 2L12 12M12 2L2 12"
-        className={cn(
-          "origin-center transition",
-          !open && "scale-90 opacity-0"
-        )}
+        className={cn("origin-center transition", !open && "scale-90 opacity-0")}
       />
     </svg>
   );

apps/webapp/app/components/navigation/ProjectSideMenu.tsx

@@ -1,10 +1,10 @@
 import { useMatches } from "@remix-run/react";
 import { motion } from "framer-motion";
-import invariant from "tiny-invariant";
-import { useJob, useOptionalJob } from "~/hooks/useJob";
+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,
@@ -12,19 +12,15 @@ import {
   projectEnvironmentsPath,
   projectIntegrationsPath,
   projectPath,
+  projectTriggersPath,
 } from "~/utils/pathBuilder";
-import { NavLinkButton } from "../primitives/Buttons";
-import type { IconNames } from "../primitives/NamedIcon";
-import { SimpleTooltip } from "../primitives/Tooltip";
 import { UserProfilePhoto } from "../UserProfilePhoto";
-import { useOptionalIntegrationClient } from "~/hooks/useIntegrationClient";
+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>
-  );
+  return <div className="flex h-full w-full justify-stretch overflow-hidden">{children}</div>;
 }
 
 const expandedWith = "14rem";
@@ -46,15 +42,15 @@ export function ProjectSideMenu() {
   const project = useProject();
   const matches = useMatches();
 
-  //we collapse the menu if we're in a job or an integration
-  const job = useOptionalJob();
-  const client = useOptionalIntegrationClient();
-  const isCollapsed = job !== undefined || client !== undefined;
+  //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 ||
-    matches.at(-1)?.id ===
-      "routes/_app.orgs.$organizationSlug.projects.$projectParam._index";
+    deepestMatch?.id === "routes/_app.orgs.$organizationSlug.projects.$projectParam._index";
 
   return (
     <motion.div
@@ -72,18 +68,30 @@ export function ProjectSideMenu() {
           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">
@@ -92,18 +100,21 @@ export function ProjectSideMenu() {
           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="Account"
           icon={UserProfilePhoto}
           to={accountPath()}
           isCollapsed={isCollapsed}
+          data-action="account"
         />
       </div>
     </motion.div>
@@ -125,11 +136,13 @@ function SideMenuItem({
   to,
   isCollapsed,
   forceActive,
+  hasWarning = false,
 }: {
   icon: IconNames | React.ComponentType<any>;
   name: string;
   to: string;
   isCollapsed: boolean;
+  hasWarning?: boolean;
   forceActive?: boolean;
 }) {
   return (
@@ -147,6 +160,7 @@ function SideMenuItem({
               isActive = forceActive;
             }
             return cn(
+              "relative",
               isActive
                 ? "bg-slate-800 text-bright group-hover:bg-slate-800"
                 : "text-dimmed group-hover:bg-slate-850 group-hover:text-bright"
@@ -161,6 +175,7 @@ function SideMenuItem({
           >
             {name}
           </motion.span>
+          {hasWarning && <NamedIcon name="error" className="absolute left-1 top-1 h-4 w-4" />}
         </NavLinkButton>
       }
       content={name}

apps/webapp/app/components/navigation/ProjectsMenu.tsx

@@ -1,14 +1,10 @@
+import { RouteMatch } from "@remix-run/react";
 import { Fragment, useState } from "react";
-import {
-  useIsNewOrganizationPage,
-  useOrganizations,
-} from "~/hooks/useOrganizations";
-import { useOptionalProject, useProject } from "~/hooks/useProject";
-import {
-  newOrganizationPath,
-  newProjectPath,
-  projectPath,
-} from "~/utils/pathBuilder";
+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,
@@ -17,11 +13,11 @@ import {
   PopoverSectionHeader,
 } from "../primitives/Popover";
 
-export function ProjectsMenu() {
+export function ProjectsMenu({ matches }: { matches: RouteMatch[] }) {
   const [isOpen, setIsOpen] = useState(false);
-  const organizations = useOrganizations();
-  const isNewOrgPage = useIsNewOrganizationPage();
-  const currentProject = useOptionalProject();
+  const organizations = useOrganizations(matches);
+  const isNewOrgPage = useIsNewOrganizationPage(matches);
+  const currentProject = useOptionalProject(matches);
 
   if (isNewOrgPage) {
     return null;
@@ -33,18 +29,27 @@ export function ProjectsMenu() {
         <PopoverArrowTrigger isOpen={isOpen}>
           {currentProject?.name ?? "Select a project"}
         </PopoverArrowTrigger>
-        <PopoverContent className="w-80 p-0" align="start">
+        <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">
+              <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={project.name}
+                      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"
                     />

apps/webapp/app/components/primitives/Alert.tsx

@@ -54,29 +54,14 @@ const AlertContent = React.forwardRef<
 ));
 AlertContent.displayName = AlertDialogPrimitive.Content.displayName;
 
-const AlertHeader = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
-  <div
-    className={cn(
-      "flex flex-col space-y-2 text-center sm:text-left",
-      className
-    )}
-    {...props}
-  />
+const AlertHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div className={cn("flex flex-col space-y-2 text-center sm:text-left", className)} {...props} />
 );
 AlertHeader.displayName = "AlertDialogHeader";
 
-const AlertFooter = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
+const AlertFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
   <div
-    className={cn(
-      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
-      className
-    )}
+    className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)}
     {...props}
   />
 );
@@ -118,11 +103,7 @@ const AlertCancel = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
 >(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Cancel
-    ref={ref}
-    className={cn("mt-2 sm:mt-0", className)}
-    {...props}
-  />
+  <AlertDialogPrimitive.Cancel ref={ref} className={cn("mt-2 sm:mt-0", className)} {...props} />
 ));
 AlertCancel.displayName = AlertDialogPrimitive.Cancel.displayName;
 

apps/webapp/app/components/primitives/Badge.tsx

@@ -4,16 +4,14 @@ import { cn } from "~/utils/cn";
 const variants = {
   default:
     "grid place-items-center rounded-full px-2 h-5 tracking-wider text-xxs bg-slate-700 text-bright uppercase whitespace-nowrap",
+  outline:
+    "grid place-items-center rounded-sm px-1 h-5 tracking-wider text-xxs border border-dimmed text-dimmed uppercase whitespace-nowrap",
 };
 
 type BadgeProps = React.HTMLAttributes<HTMLDivElement> & {
   variant?: keyof typeof variants;
 };
 
-export function Badge({
-  className,
-  variant = "default",
-  ...props
-}: BadgeProps) {
+export function Badge({ className, variant = "default", ...props }: BadgeProps) {
   return <div className={cn(variants[variant], className)} {...props} />;
 }

apps/webapp/app/components/primitives/Buttons.tsx

@@ -1,19 +1,13 @@
 import { Link, LinkProps, NavLink, NavLinkProps } from "@remix-run/react";
-import React, {
-  ReactComponentElement,
-  forwardRef,
-  useImperativeHandle,
-  useRef,
-} from "react";
+import React, { ReactComponentElement, forwardRef, useImperativeHandle, useRef } from "react";
 import { ShortcutDefinition, useShortcutKeys } from "~/hooks/useShortcutKeys";
 import { cn } from "~/utils/cn";
-import { NamedIcon } from "./NamedIcon";
+import { IconNamesOrString, NamedIcon } from "./NamedIcon";
 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",
     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",
@@ -22,8 +16,7 @@ const variant = {
       "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",
     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",
@@ -32,8 +25,7 @@ const variant = {
       "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",
     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",
@@ -42,58 +34,45 @@ const variant = {
       "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",
     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",
     shortcutVariant: "small" as const,
-    shortcut:
-      "ml-1 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
+    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",
-    button:
-      "h-8 px-2 text-sm bg-indigo-600 group-hover:bg-indigo-500/90 disabled:opacity-50",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80",
+    button: "h-8 px-2 text-sm bg-indigo-600 group-hover:bg-indigo-500/90 disabled:opacity-50",
     icon: "h-4",
     shortcutVariant: "medium" as const,
-    shortcut:
-      "ml-1.5 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
+    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",
-    button:
-      "h-8 px-2 text-sm bg-slate-800 group-hover:bg-slate-700/70 disabled:opacity-50",
+    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80",
+    button: "h-8 px-2 text-sm bg-slate-800 group-hover:bg-slate-700/70 disabled:opacity-50",
     icon: "h-4",
     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",
-    button:
-      "h-8 px-2 text-sm bg-transparent group-hover:bg-slate-850 disabled:opacity-50",
+    textColor: "text-dimmed group-hover:text-bright transition group-disabled:text-dimmed/80",
+    button: "h-8 px-2 text-sm bg-transparent group-hover:bg-slate-850 disabled:opacity-50",
     icon: "h-4",
     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",
-    button:
-      "h-8 px-2 text-sm bg-rose-600 group-hover:bg-rose-500 disabled:opacity-50",
+    textColor: "text-bright group-hover:text-white transition group-disabled:text-bright/80",
+    button: "h-8 px-2 text-sm bg-rose-600 group-hover:bg-rose-500 disabled:opacity-50",
     icon: "h-4",
     shortcutVariant: "medium" as const,
-    shortcut:
-      "ml-1.5 -mr-0.5 border-bright/40 text-bright group-hover:border-bright/60",
+    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",
     button:
       "h-10 px-2 text-sm font-medium bg-indigo-600 group-hover:bg-indigo-500/90 disabled:opacity-50",
     icon: "h-5",
@@ -125,8 +104,8 @@ const allVariants = {
 
 type ButtonContentPropsType = {
   children?: React.ReactNode;
-  LeadingIcon?: React.ComponentType<any> | string;
-  TrailingIcon?: React.ComponentType<any> | string;
+  LeadingIcon?: React.ComponentType<any> | IconNamesOrString;
+  TrailingIcon?: React.ComponentType<any> | IconNamesOrString;
   trailingIconClassName?: string;
   leadingIconClassName?: string;
   fullWidth?: boolean;
@@ -157,13 +136,7 @@ export function ButtonContent(props: ButtonContentPropsType) {
   const textColorClassName = variation.textColor;
 
   return (
-    <div
-      className={cn(
-        fullWidth ? "flex" : "inline-flex text-xxs",
-        btnClassName,
-        className
-      )}
-    >
+    <div className={cn(fullWidth ? "flex" : "inline-flex text-xxs", btnClassName, className)}>
       <div
         className={cn(
           textAlignLeft ? "text-left" : "justify-center",
@@ -174,11 +147,7 @@ export function ButtonContent(props: ButtonContentPropsType) {
           (typeof LeadingIcon === "string" ? (
             <NamedIcon
               name={LeadingIcon}
-              className={cn(
-                iconClassName,
-                leadingIconClassName,
-                "shrink-0 justify-start"
-              )}
+              className={cn(iconClassName, leadingIconClassName, "shrink-0 justify-start")}
             />
           ) : (
             <LeadingIcon
@@ -193,12 +162,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 px-1", textColorClassName)}>
               {text}
             </span>
           ) : (
@@ -209,11 +173,7 @@ export function ButtonContent(props: ButtonContentPropsType) {
           (typeof TrailingIcon === "string" ? (
             <NamedIcon
               name={TrailingIcon}
-              className={cn(
-                iconClassName,
-                trailingIconClassName,
-                "shrink-0 justify-end"
-              )}
+              className={cn(iconClassName, trailingIconClassName, "shrink-0 justify-end")}
             />
           ) : (
             <TrailingIcon
@@ -277,8 +237,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonPropsType>(
   }
 );
 
-type LinkPropsType = Pick<LinkProps, "to" | "target"> &
-  React.ComponentProps<typeof ButtonContent>;
+type LinkPropsType = Pick<LinkProps, "to" | "target"> & React.ComponentProps<typeof ButtonContent>;
 export const LinkButton = ({ to, ...props }: LinkPropsType) => {
   const innerRef = useRef<HTMLAnchorElement>(null);
   if (props.shortcut) {
@@ -317,26 +276,13 @@ export const LinkButton = ({ to, ...props }: LinkPropsType) => {
 
 type NavLinkPropsType = Pick<NavLinkProps, "to" | "target"> &
   Omit<React.ComponentProps<typeof ButtonContent>, "className"> & {
-    className?: (props: {
-      isActive: boolean;
-      isPending: boolean;
-    }) => string | undefined;
+    className?: (props: { isActive: boolean; isPending: boolean }) => string | undefined;
   };
-export const NavLinkButton = ({
-  to,
-  className,
-  ...props
-}: NavLinkPropsType) => {
+export const NavLinkButton = ({ to, className, ...props }: NavLinkPropsType) => {
   return (
-    <NavLink
-      to={to}
-      className={cn("group outline-none", props.fullWidth ? "w-full" : "")}
-    >
+    <NavLink to={to} className={cn("group outline-none", props.fullWidth ? "w-full" : "")}>
       {({ isActive, isPending }) => (
-        <ButtonContent
-          className={className && className({ isActive, isPending })}
-          {...props}
-        />
+        <ButtonContent className={className && className({ isActive, isPending })} {...props} />
       )}
     </NavLink>
   );

apps/webapp/app/components/primitives/Callout.tsx

@@ -4,39 +4,52 @@ import {
   InformationCircleIcon,
   LightBulbIcon,
 } from "@heroicons/react/20/solid";
+import {
+  ArrowTopRightOnSquareIcon,
+  BookOpenIcon,
+  CheckCircleIcon,
+  ChevronRightIcon,
+} from "@heroicons/react/24/solid";
+import { Link } from "@remix-run/react";
 import { cn } from "~/utils/cn";
 import { Paragraph } from "./Paragraph";
-import { CheckCircleIcon } from "@heroicons/react/24/solid";
 
-const variantClasses = {
+export const variantClasses = {
   info: {
     className: "border-blue-400/20 bg-blue-400/30",
     icon: <InformationCircleIcon className="h-5 w-5 shrink-0 text-blue-400" />,
-    text: "text-blue-200",
+    textColor: "text-blue-200",
+    linkClassName: "transition hover:bg-blue-400/40",
   },
   warning: {
     className: "border-yellow-400/20 bg-yellow-400/30",
-    icon: (
-      <ExclamationCircleIcon className="h-5 w-5 shrink-0 text-yellow-400" />
-    ),
-    text: "text-yellow-200",
+    icon: <ExclamationTriangleIcon className="h-5 w-5 shrink-0 text-yellow-400" />,
+    textColor: "text-yellow-200",
+    linkClassName: "transition hover:bg-yellow-400/40",
   },
   error: {
-    className: "border-[hsl(347,77%,50%)]/30 bg-[hsl(347,77%,50%)]/20",
-    icon: (
-      <ExclamationTriangleIcon className="h-5 w-5 shrink-0 text-rose-400" />
-    ),
-    text: "text-rose-200",
+    className: "border-rose-500/20 bg-rose-500/30",
+    icon: <ExclamationCircleIcon className="h-5 w-5 shrink-0 text-rose-400" />,
+    textColor: "text-rose-200",
+    linkClassName: "transition hover:bg-rose-500/40",
   },
   idea: {
     className: "border-green-400/20 bg-green-400/30",
     icon: <LightBulbIcon className="h-5 w-5 shrink-0 text-green-400" />,
-    text: "text-green-200",
+    textColor: "text-green-200",
+    linkClassName: "transition hover:bg-green-400/40",
   },
   success: {
     className: "border-green-400/20 bg-green-400/30",
     icon: <CheckCircleIcon className="h-5 w-5 shrink-0 text-green-400" />,
-    text: "text-green-200",
+    textColor: "text-green-200",
+    linkClassName: "transition hover:bg-green-400/40",
+  },
+  docs: {
+    className: "border-blue-400/20 bg-blue-400/30",
+    icon: <BookOpenIcon className="mt-0.5 h-5 w-5 shrink-0 text-blue-400" />,
+    textColor: "text-blue-200",
+    linkClassName: "transition hover:bg-blue-400/40",
   },
 } as const;
 
@@ -45,14 +58,71 @@ export function Callout({
   className,
   icon,
   variant,
+  to,
 }: {
   children?: React.ReactNode;
   className?: string;
   icon?: React.ReactNode;
   variant: keyof typeof variantClasses;
+  to?: string;
 }) {
   const variantDefinition = variantClasses[variant];
 
+  if (to !== undefined) {
+    if (to.startsWith("http")) {
+      return (
+        <a
+          href={to}
+          target="_blank"
+          className={cn(
+            `flex w-full items-start justify-between gap-2.5 rounded-md border py-2 pl-2 pr-3 shadow-md backdrop-blur-sm`,
+            variantDefinition.className,
+            variantDefinition.linkClassName,
+            className
+          )}
+        >
+          <div className={"flex w-full items-start gap-x-2"}>
+            {icon ? icon : variantDefinition.icon}
+
+            {typeof children === "string" ? (
+              <Paragraph variant={"small"} className={variantDefinition.textColor}>
+                {children}
+              </Paragraph>
+            ) : (
+              children
+            )}
+          </div>
+          <ArrowTopRightOnSquareIcon className={cn("h-5 w-5", variantDefinition.textColor)} />
+        </a>
+      );
+    } else {
+      return (
+        <Link
+          to={to}
+          className={cn(
+            `flex w-full items-start justify-between gap-2.5 rounded-md border py-2 pl-2 pr-3 shadow-md backdrop-blur-sm`,
+            variantDefinition.className,
+            variantDefinition.linkClassName,
+            className
+          )}
+        >
+          <div className={"flex w-full items-start gap-x-2"}>
+            {icon ? icon : variantDefinition.icon}
+
+            {typeof children === "string" ? (
+              <Paragraph variant={"small"} className={variantDefinition.textColor}>
+                {children}
+              </Paragraph>
+            ) : (
+              children
+            )}
+          </div>
+          <ChevronRightIcon className={cn("h-5 w-5", variantDefinition.textColor)} />
+        </Link>
+      );
+    }
+  }
+
   return (
     <div
       className={cn(
@@ -64,7 +134,7 @@ export function Callout({
       {icon ? icon : variantDefinition.icon}
 
       {typeof children === "string" ? (
-        <Paragraph variant={"small"} className={variantDefinition.text}>
+        <Paragraph variant={"small"} className={variantDefinition.textColor}>
           {children}
         </Paragraph>
       ) : (

apps/webapp/app/components/primitives/Checkbox.tsx

@@ -82,9 +82,7 @@ export const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
     },
     ref
   ) => {
-    const [isChecked, setIsChecked] = useState<boolean>(
-      defaultChecked ?? false
-    );
+    const [isChecked, setIsChecked] = useState<boolean>(defaultChecked ?? false);
     const [isDisabled, setIsDisabled] = useState<boolean>(disabled ?? false);
 
     const buttonClassName = variants[variant].button;
@@ -157,10 +155,7 @@ export const Checkbox = React.forwardRef<HTMLInputElement, CheckboxProps>(
             )}
           </div>
           {variant === "description" && (
-            <Paragraph
-              variant="small"
-              className={cn("mt-0.5", descriptionClassName)}
-            >
+            <Paragraph variant="small" className={cn("mt-0.5", descriptionClassName)}>
               {description}
             </Paragraph>
           )}

apps/webapp/app/components/primitives/ClientTabs.tsx

@@ -12,10 +12,7 @@ const ClientTabsList = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <TabsPrimitive.List
     ref={ref}
-    className={cn(
-      "inline-flex h-10 items-center justify-center rounded-md bg-muted p-1 text-muted-foreground",
-      className
-    )}
+    className={cn("inline-flex items-center justify-center transition duration-100", className)}
     {...props}
   />
 ));
@@ -28,7 +25,7 @@ const ClientTabsTrigger = React.forwardRef<
   <TabsPrimitive.Trigger
     ref={ref}
     className={cn(
-      "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+      "inline-flex items-center justify-center whitespace-nowrap border-r border-slate-700 px-2 text-sm ring-offset-background transition-all first:pl-0 last:border-none data-[state=active]:text-indigo-500 data-[state=inactive]:text-dimmed data-[state=inactive]:hover:text-bright focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
       className
     )}
     {...props}
@@ -43,7 +40,7 @@ const ClientTabsContent = React.forwardRef<
   <TabsPrimitive.Content
     ref={ref}
     className={cn(
-      "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+      "mt-1 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
       className
     )}
     {...props}

apps/webapp/app/components/primitives/ClipboardField.tsx

@@ -69,10 +69,11 @@ const variations = {
 
 type ClipboardFieldProps = {
   value: string;
-  secure?: boolean;
+  secure?: boolean | string;
   variant: keyof typeof variations;
   className?: string;
   icon?: IconNames | React.ReactNode;
+  fullWidth?: boolean;
 };
 
 export function ClipboardField({
@@ -81,8 +82,9 @@ export function ClipboardField({
   variant,
   className,
   icon,
+  fullWidth = true,
 }: ClipboardFieldProps) {
-  const [isSecure, setIsSecure] = useState(secure);
+  const [isSecure, setIsSecure] = useState(secure !== undefined && secure);
   const [copied, setCopied] = useState(false);
 
   const copy = useCallback(
@@ -104,23 +106,19 @@ export function ClipboardField({
   const inputIcon = useRef<HTMLInputElement>(null);
 
   return (
-    <div className={cn(container, className)}>
+    <span className={cn(container, fullWidth ? "w-full" : "max-w-max", className)}>
       {icon && (
-        <div
+        <span
           onClick={() => inputIcon.current && inputIcon.current.focus()}
           className={cn(iconPosition, "flex items-center")}
         >
-          {typeof icon === "string" ? (
-            <NamedIcon name={icon} className={iconClassName} />
-          ) : (
-            icon
-          )}
-        </div>
+          {typeof icon === "string" ? <NamedIcon name={icon} className={iconClassName} /> : icon}
+        </span>
       )}
       <input
         type="text"
         ref={inputIcon}
-        value={isSecure ? "•".repeat(value.length) : value}
+        value={isSecure ? (typeof secure === "string" ? secure : "•".repeat(value.length)) : value}
         readOnly={true}
         className={cn("shrink grow select-all overflow-x-auto", input)}
         size={value.length}
@@ -136,13 +134,9 @@ export function ClipboardField({
           }
         }}
       />
-      <Button
-        variant={buttonVariant}
-        onClick={copy}
-        className={cn("shrink-0 grow-0", button)}
-      >
+      <Button variant={buttonVariant} onClick={copy} className={cn("shrink-0 grow-0", button)}>
         {copied ? <CheckIcon className="h-4 w-4 text-green-500" /> : "Copy"}
       </Button>
-    </div>
+    </span>
   );
 }

apps/webapp/app/components/primitives/DateTime.tsx

@@ -1,60 +1,78 @@
+import { Fragment, useEffect, useState } from "react";
 import { useLocales } from "./LocaleProvider";
 
 type DateTimeProps = {
   date: Date | string;
   timeZone?: string;
-  className?: string;
+  includeSeconds?: boolean;
 };
 
-export const DateTime = ({ date, timeZone, className }: DateTimeProps) => {
+export const DateTime = ({ date, timeZone = "UTC", includeSeconds = true }: DateTimeProps) => {
+  const locales = useLocales();
+
   const realDate = typeof date === "string" ? new Date(date) : date;
 
-  const locales = useLocales();
-  const isoString = realDate.toISOString();
-  const formattedDate = new Intl.DateTimeFormat(locales, {
+  const initialFormattedDateTime = formatDateTime(realDate, timeZone, locales, includeSeconds);
+
+  const [formattedDateTime, setFormattedDateTime] = useState<string>(initialFormattedDateTime);
+
+  useEffect(() => {
+    const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
+
+    setFormattedDateTime(
+      formatDateTime(realDate, resolvedOptions.timeZone, locales, includeSeconds)
+    );
+  }, [locales, includeSeconds, realDate]);
+
+  return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;
+};
+
+function formatDateTime(
+  date: Date,
+  timeZone: string,
+  locales: string[],
+  includeSeconds: boolean
+): string {
+  return new Intl.DateTimeFormat(locales, {
     year: "numeric",
     month: "short",
     day: "numeric",
-    timeZone,
-  }).format(realDate);
-
-  const formattedTime = new Intl.DateTimeFormat(locales, {
     hour: "numeric",
     minute: "numeric",
+    second: includeSeconds ? "numeric" : undefined,
     timeZone,
-  }).format(realDate);
+  }).format(date);
+}
 
-  return (
-    <time dateTime={isoString} className={className}>
-      {formattedDate} at {formattedTime}
-    </time>
-  );
-};
+export const DateTimeAccurate = ({ date, timeZone = "UTC" }: DateTimeProps) => {
+  const locales = useLocales();
 
-export const DateTimeAccurate = ({ date, timeZone }: DateTimeProps) => {
   const realDate = typeof date === "string" ? new Date(date) : date;
 
-  const locales = useLocales();
-  const isoString = realDate.toISOString();
-  const formattedDate = new Intl.DateTimeFormat(locales, {
+  const initialFormattedDateTime = formatDateTimeAccurate(realDate, timeZone, locales);
+
+  const [formattedDateTime, setFormattedDateTime] = useState<string>(initialFormattedDateTime);
+
+  useEffect(() => {
+    const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
+
+    setFormattedDateTime(formatDateTimeAccurate(realDate, resolvedOptions.timeZone, locales));
+  }, [locales, realDate]);
+
+  return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;
+};
+
+function formatDateTimeAccurate(date: Date, timeZone: string, locales: string[]): string {
+  const milliseconds = `00${date.getMilliseconds()}`.slice(-3);
+
+  const formattedDateTime = new Intl.DateTimeFormat(locales, {
     month: "short",
     day: "2-digit",
-    timeZone,
-  }).format(realDate);
-
-  const formattedTime = new Intl.DateTimeFormat(locales, {
     hour: "numeric",
     minute: "2-digit",
     second: "2-digit",
-    hour12: false,
     timeZone,
-  }).format(realDate);
+  }).format(date);
 
-  const milliseconds = `00${realDate.getMilliseconds()}`.slice(-3);
-
-  return (
-    <time dateTime={isoString}>
-      {formattedDate} {formattedTime}.{milliseconds}
-    </time>
-  );
-};
+  return `${formatDateTime}.${milliseconds}`;
+}

apps/webapp/app/components/primitives/Dialog.tsx

@@ -9,11 +9,7 @@ const Dialog = DialogPrimitive.Root;
 
 const DialogTrigger = DialogPrimitive.Trigger;
 
-const DialogPortal = ({
-  className,
-  children,
-  ...props
-}: DialogPrimitive.DialogPortalProps) => (
+const DialogPortal = ({ className, children, ...props }: DialogPrimitive.DialogPortalProps) => (
   <DialogPrimitive.Portal className={cn(className)} {...props}>
     <div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center">
       {children}
@@ -61,29 +57,14 @@ 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}
-  />
+const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div className={cn("flex flex-col space-y-1.5 text-center sm:text-left", className)} {...props} />
 );
 DialogHeader.displayName = "DialogHeader";
 
-const DialogFooter = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
+const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
   <div
-    className={cn(
-      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
-      className
-    )}
+    className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)}
     {...props}
   />
 );
@@ -95,10 +76,7 @@ const DialogTitle = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Title
     ref={ref}
-    className={cn(
-      "text-lg font-semibold leading-none tracking-tight",
-      className
-    )}
+    className={cn("text-lg font-semibold leading-none tracking-tight", className)}
     {...props}
   />
 ));

apps/webapp/app/components/primitives/Fieldset.tsx

@@ -7,7 +7,5 @@ export function Fieldset({
   children: React.ReactNode;
   className?: string;
 }) {
-  return (
-    <div className={cn("flex flex-col gap-y-5", className)}>{children}</div>
-  );
+  return <div className={cn("flex flex-col gap-y-5", className)}>{children}</div>;
 }

apps/webapp/app/components/primitives/FormError.tsx

@@ -3,13 +3,7 @@ import { Paragraph } from "./Paragraph";
 import { NamedIcon } from "./NamedIcon";
 import { motion } from "framer-motion";
 
-export function FormError({
-  children,
-  id,
-}: {
-  children: React.ReactNode;
-  id?: string;
-}) {
+export function FormError({ children, id }: { children: React.ReactNode; id?: string }) {
   return (
     <>
       {children && (
@@ -29,13 +23,7 @@ export function FormError({
   );
 }
 
-export function ZodFormErrors({
-  errors,
-  path,
-}: {
-  errors: z.ZodIssue[];
-  path: string[];
-}) {
+export function ZodFormErrors({ errors, path }: { errors: z.ZodIssue[]; path: string[] }) {
   if (errors.length === 0) {
     return null;
   }

apps/webapp/app/components/primitives/FormSegmentedControl.tsx

@@ -54,10 +54,7 @@ export default function FormSegmentedControl({
                       <div className="text-sm">
                         <RadioGroup.Label
                           as="p"
-                          className={cn(
-                            "font-normal",
-                            checked ? "text-bright" : "text-dimmed"
-                          )}
+                          className={cn("font-normal", checked ? "text-bright" : "text-dimmed")}
                         >
                           {option.label}
                         </RadioGroup.Label>

apps/webapp/app/components/primitives/Headers.tsx

@@ -1,40 +1,90 @@
 import { cn } from "~/utils/cn";
 
-const header1Styles =
-  "font-sans text-base md:text-lg lg:text-xl leading-5 md:leading-6 lg:leading-7 font-semibold";
-const header2Styles = "font-sans text-base leading-6 font-medium text-bright";
-const header3Styles = "font-sans text-sm leading-5 font-medium text-bright";
+const headerVariants = {
+  header1: {
+    text: "font-sans text-base md:text-lg lg:text-xl leading-5 md:leading-6 lg:leading-7 font-semibold",
+    spacing: "mb-2",
+  },
+  header2: {
+    text: "font-sans text-base leading-6 font-medium",
+    spacing: "mb-2",
+  },
+  header3: {
+    text: "font-sans text-sm leading-5 font-medium",
+    spacing: "mb-2",
+  },
+};
 
-const header1Variants = {
-  default: "text-bright",
+const textColorVariants = {
+  bright: "text-bright",
   dimmed: "text-dimmed",
 };
 
+export type HeaderVariant = keyof typeof headerVariants;
+
 type HeaderProps = {
   className?: string;
   children: React.ReactNode;
-};
-
-type Header1Props = HeaderProps & {
-  variant?: keyof typeof header1Variants;
-};
+  spacing?: boolean;
+  textColor?: "bright" | "dimmed";
+} & React.HTMLAttributes<HTMLHeadingElement>;
 
 export function Header1({
-  variant = "default",
   className,
   children,
-}: Header1Props) {
+  spacing = false,
+  textColor = "bright",
+}: HeaderProps) {
   return (
-    <h1 className={cn(header1Styles, header1Variants[variant], className)}>
+    <h1
+      className={cn(
+        headerVariants.header1.text,
+        spacing === true && headerVariants.header1.spacing,
+        textColor === "bright" ? textColorVariants.bright : textColorVariants.dimmed,
+        className
+      )}
+    >
       {children}
     </h1>
   );
 }
 
-export function Header2({ className, children }: HeaderProps) {
-  return <h2 className={cn(header2Styles, className)}>{children}</h2>;
+export function Header2({
+  className,
+  children,
+  spacing = false,
+  textColor = "bright",
+}: HeaderProps) {
+  return (
+    <h2
+      className={cn(
+        headerVariants.header2.text,
+        spacing === true && headerVariants.header2.spacing,
+        textColor === "bright" ? textColorVariants.bright : textColorVariants.dimmed,
+        className
+      )}
+    >
+      {children}
+    </h2>
+  );
 }
 
-export function Header3({ className, children }: HeaderProps) {
-  return <h3 className={cn(header3Styles, className)}>{children}</h3>;
+export function Header3({
+  className,
+  children,
+  spacing = false,
+  textColor = "bright",
+}: HeaderProps) {
+  return (
+    <h3
+      className={cn(
+        headerVariants.header3.text,
+        spacing === true && headerVariants.header3.spacing,
+        textColor === "bright" ? textColorVariants.bright : textColorVariants.dimmed,
+        className
+      )}
+    >
+      {children}
+    </h3>
+  );
 }

apps/webapp/app/components/primitives/Help.tsx

@@ -22,25 +22,25 @@ const HelpContext = React.createContext<HelpContextValue>({
 type HelpProps = {
   defaultOpen?: boolean;
   allowDismissing?: boolean;
-  children?: React.ReactNode;
+  children?: React.ReactNode | ((open: boolean) => React.ReactNode);
 };
 
-export function Help({
-  defaultOpen,
-  allowDismissing = true,
-  children,
-}: HelpProps) {
+function useHelp() {
+  return React.useContext(HelpContext);
+}
+
+export function Help({ defaultOpen, allowDismissing = true, children }: HelpProps) {
   const [open, setOpen] = React.useState(defaultOpen || false);
 
   return (
     <HelpContext.Provider value={{ open, setOpen, allowDismissing }}>
-      {children}
+      {typeof children === "function" ? children(open) : children}
     </HelpContext.Provider>
   );
 }
 
 export function HelpTrigger({ title }: { title: string }) {
-  const { open, setOpen } = React.useContext(HelpContext);
+  const { open, setOpen } = useHelp();
 
   return open ? (
     <></>
@@ -48,7 +48,7 @@ export function HelpTrigger({ title }: { title: string }) {
     <Button
       variant="tertiary/small"
       LeadingIcon="lightbulb"
-      leadingIconClassName="text-slate-400"
+      leadingIconClassName="text-amber-400"
       onClick={() => setOpen(true)}
     >
       {title}
@@ -65,7 +65,7 @@ export function HelpContent({
   className?: string;
   children: React.ReactNode;
 }) {
-  const { open, setOpen, allowDismissing } = React.useContext(HelpContext);
+  const { open, setOpen, allowDismissing } = useHelp();
 
   return (
     <>
@@ -89,7 +89,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-4"
+            className="grow rounded border border-slate-850 bg-midnight-850 bg-contain bg-left-top bg-no-repeat p-6"
             style={{
               backgroundImage: `url(${gradientPath})`,
             }}

apps/webapp/app/components/primitives/Input.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { cn } from "~/utils/cn";
-import type { IconNames } from "./NamedIcon";
+import type { IconNamesOrString } from "./NamedIcon";
 import { NamedIcon } from "./NamedIcon";
 
 const variants = {
@@ -44,24 +44,13 @@ const variants = {
 
 export type InputProps = React.InputHTMLAttributes<HTMLInputElement> & {
   variant?: keyof typeof variants;
-  icon?: IconNames;
+  icon?: IconNamesOrString;
   shortcut?: string;
   fullWidth?: boolean;
 };
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  (
-    {
-      className,
-      type,
-      shortcut,
-      fullWidth = true,
-      variant = "medium",
-      icon,
-      ...props
-    },
-    ref
-  ) => {
+  ({ className, type, shortcut, fullWidth = true, variant = "medium", icon, ...props }, ref) => {
     const inputClassName = variants[variant].input;
     const iconClassName = variants[variant].iconSize;
     const iconOffsetClassName = variants[variant].iconOffset;
@@ -70,25 +59,16 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <div className={cn("relative", fullWidth ? "w-full" : "max-w-max")}>
         {icon && (
           <div className="pointer-events-none absolute inset-y-0 left-0 flex items-center">
-            <NamedIcon
-              name={icon}
-              className={cn(iconClassName, "text-dimmed")}
-            />
+            <NamedIcon name={icon} className={cn(iconClassName, "text-dimmed")} />
           </div>
         )}
         <input
           type={type}
-          className={cn(
-            inputClassName,
-            icon ? iconOffsetClassName : "",
-            className
-          )}
+          className={cn(inputClassName, icon ? iconOffsetClassName : "", className)}
           ref={ref}
           {...props}
         />
-        {shortcut && (
-          <div className={cn(shortcutClassName, "absolute")}>{shortcut}</div>
-        )}
+        {shortcut && <div className={cn(shortcutClassName, "absolute")}>{shortcut}</div>}
       </div>
     );
   }

apps/webapp/app/components/primitives/InputGroup.tsx

@@ -6,11 +6,7 @@ type InputGroupProps = {
   fullWidth?: boolean;
 };
 
-export function InputGroup({
-  children,
-  className,
-  fullWidth,
-}: InputGroupProps) {
+export function InputGroup({ children, className, fullWidth }: InputGroupProps) {
   return (
     <div
       className={cn(

apps/webapp/app/components/primitives/Label.tsx

@@ -1,31 +1,29 @@
 import * as React from "react";
 import { cn } from "~/utils/cn";
-import { Header2, Header3 } from "./Headers";
-import { Paragraph } from "./Paragraph";
+
+const labelVariants = {
+  small: {
+    text: "font-sans text-sm font-normal",
+  },
+  medium: {
+    text: "font-sans text-sm leading-5 font-medium",
+  },
+  large: {
+    text: "font-sans text-base leading-6 font-medium",
+  },
+};
 
 type LabelProps = React.AllHTMLAttributes<HTMLLabelElement> & {
   className?: string;
   children: React.ReactNode;
-  variant?: "small" | "medium" | "large";
+  variant?: keyof typeof labelVariants;
 };
 
-export function Label({
-  className,
-  children,
-  variant = "medium",
-  ...props
-}: LabelProps) {
-  return variant === "medium" ? (
-    <Header3 className={cn(className)} {...props}>
+export function Label({ className, children, variant = "medium", ...props }: LabelProps) {
+  const variation = labelVariants[variant];
+  return (
+    <label className={cn(variation.text, className)} {...props}>
       {children}
-    </Header3>
-  ) : variant === "large" ? (
-    <Header2 className={cn(className)} {...props}>
-      {children}
-    </Header2>
-  ) : (
-    <Paragraph variant="small" className={cn(className)}>
-      {children}
-    </Paragraph>
+    </label>
   );
 }

apps/webapp/app/components/primitives/LabelValueStack.tsx

@@ -3,10 +3,7 @@ import { Paragraph, ParagraphVariant } from "./Paragraph";
 import { ArrowTopRightOnSquareIcon } from "@heroicons/react/20/solid";
 import { SimpleTooltip } from "./Tooltip";
 
-const variations: Record<
-  string,
-  { label: ParagraphVariant; value: ParagraphVariant }
-> = {
+const variations = {
   primary: {
     label: "extra-small/bright",
     value: "extra-small",
@@ -15,7 +12,7 @@ const variations: Record<
     label: "extra-extra-small/caps",
     value: "extra-small/bright",
   },
-};
+} as const;
 
 type LabelValueStackProps = {
   label: React.ReactNode;
@@ -52,11 +49,7 @@ export function LabelValueStack({
             side="bottom"
             button={
               <Paragraph variant={variation.value}>
-                <a
-                  href={href}
-                  className="underline underline-offset-2"
-                  target="_blank"
-                >
+                <a href={href} className="underline underline-offset-2" target="_blank">
                   {value}
                   <ArrowTopRightOnSquareIcon className="ml-1 inline-block h-4 w-4 text-dimmed" />
                 </a>

apps/webapp/app/components/primitives/LinkWithDisabled.tsx

@@ -6,11 +6,7 @@ type Props = Parameters<typeof Link>[0] & {
   disabledClassName?: string;
 };
 
-export function LinkDisabled({
-  disabled = false,
-  disabledClassName,
-  ...props
-}: Props) {
+export function LinkDisabled({ disabled = false, disabledClassName, ...props }: Props) {
   if (disabled) {
     return (
       <span {...props} className={cn(props.className, disabledClassName)}>

apps/webapp/app/components/primitives/LocaleProvider.tsx

@@ -13,10 +13,7 @@ type LocaleContextProviderProps = {
 
 const Context = createContext<LocaleContext | null>(null);
 
-export const LocaleContextProvider = ({
-  locales,
-  children,
-}: LocaleContextProviderProps) => {
+export const LocaleContextProvider = ({ locales, children }: LocaleContextProviderProps) => {
   const value = { locales };
 
   return <Context.Provider value={value}>{children}</Context.Provider>;

apps/webapp/app/components/primitives/NamedIcon.tsx

@@ -1,12 +1,12 @@
 import {
-  ExclamationCircleIcon,
+  ArrowTopRightOnSquareIcon,
   ExclamationTriangleIcon,
   InformationCircleIcon,
   StopIcon,
 } from "@heroicons/react/20/solid";
-import { CompanyIcon, hasIcon } from "@trigger.dev/companyicons";
 import {
   ArrowLeftIcon,
+  ArrowPathIcon,
   ArrowRightIcon,
   BeakerIcon,
   BellAlertIcon,
@@ -15,6 +15,7 @@ import {
   BuildingOffice2Icon,
   CalendarDaysIcon,
   ChatBubbleLeftEllipsisIcon,
+  CheckCircleIcon,
   CheckIcon,
   ChevronDownIcon,
   ChevronLeftIcon,
@@ -37,6 +38,7 @@ import {
   MagnifyingGlassIcon,
   PlusIcon,
   PlusSmallIcon,
+  QrCodeIcon,
   SquaresPlusIcon,
   StarIcon,
   UserCircleIcon,
@@ -44,116 +46,74 @@ import {
   UserIcon,
   UserPlusIcon,
   WrenchScrewdriverIcon,
+  XCircleIcon,
   XMarkIcon,
 } from "@heroicons/react/24/solid";
+import { CompanyIcon, hasIcon } from "@trigger.dev/companyicons";
+import { HourglassIcon } from "lucide-react";
+import { DynamicTriggerIcon } from "~/assets/icons/DynamicTriggerIcon";
+import { ErrorIcon } from "~/assets/icons/ErrorIcon";
 import { ScheduleIcon } from "~/assets/icons/ScheduleIcon";
 import { WebhookIcon } from "~/assets/icons/WebhookIcon";
 import { cn } from "~/utils/cn";
 import { LogoIcon } from "../LogoIcon";
 import { Spinner } from "./Spinner";
-import { HourglassIcon } from "lucide-react";
-import { DynamicTriggerIcon } from "~/assets/icons/DynamicTriggerIcon";
 
 const icons = {
-  account: (className: string) => (
-    <UserCircleIcon className={cn("text-slate-400", className)} />
-  ),
-  "arrow-right": (className: string) => (
-    <ArrowRightIcon className={cn("text-white", className)} />
-  ),
-  "arrow-left": (className: string) => (
-    <ArrowLeftIcon className={cn("text-white", className)} />
-  ),
-  background: (className: string) => (
-    <CloudIcon className={cn("text-sky-400", className)} />
-  ),
-  beaker: (className: string) => (
-    <BeakerIcon className={cn("text-purple-500", className)} />
-  ),
-  billing: (className: string) => (
-    <CreditCardIcon className={cn("text-teal-500", className)} />
-  ),
+  account: (className: string) => <UserCircleIcon className={cn("text-slate-400", className)} />,
+  active: (className: string) => <CheckCircleIcon className={cn("text-green-500", className)} />,
+  "arrow-right": (className: string) => <ArrowRightIcon className={cn("text-white", className)} />,
+  "arrow-left": (className: string) => <ArrowLeftIcon className={cn("text-white", className)} />,
+  background: (className: string) => <CloudIcon className={cn("text-sky-400", className)} />,
+  beaker: (className: string) => <BeakerIcon className={cn("text-purple-500", className)} />,
+  billing: (className: string) => <CreditCardIcon className={cn("text-teal-500", className)} />,
   calendar: (className: string) => (
     <CalendarDaysIcon className={cn("text-purple-500", className)} />
   ),
-  check: (className: string) => (
-    <CheckIcon className={cn("text-dimmed", className)} />
-  ),
+  check: (className: string) => <CheckIcon className={cn("text-dimmed", className)} />,
   "chevron-down": (className: string) => (
     <ChevronDownIcon className={cn("text-dimmed", className)} />
   ),
-  "chevron-up": (className: string) => (
-    <ChevronUpIcon className={cn("text-dimmed", className)} />
-  ),
+  "chevron-up": (className: string) => <ChevronUpIcon className={cn("text-dimmed", className)} />,
   "chevron-left": (className: string) => (
     <ChevronLeftIcon className={cn("text-dimmed", className)} />
   ),
   "chevron-right": (className: string) => (
     <ChevronRightIcon className={cn("text-dimmed", className)} />
   ),
-  countdown: (className: string) => (
-    <HourglassIcon className={cn("text-amber-400", className)} />
-  ),
-  clock: (className: string) => (
-    <ClockIcon className={cn("text-cyan-500", className)} />
-  ),
-  close: (className: string) => (
-    <XMarkIcon className={cn("text-dimmed", className)} />
-  ),
+  countdown: (className: string) => <HourglassIcon className={cn("text-amber-400", className)} />,
+  clock: (className: string) => <ClockIcon className={cn("text-cyan-500", className)} />,
+  close: (className: string) => <XMarkIcon className={cn("text-dimmed", className)} />,
   "connection-alert": (className: string) => (
-    <BellAlertIcon className={cn("text-rose-500", className)} />
+    <BellAlertIcon className={cn("text-amber-500", className)} />
   ),
-  docs: (className: string) => (
-    <BookOpenIcon className={cn("text-slate-400", className)} />
-  ),
-  dynamic: (className: string) => (
-    <DynamicTriggerIcon className={cn("text-cyan-500", className)} />
-  ),
-  error: (className: string) => (
-    <ExclamationCircleIcon className={cn("text-rose-500", className)} />
-  ),
-  flag: (className: string) => (
-    <FlagIcon className={cn("text-sky-500", className)} />
-  ),
-  folder: (className: string) => (
-    <FolderIcon className={cn("text-indigo-600", className)} />
-  ),
-  envelope: (className: string) => (
-    <EnvelopeIcon className={cn("text-cyan-500", className)} />
-  ),
-  environment: (className: string) => (
-    <KeyIcon className={cn("text-yellow-500", className)} />
-  ),
-  globe: (className: string) => (
-    <GlobeAltIcon className={cn("text-fuchsia-600", className)} />
+  docs: (className: string) => <BookOpenIcon className={cn("text-slate-400", className)} />,
+  dynamic: (className: string) => <DynamicTriggerIcon className={cn("text-cyan-500", className)} />,
+  error: (className: string) => <ErrorIcon className={cn("text-rose-500", className)} />,
+  "external-link": (className: string) => (
+    <ArrowTopRightOnSquareIcon className={cn("text-dimmed", className)} />
   ),
+  flag: (className: string) => <FlagIcon className={cn("text-sky-500", className)} />,
+  folder: (className: string) => <FolderIcon className={cn("text-indigo-600", className)} />,
+  envelope: (className: string) => <EnvelopeIcon className={cn("text-cyan-500", className)} />,
+  environment: (className: string) => <KeyIcon className={cn("text-yellow-500", className)} />,
+  globe: (className: string) => <GlobeAltIcon className={cn("text-fuchsia-600", className)} />,
   "hand-raised": (className: string) => (
     <HandRaisedIcon className={cn("text-amber-400", className)} />
   ),
-  heart: (className: string) => (
-    <HeartIcon className={cn("text-rose-500", className)} />
-  ),
-  id: (className: string) => (
-    <FingerPrintIcon className={cn("text-rose-200", className)} />
-  ),
-  info: (className: string) => (
-    <InformationCircleIcon className={cn("text-blue-500", className)} />
-  ),
+  heart: (className: string) => <HeartIcon className={cn("text-rose-500", className)} />,
+  id: (className: string) => <FingerPrintIcon className={cn("text-rose-200", className)} />,
+  inactive: (className: string) => <XCircleIcon className={cn("text-rose-500", className)} />,
+  info: (className: string) => <InformationCircleIcon className={cn("text-blue-500", className)} />,
   integration: (className: string) => (
     <SquaresPlusIcon className={cn("text-teal-500", className)} />
   ),
   "invite-member": (className: string) => (
     <UserPlusIcon className={cn("text-indigo-500", className)} />
   ),
-  job: (className: string) => (
-    <WrenchScrewdriverIcon className={cn("text-teal-500", className)} />
-  ),
-  key: (className: string) => (
-    <KeyIcon className={cn("text-amber-400", className)} />
-  ),
-  lightbulb: (className: string) => (
-    <LightBulbIcon className={cn("text-amber-400", className)} />
-  ),
+  job: (className: string) => <WrenchScrewdriverIcon className={cn("text-teal-500", className)} />,
+  key: (className: string) => <KeyIcon className={cn("text-amber-400", className)} />,
+  lightbulb: (className: string) => <LightBulbIcon className={cn("text-amber-400", className)} />,
   log: (className: string) => (
     <ChatBubbleLeftEllipsisIcon className={cn("text-slate-400", className)} />
   ),
@@ -161,39 +121,22 @@ const icons = {
   organization: (className: string) => (
     <BuildingOffice2Icon className={cn("text-fuchsia-600", className)} />
   ),
-  plus: (className: string) => (
-    <PlusIcon className={cn("text-green-600", className)} />
-  ),
+  plus: (className: string) => <PlusIcon className={cn("text-green-600", className)} />,
   "plus-small": (className: string) => (
     <PlusSmallIcon className={cn("text-green-600", className)} />
   ),
-  property: (className: string) => (
-    <Cog8ToothIcon className={cn("text-slate-600", className)} />
-  ),
-  search: (className: string) => (
-    <MagnifyingGlassIcon className={cn("text-dimmed", className)} />
-  ),
-  settings: (className: string) => (
-    <Cog8ToothIcon className={cn("text-slate-600", className)} />
-  ),
-  spinner: (className: string) => (
-    <Spinner className={className} color="blue" />
-  ),
-  "spinner-white": (className: string) => (
-    <Spinner className={className} color="white" />
-  ),
-  star: (className: string) => (
-    <StarIcon className={cn("text-yellow-500", className)} />
-  ),
-  team: (className: string) => (
-    <UserGroupIcon className={cn("text-blue-500", className)} />
-  ),
-  trigger: (className: string) => (
-    <BoltIcon className={cn("text-orange-500", className)} />
-  ),
-  user: (className: string) => (
-    <UserIcon className={cn("text-blue-600", className)} />
-  ),
+  property: (className: string) => <Cog8ToothIcon className={cn("text-slate-600", className)} />,
+  "qr-code": (className: string) => <QrCodeIcon className={cn("text-amber-400", className)} />,
+  refresh: (className: string) => <ArrowPathIcon className={cn("text-bright", className)} />,
+  search: (className: string) => <MagnifyingGlassIcon className={cn("text-dimmed", className)} />,
+  settings: (className: string) => <Cog8ToothIcon className={cn("text-slate-600", className)} />,
+  spinner: (className: string) => <Spinner className={className} color="blue" />,
+  "spinner-white": (className: string) => <Spinner className={className} color="white" />,
+  star: (className: string) => <StarIcon className={cn("text-yellow-500", className)} />,
+  stop: (className: string) => <StopIcon className={cn("text-rose-500", className)} />,
+  team: (className: string) => <UserGroupIcon className={cn("text-blue-500", className)} />,
+  trigger: (className: string) => <BoltIcon className={cn("text-orange-500", className)} />,
+  user: (className: string) => <UserIcon className={cn("text-blue-600", className)} />,
   warning: (className: string) => (
     <ExclamationTriangleIcon className={cn("text-amber-400", className)} />
   ),
@@ -201,8 +144,11 @@ const icons = {
   "custom-event": (className: string) => (
     <CodeBracketSquareIcon className={cn("text-toxic-600", className)} />
   ),
+  "register-source": (className: string) => (
+    <GlobeAltIcon className={cn("text-sky-500", className)} />
+  ),
   "schedule-interval": (className: string) => (
-    <ScheduleIcon className={cn("text-sky-500", className)} />
+    <ClockIcon className={cn("text-sky-500", className)} />
   ),
   "schedule-cron": (className: string) => (
     <ScheduleIcon className={cn("text-sky-500", className)} />
@@ -210,12 +156,11 @@ const icons = {
   "schedule-dynamic": (className: string) => (
     <ScheduleIcon className={cn("text-sky-500", className)} />
   ),
-  webhook: (className: string) => (
-    <WebhookIcon className={cn("text-pink-500", className)} />
-  ),
+  webhook: (className: string) => <WebhookIcon className={cn("text-pink-500", className)} />,
 };
 
 export type IconNames = keyof typeof icons;
+export type IconNamesOrString = IconNames | (string & {});
 export const iconNames = Object.keys(icons) as IconNames[];
 
 export function NamedIcon({
@@ -223,7 +168,7 @@ export function NamedIcon({
   className,
   fallback,
 }: {
-  name: string;
+  name: IconNamesOrString;
   className: string;
   fallback?: JSX.Element;
 }) {
@@ -233,12 +178,7 @@ export function NamedIcon({
 
   if (hasIcon(name)) {
     return (
-      <div
-        className={cn(
-          "grid aspect-square min-h-fit place-items-center",
-          className
-        )}
-      >
+      <span className={cn("grid aspect-square min-h-fit place-items-center", className)}>
         <CompanyIcon
           name={name}
           className={"h-full w-full p-[7%]"}
@@ -247,7 +187,7 @@ export function NamedIcon({
             shapeRendering: "geometricPrecision",
           }}
         />
-      </div>
+      </span>
     );
   }
 
@@ -265,10 +205,12 @@ export function NamedIconInBox({
   name,
   className,
   fallback,
+  iconClassName,
 }: {
   name: string;
   className?: string;
   fallback?: JSX.Element;
+  iconClassName?: string;
 }) {
   return (
     <div
@@ -277,7 +219,7 @@ export function NamedIconInBox({
         className
       )}
     >
-      <NamedIcon name={name} fallback={fallback} className="h-6 w-6" />
+      <NamedIcon name={name} fallback={fallback} className={cn("h-6 w-6", iconClassName)} />
     </div>
   );
 }

apps/webapp/app/components/primitives/OperatingSystemProvider.tsx

@@ -23,9 +23,7 @@ export const OperatingSystemContextProvider = ({
 };
 
 const throwIfNoProvider = () => {
-  throw new Error(
-    "Please wrap your application in an OperatingSystemContextProvider."
-  );
+  throw new Error("Please wrap your application in an OperatingSystemContextProvider.");
 };
 
 export const useOperatingSystem = () => {

apps/webapp/app/components/primitives/PageHeader.tsx

@@ -11,17 +11,9 @@ type WithChildren = {
   children: React.ReactNode;
 };
 
-export function PageHeader({
-  children,
-  hideBorder,
-}: WithChildren & { hideBorder?: boolean }) {
+export function PageHeader({ children, hideBorder }: WithChildren & { hideBorder?: boolean }) {
   return (
-    <div
-      className={cn(
-        "mx-4 pt-4",
-        hideBorder ? "" : "border-b border-slate-800 pb-4"
-      )}
-    >
+    <div className={cn("mx-4 pt-4", hideBorder ? "" : "border-b border-slate-800 pb-4")}>
       {children}
     </div>
   );
@@ -49,10 +41,7 @@ export function PageTitle({ title, backButton }: PageTitleProps) {
             className="flex items-center gap-1 text-slate-400 transition group-hover:text-white"
           >
             <ChevronLeftIcon className="h-6" />
-            <Header1
-              variant="dimmed"
-              className="transition group-hover:text-white"
-            >
+            <Header1 textColor="dimmed" className="transition group-hover:text-white">
               {backButton.text}
             </Header1>
           </Link>
@@ -107,24 +96,13 @@ export function PageInfoProperty({
 }) {
   return (
     <div className="flex items-center gap-1">
-      {icon && typeof icon === "string" ? (
-        <NamedIcon name={icon} className="h-4 w-4" />
-      ) : (
-        icon
-      )}
+      {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"
-        >
+        <Paragraph variant="extra-small/caps" className="mt-0.5 whitespace-nowrap">
           {label}:
         </Paragraph>
       )}
-      {typeof value === "string" || typeof value === "number" ? (
-        <Paragraph variant="small">{value}</Paragraph>
-      ) : (
-        value
-      )}
+      <Paragraph variant="small">{value}</Paragraph>
     </div>
   );
 }

apps/webapp/app/components/primitives/Pagination.tsx

@@ -43,11 +43,8 @@ export function PaginationControls({
       <div className="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
         <div>
           <p className="text-sm text-slate-400">
-            Showing{" "}
-            <span className="font-medium">
-              {(currentPage - 1) * pageSize + 1}
-            </span>{" "}
-            to <span className="font-medium">{currentPage * pageSize}</span> of{" "}
+            Showing <span className="font-medium">{(currentPage - 1) * pageSize + 1}</span> to{" "}
+            <span className="font-medium">{currentPage * pageSize}</span> of{" "}
             <span className="font-medium">{totalResults}</span> results
           </p>
         </div>
@@ -86,10 +83,7 @@ export function PaginationControls({
   );
 }
 
-function pageUrl(
-  location: ReturnType<typeof useLocation>,
-  page: number
-): string {
+function pageUrl(location: ReturnType<typeof useLocation>, page: number): string {
   const search = new URLSearchParams(location.search);
 
   search.set("page", String(page));
@@ -101,8 +95,7 @@ const baseClass =
   "relative inline-flex items-center border px-3.5 py-2 text-xs font-medium focus:z-20 transition";
 const unselectedClass =
   "bg-slate-700/20 border-slate-500 text-slate-400 hover:bg-slate-400 hover:text-slate-900";
-const selectedClass =
-  "z-10 bg-slate-500 border-slate-500 hover:bg-slate-400 text-slate-900";
+const selectedClass = "z-10 bg-slate-500 border-slate-500 hover:bg-slate-400 text-slate-900";
 
 function PageLinkComponent({
   page,
@@ -114,19 +107,13 @@ function PageLinkComponent({
   if (page.type === "specific") {
     if (page.isCurrent) {
       return (
-        <Link
-          to={pageUrl(location, page.page)}
-          className={cn(baseClass, selectedClass)}
-        >
+        <Link to={pageUrl(location, page.page)} className={cn(baseClass, selectedClass)}>
           {page.page}
         </Link>
       );
     } else {
       return (
-        <Link
-          to={pageUrl(location, page.page)}
-          className={cn(baseClass, unselectedClass)}
-        >
+        <Link to={pageUrl(location, page.page)} className={cn(baseClass, unselectedClass)}>
           {page.page}
         </Link>
       );
@@ -154,10 +141,7 @@ type SpecificPageLink = {
 
 // If there are less than or equal to 6 pages, just show all the pages.
 // If there are more than 5 pages, show the first 3, the current page, and the last 3.
-function calculatePageLinks(
-  currentPage: number,
-  totalPages: number
-): Array<PageLink> {
+function calculatePageLinks(currentPage: number, totalPages: number): Array<PageLink> {
   const pageLinks: Array<PageLink> = [];
 
   if (totalPages <= 10) {

apps/webapp/app/components/primitives/Paragraph.tsx

@@ -1,4 +1,6 @@
+import { Link } from "@remix-run/react";
 import { cn } from "~/utils/cn";
+import { IconNamesOrString, NamedIcon } from "./NamedIcon";
 
 const paragraphVariants = {
   base: {
@@ -88,20 +90,3 @@ export function Paragraph({
     </p>
   );
 }
-
-type TextLinkProps = {
-  href: string;
-  children: React.ReactNode;
-} & React.AnchorHTMLAttributes<HTMLAnchorElement>;
-
-export function TextLink({ href, children, ...props }: TextLinkProps) {
-  return (
-    <a
-      href={href}
-      className="text-indigo-500 transition hover:text-indigo-400"
-      {...props}
-    >
-      {children}
-    </a>
-  );
-}

apps/webapp/app/components/primitives/Popover.tsx

@@ -35,10 +35,7 @@ PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 
 function PopoverSectionHeader({ title }: { title: string }) {
   return (
-    <Paragraph
-      variant="extra-extra-small/bright/caps"
-      className="bg-slate-900 px-2.5 py-2"
-    >
+    <Paragraph variant="extra-extra-small/bright/caps" className="bg-slate-900 px-2.5 py-2">
       {title}
     </Paragraph>
   );
@@ -63,9 +60,7 @@ function PopoverMenuItem({
       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-750" : undefined}
     >
       {title}
     </LinkButton>
@@ -77,9 +72,7 @@ function PopoverArrowTrigger({
   children,
   className,
   ...props
-}: { isOpen?: boolean } & React.ComponentPropsWithoutRef<
-  typeof PopoverTrigger
->) {
+}: { isOpen?: boolean } & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
   return (
     <PopoverTrigger
       {...props}
@@ -88,17 +81,11 @@ function PopoverArrowTrigger({
         className
       )}
     >
-      <Paragraph
-        variant="extra-small"
-        className="transition group-hover:text-bright"
-      >
+      <Paragraph variant="extra-small" className="transition group-hover:text-bright">
         {children}
       </Paragraph>
       <ChevronDownIcon
-        className={cn(
-          "h-3 w-3 transition group-hover:text-bright",
-          isOpen && "-rotate-180"
-        )}
+        className={cn("h-3 w-3 transition group-hover:text-bright", isOpen && "-rotate-180")}
       />
     </PopoverTrigger>
   );

apps/webapp/app/components/primitives/RadioButton.tsx

@@ -34,9 +34,9 @@ const variants = {
   },
   description: {
     button:
-      "w-full py-2 pl-2 pr-3 hover:bg-slate-850 transition data-[disabled]:opacity-70 data-[state=checked]:bg-slate-850 border-slate-800 border rounded-sm",
+      "w-full p-2.5 hover:bg-slate-850 transition data-[disabled]:opacity-70 data-[state=checked]:bg-slate-850 border-slate-800 border rounded-sm",
     label: "text-bright font-semibold -mt-1 text-left",
-    description: "text-dimmed -mt-0.5 text-left",
+    description: "text-dimmed -mt-0 text-left",
     inputPosition: "mt-0",
   },
 };
@@ -45,9 +45,7 @@ export const RadioGroup = React.forwardRef<
   React.ElementRef<typeof RadioGroupPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof RadioGroupPrimitive.Root>
 >(({ className, ...props }, ref) => {
-  return (
-    <RadioGroupPrimitive.Root className={className} {...props} ref={ref} />
-  );
+  return <RadioGroupPrimitive.Root className={className} {...props} ref={ref} />;
 });
 
 type RadioGroupItemProps = Omit<
@@ -64,67 +62,48 @@ type RadioGroupItemProps = Omit<
 export const RadioGroupItem = React.forwardRef<
   React.ElementRef<typeof RadioGroupPrimitive.Item>,
   RadioGroupItemProps
->(
-  (
-    {
-      className,
-      children,
-      variant = "simple",
-      label,
-      description,
-      badges,
-      ...props
-    },
-    ref
-  ) => {
-    const variation = variants[variant];
+>(({ className, children, variant = "simple", label, description, badges, ...props }, ref) => {
+  const variation = variants[variant];
 
-    return (
-      <RadioGroupPrimitive.Item
-        ref={ref}
+  return (
+    <RadioGroupPrimitive.Item
+      ref={ref}
+      className={cn(
+        "group flex cursor-pointer items-start gap-x-2 transition",
+        variation.button,
+        className
+      )}
+      {...props}
+    >
+      <div
         className={cn(
-          "group flex cursor-pointer items-start gap-x-2 transition",
-          variation.button,
-          className
+          "aspect-square h-4 w-4 shrink-0 overflow-hidden rounded-sm border border-slate-700 ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+          variation.inputPosition
         )}
-        {...props}
       >
-        <div
-          className={cn(
-            "aspect-square h-4 w-4 shrink-0 overflow-hidden rounded-sm border border-slate-700 ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
-            variation.inputPosition
-          )}
-        >
-          <RadioGroupPrimitive.Indicator className="flex h-full w-full items-center justify-center bg-indigo-700">
-            <Circle className="h-1.5 w-1.5 fill-white text-white" />
-          </RadioGroupPrimitive.Indicator>
-        </div>
-        <div>
-          <div className="flex items-center gap-x-2">
-            <label
-              htmlFor={props.id}
-              className={cn("cursor-pointer", variation.label)}
-            >
-              {label}
-            </label>
-            {badges && (
-              <span className="-mr-2 flex gap-x-1.5">
-                {badges.map((badge) => (
-                  <Badge key={badge}>{badge}</Badge>
-                ))}
-              </span>
-            )}
-          </div>
-          {variant === "description" && (
-            <Paragraph
-              variant="small"
-              className={cn("mt-0.5", variation.description)}
-            >
-              {description}
-            </Paragraph>
+        <RadioGroupPrimitive.Indicator className="flex h-full w-full items-center justify-center bg-indigo-700">
+          <Circle className="h-1.5 w-1.5 fill-white text-white" />
+        </RadioGroupPrimitive.Indicator>
+      </div>
+      <div>
+        <div className="flex items-center gap-x-2">
+          <label htmlFor={props.id} className={cn("cursor-pointer", variation.label)}>
+            {label}
+          </label>
+          {badges && (
+            <span className="-mr-2 flex gap-x-1.5">
+              {badges.map((badge) => (
+                <Badge key={badge}>{badge}</Badge>
+              ))}
+            </span>
           )}
         </div>
-      </RadioGroupPrimitive.Item>
-    );
-  }
-);
+        {variant === "description" && (
+          <Paragraph variant="small" className={cn("mt-0.5", variation.description)}>
+            {description}
+          </Paragraph>
+        )}
+      </div>
+    </RadioGroupPrimitive.Item>
+  );
+});

apps/webapp/app/components/primitives/Select.tsx

@@ -6,7 +6,7 @@ import { Check, ChevronDown } from "lucide-react";
 import { cn } from "~/utils/cn";
 
 const sizes = {
-  small: "text-xs h-6 bg-tertiary hover:bg-tertiary-foreground px-2",
+  "secondary/small": "text-xs h-6 bg-tertiary hover:bg-tertiary-foreground pr-2 pl-1 bg-slate-800",
   medium:
     "text-sm h-8 bg-slate-850 border border-slate-800 hover:bg-slate-800 hover:border-slate-750 px-2.5",
 };
@@ -22,35 +22,30 @@ const SelectValue = SelectPrimitive.Value;
 const SelectTrigger = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Trigger>,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & SelectProps
->(
-  (
-    { className, children, width = "content", size = "small", ...props },
-    ref
-  ) => {
-    const sizeClassName = sizes[size];
-    return (
-      <SelectPrimitive.Trigger
-        ref={ref}
-        className={cn(
-          "group flex items-center justify-between gap-x-2 rounded text-dimmed ring-offset-background transition placeholder:text-dimmed hover:text-bright focus-visible:bg-tertiary-foreground focus-visible:text-bright focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
-          width === "full" ? "w-full" : "w-min",
-          sizeClassName,
-          className
-        )}
-        {...props}
-      >
-        {children}
-        <SelectPrimitive.Icon asChild>
-          <ChevronDown
-            className={cn(
-              "h-4 w-4 text-dimmed transition group-hover:text-bright group-focus:text-bright"
-            )}
-          />
-        </SelectPrimitive.Icon>
-      </SelectPrimitive.Trigger>
-    );
-  }
-);
+>(({ className, children, width = "content", size = "secondary/small", ...props }, ref) => {
+  const sizeClassName = sizes[size];
+  return (
+    <SelectPrimitive.Trigger
+      ref={ref}
+      className={cn(
+        "group flex items-center justify-between gap-x-2 rounded text-dimmed ring-offset-background transition placeholder:text-dimmed hover:text-bright focus-visible:bg-tertiary-foreground focus-visible:text-bright focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50",
+        width === "full" ? "w-full" : "w-min",
+        sizeClassName,
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <SelectPrimitive.Icon asChild>
+        <ChevronDown
+          className={cn(
+            "h-4 w-4 text-dimmed transition group-hover:text-bright group-focus:text-bright"
+          )}
+        />
+      </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
+  );
+});
 SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
 
 const SelectContent = React.forwardRef<

apps/webapp/app/components/primitives/Sheet.tsx

@@ -28,12 +28,7 @@ interface SheetPortalProps
   extends SheetPrimitive.DialogPortalProps,
     VariantProps<typeof portalVariants> {}
 
-const SheetPortal = ({
-  position,
-  className,
-  children,
-  ...props
-}: SheetPortalProps) => (
+const SheetPortal = ({ position, className, children, ...props }: SheetPortalProps) => (
   <SheetPrimitive.Portal className={cn(className)} {...props}>
     <div className={portalVariants({ position })}>{children}</div>
   </SheetPrimitive.Portal>
@@ -46,7 +41,7 @@ const SheetOverlay = React.forwardRef<
 >(({ className, children, ...props }, ref) => (
   <SheetPrimitive.Overlay
     className={cn(
-      "fixed inset-0 z-50 bg-slate-900/50 transition-all duration-100 data-[state=closed]:animate-out data-[state=closed]:fade-out data-[state=open]:fade-in",
+      "fixed inset-0 z-50 bg-midnight-900/80 transition animate-in duration-200 data-[state=closed]:animate-out data-[state=closed]:fade-out data-[state=open]:fade-in",
       className
     )}
     {...props}
@@ -56,14 +51,14 @@ const SheetOverlay = React.forwardRef<
 SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
 
 const sheetVariants = cva(
-  "fixed z-50 scale-100 gap-4 bg-midnight-900 opacity-100 shadow-lg rounded-md border border-slate-800 mr-4 mt-4",
+  "fixed z-50 scale-100 gap-4 bg-midnight-900 shadow-lg shadow-indigo-900 opacity-100 border-l border-y border-slate-800",
   {
     variants: {
       position: {
-        top: "animate-in slide-in-from-top w-full duration-300",
-        bottom: "animate-in slide-in-from-bottom w-full duration-300",
-        left: "animate-in slide-in-from-left h-full duration-300",
-        right: "animate-in slide-in-from-right h-[97vh] duration-300",
+        top: "animate-in slide-in-from-top w-full duration-200",
+        bottom: "animate-in slide-in-from-bottom w-full duration-200",
+        left: "animate-in slide-in-from-left h-full duration-200",
+        right: "animate-in slide-in-from-right h-screen duration-200",
       },
       size: {
         content: "",
@@ -166,19 +161,14 @@ const SheetContent = React.forwardRef<
           </SheetPrimitive.Close>
           <ShortcutKey shortcut={{ key: "esc" }} variant="small" />
         </div>
-        <div className="flex max-h-full flex-col overflow-hidden">
-          {children}
-        </div>
+        <div className="flex max-h-full flex-col overflow-hidden">{children}</div>
       </div>
     </SheetPrimitive.Content>
   </SheetPortal>
 ));
 SheetContent.displayName = SheetPrimitive.Content.displayName;
 
-export const SheetBody = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
+export const SheetBody = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
   <div
     className={cn(
       "overflow-y-auto p-4 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-slate-700",
@@ -188,10 +178,7 @@ export const SheetBody = ({
   />
 );
 
-export const SheetHeader = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
+export const SheetHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
   <div
     className={cn(
       "mx-4 flex shrink-0 items-center gap-4 border-b border-slate-800 py-3.5",

apps/webapp/app/components/primitives/ShortcutKey.tsx

@@ -18,15 +18,10 @@ type ShortcutKeyProps = {
   className?: string;
 };
 
-export function ShortcutKey({
-  shortcut,
-  variant,
-  className,
-}: ShortcutKeyProps) {
+export function ShortcutKey({ shortcut, variant, className }: ShortcutKeyProps) {
   const { platform } = useOperatingSystem();
   const isMac = platform === "mac";
-  let relevantShortcut =
-    "mac" in shortcut ? (isMac ? shortcut.mac : shortcut.windows) : shortcut;
+  let relevantShortcut = "mac" in shortcut ? (isMac ? shortcut.mac : shortcut.windows) : shortcut;
   const modifiers = relevantShortcut.modifiers ?? [];
   const character = relevantShortcut.key;
 

apps/webapp/app/components/primitives/Spinner.tsx

@@ -29,15 +29,7 @@ export function Spinner({
       xmlns="http://www.w3.org/2000/svg"
       className={cn("animate-spin motion-reduce:hidden", className)}
     >
-      <rect
-        x="2"
-        y="2"
-        width="16"
-        height="16"
-        rx="8"
-        stroke={currentColor.light}
-        strokeWidth="3"
-      />
+      <rect x="2" y="2" width="16" height="16" rx="8" stroke={currentColor.light} strokeWidth="3" />
       <path
         d="M10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2"
         stroke={currentColor.dark}

apps/webapp/app/components/primitives/StepNumber.tsx

@@ -1,30 +1,35 @@
-export function TutorialStep({
+import { cn } from "~/utils/cn";
+import { Header2 } from "./Headers";
+
+export function StepNumber({
   stepNumber,
-  drawLine,
   active = false,
   complete = false,
+  title,
+  className,
 }: {
   stepNumber?: string;
-  drawLine?: boolean;
   active?: boolean;
   complete?: boolean;
+  title?: React.ReactNode;
+  className?: string;
 }) {
   return (
-    <div className="mr-3 flex flex-col items-center justify-center">
+    <div className={cn("mr-3", className)}>
       {active ? (
-        <span className="flex h-7 w-7 items-center justify-center rounded bg-green-600 py-1 text-sm font-semibold text-slate-900 shadow">
-          {stepNumber}
-        </span>
+        <div className="flex items-center gap-x-3">
+          <span className="flex h-6 w-6 items-center justify-center rounded bg-green-600 py-1 text-xs font-semibold text-slate-900 shadow">
+            {stepNumber}
+          </span>
+          <Header2>{title}</Header2>
+        </div>
       ) : (
-        <span className="flex h-7 w-7 items-center justify-center rounded border border-slate-700 bg-slate-800 py-1 text-sm font-semibold text-green-400 shadow">
-          {complete ? "✓" : stepNumber}
-        </span>
-      )}
-
-      {drawLine ? (
-        <div className="h-full border-l border-slate-700"></div>
-      ) : (
-        <div className="h-full"></div>
+        <div className="flex items-center gap-x-3">
+          <span className="flex h-6 w-6 items-center justify-center rounded border border-slate-700 bg-slate-800 py-1 text-xs font-semibold text-dimmed shadow">
+            {complete ? "✓" : stepNumber}
+          </span>
+          <Header2>{title}</Header2>
+        </div>
       )}
     </div>
   );